mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

genesys: Remove bulk_write_register from the cmd_set structures

merge-requests/111/head
Povilas Kanapickas 2019-08-02 22:38:59 +03:00
rodzic 6014645664
commit 7836ea5778
9 zmienionych plików z 70 dodań i 78 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
backend/genesys.cc
Wyświetl plik

@ -1671,7 +1671,7 @@ static void genesys_dark_shading_calibration(Genesys_Device* dev, const Genesys_
sanei_genesys_set_motor_power(dev->calib_reg, motor);
}
dev->model->cmd_set->bulk_write_register(dev, dev->calib_reg);
sanei_genesys_bulk_write_register(dev, dev->calib_reg);
// wait some time to let lamp to get dark
sanei_genesys_sleep_ms(200);
@ -1846,7 +1846,7 @@ static void genesys_white_shading_calibration(Genesys_Device* dev, const Genesys
sanei_genesys_set_lamp_power(dev, sensor, dev->calib_reg, true);
sanei_genesys_set_motor_power(dev->calib_reg, motor);
dev->model->cmd_set->bulk_write_register(dev, dev->calib_reg);
sanei_genesys_bulk_write_register(dev, dev->calib_reg);
if (dev->model->flags & GENESYS_FLAG_DARK_CALIBRATION) {
sanei_genesys_sleep_ms(500); // make sure lamp is bright again
@ -1932,7 +1932,7 @@ static void genesys_dark_white_shading_calibration(Genesys_Device* dev,
sanei_genesys_set_lamp_power(dev, sensor, dev->calib_reg, true);
sanei_genesys_set_motor_power(dev->calib_reg, motor);
dev->model->cmd_set->bulk_write_register(dev, dev->calib_reg);
sanei_genesys_bulk_write_register(dev, dev->calib_reg);
dev->model->cmd_set->begin_scan(dev, sensor, &dev->calib_reg, SANE_FALSE);
@ -3427,7 +3427,7 @@ static void genesys_start_scan(Genesys_Device* dev, SANE_Bool lamp_off)
}
// now send registers for scan
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
// start effective scan
dev->model->cmd_set->begin_scan(dev, sensor, &dev->reg, SANE_TRUE);

31
backend/genesys_gl124.cc
Wyświetl plik

@ -1775,7 +1775,7 @@ static void gl124_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home)
r = sanei_genesys_get_address(&local_reg, REG02);
r->value |= REG02_MTRREV;
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
gl124_setup_scan_gpio(dev,resolution);
@ -1786,7 +1786,7 @@ static void gl124_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -1879,7 +1879,7 @@ static void gl124_feed(Genesys_Device* dev, unsigned int steps, int reverse)
}
// send registers
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl124_start_action(dev);
@ -1889,7 +1889,7 @@ static void gl124_feed(Genesys_Device* dev, unsigned int steps, int reverse)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -1943,7 +1943,7 @@ static void gl124_search_start_position(Genesys_Device* dev)
gl124_init_scan_regs(dev, sensor, &local_reg, params);
// send to scanner
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
size = pixels * dev->model->search_lines;
@ -2014,7 +2014,7 @@ static void gl124_init_regs_for_coarse_calibration(Genesys_Device* dev,
DBG(DBG_info, "%s: optical sensor res: %d dpi, actual res: %d\n", __func__,
sensor.optical_res / sensor.ccd_pixels_per_system_pixel(), dev->settings.xres);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
}
@ -2084,7 +2084,7 @@ static void gl124_init_regs_for_shading(Genesys_Device* dev, const Genesys_Senso
dev->scanhead_position_in_steps += dev->calib_lines + move;
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
}
static void gl124_wait_for_motor_stop(Genesys_Device* dev)
@ -2333,7 +2333,7 @@ static void move_to_calibration_area(Genesys_Device* dev, const Genesys_Sensor&
std::vector<uint8_t> line(size);
// write registers and scan data
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG (DBG_info, "%s: starting line reading\n", __func__);
gl124_begin_scan (dev, sensor, &regs, SANE_TRUE);
@ -2432,7 +2432,7 @@ static void gl124_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
sanei_genesys_set_triple(&regs,REG_EXPB,exp[2]);
// write registers and scan data
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting line reading\n", __func__);
gl124_begin_scan (dev, sensor, &regs, SANE_TRUE);
@ -2602,7 +2602,7 @@ static void gl124_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
dev->frontend.set_offset(2, bottom);
gl124_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting first line reading\n", __func__);
gl124_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, first_line.data(), total_size);
@ -2622,7 +2622,7 @@ static void gl124_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
dev->frontend.set_offset(1, top);
dev->frontend.set_offset(2, top);
gl124_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl124_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -2642,7 +2642,7 @@ static void gl124_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
// scan with no move
gl124_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl124_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -2749,7 +2749,7 @@ static void gl124_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
sanei_genesys_set_motor_power(regs, false);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
total_size = pixels * channels * (16/bpp) * lines;
@ -2864,7 +2864,7 @@ static void gl124_init_regs_for_warmup(Genesys_Device* dev, const Genesys_Sensor
*total_size = num_pixels * 3 * 1; /* colors * bytes_per_color * scan lines */
sanei_genesys_set_motor_power(*reg, false);
dev->model->cmd_set->bulk_write_register(dev, *reg);
sanei_genesys_bulk_write_register(dev, *reg);
}
/** @brief default GPIO values
@ -3009,7 +3009,7 @@ static void gl124_boot(Genesys_Device* dev, SANE_Bool cold)
gl124_init_registers (dev);
// Write initial registers
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
/* tune reg 0B */
val = REG0B_30MHZ | REG0B_ENBDRAM | REG0B_64M;
@ -3102,7 +3102,6 @@ static Genesys_Command_Set gl124_cmd_set = {
gl124_slow_back_home,
gl124_rewind,
sanei_genesys_bulk_write_register,
NULL,
sanei_genesys_bulk_read_data,

1
backend/genesys_gl646.cc
Wyświetl plik

@ -4131,7 +4131,6 @@ static Genesys_Command_Set gl646_cmd_set = {
gl646_slow_back_home,
NULL,
sanei_genesys_bulk_write_register,
sanei_genesys_bulk_write_data,
gl646_bulk_read_data,

1
backend/genesys_gl841.cc
Wyświetl plik

@ -4696,7 +4696,6 @@ static Genesys_Command_Set gl841_cmd_set = {
gl841_slow_back_home,
NULL,
sanei_genesys_bulk_write_register,
sanei_genesys_bulk_write_data,
sanei_genesys_bulk_read_data,

39
backend/genesys_gl843.cc
Wyświetl plik

@ -2201,7 +2201,7 @@ static void gl843_park_xpa_lamp(Genesys_Device* dev)
r->value &= ~REG01_SCAN;
// write to scanner and start action
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
gl843_set_xpa_motor_power(dev, true);
try {
gl843_start_action(dev);
@ -2210,7 +2210,7 @@ static void gl843_park_xpa_lamp(Genesys_Device* dev)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -2311,7 +2311,7 @@ static void gl843_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home)
r = sanei_genesys_get_address(&local_reg, REG01);
r->value &= ~REG01_SCAN;
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl843_start_action(dev);
@ -2320,7 +2320,7 @@ static void gl843_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -2398,7 +2398,7 @@ static void gl843_search_start_position(Genesys_Device* dev)
gl843_init_scan_regs(dev, sensor, &local_reg, session);
// send to scanner
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
size = dev->read_bytes_left;
@ -2477,7 +2477,7 @@ static void gl843_init_regs_for_coarse_calibration(Genesys_Device* dev,
DBG(DBG_info, "%s: optical sensor res: %d dpi, actual res: %d\n", __func__,
sensor.optical_res / sensor.ccd_pixels_per_system_pixel(), dev->settings.xres);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
}
/** @brief moves the slider to steps at motor base dpi
@ -2528,7 +2528,7 @@ static void gl843_feed(Genesys_Device* dev, unsigned int steps)
r->value &= ~REG01_SCAN;
// send registers
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl843_start_action(dev);
@ -2537,7 +2537,7 @@ static void gl843_feed(Genesys_Device* dev, unsigned int steps)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -2650,7 +2650,7 @@ static void gl843_init_regs_for_shading(Genesys_Device* dev, const Genesys_Senso
sanei_genesys_get_double(&regs,REG_STRPIXEL,&strpixel);
DBG(DBG_info, "%s: STRPIXEL=%d\n", __func__, strpixel);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
}
/** @brief set up registers for the actual scan
@ -2839,7 +2839,7 @@ static void gl843_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
gl843_init_scan_regs(dev, calib_sensor, &regs, session);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
total_size = dev->read_bytes_left;
@ -2868,7 +2868,7 @@ static void gl843_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
sanei_genesys_set_exposure(regs, calib_sensor.exposure);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting first line reading\n", __func__);
gl843_begin_scan(dev, calib_sensor, &regs, SANE_TRUE);
@ -3091,7 +3091,7 @@ static void gl843_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
gl843_set_fe(dev, calib_sensor, AFE_SET);
// scan with obttom AFE settings
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting first line reading\n", __func__);
gl843_begin_scan(dev, calib_sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, first_line.data(), total_size);
@ -3120,7 +3120,7 @@ static void gl843_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
gl843_set_fe(dev, calib_sensor, AFE_SET);
// scan with top AFE values
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl843_begin_scan(dev, calib_sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -3156,7 +3156,7 @@ static void gl843_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
gl843_set_fe(dev, calib_sensor, AFE_SET);
// scan with no move
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl843_begin_scan(dev, calib_sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -3300,7 +3300,7 @@ static void gl843_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
sanei_genesys_set_motor_power(regs, false);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
total_size = dev->read_bytes_left;
@ -3452,7 +3452,7 @@ static void gl843_init_regs_for_warmup(Genesys_Device* dev, const Genesys_Sensor
gl843_init_scan_regs(dev, calib_sensor, reg, session);
sanei_genesys_set_motor_power(*reg, false);
dev->model->cmd_set->bulk_write_register(dev, *reg);
sanei_genesys_bulk_write_register(dev, *reg);
}
/**
@ -3531,7 +3531,7 @@ static void gl843_boot(Genesys_Device* dev, SANE_Bool cold)
}
// Write initial registers
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
// Enable DRAM by setting a rising edge on bit 3 of reg 0x0b
val = dev->reg.find_reg(0x0b).value & REG0B_DRAMSEL;
@ -3705,7 +3705,7 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
r->value |= REG02_MTRREV;
}
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
gl843_begin_scan(dev, calib_sensor, &local_reg, SANE_TRUE);
@ -3732,7 +3732,7 @@ static void gl843_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
found = 0;
while (pass < 20 && !found)
{
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
// now start scan
gl843_begin_scan(dev, calib_sensor, &local_reg, SANE_TRUE);
@ -3956,7 +3956,6 @@ static Genesys_Command_Set gl843_cmd_set = {
gl843_slow_back_home,
NULL,
sanei_genesys_bulk_write_register,
sanei_genesys_bulk_write_data,
sanei_genesys_bulk_read_data,

31
backend/genesys_gl846.cc
Wyświetl plik

@ -1531,7 +1531,7 @@ static void gl846_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home
r = sanei_genesys_get_address(&local_reg, REG02);
r->value |= REG02_MTRREV;
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl846_start_action(dev);
@ -1542,7 +1542,7 @@ static void gl846_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -1616,7 +1616,7 @@ static void gl846_search_start_position(Genesys_Device* dev)
gl846_init_scan_regs(dev, sensor, &local_reg, params);
// send to scanner
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
size = pixels * dev->model->search_lines;
@ -1686,7 +1686,7 @@ static void gl846_init_regs_for_coarse_calibration(Genesys_Device* dev,
DBG(DBG_info, "%s: optical sensor res: %d dpi, actual res: %d\n", __func__,
sensor.optical_res / sensor.ccd_pixels_per_system_pixel(), dev->settings.xres);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
}
/** @brief moves the slider to steps at motor base dpi
@ -1740,7 +1740,7 @@ static void gl846_feed(Genesys_Device* dev, unsigned int steps)
r->value &= ~REG01_SCAN;
// send registers
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl846_start_action(dev);
@ -1751,7 +1751,7 @@ static void gl846_feed(Genesys_Device* dev, unsigned int steps)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -1814,7 +1814,7 @@ static void gl846_init_regs_for_shading(Genesys_Device* dev, const Genesys_Senso
gl846_init_scan_regs(dev, sensor, &regs, params);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
/* we use GENESYS_FLAG_SHADING_REPARK */
dev->scanhead_position_in_steps = 0;
@ -2099,7 +2099,7 @@ static void gl846_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
sanei_genesys_set_double(&regs,REG_EXPB,exp[2]);
// write registers and scan data
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting line reading\n", __func__);
gl846_begin_scan(dev, sensor, &regs, SANE_TRUE);
@ -2278,7 +2278,7 @@ static void gl846_boot(Genesys_Device* dev, SANE_Bool cold)
gl846_init_registers (dev);
// Write initial registers
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
/* Enable DRAM by setting a rising edge on bit 3 of reg 0x0b */
val = dev->reg.find_reg(0x0b).value & REG0B_DRAMSEL;
@ -2408,7 +2408,7 @@ static void gl846_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
r->value |= REG02_MTRREV;
}
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
gl846_begin_scan(dev, sensor, &local_reg, SANE_TRUE);
@ -2434,7 +2434,7 @@ static void gl846_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
found = 0;
while (pass < 20 && !found)
{
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
// now start scan
gl846_begin_scan(dev, sensor, &local_reg, SANE_TRUE);
@ -2646,7 +2646,7 @@ static void gl846_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
dev->frontend.set_offset(2, bottom);
gl846_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting first line reading\n", __func__);
gl846_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, first_line.data(), total_size);
@ -2666,7 +2666,7 @@ static void gl846_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
dev->frontend.set_offset(1, top);
dev->frontend.set_offset(2, top);
gl846_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl846_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -2686,7 +2686,7 @@ static void gl846_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
// scan with no move
gl846_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl846_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -2786,7 +2786,7 @@ static void gl846_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
sanei_genesys_set_motor_power(regs, false);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
total_size = pixels * channels * (16/bpp) * lines;
@ -2886,7 +2886,6 @@ static Genesys_Command_Set gl846_cmd_set = {
gl846_slow_back_home,
NULL,
sanei_genesys_bulk_write_register,
NULL,
sanei_genesys_bulk_read_data,

31
backend/genesys_gl847.cc
Wyświetl plik

@ -1588,7 +1588,7 @@ static void gl847_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home)
r = sanei_genesys_get_address (&local_reg, REG02);
r->value |= REG02_MTRREV;
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl847_start_action(dev);
@ -1597,7 +1597,7 @@ static void gl847_slow_back_home(Genesys_Device* dev, SANE_Bool wait_until_home)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -1671,7 +1671,7 @@ static void gl847_search_start_position(Genesys_Device* dev)
gl847_init_scan_regs(dev, sensor, &local_reg, params);
// send to scanner
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
size = pixels * dev->model->search_lines;
@ -1741,7 +1741,7 @@ static void gl847_init_regs_for_coarse_calibration(Genesys_Device* dev,
DBG(DBG_info, "%s: optical sensor res: %d dpi, actual res: %d\n", __func__,
sensor.optical_res / sensor.ccd_pixels_per_system_pixel(), dev->settings.xres);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
}
/** @brief moves the slider to steps at motor base dpi
@ -1794,7 +1794,7 @@ static void gl847_feed(Genesys_Device* dev, unsigned int steps)
r->value &= ~REG01_SCAN;
// send registers
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
try {
gl847_start_action(dev);
@ -1803,7 +1803,7 @@ static void gl847_feed(Genesys_Device* dev, unsigned int steps)
// restore original registers
catch_all_exceptions(__func__, [&]()
{
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
});
throw;
}
@ -1867,7 +1867,7 @@ static void gl847_init_regs_for_shading(Genesys_Device* dev, const Genesys_Senso
gl847_init_scan_regs(dev, sensor, &regs, params);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
/* we use GENESYS_FLAG_SHADING_REPARK */
dev->scanhead_position_in_steps = 0;
@ -2152,7 +2152,7 @@ static void gl847_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
sanei_genesys_set_double(&regs,REG_EXPB,exp[2]);
// write registers and scan data
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting line reading\n", __func__);
gl847_begin_scan(dev, sensor, &regs, SANE_TRUE);
@ -2369,7 +2369,7 @@ static void gl847_boot(Genesys_Device* dev, SANE_Bool cold)
gl847_init_registers (dev);
// Write initial registers
dev->model->cmd_set->bulk_write_register(dev, dev->reg);
sanei_genesys_bulk_write_register(dev, dev->reg);
/* Enable DRAM by setting a rising edge on bit 3 of reg 0x0b */
val = dev->reg.find_reg(0x0b).value & REG0B_DRAMSEL;
@ -2501,7 +2501,7 @@ static void gl847_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
r->value |= REG02_MTRREV;
}
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
gl847_begin_scan(dev, sensor, &local_reg, SANE_TRUE);
@ -2527,7 +2527,7 @@ static void gl847_search_strip(Genesys_Device* dev, const Genesys_Sensor& sensor
found = 0;
while (pass < 20 && !found)
{
dev->model->cmd_set->bulk_write_register(dev, local_reg);
sanei_genesys_bulk_write_register(dev, local_reg);
// now start scan
gl847_begin_scan(dev, sensor, &local_reg, SANE_TRUE);
@ -2739,7 +2739,7 @@ static void gl847_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
dev->frontend.set_offset(2, bottom);
gl847_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting first line reading\n", __func__);
gl847_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, first_line.data(), total_size);
@ -2759,7 +2759,7 @@ static void gl847_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
dev->frontend.set_offset(1, top);
dev->frontend.set_offset(2, top);
gl847_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl847_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -2779,7 +2779,7 @@ static void gl847_offset_calibration(Genesys_Device* dev, const Genesys_Sensor&
// scan with no move
gl847_set_fe(dev, sensor, AFE_SET);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
DBG(DBG_info, "%s: starting second line reading\n", __func__);
gl847_begin_scan(dev, sensor, &regs, SANE_TRUE);
sanei_genesys_read_data_from_scanner(dev, second_line.data(), total_size);
@ -2877,7 +2877,7 @@ static void gl847_coarse_gain_calibration(Genesys_Device* dev, const Genesys_Sen
sanei_genesys_set_motor_power(regs, false);
dev->model->cmd_set->bulk_write_register(dev, regs);
sanei_genesys_bulk_write_register(dev, regs);
total_size = pixels * channels * (16/bpp) * lines;
@ -2996,7 +2996,6 @@ static Genesys_Command_Set gl847_cmd_set = {
gl847_slow_back_home,
NULL, /* disable gl847_rewind, see #7 */
sanei_genesys_bulk_write_register,
NULL,
sanei_genesys_bulk_read_data,

4
backend/genesys_low.cc
Wyświetl plik

@ -542,7 +542,7 @@ void sanei_genesys_fe_read_data (Genesys_Device* dev, uint8_t addr, uint16_t* da
reg.init_reg(0x50, addr);
// set up read address
dev->model->cmd_set->bulk_write_register(dev, reg);
sanei_genesys_bulk_write_register(dev, reg);
// read data
uint8_t value = dev->read_register(0x46);
@ -574,7 +574,7 @@ void sanei_genesys_fe_write_data(Genesys_Device* dev, uint8_t addr, uint16_t dat
reg.init_reg(0x3b, data & 0xff);
}
dev->model->cmd_set->bulk_write_register(dev, reg);
sanei_genesys_bulk_write_register(dev, reg);
}
/* ------------------------------------------------------------------------ */

2
backend/genesys_low.h
Wyświetl plik

@ -284,8 +284,6 @@ struct Genesys_Command_Set
void (*slow_back_home) (Genesys_Device* dev, SANE_Bool wait_until_home);
void (*rewind) (Genesys_Device* dev);
void (*bulk_write_register) (Genesys_Device* dev, Genesys_Register_Set& regs);
void (*bulk_write_data) (Genesys_Device* dev, uint8_t addr, uint8_t* data, size_t len);
void (*bulk_read_data) (Genesys_Device * dev, uint8_t addr, uint8_t * data, size_t len);