genesys: Retrieve depth from session in genesys_warmup_lamp()

backend/genesys/command_set.h

@@ -74,7 +74,6 @@ public:
                                        Genesys_Register_Set& regs) const = 0;
     virtual void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const = 0;
 
-    virtual bool get_bitset_bit(Genesys_Register_Set * reg) const = 0;
     virtual bool get_gain4_bit(Genesys_Register_Set * reg) const = 0;
 
     virtual bool test_buffer_empty_bit(std::uint8_t val) const = 0;

backend/genesys/genesys.cpp

@@ -3011,7 +3011,7 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
       for (pixel = 0; pixel < total_size; pixel++)
 	{
             // 16 bit data
-            if (dev->cmd_set->get_bitset_bit(&dev->reg)) {
+            if (dev->session.params.depth == 16) {
 	      first_average += (first_line[pixel] + first_line[pixel + 1] * 256);
 	      second_average += (second_line[pixel] + second_line[pixel + 1] * 256);
 	      pixel++;
@@ -3022,7 +3022,7 @@ static void genesys_warmup_lamp(Genesys_Device* dev)
 	      second_average += second_line[pixel];
 	    }
 	}
-        if (dev->cmd_set->get_bitset_bit(&dev->reg)) {
+        if (dev->session.params.depth == 16) {
 	  first_average /= pixel;
 	  second_average /= pixel;
 	  difference = fabs (first_average - second_average);

backend/genesys/gl124.cpp

@@ -49,11 +49,6 @@
 
 #include <vector>
 
-bool CommandSetGl124::get_bitset_bit(Genesys_Register_Set* regs) const
-{
-    return static_cast<bool>(regs->get8(REG04) & REG04_BITSET);
-}
-
 bool CommandSetGl124::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     return static_cast<bool>(regs->get8(REG06) & REG06_GAIN4);

backend/genesys/gl124.h

@@ -142,7 +142,6 @@ public:
 
     void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    bool get_bitset_bit(Genesys_Register_Set * reg) const override;
     bool get_gain4_bit(Genesys_Register_Set * reg) const override;
 
     bool test_buffer_empty_bit(std::uint8_t val) const override;

backend/genesys/gl646.cpp

@@ -93,12 +93,6 @@ void CommandSetGl646::bulk_read_data(Genesys_Device* dev, uint8_t addr, uint8_t*
     }
 }
 
-bool CommandSetGl646::get_bitset_bit(Genesys_Register_Set* regs) const
-{
-    GenesysRegister *r = sanei_genesys_get_address(regs, 0x04);
-    return (r && (r->value & REG04_BITSET));
-}
-
 bool CommandSetGl646::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     GenesysRegister *r = sanei_genesys_get_address(regs, 0x06);

backend/genesys/gl646.h

@@ -252,7 +252,6 @@ public:
 
     void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    bool get_bitset_bit(Genesys_Register_Set * reg) const override;
     bool get_gain4_bit(Genesys_Register_Set * reg) const override;
 
     bool test_buffer_empty_bit(std::uint8_t val) const override;

backend/genesys/gl841.cpp

@@ -70,12 +70,6 @@ static void gl841_set_buffer_address_gamma(Genesys_Device* dev, uint32_t addr)
     dev->write_register(0x5b, (addr & 0xff));
 }
 
-bool CommandSetGl841::get_bitset_bit(Genesys_Register_Set* regs) const
-{
-    GenesysRegister *r = sanei_genesys_get_address(regs, 0x04);
-    return (r && (r->value & REG04_BITSET));
-}
-
 bool CommandSetGl841::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     GenesysRegister *r = sanei_genesys_get_address(regs, 0x06);

backend/genesys/gl841.h

@@ -81,7 +81,6 @@ public:
 
     void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    bool get_bitset_bit(Genesys_Register_Set* reg) const override;
     bool get_gain4_bit(Genesys_Register_Set* reg) const override;
 
     bool test_buffer_empty_bit(std::uint8_t val) const override;

backend/genesys/gl843.cpp

@@ -88,12 +88,6 @@ static void write_data(Genesys_Device* dev, uint32_t addr, uint32_t size, uint8_
     gl843_set_buffer_address(dev, 0);
 }
 
-bool CommandSetGl843::get_bitset_bit(Genesys_Register_Set* regs) const
-{
-    GenesysRegister *r = sanei_genesys_get_address (regs, REG04);
-    return (r && (r->value & REG04_BITSET));
-}
-
 bool CommandSetGl843::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     GenesysRegister *r = sanei_genesys_get_address (regs, REG06);

backend/genesys/gl843.h

@@ -83,7 +83,6 @@ public:
 
     void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    bool get_bitset_bit(Genesys_Register_Set * reg) const override;
     bool get_gain4_bit(Genesys_Register_Set * reg) const override;
 
     bool test_buffer_empty_bit(std::uint8_t val) const override;

backend/genesys/gl846.cpp

@@ -54,12 +54,6 @@
 
 #include <vector>
 
-bool CommandSetGl846::get_bitset_bit(Genesys_Register_Set* regs) const
-{
-    GenesysRegister *r = sanei_genesys_get_address(regs, REG04);
-    return (r && (r->value & REG04_BITSET));
-}
-
 bool CommandSetGl846::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     GenesysRegister *r = sanei_genesys_get_address(regs, 0x06);

backend/genesys/gl846.h

@@ -153,7 +153,6 @@ public:
 
     void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    bool get_bitset_bit(Genesys_Register_Set * reg) const override;
     bool get_gain4_bit(Genesys_Register_Set * reg) const override;
 
     bool test_buffer_empty_bit(std::uint8_t val) const override;

backend/genesys/gl847.cpp

@@ -49,12 +49,6 @@
 
 #include <vector>
 
-bool CommandSetGl847::get_bitset_bit(Genesys_Register_Set* regs) const
-{
-    GenesysRegister *r = sanei_genesys_get_address(regs, REG04);
-    return (r && (r->value & REG04_BITSET));
-}
-
 bool CommandSetGl847::get_gain4_bit(Genesys_Register_Set* regs) const
 {
     GenesysRegister *r = sanei_genesys_get_address(regs, 0x06);

backend/genesys/gl847.h

@@ -137,7 +137,6 @@ public:
 
     void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override;
 
-    bool get_bitset_bit(Genesys_Register_Set * reg) const override;
     bool get_gain4_bit(Genesys_Register_Set * reg) const override;
 
     bool test_buffer_empty_bit(std::uint8_t val) const override;