diff --git a/backend/genesys.cc b/backend/genesys.cc index b6013fc66..86da1091d 100644 --- a/backend/genesys.cc +++ b/backend/genesys.cc @@ -6134,9 +6134,9 @@ sane_open_impl(SANE_String_Const devicename, SANE_Handle * handle) sanei_genesys_init_cmd_set(s->dev); - // FIXME: we create sensor tables for the sensor, this should happen when we know which sensor - // we will select - RIE (dev->model->cmd_set->init(dev)); + // FIXME: we create sensor tables for the sensor, this should happen when we know which sensor + // we will select + dev->model->cmd_set->init(dev); /* some hardware capabilities are detected through sensors */ RIE (s->dev->model->cmd_set->update_hardware_sensors (s)); diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc index de0356acf..aa1cb53b2 100644 --- a/backend/genesys_gl124.cc +++ b/backend/genesys_gl124.cc @@ -3028,17 +3028,12 @@ static void gl124_init_memory_layout(Genesys_Device* dev) * initialize backend and ASIC : registers, motor tables, and gamma tables * then ensure scanner's head is at home */ -static SANE_Status -gl124_init(Genesys_Device * dev) +static void gl124_init(Genesys_Device* dev) { - SANE_Status status = SANE_STATUS_GOOD; - DBG_INIT (); DBG_HELPER(dbg); - status=sanei_genesys_asic_init(dev, 0); - - return status; + sanei_genesys_asic_init(dev, 0); } diff --git a/backend/genesys_gl124.h b/backend/genesys_gl124.h index f15da39c1..c630ec287 100644 --- a/backend/genesys_gl124.h +++ b/backend/genesys_gl124.h @@ -470,7 +470,7 @@ static void gl124_begin_scan(Genesys_Device* dev, const Genesys_Sensor& sensor, Genesys_Register_Set* reg, SANE_Bool start_motor); static void gl124_end_scan(Genesys_Device* dev, Genesys_Register_Set* reg, SANE_Bool check_stop); static void gl124_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home); -static SANE_Status gl124_init(Genesys_Device * dev); +static void gl124_init(Genesys_Device* dev); static void gl124_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size); diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc index 74f0202b3..071f61f56 100644 --- a/backend/genesys_gl646.cc +++ b/backend/genesys_gl646.cc @@ -3394,8 +3394,7 @@ static void gl646_repark_head(Genesys_Device* dev) * @param dev device description of the scanner to initailize * @return SANE_STATUS_GOOD if success, error code if failure */ -static SANE_Status -gl646_init (Genesys_Device * dev) +static void gl646_init(Genesys_Device* dev) { DBG_INIT(); DBG_HELPER(dbg); @@ -3553,8 +3552,6 @@ gl646_init (Genesys_Device * dev) /* here session and device are initialized */ dev->already_initialized = SANE_TRUE; - - return SANE_STATUS_GOOD; } static diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc index fa17ec49f..a35dc43a9 100644 --- a/backend/genesys_gl841.cc +++ b/backend/genesys_gl841.cc @@ -4269,8 +4269,7 @@ gl841_is_compatible_calibration (Genesys_Device * dev, const Genesys_Sensor& sen * initialize ASIC : registers, motor tables, and gamma tables * then ensure scanner's head is at home */ -static SANE_Status -gl841_init (Genesys_Device * dev) +static void gl841_init(Genesys_Device* dev) { uint8_t val; size_t size; @@ -4287,7 +4286,7 @@ gl841_init (Genesys_Device * dev) if (val & REG41_PWRBIT) { DBG(DBG_info, "%s: already initialized\n", __func__); - return SANE_STATUS_GOOD; + return; } } @@ -4381,8 +4380,6 @@ gl841_init (Genesys_Device * dev) // Set powersaving(default = 15 minutes) gl841_set_powersaving(dev, 15); dev->already_initialized = SANE_TRUE; - - return SANE_STATUS_GOOD; } static SANE_Status diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc index 448e37c13..014c7f9ab 100644 --- a/backend/genesys_gl843.cc +++ b/backend/genesys_gl843.cc @@ -3645,17 +3645,12 @@ static void gl843_boot(Genesys_Device* dev, SANE_Bool cold) * initialize backend and ASIC : registers, motor tables, and gamma tables * then ensure scanner's head is at home */ -static SANE_Status -gl843_init (Genesys_Device * dev) +static void gl843_init(Genesys_Device* dev) { - SANE_Status status = SANE_STATUS_GOOD; - DBG_INIT (); DBG_HELPER(dbg); - status=sanei_genesys_asic_init(dev, 0); - - return status; + sanei_genesys_asic_init(dev, 0); } static SANE_Status diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc index 65d764d2d..11a108e2e 100644 --- a/backend/genesys_gl846.cc +++ b/backend/genesys_gl846.cc @@ -2334,16 +2334,12 @@ static void gl846_boot(Genesys_Device* dev, SANE_Bool cold) * initialize backend and ASIC : registers, motor tables, and gamma tables * then ensure scanner's head is at home */ -static SANE_Status gl846_init(Genesys_Device * dev) +static void gl846_init(Genesys_Device* dev) { - SANE_Status status = SANE_STATUS_GOOD; - DBG_INIT (); DBG_HELPER(dbg); - status=sanei_genesys_asic_init(dev, 0); - - return status; + sanei_genesys_asic_init(dev, 0); } static SANE_Status diff --git a/backend/genesys_gl846.h b/backend/genesys_gl846.h index 917ecf030..37e3e8eda 100644 --- a/backend/genesys_gl846.h +++ b/backend/genesys_gl846.h @@ -352,7 +352,7 @@ static void gl846_begin_scan(Genesys_Device* dev, const Genesys_Sensor& sensor, // Send the stop scan command static void gl846_end_scan(Genesys_Device* dev, Genesys_Register_Set* reg, SANE_Bool check_stop); -static SANE_Status gl846_init (Genesys_Device * dev); +static void gl846_init(Genesys_Device* dev); /** @brief moves the slider to steps at motor base dpi * @param dev device to work on diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc index 85fdc140d..461758ee8 100644 --- a/backend/genesys_gl847.cc +++ b/backend/genesys_gl847.cc @@ -2434,16 +2434,12 @@ static void gl847_boot(Genesys_Device* dev, SANE_Bool cold) * initialize backend and ASIC : registers, motor tables, and gamma tables * then ensure scanner's head is at home */ -static SANE_Status gl847_init (Genesys_Device * dev) +static void gl847_init(Genesys_Device* dev) { - SANE_Status status = SANE_STATUS_GOOD; - DBG_INIT (); DBG_HELPER(dbg); - status=sanei_genesys_asic_init(dev, 0); - - return status; + sanei_genesys_asic_init(dev, 0); } static SANE_Status diff --git a/backend/genesys_gl847.h b/backend/genesys_gl847.h index f6e01171a..a8a0e4eb3 100644 --- a/backend/genesys_gl847.h +++ b/backend/genesys_gl847.h @@ -336,7 +336,7 @@ static void gl847_begin_scan(Genesys_Device* dev, const Genesys_Sensor& sensor, // Send the stop scan command static void gl847_end_scan(Genesys_Device* dev, Genesys_Register_Set* reg, SANE_Bool check_stop); -static SANE_Status gl847_init (Genesys_Device * dev); +static void gl847_init(Genesys_Device* dev); /** @brief moves the slider to steps at motor base dpi * @param dev device to work on diff --git a/backend/genesys_low.cc b/backend/genesys_low.cc index b7970a95d..585fc7e75 100644 --- a/backend/genesys_low.cc +++ b/backend/genesys_low.cc @@ -1198,12 +1198,10 @@ void sanei_genesys_send_gamma_table(Genesys_Device* dev, const Genesys_Sensor& s * @param max_regs umber of maximum used registers * @return SANE_STATUS_GOOD in case of success */ -SANE_Status -sanei_genesys_asic_init(Genesys_Device* dev, int /*max_regs*/) +void sanei_genesys_asic_init(Genesys_Device* dev, int /*max_regs*/) { DBG_HELPER(dbg); - SANE_Status status = SANE_STATUS_GOOD; uint8_t val; SANE_Bool cold = SANE_TRUE; @@ -1238,7 +1236,7 @@ sanei_genesys_asic_init(Genesys_Device* dev, int /*max_regs*/) if (dev->already_initialized && !cold) { DBG (DBG_info, "%s: already initialized, nothing to do\n", __func__); - return SANE_STATUS_GOOD; + return; } // set up hardware and registers @@ -1266,8 +1264,6 @@ sanei_genesys_asic_init(Genesys_Device* dev, int /*max_regs*/) // Set powersaving (default = 15 minutes) dev->model->cmd_set->set_powersaving(dev, 15); - - return status; } /** diff --git a/backend/genesys_low.h b/backend/genesys_low.h index 722b2878c..4525f2ef4 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -1043,7 +1043,7 @@ struct Genesys_Command_Set bool (*needs_home_before_init_regs_for_scan) (Genesys_Device* dev); /** For ASIC initialization */ - SANE_Status (*init) (Genesys_Device * dev); + void (*init) (Genesys_Device* dev); SANE_Status (*init_regs_for_warmup) (Genesys_Device * dev, const Genesys_Sensor& sensor, @@ -1951,8 +1951,7 @@ inline SensorExposure sanei_genesys_fixup_exposure(SensorExposure exposure) extern void sanei_genesys_wait_for_home(Genesys_Device* dev); -extern SANE_Status -sanei_genesys_asic_init(Genesys_Device *dev, SANE_Bool cold); +extern void sanei_genesys_asic_init(Genesys_Device* dev, SANE_Bool cold); int sanei_genesys_compute_dpihw(Genesys_Device *dev, const Genesys_Sensor& sensor, int xres);