From 8ec6bc2e5d1e2a8c18a293a553887ed288ab8280 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Tue, 26 May 2020 01:32:44 +0300 Subject: [PATCH] genesys: Deduplicate move_to_ta() --- backend/genesys/command_set.h | 3 --- backend/genesys/genesys.cpp | 19 ++++++++++++++----- backend/genesys/gl124.cpp | 6 ------ backend/genesys/gl124.h | 2 -- backend/genesys/gl646.cpp | 7 ------- backend/genesys/gl646.h | 2 -- backend/genesys/gl841.cpp | 6 ------ backend/genesys/gl841.h | 2 -- backend/genesys/gl842.cpp | 17 ++--------------- backend/genesys/gl842.h | 2 -- backend/genesys/gl843.cpp | 17 ++--------------- backend/genesys/gl843.h | 2 -- backend/genesys/gl846.cpp | 13 ++----------- backend/genesys/gl846.h | 2 -- backend/genesys/gl847.cpp | 13 ++----------- backend/genesys/gl847.h | 2 -- 16 files changed, 22 insertions(+), 93 deletions(-) diff --git a/backend/genesys/command_set.h b/backend/genesys/command_set.h index 71cc58993..adaf10321 100644 --- a/backend/genesys/command_set.h +++ b/backend/genesys/command_set.h @@ -130,9 +130,6 @@ public: /// eject document from scanner virtual void eject_document(Genesys_Device* dev) const = 0; - /// move scanning head to transparency adapter - virtual void move_to_ta(Genesys_Device* dev) const = 0; - /// write shading data calibration to ASIC virtual void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, std::uint8_t* data, int size) const = 0; diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp index 2fffc6708..794bdad47 100644 --- a/backend/genesys/genesys.cpp +++ b/backend/genesys/genesys.cpp @@ -899,6 +899,15 @@ void scanner_move(Genesys_Device& dev, ScanMethod scan_method, unsigned steps, D dev.interface->sleep_ms(100); } +void scanner_move_to_ta(Genesys_Device& dev) +{ + DBG_HELPER(dbg); + + unsigned feed = static_cast((dev.model->y_offset_sensor_to_ta * dev.motor.base_ydpi) / + MM_PER_INCH); + scanner_move(dev, dev.model->default_method, feed, Direction::FORWARD); +} + void scanner_move_back_home(Genesys_Device& dev, bool wait_until_home) { DBG_HELPER_ARGS(dbg, "wait_until_home = %d", wait_until_home); @@ -2511,7 +2520,7 @@ static void genesys_repark_sensor_before_shading(Genesys_Device* dev) if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - dev->cmd_set->move_to_ta(dev); + scanner_move_to_ta(*dev); } } } @@ -3727,7 +3736,7 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - dev->cmd_set->move_to_ta(dev); + scanner_move_to_ta(*dev); } // shading calibration @@ -4051,7 +4060,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off) if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - dev->cmd_set->move_to_ta(dev); + scanner_move_to_ta(*dev); } genesys_warmup_lamp(dev); @@ -4068,7 +4077,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off) if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - dev->cmd_set->move_to_ta(dev); + scanner_move_to_ta(*dev); } /* load document if needed (for sheetfed scanner for instance) */ @@ -4110,7 +4119,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off) if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - dev->cmd_set->move_to_ta(dev); + scanner_move_to_ta(*dev); } init_regs_for_scan(*dev, sensor, dev->reg); diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp index 4237b36c1..d3fc1bcc6 100644 --- a/backend/genesys/gl124.cpp +++ b/backend/genesys/gl124.cpp @@ -1387,11 +1387,5 @@ void CommandSetGl124::eject_document(Genesys_Device* dev) const throw SaneException("not implemented"); } -void CommandSetGl124::move_to_ta(Genesys_Device* dev) const -{ - (void) dev; - throw SaneException("not implemented"); -} - } // namespace gl124 } // namespace genesys diff --git a/backend/genesys/gl124.h b/backend/genesys/gl124.h index 32f399ad2..2bbc05adf 100644 --- a/backend/genesys/gl124.h +++ b/backend/genesys/gl124.h @@ -105,8 +105,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override; diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp index 97ed9a035..2d17249a0 100644 --- a/backend/genesys/gl646.cpp +++ b/backend/genesys/gl646.cpp @@ -2657,13 +2657,6 @@ void CommandSetGl646::init(Genesys_Device* dev) const dev->already_initialized = true; } -void CommandSetGl646::move_to_ta(Genesys_Device* dev) const -{ - DBG_HELPER(dbg); - - simple_move(dev, static_cast(dev->model->y_offset_sensor_to_ta)); -} - static void simple_scan(Genesys_Device* dev, const Genesys_Sensor& sensor, const ScanSession& session, bool move, std::vector& data, const char* scan_identifier) diff --git a/backend/genesys/gl646.h b/backend/genesys/gl646.h index 2ca273fec..346bca9f6 100644 --- a/backend/genesys/gl646.h +++ b/backend/genesys/gl646.h @@ -105,8 +105,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override; diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp index 7dd31f919..8e3061b82 100644 --- a/backend/genesys/gl841.cpp +++ b/backend/genesys/gl841.cpp @@ -2283,12 +2283,6 @@ void CommandSetGl841::wait_for_motor_stop(Genesys_Device* dev) const (void) dev; } -void CommandSetGl841::move_to_ta(Genesys_Device* dev) const -{ - (void) dev; - throw SaneException("not implemented"); -} - void CommandSetGl841::asic_boot(Genesys_Device *dev, bool cold) const { // reset ASIC in case of cold boot diff --git a/backend/genesys/gl841.h b/backend/genesys/gl841.h index 64b63c6bd..860110504 100644 --- a/backend/genesys/gl841.h +++ b/backend/genesys/gl841.h @@ -105,8 +105,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override; diff --git a/backend/genesys/gl842.cpp b/backend/genesys/gl842.cpp index 13a05da1b..47893cc9a 100644 --- a/backend/genesys/gl842.cpp +++ b/backend/genesys/gl842.cpp @@ -544,7 +544,7 @@ ScanSession CommandSetGl842::calculate_scan_session(const Genesys_Device* dev, if (settings.scan_method == ScanMethod::TRANSPARENCY || settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter if (!dev->ignore_offsets) { move = dev->model->y_offset_ta - dev->model->y_offset_sensor_to_ta; @@ -737,7 +737,7 @@ void CommandSetGl842::init_regs_for_shading(Genesys_Device* dev, const Genesys_S if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter move = static_cast(dev->model->y_offset_calib_white_ta - dev->model->y_offset_sensor_to_ta); @@ -923,19 +923,6 @@ void CommandSetGl842::update_hardware_sensors(Genesys_Scanner* s) const (void) s; } -/** @brief move sensor to transparency adaptor - * Move sensor to the calibration of the transparency adapator (XPA). - * @param dev device to use - */ -void CommandSetGl842::move_to_ta(Genesys_Device* dev) const -{ - DBG_HELPER(dbg); - - unsigned feed = static_cast((dev->model->y_offset_sensor_to_ta * dev->motor.base_ydpi) / - MM_PER_INCH); - scanner_move(*dev, dev->model->default_method, feed, Direction::FORWARD); -} - /** * Send shading calibration data. The buffer is considered to always hold values * for all the channels. diff --git a/backend/genesys/gl842.h b/backend/genesys/gl842.h index 0602494d9..d02624a59 100644 --- a/backend/genesys/gl842.h +++ b/backend/genesys/gl842.h @@ -101,8 +101,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override; diff --git a/backend/genesys/gl843.cpp b/backend/genesys/gl843.cpp index 9fe8fc0e9..9e136d0e0 100644 --- a/backend/genesys/gl843.cpp +++ b/backend/genesys/gl843.cpp @@ -1079,7 +1079,7 @@ ScanSession CommandSetGl843::calculate_scan_session(const Genesys_Device* dev, if (settings.scan_method == ScanMethod::TRANSPARENCY || settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter if (!dev->ignore_offsets) { move = dev->model->y_offset_ta - dev->model->y_offset_sensor_to_ta; @@ -1402,7 +1402,7 @@ void CommandSetGl843::init_regs_for_shading(Genesys_Device* dev, const Genesys_S if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter move = static_cast(dev->model->y_offset_calib_white_ta - dev->model->y_offset_sensor_to_ta); if (dev->model->model_id == ModelId::CANON_8600F && resolution == 2400) { @@ -1698,19 +1698,6 @@ void CommandSetGl843::update_hardware_sensors(Genesys_Scanner* s) const } } -/** @brief move sensor to transparency adaptor - * Move sensor to the calibration of the transparency adapator (XPA). - * @param dev device to use - */ -void CommandSetGl843::move_to_ta(Genesys_Device* dev) const -{ - DBG_HELPER(dbg); - - unsigned feed = static_cast((dev->model->y_offset_sensor_to_ta * dev->motor.base_ydpi) / - MM_PER_INCH); - scanner_move(*dev, dev->model->default_method, feed, Direction::FORWARD); -} - /** * Send shading calibration data. The buffer is considered to always hold values * for all the channels. diff --git a/backend/genesys/gl843.h b/backend/genesys/gl843.h index 7b1d7682b..1e9a97897 100644 --- a/backend/genesys/gl843.h +++ b/backend/genesys/gl843.h @@ -101,8 +101,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override; diff --git a/backend/genesys/gl846.cpp b/backend/genesys/gl846.cpp index 34b66f6ed..3a7437f2a 100644 --- a/backend/genesys/gl846.cpp +++ b/backend/genesys/gl846.cpp @@ -717,7 +717,7 @@ ScanSession CommandSetGl846::calculate_scan_session(const Genesys_Device* dev, if (settings.scan_method == ScanMethod::TRANSPARENCY || settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter if (!dev->ignore_offsets) { move = dev->model->y_offset_ta - dev->model->y_offset_sensor_to_ta; @@ -857,7 +857,7 @@ void CommandSetGl846::init_regs_for_shading(Genesys_Device* dev, const Genesys_S if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter move = static_cast(dev->model->y_offset_calib_white_ta - dev->model->y_offset_sensor_to_ta); flags |= ScanFlag::USE_XPA; @@ -1154,14 +1154,5 @@ void CommandSetGl846::eject_document(Genesys_Device* dev) const throw SaneException("not implemented"); } -void CommandSetGl846::move_to_ta(Genesys_Device* dev) const -{ - DBG_HELPER(dbg); - - unsigned feed = static_cast((dev->model->y_offset_sensor_to_ta * dev->motor.base_ydpi) / - MM_PER_INCH); - scanner_move(*dev, dev->model->default_method, feed, Direction::FORWARD); -} - } // namespace gl846 } // namespace genesys diff --git a/backend/genesys/gl846.h b/backend/genesys/gl846.h index e0b7c73ab..f1c33dfc5 100644 --- a/backend/genesys/gl846.h +++ b/backend/genesys/gl846.h @@ -105,8 +105,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override; diff --git a/backend/genesys/gl847.cpp b/backend/genesys/gl847.cpp index 00a1f6f2c..db47b729f 100644 --- a/backend/genesys/gl847.cpp +++ b/backend/genesys/gl847.cpp @@ -603,7 +603,7 @@ ScanSession CommandSetGl847::calculate_scan_session(const Genesys_Device* dev, if (settings.scan_method == ScanMethod::TRANSPARENCY || settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter if (!dev->ignore_offsets) { move = dev->model->y_offset_ta - dev->model->y_offset_sensor_to_ta; @@ -754,7 +754,7 @@ void CommandSetGl847::init_regs_for_shading(Genesys_Device* dev, const Genesys_S if (dev->settings.scan_method == ScanMethod::TRANSPARENCY || dev->settings.scan_method == ScanMethod::TRANSPARENCY_INFRARED) { - // note: move_to_ta() function has already been called and the sensor is at the + // note: scanner_move_to_ta() function has already been called and the sensor is at the // transparency adapter move = dev->model->y_offset_calib_white_ta - dev->model->y_offset_sensor_to_ta; flags |= ScanFlag::USE_XPA; @@ -1081,14 +1081,5 @@ void CommandSetGl847::eject_document(Genesys_Device* dev) const throw SaneException("not implemented"); } -void CommandSetGl847::move_to_ta(Genesys_Device* dev) const -{ - DBG_HELPER(dbg); - - unsigned feed = static_cast((dev->model->y_offset_sensor_to_ta * dev->motor.base_ydpi) / - MM_PER_INCH); - scanner_move(*dev, dev->model->default_method, feed, Direction::FORWARD); -} - } // namespace gl847 } // namespace genesys diff --git a/backend/genesys/gl847.h b/backend/genesys/gl847.h index eee6586f2..f2ce7a23e 100644 --- a/backend/genesys/gl847.h +++ b/backend/genesys/gl847.h @@ -105,8 +105,6 @@ public: void eject_document(Genesys_Device* dev) const override; - void move_to_ta(Genesys_Device* dev) const override; - void send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t* data, int size) const override;