From 309ee441de2875f7e6d498dcad7c3d78262b1166 Mon Sep 17 00:00:00 2001
From: Povilas Kanapickas <povilas@radix.lt>
Date: Sat, 26 Oct 2019 11:38:36 +0200
Subject: [PATCH] genesys: Remove trivial bulk_{read,write}_data() wrapper

---
 backend/genesys/command_set.h |  5 -----
 backend/genesys/genesys.cpp   |  2 +-
 backend/genesys/gl124.cpp     | 12 ------------
 backend/genesys/gl124.h       |  5 -----
 backend/genesys/gl646.cpp     | 18 ++----------------
 backend/genesys/gl646.h       |  5 -----
 backend/genesys/gl841.cpp     | 16 ++--------------
 backend/genesys/gl841.h       |  5 -----
 backend/genesys/gl843.cpp     | 14 +-------------
 backend/genesys/gl843.h       |  5 -----
 backend/genesys/gl846.cpp     | 12 ------------
 backend/genesys/gl846.h       |  5 -----
 backend/genesys/gl847.cpp     | 12 ------------
 backend/genesys/gl847.h       |  5 -----
 backend/genesys/low.cpp       |  4 ++--
 15 files changed, 8 insertions(+), 117 deletions(-)

diff --git a/backend/genesys/command_set.h b/backend/genesys/command_set.h
index 3df60a482..eed6fce8e 100644
--- a/backend/genesys/command_set.h
+++ b/backend/genesys/command_set.h
@@ -108,11 +108,6 @@ public:
 
     virtual bool has_rewind() const { return true; }
 
-    virtual void bulk_write_data(Genesys_Device* dev, std::uint8_t addr, std::uint8_t* data,
-                                 size_t len) const = 0;
-    virtual void bulk_read_data(Genesys_Device * dev, std::uint8_t addr, std::uint8_t* data,
-                                size_t len) const = 0;
-
     // Updates hardware sensor information in Genesys_Scanner.val[].
     virtual void update_hardware_sensors(struct Genesys_Scanner* s) const = 0;
 
diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp
index 799391a30..74fee567e 100644
--- a/backend/genesys/genesys.cpp
+++ b/backend/genesys/genesys.cpp
@@ -922,7 +922,7 @@ static void genesys_send_offset_and_shading(Genesys_Device* dev, const Genesys_S
 
     sanei_genesys_set_buffer_address(dev, start_address);
 
-    dev->cmd_set->bulk_write_data(dev, 0x3c, data, size);
+    sanei_genesys_bulk_write_data(dev, 0x3c, data, size);
 }
 
 // ?
diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp
index f1d555030..8511932bd 100644
--- a/backend/genesys/gl124.cpp
+++ b/backend/genesys/gl124.cpp
@@ -2513,18 +2513,6 @@ void CommandSetGl124::send_gamma_table(Genesys_Device* dev, const Genesys_Sensor
     sanei_genesys_send_gamma_table(dev, sensor);
 }
 
-void CommandSetGl124::bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                      size_t len) const
-{
-    sanei_genesys_bulk_write_data(dev, addr, data, len);
-}
-
-void CommandSetGl124::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                     size_t len) const
-{
-    sanei_genesys_bulk_read_data(dev, addr, data, len);
-}
-
 void CommandSetGl124::load_document(Genesys_Device* dev) const
 {
     (void) dev;
diff --git a/backend/genesys/gl124.h b/backend/genesys/gl124.h
index e09acb0e5..012bb4954 100644
--- a/backend/genesys/gl124.h
+++ b/backend/genesys/gl124.h
@@ -174,11 +174,6 @@ public:
     void slow_back_home(Genesys_Device* dev, bool wait_until_home) const override;
     void rewind(Genesys_Device* dev) const override;
 
-    void bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                         size_t len) const override;
-    void bulk_read_data(Genesys_Device * dev, uint8_t addr, uint8_t * data,
-                        size_t len) const override;
-
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
     void load_document(Genesys_Device* dev) const override;
diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp
index c8de2ee3d..7be52490a 100644
--- a/backend/genesys/gl646.cpp
+++ b/backend/genesys/gl646.cpp
@@ -84,14 +84,6 @@ static void gl646_gpio_output_enable(UsbDevice& usb_dev, uint8_t value)
     usb_dev.control_msg(REQUEST_TYPE_OUT, REQUEST_REGISTER, GPIO_OUTPUT_ENABLE, INDEX, 1, &value);
 }
 
-/* Read bulk data (e.g. scanned data) */
-void CommandSetGl646::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                     size_t len) const
-{
-    DBG_HELPER(dbg);
-    sanei_genesys_bulk_read_data(dev, addr, data, len);
-}
-
 bool CommandSetGl646::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     GenesysRegister *r = sanei_genesys_get_address(regs, 0x06);
