diff --git a/backend/genesys.cc b/backend/genesys.cc index a49bdbf89..ba334c359 100644 --- a/backend/genesys.cc +++ b/backend/genesys.cc @@ -4678,7 +4678,7 @@ probe_genesys_devices (void) of Genesys_Calibration_Cache as is. */ static const char* CALIBRATION_IDENT = "sane_genesys"; -static const int CALIBRATION_VERSION = 9; +static const int CALIBRATION_VERSION = 10; bool read_calibration(std::istream& str, Genesys_Device::Calibration& calibration, const std::string& path) diff --git a/backend/genesys_gl124.cc b/backend/genesys_gl124.cc index ba8faea70..59f48236d 100644 --- a/backend/genesys_gl124.cc +++ b/backend/genesys_gl124.cc @@ -924,9 +924,6 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens dev->line_count = 0; - DBG (DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); - DBG (DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - build_image_pipeline(dev, session); // MAXWD is expressed in 2 words unit @@ -978,8 +975,6 @@ static void gl124_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens int slope_dpi = 0; int scan_step_type = 1; - DBG (DBG_info, "%s: optical_res=%d\n", __func__, session.optical_resolution); - /* cis color scan is effectively a gray scan with 3 gray lines per color line and a FILTER of 0 */ if (dev->model->is_cis) { slope_dpi = session.params.yres * session.params.channels; @@ -1091,8 +1086,6 @@ gl124_calculate_current_setup (Genesys_Device * dev, const Genesys_Sensor& senso /* pixels are allways given at half or full CCD optical resolution */ /* use detected left margin and fixed value */ - DBG(DBG_info, "%s: used_pixels=%d\n", __func__, session.optical_pixels); - exposure_time = get_sensor_profile(dev->model->asic_type, sensor, session.params.xres, session.ccd_size_divisor).exposure_lperiod; diff --git a/backend/genesys_gl646.cc b/backend/genesys_gl646.cc index 69d2c3999..bb729b86d 100644 --- a/backend/genesys_gl646.cc +++ b/backend/genesys_gl646.cc @@ -3057,11 +3057,9 @@ static void gl646_init(Genesys_Device* dev) // Write initial registers dev->write_registers(dev->reg); - /* Test ASIC and RAM */ - if (!(dev->model->flags & GENESYS_FLAG_LAZY_INIT)) - { - gl646_asic_test(dev); - } + if (dev->model->flags & GENESYS_FLAG_TEST_ON_INIT) { + gl646_asic_test(dev); + } // send gamma tables if needed gl646_send_gamma_table(dev, sensor); diff --git a/backend/genesys_gl841.cc b/backend/genesys_gl841.cc index 1ab1b0eeb..c0a6afa5a 100644 --- a/backend/genesys_gl841.cc +++ b/backend/genesys_gl841.cc @@ -3933,9 +3933,7 @@ static void gl841_init(Genesys_Device* dev) // Write initial registers dev->write_registers(dev->reg); - /* Test ASIC and RAM */ - if (!(dev->model->flags & GENESYS_FLAG_LAZY_INIT)) - { + if (dev->model->flags & GENESYS_FLAG_TEST_ON_INIT) { sanei_gl841_asic_test(dev); } diff --git a/backend/genesys_gl843.cc b/backend/genesys_gl843.cc index bba2b5466..272ce4d12 100644 --- a/backend/genesys_gl843.cc +++ b/backend/genesys_gl843.cc @@ -1159,9 +1159,6 @@ static void gl843_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens reg->set16(REG_STRPIXEL, session.pixel_startx); reg->set16(REG_ENDPIXEL, session.pixel_endx); - DBG(DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); - DBG(DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - /* MAXWD is expressed in 2 words unit */ /* nousedspace = (mem_bank_range * 1024 / 256 -1 ) * 4; */ // BUG: the division by ccd_size_divisor likely does not make sense @@ -1211,8 +1208,6 @@ static void gl843_init_scan_regs(Genesys_Device* dev, const Genesys_Sensor& sens int dummy = 0; int scan_step_type = 1; - DBG(DBG_info, "%s : stagger=%d lines\n", __func__, session.num_staggered_lines); - /* we enable true gray for cis scanners only, and just when doing * scan since color calibration is OK for this mode */ @@ -3532,10 +3527,10 @@ static void gl843_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s if (dev->model->model_id == MODEL_CANON_CANOSCAN_8600F) { - int dpiset_real = dev->session.output_resolution * sensor.ccd_pixels_per_system_pixel(); - int half_ccd_factor = dev->session.optical_resolution / sensor.get_logical_hwdpi(dpiset_real); - strpixel /= half_ccd_factor; - endpixel /= half_ccd_factor; + int half_ccd_factor = dev->session.optical_resolution / + sensor.get_logical_hwdpi(dev->session.output_resolution); + strpixel /= half_ccd_factor * sensor.ccd_pixels_per_system_pixel(); + endpixel /= half_ccd_factor * sensor.ccd_pixels_per_system_pixel(); } /* 16 bit words, 2 words per color, 3 color channels */ diff --git a/backend/genesys_gl846.cc b/backend/genesys_gl846.cc index 36e809e50..3e4250a93 100644 --- a/backend/genesys_gl846.cc +++ b/backend/genesys_gl846.cc @@ -801,9 +801,6 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens reg->set16(REG_STRPIXEL, session.pixel_startx); reg->set16(REG_ENDPIXEL, session.pixel_endx); - DBG (DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); - DBG (DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - build_image_pipeline(dev, session); /* MAXWD is expressed in 4 words unit */ diff --git a/backend/genesys_gl847.cc b/backend/genesys_gl847.cc index c614e653d..31a31aaa1 100644 --- a/backend/genesys_gl847.cc +++ b/backend/genesys_gl847.cc @@ -818,9 +818,6 @@ static void gl847_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens reg->set16(REG_STRPIXEL, session.pixel_startx); reg->set16(REG_ENDPIXEL, session.pixel_endx); - DBG (DBG_io2, "%s: pixels =%d\n", __func__, session.optical_pixels); - DBG (DBG_io2, "%s: depth =%d\n", __func__, session.params.depth); - build_image_pipeline(dev, session); /* MAXWD is expressed in 4 words unit */ diff --git a/backend/genesys_low.h b/backend/genesys_low.h index cb1aaf0f5..539a2855f 100644 --- a/backend/genesys_low.h +++ b/backend/genesys_low.h @@ -108,7 +108,7 @@ /* Flags */ #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_TEST_ON_INIT (1 << 2) // perform ASIC test on initialization #define GENESYS_FLAG_XPA (1 << 3) #define GENESYS_FLAG_SKIP_WARMUP (1 << 4) /**< skip genesys_warmup() */ /** @brief offset calibration flag diff --git a/backend/genesys_sensor.h b/backend/genesys_sensor.h index f60309eed..f17893a09 100644 --- a/backend/genesys_sensor.h +++ b/backend/genesys_sensor.h @@ -98,30 +98,30 @@ struct Genesys_Frontend // id of the frontend description uint8_t fe_id = 0; - // all registers of the frontend - GenesysRegisterSettingSet regs; + // all registers of the frontend. Note that the registers can hold 9-bit values + RegisterSettingSet regs; // extra control registers - std::array reg2 = {}; + std::array reg2 = {}; GenesysFrontendLayout layout; - void set_offset(unsigned which, uint8_t value) + void set_offset(unsigned which, std::uint16_t value) { regs.set_value(layout.offset_addr[which], value); } - void set_gain(unsigned which, uint8_t value) + void set_gain(unsigned which, std::uint16_t value) { regs.set_value(layout.gain_addr[which], value); } - uint8_t get_offset(unsigned which) const + std::uint16_t get_offset(unsigned which) const { return regs.get_value(layout.offset_addr[which]); } - uint8_t get_gain(unsigned which) const + std::uint16_t get_gain(unsigned which) const { return regs.get_value(layout.gain_addr[which]); } diff --git a/backend/genesys_tables_model.cc b/backend/genesys_tables_model.cc index 814e553a8..d93c350e0 100644 --- a/backend/genesys_tables_model.cc +++ b/backend/genesys_tables_model.cc @@ -157,8 +157,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_CANONLIDE35; model.gpo_type = GPO_CANONLIDE35; model.motor_type = MOTOR_CANONLIDE35; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_WHITE_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; @@ -216,8 +215,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_KVSS080; model.gpo_type = GPO_KVSS080; model.motor_type = MOTOR_KVSS080; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; model.buttons = GENESYS_HAS_SCAN_SW; @@ -271,8 +269,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_G4050; model.gpo_type = GPO_G4050; model.motor_type = MOTOR_G4050; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_OFFSET_CALIBRATION | + model.flags = GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_DARK_CALIBRATION | @@ -326,8 +323,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_G4050; model.gpo_type = GPO_G4050; model.motor_type = MOTOR_G4050; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_OFFSET_CALIBRATION | + model.flags = GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_DARK_CALIBRATION | @@ -383,8 +379,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_G4050; model.gpo_type = GPO_G4050; model.motor_type = MOTOR_G4050; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_OFFSET_CALIBRATION | + model.flags = GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_DARK_CALIBRATION | @@ -441,7 +436,6 @@ void genesys_init_usb_device_tables() model.gpo_type = GPO_CS4400F; model.motor_type = MOTOR_G4050; model.flags = GENESYS_FLAG_NO_CALIBRATION | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_SKIP_WARMUP | @@ -501,7 +495,6 @@ void genesys_init_usb_device_tables() model.motor_type = MOTOR_CS8400F; model.flags = GENESYS_FLAG_HAS_UTA | GENESYS_FLAG_HAS_UTA_INFRARED | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_SKIP_WARMUP | @@ -562,7 +555,6 @@ void genesys_init_usb_device_tables() model.motor_type = MOTOR_CS8600F; model.flags = GENESYS_FLAG_HAS_UTA | GENESYS_FLAG_HAS_UTA_INFRARED | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_SKIP_WARMUP | @@ -1092,8 +1084,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_CANONLIDE35; model.gpo_type = GPO_CANONLIDE35; model.motor_type = MOTOR_CANONLIDE35; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_WHITE_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; @@ -1151,8 +1142,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_CANONLIDE80; model.gpo_type = GPO_CANONLIDE80; model.motor_type = MOTOR_CANONLIDE80; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_WHITE_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; @@ -1214,7 +1204,6 @@ void genesys_init_usb_device_tables() model.motor_type = MOTOR_HP2300; model.flags = GENESYS_FLAG_14BIT_GAMMA | GENESYS_FLAG_SKIP_WARMUP | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_OFFSET_CALIBRATION | @@ -1270,8 +1259,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_HP2400; model.gpo_type = GPO_HP2400; model.motor_type = MOTOR_HP2400; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_14BIT_GAMMA | + model.flags = GENESYS_FLAG_14BIT_GAMMA | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_SKIP_WARMUP | @@ -1329,7 +1317,6 @@ void genesys_init_usb_device_tables() model.gpo_type = GPO_XP200; model.motor_type = MOTOR_XP200; model.flags = GENESYS_FLAG_14BIT_GAMMA | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_DARK_CALIBRATION | @@ -1385,8 +1372,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_HP3670; model.gpo_type = GPO_HP3670; model.motor_type = MOTOR_HP3670; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_14BIT_GAMMA | + model.flags = GENESYS_FLAG_14BIT_GAMMA | GENESYS_FLAG_XPA | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_OFFSET_CALIBRATION | @@ -1496,7 +1482,6 @@ void genesys_init_usb_device_tables() model.motor_type = MOTOR_ST24; model.flags = GENESYS_FLAG_UNTESTED | GENESYS_FLAG_14BIT_GAMMA | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_OFFSET_CALIBRATION; @@ -1550,7 +1535,6 @@ void genesys_init_usb_device_tables() model.gpo_type = GPO_5345; model.motor_type = MOTOR_5345; model.flags = GENESYS_FLAG_14BIT_GAMMA | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_DARK_CALIBRATION | @@ -1611,8 +1595,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_XP300; model.motor_type = MOTOR_XP300; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; @@ -1666,8 +1649,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_DP665; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; @@ -1721,8 +1703,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_ROADWARRIOR; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -1776,8 +1757,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_ROADWARRIOR; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_NO_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_UNTESTED; @@ -1832,8 +1812,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_ROADWARRIOR; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -1887,8 +1866,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_DSM600; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_DSMOBILE_600; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -1943,8 +1921,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_DSM600; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_DSMOBILE_600; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -1998,8 +1975,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_DSM600; model.gpo_type = GPO_DP685; model.motor_type = MOTOR_XP300; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -2055,8 +2031,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_XP300; model.motor_type = MOTOR_XP300; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -2111,8 +2086,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_XP300; model.motor_type = MOTOR_XP300; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | @@ -2168,7 +2142,6 @@ void genesys_init_usb_device_tables() model.gpo_type = GPO_5345; model.motor_type = MOTOR_5345; model.flags = GENESYS_FLAG_14BIT_GAMMA | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_DARK_CALIBRATION | @@ -2229,7 +2202,6 @@ void genesys_init_usb_device_tables() model.gpo_type = GPO_5345; model.motor_type = MOTOR_5345; model.flags = GENESYS_FLAG_14BIT_GAMMA | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_SEARCH_START | GENESYS_FLAG_STAGGERED_LINE | GENESYS_FLAG_DARK_CALIBRATION | @@ -2290,8 +2262,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_WOLFSON_XP300; model.gpo_type = GPO_DP665; model.motor_type = MOTOR_ROADWARRIOR; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_DARK_CALIBRATION; @@ -2349,8 +2320,7 @@ void genesys_init_usb_device_tables() GENESYS_FLAG_CUSTOM_GAMMA | GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_DARK_CALIBRATION | - GENESYS_FLAG_OFFSET_CALIBRATION | - GENESYS_FLAG_LAZY_INIT; + GENESYS_FLAG_OFFSET_CALIBRATION; model.buttons = GENESYS_HAS_NO_BUTTONS; model.shading_lines = 7; model.shading_ta_lines = 0; @@ -2404,7 +2374,6 @@ void genesys_init_usb_device_tables() model.gpo_type = GPO_HP_N6310; model.motor_type = MOTOR_CANONLIDE200, // Not defined yet for N6310 model.flags = GENESYS_FLAG_UNTESTED | - GENESYS_FLAG_LAZY_INIT | GENESYS_FLAG_14BIT_GAMMA | GENESYS_FLAG_DARK_CALIBRATION | GENESYS_FLAG_OFFSET_CALIBRATION | @@ -2463,8 +2432,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_PLUSTEK3800; model.gpo_type = GPO_PLUSTEK3800; model.motor_type = MOTOR_PLUSTEK3800; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; model.buttons = GENESYS_HAS_NO_BUTTONS; // TODO there are 4 buttons to support @@ -2518,8 +2486,7 @@ void genesys_init_usb_device_tables() model.dac_type = DAC_IMG101; model.gpo_type = GPO_IMG101; model.motor_type = MOTOR_IMG101; - model.flags = GENESYS_FLAG_LAZY_INIT | - GENESYS_FLAG_SKIP_WARMUP | + model.flags = GENESYS_FLAG_SKIP_WARMUP | GENESYS_FLAG_OFFSET_CALIBRATION | GENESYS_FLAG_CUSTOM_GAMMA; model.buttons = GENESYS_HAS_NO_BUTTONS ;