Merge branch 'release/debian/1.0.31-1_experimental1' into masterdebian/1.0.31-1_experimental1

1 files changed, 5 insertions, 398 deletions

diff --git a/backend/genesys/gl646.h b/backend/genesys/gl646.h
index afcfa05..8ab2c96 100644
--- a/backend/genesys/gl646.h
+++ b/backend/genesys/gl646.h
@@ -48,395 +48,13 @@
 #define BACKEND_GENESYS_GL646_H
 
 #include "genesys.h"
-#include "command_set.h"
+#include "command_set_common.h"
 #include "motor.h"
 
 namespace genesys {
 namespace gl646 {
 
-static void gl646_set_fe(Genesys_Device* dev, const Genesys_Sensor& sensor, uint8_t set, int dpi);
-
-/**
- * sets up the scanner for a scan, registers, gamma tables, shading tables
- * and slope tables, based on the parameter struct.
- * @param dev         device to set up
- * @param regs        registers to set up
- * @param settings    settings of the scan
- * @param split       true if move before scan has to be done
- * @param xcorrection true if scanner's X geometry must be taken into account to
- * 		     compute X, ie add left margins
- * @param ycorrection true if scanner's Y geometry must be taken into account to
- * 		     compute Y, ie add top margins
- */
-static void setup_for_scan(Genesys_Device* device,
-                           const Genesys_Sensor& sensor,
-                           Genesys_Register_Set*regs,
-                           Genesys_Settings settings,
-                           bool split,
-                           bool xcorrection,
-                           bool ycorrection,
-                           bool reverse);
-
-/**
- * Does a simple move of the given distance by doing a scan at lowest resolution
- * shading correction. Memory for data is allocated in this function
- * and must be freed by caller.
- * @param dev device of the scanner
- * @param distance distance to move in MM
- */
-static void simple_move(Genesys_Device* dev, SANE_Int distance);
-
-/**
- * Does a simple scan of the area given by the settings. Scanned data
- * it put in an allocated area which must be freed by the caller.
- * and slope tables, based on the parameter struct. There is no shading
- * correction while gamma correction is active.
- * @param dev      device to set up
- * @param settings settings of the scan
- * @param move     flag to enable scanhead to move
- * @param forward  flag to tell movement direction
- * @param shading  flag to tell if shading correction should be done
- * @param data     pointer that will point to the scanned data
- */
-static void simple_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
-                        Genesys_Settings settings, bool move, bool forward,
-                        bool shading, std::vector<uint8_t>& data, const char* test_identifier);
-
-/**
- * Send the stop scan command
- * */
-static void end_scan_impl(Genesys_Device* dev, Genesys_Register_Set* reg, bool check_stop,
-                          bool eject);
-/**
- * writes control data to an area behind the last motor table.
- */
-static void write_control(Genesys_Device* dev, const Genesys_Sensor& sensor, int resolution);
-
-
-/**
- * initialize scanner's registers at SANE init time
- */
-static void gl646_init_regs (Genesys_Device * dev);
-
-/**
- * master motor settings table entry
- */
-typedef struct
-{
-  /* key */
-    MotorId motor_id;
-    unsigned dpi;
-  unsigned channels;
-
-  /* settings */
-    StepType steptype;
-    bool fastmod; // fast scanning
-    bool fastfed; // fast fed slope tables
-  SANE_Int mtrpwm;
-    MotorSlope slope1;
-    MotorSlope slope2;
-  SANE_Int fwdbwd;		/* forward/backward steps */
-} Motor_Master;
-
-/**
- * master motor settings, for a given motor and dpi,
- * it gives steps and speed informations
- */
-static Motor_Master motor_master[] = {
-    /* HP3670 motor settings */
-    {MotorId::HP3670, 50, 3, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(2329, 120, 229),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 75, 3, StepType::FULL, false, true, 1,
-     MotorSlope::create_from_steps(3429, 305, 200),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 100, 3, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(2905, 187, 143),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 150, 3, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(3429, 305, 73),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 300, 3, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(1055, 563, 11),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 600, 3, StepType::FULL, false, true, 0,
-     MotorSlope::create_from_steps(10687, 5126, 3),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670,1200, 3, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(15937, 6375, 3),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 50, 1, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(2329, 120, 229),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 75, 1, StepType::FULL, false, true, 1,
-     MotorSlope::create_from_steps(3429, 305, 200),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 100, 1, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(2905, 187, 143),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 150, 1, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(3429, 305, 73),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 300, 1, StepType::HALF, false, true, 1,
-     MotorSlope::create_from_steps(1055, 563, 11),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670, 600, 1, StepType::FULL, false, true, 0,
-     MotorSlope::create_from_steps(10687, 5126, 3),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    {MotorId::HP3670,1200, 1, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(15937, 6375, 3),
-     MotorSlope::create_from_steps(3399, 337, 192), 192},
-
-    /* HP2400/G2410 motor settings base motor dpi = 600 */
-    {MotorId::HP2400, 50, 3, StepType::FULL, false, true, 63,
-     MotorSlope::create_from_steps(8736, 601, 120),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 100, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(8736, 601, 120),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 150, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(15902, 902, 67),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 300, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(16703, 2188, 32),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 600, 3, StepType::FULL, false, true, 63,
-     MotorSlope::create_from_steps(18761, 18761, 3),
-     MotorSlope::create_from_steps(4905, 627, 192), 192},
-
-    {MotorId::HP2400,1200, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(43501, 43501, 3),
-     MotorSlope::create_from_steps(4905, 627, 192), 192},
-
-    {MotorId::HP2400, 50, 1, StepType::FULL, false, true, 63,
-     MotorSlope::create_from_steps(8736, 601, 120),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 100, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(8736, 601, 120),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 150, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(15902, 902, 67),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 300, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(16703, 2188, 32),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400, 600, 1, StepType::FULL, false, true, 63,
-     MotorSlope::create_from_steps(18761, 18761, 3),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    {MotorId::HP2400,1200, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(43501, 43501, 3),
-     MotorSlope::create_from_steps(4905, 337, 192), 192},
-
-    /* XP 200 motor settings */
-    {MotorId::XP200, 75, 3, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6000, 2136, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 100, 3, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6000, 2850, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 200, 3, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6999, 5700, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 250, 3, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6999, 6999, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 300, 3, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(13500, 13500, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 600, 3, StepType::HALF, true, true, 0,
-     MotorSlope::create_from_steps(31998, 31998, 4),
-     MotorSlope::create_from_steps(12000, 1200, 2), 1},
-
-    {MotorId::XP200, 75, 1, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6000, 2000, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 100, 1, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6000, 1300, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 200, 1, StepType::HALF, true, true, 0,
-     MotorSlope::create_from_steps(6000, 3666, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 300, 1, StepType::HALF, true, false, 0,
-     MotorSlope::create_from_steps(6500, 6500, 4),
-     MotorSlope::create_from_steps(12000, 1200, 8), 1},
-
-    {MotorId::XP200, 600, 1, StepType::HALF, true, true, 0,
-     MotorSlope::create_from_steps(24000, 24000, 4),
-     MotorSlope::create_from_steps(12000, 1200, 2), 1},
-
-    /* HP scanjet 2300c */
-    {MotorId::HP2300, 75, 3, StepType::FULL, false, true, 63,
-     MotorSlope::create_from_steps(8139, 560, 120),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 150, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(7903, 543, 67),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 300, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(2175, 1087, 3),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 600, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(8700, 4350, 3),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300,1200, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(17400, 8700, 3),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 75, 1, StepType::FULL, false, true, 63,
-     MotorSlope::create_from_steps(8139, 560, 120),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 150, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(7903, 543, 67),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 300, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(2175, 1087, 3),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 600, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(8700, 4350, 3),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300,1200, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(17400, 8700, 3),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    /* non half ccd settings for 300 dpi
-    {MotorId::HP2300, 300, 3, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(5386, 2175, 44),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-
-    {MotorId::HP2300, 300, 1, StepType::HALF, false, true, 63,
-     MotorSlope::create_from_steps(5386, 2175, 44),
-     MotorSlope::create_from_steps(4905, 337, 120), 16},
-    */
-
-    /* MD5345/6471 motor settings */
-    /* vfinal=(exposure/(1200/dpi))/step_type */
-    {MotorId::MD_5345, 50, 3, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 250, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 75, 3, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 343, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 100, 3, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 458, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 150, 3, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 687, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 200, 3, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 916, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 300, 3, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 1375, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 400, 3, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(2000, 1833, 32),
-     MotorSlope::create_from_steps(2000, 300, 255), 32},
-
-    {MotorId::MD_5345, 500, 3, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(2291, 2291, 32),
-     MotorSlope::create_from_steps(2000, 300, 255), 32},
-
-    {MotorId::MD_5345, 600, 3, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(2750, 2750, 32),
-     MotorSlope::create_from_steps(2000, 300, 255), 32},
-
-    {MotorId::MD_5345, 1200, 3, StepType::QUARTER, false, true, 0,
-     MotorSlope::create_from_steps(2750, 2750, 16),
-     MotorSlope::create_from_steps(2000, 300, 255), 146},
-
-    {MotorId::MD_5345, 2400, 3, StepType::QUARTER, false, true, 0,
-     MotorSlope::create_from_steps(5500, 5500, 16),
-     MotorSlope::create_from_steps(2000, 300, 255), 146},
-
-    {MotorId::MD_5345, 50, 1, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 250, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 75, 1, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 343, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 100, 1, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 458, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 150, 1, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 687, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 200, 1, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 916, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 300, 1, StepType::HALF, false, true, 2,
-     MotorSlope::create_from_steps(2500, 1375, 255),
-     MotorSlope::create_from_steps(2000, 300, 255), 64},
-
-    {MotorId::MD_5345, 400, 1, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(2000, 1833, 32),
-     MotorSlope::create_from_steps(2000, 300, 255), 32},
-
-    {MotorId::MD_5345, 500, 1, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(2291, 2291, 32),
-     MotorSlope::create_from_steps(2000, 300, 255), 32},
-
-    {MotorId::MD_5345, 600, 1, StepType::HALF, false, true, 0,
-     MotorSlope::create_from_steps(2750, 2750, 32),
-     MotorSlope::create_from_steps(2000, 300, 255), 32},
-
-    {MotorId::MD_5345, 1200, 1, StepType::QUARTER, false, true, 0,
-     MotorSlope::create_from_steps(2750, 2750, 16),
-     MotorSlope::create_from_steps(2000, 300, 255), 146},
-
-    {MotorId::MD_5345, 2400, 1, StepType::QUARTER, false, true, 0,
-     MotorSlope::create_from_steps(5500, 5500, 16),
-     MotorSlope::create_from_steps(2000, 300, 255), 146}, /* 5500 guessed */
-};
-
-class CommandSetGl646 : public CommandSet
+class CommandSetGl646 : public CommandSetCommon
 {
 public:
     ~CommandSetGl646() override = default;
@@ -446,17 +64,11 @@ public:
     void init(Genesys_Device* dev) const override;
 
     void init_regs_for_warmup(Genesys_Device* dev, const Genesys_Sensor& sensor,
-                              Genesys_Register_Set* regs, int* channels,
-                              int* total_size) const override;
-
-    void init_regs_for_coarse_calibration(Genesys_Device* dev, const Genesys_Sensor& sensor,
-                                          Genesys_Register_Set& regs) const override;
+                              Genesys_Register_Set* regs) const override;
 
     void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
                                Genesys_Register_Set& regs) const override;
 
-    void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
-
     void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
                                     Genesys_Register_Set* reg,
                                     const ScanSession& session) const override;
@@ -472,8 +84,6 @@ public:
 
     void send_gamma_table(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    void search_start_position(Genesys_Device* dev) const override;
-
     void offset_calibration(Genesys_Device* dev, const Genesys_Sensor& sensor,
                             Genesys_Register_Set& regs) const override;
 
@@ -489,17 +99,14 @@ public:
 
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
+    void update_home_sensor_gpio(Genesys_Device& dev) const override;
+
     void load_document(Genesys_Device* dev) const override;
 
     void detect_document_end(Genesys_Device* dev) const override;
 
     void eject_document(Genesys_Device* dev) const override;
 
-    void search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor,
-                      bool forward, bool black) 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;