From 32041bc7fedb64a031e3e75c01c9edd9aa94fda4 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sun, 2 Feb 2020 18:45:31 +0200 Subject: [PATCH] genesys: Rename calib_reg to initial_regs --- backend/genesys/device.cpp | 2 +- backend/genesys/device.h | 2 +- backend/genesys/genesys.cpp | 4 ++-- backend/genesys/gl124.cpp | 2 +- backend/genesys/gl646.cpp | 3 +-- backend/genesys/gl841.cpp | 14 +++++++------- backend/genesys/gl846.cpp | 3 +-- backend/genesys/gl847.cpp | 3 +-- backend/genesys/low.cpp | 3 +-- 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/backend/genesys/device.cpp b/backend/genesys/device.cpp index dd13d8e7b..0a2033e1a 100644 --- a/backend/genesys/device.cpp +++ b/backend/genesys/device.cpp @@ -209,7 +209,7 @@ std::ostream& operator<<(std::ostream& out, const Genesys_Device& dev) << " ignore_offsets: " << dev.ignore_offsets << '\n' << " model: (not printed)\n" << " reg: " << format_indent_braced_list(4, dev.reg) << '\n' - << " calib_reg: " << format_indent_braced_list(4, dev.calib_reg) << '\n' + << " initial_regs: " << format_indent_braced_list(4, dev.initial_regs) << '\n' << " settings: " << format_indent_braced_list(4, dev.settings) << '\n' << " frontend: " << format_indent_braced_list(4, dev.frontend) << '\n' << " frontend_initial: " << format_indent_braced_list(4, dev.frontend_initial) << '\n' diff --git a/backend/genesys/device.h b/backend/genesys/device.h index 479c2be79..4d8686cd3 100644 --- a/backend/genesys/device.h +++ b/backend/genesys/device.h @@ -250,7 +250,7 @@ struct Genesys_Device std::unique_ptr cmd_set; Genesys_Register_Set reg; - Genesys_Register_Set calib_reg; + Genesys_Register_Set initial_regs; Genesys_Settings settings; Genesys_Frontend frontend, frontend_initial; diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp index 1940b59a6..170bf3461 100644 --- a/backend/genesys/genesys.cpp +++ b/backend/genesys/genesys.cpp @@ -2912,7 +2912,7 @@ static void genesys_flatbed_calibration(Genesys_Device* dev, Genesys_Sensor& sen coarse_res = 1200; } - auto local_reg = dev->calib_reg; + auto local_reg = dev->initial_regs; /* do offset calibration if needed */ if (has_flag(dev->model->flags, ModelFlag::OFFSET_CALIBRATION)) { @@ -3039,7 +3039,7 @@ static void genesys_sheetfed_calibration(Genesys_Device* dev, Genesys_Sensor& se DBG_HELPER(dbg); bool forward = true; - auto local_reg = dev->calib_reg; + auto local_reg = dev->initial_regs; // first step, load document dev->cmd_set->load_document(dev); diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp index e64eedcea..9fded5244 100644 --- a/backend/genesys/gl124.cpp +++ b/backend/genesys/gl124.cpp @@ -338,7 +338,7 @@ gl124_init_registers (Genesys_Device * dev) const auto& sensor = sanei_genesys_find_sensor_any(dev); sanei_genesys_set_dpihw(dev->reg, sensor, sensor.optical_res); - dev->calib_reg = dev->reg; + dev->initial_regs = dev->reg; } /**@brief send slope table for motor movement diff --git a/backend/genesys/gl646.cpp b/backend/genesys/gl646.cpp index 0f9db41ab..8f2e0e212 100644 --- a/backend/genesys/gl646.cpp +++ b/backend/genesys/gl646.cpp @@ -2726,8 +2726,7 @@ void CommandSetGl646::init(Genesys_Device* dev) const // Init shading data sanei_genesys_init_shading_data(dev, sensor, sensor.sensor_pixels); - /* initial calibration reg values */ - dev->calib_reg = dev->reg; + dev->initial_regs = dev->reg; } // execute physical unit init only if cold diff --git a/backend/genesys/gl841.cpp b/backend/genesys/gl841.cpp index f9aab5c42..a3641d4bd 100644 --- a/backend/genesys/gl841.cpp +++ b/backend/genesys/gl841.cpp @@ -1745,7 +1745,7 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const uint8_t val = dev->interface->read_register(REG_0x6B); dev->interface->write_register(REG_0x6B, val & ~REG_0x6B_GPO17); dev->reg.find_reg(0x6b).value &= ~REG_0x6B_GPO17; - dev->calib_reg.find_reg(0x6b).value &= ~REG_0x6B_GPO17; + dev->initial_regs.find_reg(0x6b).value &= ~REG_0x6B_GPO17; } set_fe(dev, sensor, AFE_POWER_SAVE); @@ -1777,13 +1777,13 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const val = dev->interface->read_register(REG_0x6B); dev->interface->write_register(REG_0x6B, val | REG_0x6B_GPO17); dev->reg.find_reg(0x6b).value |= REG_0x6B_GPO17; - dev->calib_reg.find_reg(0x6b).value |= REG_0x6B_GPO17; + dev->initial_regs.find_reg(0x6b).value |= REG_0x6B_GPO17; /*enable GPO18*/ val = dev->interface->read_register(REG_0x6B); dev->interface->write_register(REG_0x6B, val | REG_0x6B_GPO18); dev->reg.find_reg(0x6b).value |= REG_0x6B_GPO18; - dev->calib_reg.find_reg(0x6b).value |= REG_0x6B_GPO18; + dev->initial_regs.find_reg(0x6b).value |= REG_0x6B_GPO18; } if (dev->model->gpio_id == GpioId::DP665 @@ -1792,7 +1792,7 @@ void CommandSetGl841::save_power(Genesys_Device* dev, bool enable) const uint8_t val = dev->interface->read_register(REG_0x6B); dev->interface->write_register(REG_0x6B, val | REG_0x6B_GPO17); dev->reg.find_reg(0x6b).value |= REG_0x6B_GPO17; - dev->calib_reg.find_reg(0x6b).value |= REG_0x6B_GPO17; + dev->initial_regs.find_reg(0x6b).value |= REG_0x6B_GPO17; } } @@ -3446,8 +3446,8 @@ void CommandSetGl841::init(Genesys_Device* dev) const // Set analog frontend dev->cmd_set->set_fe(dev, sensor, AFE_INIT); - // FIXME: move_back_home modifies dev->calib_reg and requires it to be filled - dev->calib_reg = dev->reg; + // FIXME: move_back_home modifies dev->initial_regs and requires it to be filled + dev->initial_regs = dev->reg; // Move home dev->cmd_set->move_back_home(dev, true); @@ -3466,7 +3466,7 @@ void CommandSetGl841::init(Genesys_Device* dev) const dev->cmd_set->send_gamma_table(dev, sensor); /* initial calibration reg values */ - Genesys_Register_Set& regs = dev->calib_reg; + Genesys_Register_Set& regs = dev->initial_regs; regs = dev->reg; unsigned resolution = sensor.get_logical_hwdpi(300); diff --git a/backend/genesys/gl846.cpp b/backend/genesys/gl846.cpp index 619f89071..0f3b50396 100644 --- a/backend/genesys/gl846.cpp +++ b/backend/genesys/gl846.cpp @@ -218,8 +218,7 @@ gl846_init_registers (Genesys_Device * dev) const auto& sensor = sanei_genesys_find_sensor_any(dev); sanei_genesys_set_dpihw(dev->reg, sensor, sensor.optical_res); - /* initalize calibration reg */ - dev->calib_reg = dev->reg; + dev->initial_regs = dev->reg; } /**@brief send slope table for motor movement diff --git a/backend/genesys/gl847.cpp b/backend/genesys/gl847.cpp index 442127aa4..72aee3e79 100644 --- a/backend/genesys/gl847.cpp +++ b/backend/genesys/gl847.cpp @@ -239,8 +239,7 @@ gl847_init_registers (Genesys_Device * dev) const auto& sensor = sanei_genesys_find_sensor_any(dev); sanei_genesys_set_dpihw(dev->reg, sensor, sensor.optical_res); - /* initalize calibration reg */ - dev->calib_reg = dev->reg; + dev->initial_regs = dev->reg; } /**@brief send slope table for motor movement diff --git a/backend/genesys/low.cpp b/backend/genesys/low.cpp index 4f3849b3b..1e1b632bf 100644 --- a/backend/genesys/low.cpp +++ b/backend/genesys/low.cpp @@ -1493,8 +1493,7 @@ void sanei_genesys_asic_init(Genesys_Device* dev, bool /*max_regs*/) dev->settings.color_filter = ColorFilter::RED; - /* duplicate initial values into calibration registers */ - dev->calib_reg = dev->reg; + dev->initial_regs = dev->reg; const auto& sensor = sanei_genesys_find_sensor_any(dev);