@@ -2894,9 +2886,9 @@ void CommandSetGl646::init(Genesys_Device* dev) const
         // for some reason, read fails here for MD6471, HP2300 and XP200 one time out of
         // 2 scanimage launches
         try {
-            bulk_read_data(dev, 0x45, dev->control, len);
+            sanei_genesys_bulk_read_data(dev, 0x45, dev->control, len);
         } catch (...) {
-            bulk_read_data(dev, 0x45, dev->control, len);
+            sanei_genesys_bulk_read_data(dev, 0x45, dev->control, len);
         }
         DBG(DBG_info, "%s: control read=0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n", __func__,
             dev->control[0], dev->control[1], dev->control[2], dev->control[3], dev->control[4],
@@ -3451,12 +3443,6 @@ void CommandSetGl646::rewind(Genesys_Device* dev) const
     throw SaneException("not implemented");
 }
 
-void CommandSetGl646::bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                      size_t len) const
-{
-    sanei_genesys_bulk_write_data(dev, addr, data, len);
-}
-
 void CommandSetGl646::send_shading_data(Genesys_Device* dev, const Genesys_Sensor& sensor,
                                         std::uint8_t* data, int size) const
 {
diff --git a/backend/genesys/gl646.h b/backend/genesys/gl646.h
index e4c053f61..da66c704d 100644
--- a/backend/genesys/gl646.h
+++ b/backend/genesys/gl646.h
@@ -286,11 +286,6 @@ public:
 
     bool has_rewind() const override { return false; }
 
-    void bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                         size_t len) const override;
-    void bulk_read_data(Genesys_Device * dev, uint8_t addr, uint8_t * data,
-                        size_t len) const override;
-
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
     void load_document(Genesys_Device* dev) const override;
diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp
index 792d2414c..7974493b7 100644
--- a/backend/genesys/gl841.cpp
+++ b/backend/genesys/gl841.cpp
@@ -3928,7 +3928,7 @@ void CommandSetGl841::send_shading_data(Genesys_Device* dev, const Genesys_Senso
         sanei_genesys_set_buffer_address(dev, 0x0000);
 
         // shading data whole line
-        dev->cmd_set->bulk_write_data(dev, 0x3c, data, size);
+        sanei_genesys_bulk_write_data(dev, 0x3c, data, size);
         return;
     }
 
@@ -3989,7 +3989,7 @@ void CommandSetGl841::send_shading_data(Genesys_Device* dev, const Genesys_Senso
 
         // 0x5400 alignment for LIDE80 internal memory
         sanei_genesys_set_buffer_address(dev, 0x5400*i);
-        dev->cmd_set->bulk_write_data(dev, 0x3c, buffer.data(), pixels);
+        sanei_genesys_bulk_write_data(dev, 0x3c, buffer.data(), pixels);
     }
 }
 
@@ -4010,18 +4010,6 @@ void CommandSetGl841::rewind(Genesys_Device* dev) const
     throw SaneException("not implemented");
 }
 
-void CommandSetGl841::bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                      size_t len) const
-{
-    sanei_genesys_bulk_write_data(dev, addr, data, len);
-}
-
-void CommandSetGl841::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                     size_t len) const
-{
-    sanei_genesys_bulk_read_data(dev, addr, data, len);
-}
-
 void CommandSetGl841::move_to_ta(Genesys_Device* dev) const
 {
     (void) dev;
diff --git a/backend/genesys/gl841.h b/backend/genesys/gl841.h
index af412ba57..fb5c15319 100644
--- a/backend/genesys/gl841.h
+++ b/backend/genesys/gl841.h
@@ -115,11 +115,6 @@ public:
 
     bool has_rewind() const override { return false; }
 
-    void bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                         size_t len) const override;
-    void bulk_read_data(Genesys_Device * dev, uint8_t addr, uint8_t * data,
-                        size_t len) const override;
-
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
     void load_document(Genesys_Device* dev) const override;
diff --git a/backend/genesys/gl843.cpp b/backend/genesys/gl843.cpp
index c04c2bd50..5ae776ac4 100644
--- a/backend/genesys/gl843.cpp
+++ b/backend/genesys/gl843.cpp
@@ -3375,7 +3375,7 @@ void CommandSetGl843::send_shading_data(Genesys_Device* dev, const Genesys_Senso
     // send data
     sanei_genesys_set_buffer_address(dev, 0);
 
-    dev->cmd_set->bulk_write_data (dev, 0x3c, final_data.data(), count);
+    sanei_genesys_bulk_write_data(dev, 0x3c, final_data.data(), count);
 }
 
 bool CommandSetGl843::needs_home_before_init_regs_for_scan(Genesys_Device* dev) const
@@ -3395,18 +3395,6 @@ void CommandSetGl843::rewind(Genesys_Device* dev) const
     throw SaneException("not implemented");
 }
 
