diff options
Diffstat (limited to 'contrib/lips4/gdevl4r.c')
| -rw-r--r-- | contrib/lips4/gdevl4r.c | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/contrib/lips4/gdevl4r.c b/contrib/lips4/gdevl4r.c index e679791c9..3b5100c4c 100644 --- a/contrib/lips4/gdevl4r.c +++ b/contrib/lips4/gdevl4r.c @@ -99,72 +99,52 @@ struct gx_device_lips4_s { lips4_params_common; }; -static int -lips2p_initialize(gx_device *dev) +static void +lips2p_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono(dev); set_dev_proc(dev, open_device, lips2p_open); set_dev_proc(dev, close_device, lips_close); set_dev_proc(dev, get_params, lips_get_params); set_dev_proc(dev, put_params, lips_put_params); - - return 0; }; -static int -lips3_initialize(gx_device *dev) +static void +lips3_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono(dev); set_dev_proc(dev, open_device, lips3_open); set_dev_proc(dev, close_device, lips_close); set_dev_proc(dev, get_params, lips_get_params); set_dev_proc(dev, put_params, lips_put_params); - - return 0; }; -static int -bjc880j_initialize(gx_device *dev) +static void +bjc880j_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono(dev); set_dev_proc(dev, open_device, bjc880j_open); set_dev_proc(dev, close_device, lips_close); set_dev_proc(dev, get_params, lips4_get_params); set_dev_proc(dev, put_params, lips4_put_params); - - return 0; }; -static int -lips4_initialize(gx_device *dev) +static void +lips4_initialize_device_procs(gx_device *dev) { - int code = gdev_prn_initialize_mono(dev); - - if (code < 0) - return code; + gdev_prn_initialize_device_procs_mono(dev); set_dev_proc(dev, open_device, lips4_open); set_dev_proc(dev, close_device, lips_close); set_dev_proc(dev, get_params, lips4_get_params); set_dev_proc(dev, put_params, lips4_put_params); - - return 0; }; gx_device_lips far_data gs_lips2p_device = -lips_device(gx_device_lips, lips2p_initialize, "lips2p", +lips_device(gx_device_lips, lips2p_initialize_device_procs, "lips2p", LIPS2P_DPI_DEFAULT, LIPS2P_DPI_DEFAULT, LIPS2P_LEFT_MARGIN_DEFAULT, @@ -176,7 +156,7 @@ lips_device(gx_device_lips, lips2p_initialize, "lips2p", LIPS_USERNAME_DEFAULT); gx_device_lips far_data gs_lips3_device = -lips_device(gx_device_lips, lips3_initialize, "lips3", +lips_device(gx_device_lips, lips3_initialize_device_procs, "lips3", LIPS3_DPI_DEFAULT, LIPS3_DPI_DEFAULT, LIPS3_LEFT_MARGIN_DEFAULT, @@ -188,7 +168,7 @@ lips_device(gx_device_lips, lips3_initialize, "lips3", LIPS_USERNAME_DEFAULT); gx_device_lips4 far_data gs_bjc880j_device = -lips4_device(gx_device_lips4, bjc880j_initialize, "bjc880j", +lips4_device(gx_device_lips4, bjc880j_initialize_device_procs, "bjc880j", BJC880J_DPI_DEFAULT, BJC880J_DPI_DEFAULT, BJC880J_LEFT_MARGIN_DEFAULT, @@ -200,7 +180,7 @@ lips4_device(gx_device_lips4, bjc880j_initialize, "bjc880j", LIPS_USERNAME_DEFAULT); gx_device_lips4 far_data gs_lips4_device = -lips4_device(gx_device_lips4, lips4_initialize, "lips4", +lips4_device(gx_device_lips4, lips4_initialize_device_procs, "lips4", LIPS4_DPI_DEFAULT, LIPS4_DPI_DEFAULT, LIPS4_LEFT_MARGIN_DEFAULT, |