diff --git a/ChangeLog b/ChangeLog index 28c73d555..726ebf69a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * backend/genesys_devices.c: Enable Motor again for combined dark/bright calibration, fix calculation of pixel number used in calibration + * backend/genesys_devices.c, backend/genesys_gl646.c, + backend/genesys_gl841.c, backend/genesys_low.h: Remove park_head 2009-03-21 m. allan noah * backend/fujitsu.[ch]: backend v91 diff --git a/backend/genesys.c b/backend/genesys.c index 5745e5445..f462f4ad4 100644 --- a/backend/genesys.c +++ b/backend/genesys.c @@ -3701,10 +3701,7 @@ genesys_start_scan (Genesys_Device * dev) return status; } - if (dev->model->flags & GENESYS_FLAG_USE_PARK) - status = dev->model->cmd_set->park_head (dev, dev->reg, 1); - else - status = dev->model->cmd_set->slow_back_home (dev, 1); + status = dev->model->cmd_set->slow_back_home (dev, 1); if (status != SANE_STATUS_GOOD) { DBG (DBG_error, @@ -3719,10 +3716,7 @@ genesys_start_scan (Genesys_Device * dev) /* Go home */ /* TODO: check we can drop this since we cannot have the scanner's head wandering here */ - if (dev->model->flags & GENESYS_FLAG_USE_PARK) - status = dev->model->cmd_set->park_head (dev, dev->reg, 1); - else - status = dev->model->cmd_set->slow_back_home (dev, 1); + status = dev->model->cmd_set->slow_back_home (dev, 1); if (status != SANE_STATUS_GOOD) { DBG (DBG_error, @@ -6067,10 +6061,7 @@ sane_cancel (SANE_Handle handle) /* park head if flatbed scanner */ if (s->dev->model->is_sheetfed == SANE_FALSE) { - if (s->dev->model->flags & GENESYS_FLAG_USE_PARK) - status = s->dev->model->cmd_set->park_head (s->dev, s->dev->reg, 1); - else - status = s->dev->model->cmd_set->slow_back_home (s->dev, 1); + status = s->dev->model->cmd_set->slow_back_home (s->dev, 1); if (status != SANE_STATUS_GOOD) { DBG (DBG_error, diff --git a/backend/genesys_devices.c b/backend/genesys_devices.c index 09c25d4e7..992998bff 100644 --- a/backend/genesys_devices.c +++ b/backend/genesys_devices.c @@ -1093,7 +1093,6 @@ static Genesys_Model plustek_st24_model = { GENESYS_FLAG_UNTESTED | GENESYS_FLAG_14BIT_GAMMA | GENESYS_FLAG_LAZY_INIT - | GENESYS_FLAG_USE_PARK | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_OFFSET_CALIBRATION, GENESYS_HAS_NO_BUTTONS, /* no buttons supported */ 20, @@ -1144,7 +1143,6 @@ static Genesys_Model medion_md5345_model = { MOTOR_5345, GENESYS_FLAG_14BIT_GAMMA | GENESYS_FLAG_LAZY_INIT - | GENESYS_FLAG_USE_PARK | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_DARK_CALIBRATION diff --git a/backend/genesys_gl646.c b/backend/genesys_gl646.c index c98517557..277996112 100644 --- a/backend/genesys_gl646.c +++ b/backend/genesys_gl646.c @@ -305,12 +305,6 @@ gl646_setup_registers (Genesys_Device * dev, uint32_t linecnt, uint16_t startx, uint16_t endx, SANE_Bool color, SANE_Int depth); -/** - * this function moves head without scanning, forward, then backward - * so that the head goes to park position. - * as a by-product, also check for lock - */ -static SANE_Status gl646_repark_head (Genesys_Device * dev); /** * Does a simple scan of the area given by the settings. Scanned data @@ -3227,13 +3221,6 @@ gl646_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home) return SANE_STATUS_GOOD; } -static SANE_Status -gl646_park_head (Genesys_Device * dev, Genesys_Register_Set * reg, - SANE_Bool wait_until_home) -{ - return gl646_slow_back_home (dev, wait_until_home); -} - /** * Automatically set top-left edge of the scan area by scanning an * area at 300 dpi from very top of scanner @@ -4830,7 +4817,6 @@ static Genesys_Command_Set gl646_cmd_set = { gl646_led_calibration, gl646_slow_back_home, - gl646_park_head, gl646_bulk_write_register, gl646_bulk_write_data, diff --git a/backend/genesys_gl841.c b/backend/genesys_gl841.c index 06967d619..496cc0f10 100644 --- a/backend/genesys_gl841.c +++ b/backend/genesys_gl841.c @@ -3984,19 +3984,6 @@ gl841_slow_back_home (Genesys_Device * dev, SANE_Bool wait_until_home) return SANE_STATUS_GOOD; } -/* Moves the slider to the home (top) postion */ -/* relies on the settings given for scan, - but disables scan, puts motor in reverse and - steps to go before area to 65535 so head will - go home */ -static SANE_Status -gl841_park_head (Genesys_Device * dev, Genesys_Register_Set * reg, - SANE_Bool wait_until_home) -{ - return gl841_slow_back_home (dev, wait_until_home); -} - - /* Automatically set top-left edge of the scan area by scanning a 200x200 pixels area at 600 dpi from very top of scanner */ static SANE_Status @@ -5561,7 +5548,6 @@ static Genesys_Command_Set gl841_cmd_set = { gl841_led_calibration, gl841_slow_back_home, - gl841_park_head, gl841_bulk_write_register, gl841_bulk_write_data, diff --git a/backend/genesys_low.h b/backend/genesys_low.h index 110114373..809b65d20 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -75,8 +75,7 @@ #define GENESYS_FLAG_UNTESTED (1 << 0) /* Print a warning for these scanners */ #define GENESYS_FLAG_14BIT_GAMMA (1 << 1) /* use 14bit Gamma table instead of 12 */ #define GENESYS_FLAG_LAZY_INIT (1 << 2) /* skip extensive ASIC test at init */ -#define GENESYS_FLAG_USE_PARK (1 << 3) /* use genesys_park_head() instead of - genesys_slow_back_home() */ +/*#define GENESYS_FLAG_UNUSED (1 << 3) */ #define GENESYS_FLAG_SKIP_WARMUP (1 << 4) /* skip genesys_warmup() */ #define GENESYS_FLAG_OFFSET_CALIBRATION (1 << 5) /* do offset calibration */ #define GENESYS_FLAG_SEARCH_START (1 << 6) /* do start search beofre scanning */ @@ -359,9 +358,6 @@ typedef struct Genesys_Command_Set SANE_Status (*slow_back_home) (Genesys_Device * dev, SANE_Bool wait_until_home); - SANE_Status (*park_head) (Genesys_Device * dev, - Genesys_Register_Set * reg, - SANE_Bool wait_until_home); SANE_Status (*bulk_write_register) (Genesys_Device * dev, Genesys_Register_Set * reg,