-void CommandSetGl843::bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                      size_t len) const
-{
-    sanei_genesys_bulk_write_data(dev, addr, data, len);
-}
-
-void CommandSetGl843::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                     size_t len) const
-{
-    sanei_genesys_bulk_read_data(dev, addr, data, len);
-}
-
 std::unique_ptr<CommandSet> create_gl843_cmd_set()
 {
     return std::unique_ptr<CommandSet>(new CommandSetGl843{});
diff --git a/backend/genesys/gl843.h b/backend/genesys/gl843.h
index 6c4209546..13950f1ea 100644
--- a/backend/genesys/gl843.h
+++ b/backend/genesys/gl843.h
@@ -110,11 +110,6 @@ public:
 
     bool has_rewind() const override { return false; }
 
-    void bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                         size_t len) const override;
-    void bulk_read_data(Genesys_Device * dev, uint8_t addr, uint8_t * data,
-                        size_t len) const override;
-
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
     void load_document(Genesys_Device* dev) const override;
diff --git a/backend/genesys/gl846.cpp b/backend/genesys/gl846.cpp
index 9994cb2b4..5718d442c 100644
--- a/backend/genesys/gl846.cpp
+++ b/backend/genesys/gl846.cpp
@@ -2333,18 +2333,6 @@ void CommandSetGl846::rewind(Genesys_Device* dev) const
     throw SaneException("not implemented");
 }
 
-void CommandSetGl846::bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                      size_t len) const
-{
-    sanei_genesys_bulk_write_data(dev, addr, data, len);
-}
-
-void CommandSetGl846::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                     size_t len) const
-{
-    sanei_genesys_bulk_read_data(dev, addr, data, len);
-}
-
 void CommandSetGl846::load_document(Genesys_Device* dev) const
 {
     (void) dev;
diff --git a/backend/genesys/gl846.h b/backend/genesys/gl846.h
index 45d085b6f..c988c091c 100644
--- a/backend/genesys/gl846.h
+++ b/backend/genesys/gl846.h
@@ -187,11 +187,6 @@ public:
 
     bool has_rewind() const override { return false; }
 
-    void bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                         size_t len) const override;
-    void bulk_read_data(Genesys_Device * dev, uint8_t addr, uint8_t * data,
-                        size_t len) const override;
-
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
     void load_document(Genesys_Device* dev) const override;
diff --git a/backend/genesys/gl847.cpp b/backend/genesys/gl847.cpp
index 52fda7895..d307765b7 100644
--- a/backend/genesys/gl847.cpp
+++ b/backend/genesys/gl847.cpp
@@ -2403,18 +2403,6 @@ void CommandSetGl847::rewind(Genesys_Device* dev) const
     throw SaneException("not implemented");
 }
 
-void CommandSetGl847::bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                      size_t len) const
-{
-    sanei_genesys_bulk_write_data(dev, addr, data, len);
-}
-
-void CommandSetGl847::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                                     size_t len) const
-{
-    sanei_genesys_bulk_read_data(dev, addr, data, len);
-}
-
 void CommandSetGl847::load_document(Genesys_Device* dev) const
 {
     (void) dev;
diff --git a/backend/genesys/gl847.h b/backend/genesys/gl847.h
index 7f6087f28..47b501645 100644
--- a/backend/genesys/gl847.h
+++ b/backend/genesys/gl847.h
@@ -171,11 +171,6 @@ public:
 
     bool has_rewind() const override { return false; }
 
-    void bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* data,
-                         size_t len) const override;
-    void bulk_read_data(Genesys_Device * dev, uint8_t addr, uint8_t * data,
-                        size_t len) const override;
-
     void update_hardware_sensors(struct Genesys_Scanner* s) const override;
 
     void load_document(Genesys_Device* dev) const override;
diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp
index bffec37fc..abd20c964 100644
--- a/backend/genesys/low.cpp
+++ b/backend/genesys/low.cpp
@@ -831,7 +831,7 @@ void sanei_genesys_read_data_from_scanner(Genesys_Device* dev, uint8_t* data, si
 
     wait_until_has_valid_words(dev);
 
-    dev->cmd_set->bulk_read_data(dev, 0x45, data, size);
+    sanei_genesys_bulk_read_data(dev, 0x45, data, size);
 }
 
 Image read_unshuffled_image_from_scanner(Genesys_Device* dev, const ScanSession& session,
@@ -1748,7 +1748,7 @@ void build_image_pipeline(Genesys_Device* dev, const ScanSession& session)
 
     auto read_data_from_usb = [dev](std::size_t size, std::uint8_t* data)
     {
-        dev->cmd_set->bulk_read_data(dev, 0x45, data, size);
+        sanei_genesys_bulk_read_data(dev, 0x45, data, size);
         return true;
     };