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 uses of sanei_genesys_set_double()

merge-requests/115/head
Povilas Kanapickas 2019-07-21 18:41:47 +03:00
rodzic 98546ecff0
commit 08c98e13b2
7 zmienionych plików z 65 dodań i 77 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

28
backend/genesys_gl124.cc
Wyświetl plik

@ -710,8 +710,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
reg->set8(REG02, r02);
sanei_genesys_set_motor_power(*reg, true);
/* SCANFED */
sanei_genesys_set_double(reg,REG_SCANFED,4);
reg->set16(REG_SCANFED, 4);
/* scan and backtracking slope table */
sanei_genesys_slope_table(scan_table,
@ -726,8 +725,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
gl124_send_slope_table(dev, SCAN_TABLE, scan_table, scan_steps);
gl124_send_slope_table(dev, BACKTRACK_TABLE, scan_table, scan_steps);
/* STEPNO */
sanei_genesys_set_double(reg,REG_STEPNO,scan_steps);
reg->set16(REG_STEPNO, scan_steps);
/* fast table */
fast_dpi=yres;
@ -750,14 +748,9 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
gl124_send_slope_table(dev, STOP_TABLE, fast_table, fast_steps);
gl124_send_slope_table(dev, FAST_TABLE, fast_table, fast_steps);
/* FASTNO */
sanei_genesys_set_double(reg,REG_FASTNO,fast_steps);
/* FSHDEC */
sanei_genesys_set_double(reg,REG_FSHDEC,fast_steps);
/* FMOVNO */
sanei_genesys_set_double(reg,REG_FMOVNO,fast_steps);
reg->set16(REG_FASTNO, fast_steps);
reg->set16(REG_FSHDEC, fast_steps);
reg->set16(REG_FMOVNO, fast_steps);
/* substract acceleration distance from feedl */
feedl=feed_steps;
@ -801,8 +794,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
reg->set8_mask(REG1D, linesel, REG1D_LINESEL);
reg->set8(REGA0, (scan_step_type << REGA0S_STEPSEL) | (scan_step_type << REGA0S_FSTPSEL));
/* FMOVDEC */
sanei_genesys_set_double(reg,REG_FMOVDEC,fast_steps);
reg->set16(REG_FMOVDEC, fast_steps);
}
@ -855,8 +847,8 @@ static void gl124_setup_sensor(Genesys_Device * dev,
sanei_genesys_set_triple(regs,REG_SEGCNT,sensor_profile->segcnt);
sanei_genesys_set_double(regs,REG_TG0CNT,sensor_profile->tg0cnt);
sanei_genesys_set_double(regs,REG_EXPDMY,sensor_profile->expdummy);
regs->set16(REG_TG0CNT, sensor_profile->tg0cnt);
regs->set16(REG_EXPDMY, sensor_profile->expdummy);
/* if no calibration has been done, set default values for exposures */
exp = sensor.exposure.red;
@ -1043,7 +1035,7 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
r->value |= REG05_GMMENB;
}
sanei_genesys_set_double(reg, REG_DPISET, dpiset * ccd_size_divisor);
reg->set16(REG_DPISET, dpiset * ccd_size_divisor);
DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset * ccd_size_divisor);
r = sanei_genesys_get_address (reg, REG06);
@ -1135,7 +1127,7 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
sanei_genesys_set_triple(reg,REG_LPERIOD,exposure_time);
DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);
sanei_genesys_set_double(reg,REG_DUMMY,sensor.dummy_pixel);
reg->set16(REG_DUMMY, sensor.dummy_pixel);
}
/** set up registers for an actual scan

12
backend/genesys_gl646.cc
Wyświetl plik

@ -739,8 +739,8 @@ static void gl646_setup_registers(Genesys_Device* dev,
/* scanner's x coordinates are expressed in physical DPI but they must be divided by cksel */
sx = startx / sensor_mst->cksel / ccd_size_divisor;
ex = endx / sensor_mst->cksel / ccd_size_divisor;
sanei_genesys_set_double(regs, REG_STRPIXEL, sx);
sanei_genesys_set_double(regs, REG_ENDPIXEL, ex);
regs->set16(REG_STRPIXEL, sx);
regs->set16(REG_ENDPIXEL, ex);
DBG(DBG_info, "%s: startx=%d, endx=%d, ccd_size_divisor=%d\n", __func__, sx, ex, ccd_size_divisor);
/* words_per_line must be computed according to the scan's resolution */
@ -763,8 +763,8 @@ static void gl646_setup_registers(Genesys_Device* dev,
DBG(DBG_info, "%s: wpl=%d\n", __func__, words_per_line);
sanei_genesys_set_triple(regs, REG_MAXWD, words_per_line);
sanei_genesys_set_double(regs, REG_DPISET, sensor_mst->dpiset);
sanei_genesys_set_double(regs, REG_LPERIOD, sensor_mst->exposure);
regs->set16(REG_DPISET, sensor_mst->dpiset);
regs->set16(REG_LPERIOD, sensor_mst->exposure);
/* move distance must be adjusted to take into account the extra lines
* read to reorder data */
@ -904,8 +904,8 @@ static void gl646_setup_registers(Genesys_Device* dev,
z1 = 0;
z2 = 0;
}
sanei_genesys_set_double(regs, REG_Z1MOD, z1);
sanei_genesys_set_double(regs, REG_Z2MOD, z2);
regs->set16(REG_Z1MOD, z1);
regs->set16(REG_Z2MOD, z2);
regs->find_reg(0x6b).value = motor->steps2;
regs->find_reg(0x6c).value =
(regs->find_reg(0x6c).value & REG6C_TGTIME) | ((z1 >> 13) & 0x38) | ((z2 >> 16)

14
backend/genesys_gl841.cc
Wyświetl plik

@ -1611,9 +1611,9 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
if (expb < expavg)
expavg = expb;
sanei_genesys_set_double(&dev->reg, REG_EXPR, expavg);
sanei_genesys_set_double(&dev->reg, REG_EXPG, expavg);
sanei_genesys_set_double(&dev->reg, REG_EXPB, expavg);
dev->reg.set16(REG_EXPR, expavg);
dev->reg.set16(REG_EXPG, expavg);
dev->reg.set16(REG_EXPB, expavg);
}
/* enable gamma tables */
@ -1629,9 +1629,9 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
r = sanei_genesys_get_address (reg, 0x29);
r->value = 255; /*<<<"magic" number, only suitable for cis*/
sanei_genesys_set_double(reg, REG_DPISET, dpiset);
sanei_genesys_set_double(reg, REG_STRPIXEL, start);
sanei_genesys_set_double(reg, REG_ENDPIXEL, end);
reg->set16(REG_DPISET, dpiset);
reg->set16(REG_STRPIXEL, start);
reg->set16(REG_ENDPIXEL, end);
DBG(DBG_io2, "%s: STRPIXEL=%d, ENDPIXEL=%d\n", __func__, start, end);
/* words(16bit) before gamma, conversion to 8 bit or lineart*/
@ -1654,7 +1654,7 @@ static void gl841_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
r = sanei_genesys_get_address (reg, 0x37);
r->value = LOBYTE (LOWORD (words_per_line));
sanei_genesys_set_double(reg, REG_LPERIOD, exposure_time);
reg->set16(REG_LPERIOD, exposure_time);
r = sanei_genesys_get_address (reg, 0x34);
r->value = sensor.dummy_pixel;

19
backend/genesys_gl843.cc
Wyświetl plik

@ -1194,16 +1194,17 @@ static void gl843_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
}
/* enable gamma tables */
if (flags & OPTICAL_FLAG_DISABLE_GAMMA)
r->value &= ~REG05_GMMENB;
else
r->value |= REG05_GMMENB;
if (flags & OPTICAL_FLAG_DISABLE_GAMMA) {
r->value &= ~REG05_GMMENB;
} else {
r->value |= REG05_GMMENB;
}
sanei_genesys_set_double(reg, REG_DPISET, dpiset * ccd_size_divisor);
DBG(DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset * ccd_size_divisor);
reg->set16(REG_DPISET, dpiset * ccd_size_divisor);
DBG(DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset * ccd_size_divisor);
sanei_genesys_set_double(reg, REG_STRPIXEL, startx);
sanei_genesys_set_double(reg, REG_ENDPIXEL, endx);
reg->set16(REG_STRPIXEL, startx);
reg->set16(REG_ENDPIXEL, endx);
/* words(16bit) before gamma, conversion to 8 bit or lineart */
words_per_line = (used_pixels * dpiset) / dpihw;
@ -1234,7 +1235,7 @@ static void gl843_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
sanei_genesys_set_triple(reg,REG_MAXWD,(words_per_line)>>1);
DBG(DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
sanei_genesys_set_double(reg,REG_LPERIOD,exposure/tgtime);
reg->set16(REG_LPERIOD,exposure/tgtime);
DBG(DBG_io2, "%s: exposure used=%d\n", __func__, exposure/tgtime);
r = sanei_genesys_get_address (reg, REG_DUMMY);

32
backend/genesys_gl846.cc
Wyświetl plik

@ -240,21 +240,21 @@ static void gl846_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& senso
{
exp=sensor_profile->expr;
}
sanei_genesys_set_double(regs,REG_EXPR,exp);
regs->set16(REG_EXPR, exp);
exp = sensor.exposure.green;
if(exp==0)
{
exp=sensor_profile->expg;
}
sanei_genesys_set_double(regs,REG_EXPG,exp);
regs->set16(REG_EXPG, exp);
exp = sensor.exposure.blue;
if(exp==0)
{
exp=sensor_profile->expb;
}
sanei_genesys_set_double(regs,REG_EXPB,exp);
regs->set16(REG_EXPB, exp);
sanei_genesys_set_triple(regs,REG_CK1MAP,sensor_profile->ck1map);
sanei_genesys_set_triple(regs,REG_CK3MAP,sensor_profile->ck3map);
@ -967,11 +967,11 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
dev->segnb=segnb;
dev->line_interp = 0;
sanei_genesys_set_double(reg,REG_DPISET,dpiset);
DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
reg->set16(REG_DPISET,dpiset);
DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
sanei_genesys_set_double(reg,REG_STRPIXEL,startx);
sanei_genesys_set_double(reg,REG_ENDPIXEL,endx);
reg->set16(REG_STRPIXEL,startx);
reg->set16(REG_ENDPIXEL,endx);
DBG (DBG_io2, "%s: startx=%d\n", __func__, startx);
DBG (DBG_io2, "%s: endx =%d\n", __func__, endx);
@ -993,7 +993,7 @@ static void gl846_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
sanei_genesys_set_triple(reg, REG_MAXWD, (words_per_line >> 2));
DBG (DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
sanei_genesys_set_double(reg, REG_LPERIOD, exposure_time);
reg->set16(REG_LPERIOD, exposure_time);
DBG (DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);
r = sanei_genesys_get_address (reg, 0x34);
@ -2073,10 +2073,10 @@ static void gl846_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
sanei_genesys_set_motor_power(regs, false);
do
{
/* set up exposure */
sanei_genesys_set_double(&regs,REG_EXPR,exp[0]);
sanei_genesys_set_double(&regs,REG_EXPG,exp[1]);
sanei_genesys_set_double(&regs,REG_EXPB,exp[2]);
// set up exposure
regs.set16(REG_EXPR, exp[0]);
regs.set16(REG_EXPG, exp[1]);
regs.set16(REG_EXPB, exp[2]);
// write registers and scan data
dev->write_registers(regs);
@ -2139,10 +2139,10 @@ static void gl846_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
DBG(DBG_info, "%s: acceptable exposure: %d,%d,%d\n", __func__, exp[0], exp[1], exp[2]);
/* set these values as final ones for scan */
sanei_genesys_set_double(&dev->reg,REG_EXPR,exp[0]);
sanei_genesys_set_double(&dev->reg,REG_EXPG,exp[1]);
sanei_genesys_set_double(&dev->reg,REG_EXPB,exp[2]);
// set these values as final ones for scan
dev->reg.set16(REG_EXPR, exp[0]);
dev->reg.set16(REG_EXPG, exp[1]);
dev->reg.set16(REG_EXPB, exp[2]);
/* store in this struct since it is the one used by cache calibration */
sensor.exposure.red = exp[0];

32
backend/genesys_gl847.cc
Wyświetl plik

@ -235,21 +235,21 @@ static void gl847_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& senso
{
exp=sensor_profile->expr;
}
sanei_genesys_set_double(regs,REG_EXPR,exp);
regs->set16(REG_EXPR, exp);
exp = sensor.exposure.green;
if(exp==0)
{
exp=sensor_profile->expg;
}
sanei_genesys_set_double(regs,REG_EXPG,exp);
regs->set16(REG_EXPG, exp);
exp = sensor.exposure.blue;
if(exp==0)
{
exp=sensor_profile->expb;
}
sanei_genesys_set_double(regs,REG_EXPB,exp);
regs->set16(REG_EXPB, exp);
sanei_genesys_set_triple(regs,REG_CK1MAP,sensor_profile->ck1map);
sanei_genesys_set_triple(regs,REG_CK3MAP,sensor_profile->ck3map);
@ -983,11 +983,11 @@ static void gl847_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
dev->segnb=segnb;
dev->line_interp = 0;
sanei_genesys_set_double(reg,REG_DPISET,dpiset);
DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
reg->set16(REG_DPISET,dpiset);
DBG (DBG_io2, "%s: dpiset used=%d\n", __func__, dpiset);
sanei_genesys_set_double(reg,REG_STRPIXEL,startx);
sanei_genesys_set_double(reg,REG_ENDPIXEL,endx);
reg->set16(REG_STRPIXEL,startx);
reg->set16(REG_ENDPIXEL,endx);
DBG (DBG_io2, "%s: startx=%d\n", __func__, startx);
DBG (DBG_io2, "%s: endx =%d\n", __func__, endx);
@ -1009,7 +1009,7 @@ static void gl847_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
sanei_genesys_set_triple(reg, REG_MAXWD, (words_per_line >> 2));
DBG(DBG_io2, "%s: words_per_line used=%d\n", __func__, words_per_line);
sanei_genesys_set_double(reg, REG_LPERIOD, exposure_time);
reg->set16(REG_LPERIOD, exposure_time);
DBG(DBG_io2, "%s: exposure_time used=%d\n", __func__, exposure_time);
r = sanei_genesys_get_address (reg, 0x34);
@ -2125,10 +2125,10 @@ static void gl847_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
sanei_genesys_set_motor_power(regs, false);
do
{
/* set up exposure */
sanei_genesys_set_double(&regs,REG_EXPR,exp[0]);
sanei_genesys_set_double(&regs,REG_EXPG,exp[1]);
sanei_genesys_set_double(&regs,REG_EXPB,exp[2]);
// set up exposure
regs.set16(REG_EXPR,exp[0]);
regs.set16(REG_EXPG,exp[1]);
regs.set16(REG_EXPB,exp[2]);
// write registers and scan data
dev->write_registers(regs);
@ -2191,10 +2191,10 @@ static void gl847_led_calibration(Genesys_Device* dev, Genesys_Sensor& sensor,
DBG(DBG_info, "%s: acceptable exposure: %d,%d,%d\n", __func__, exp[0], exp[1], exp[2]);
/* set these values as final ones for scan */
sanei_genesys_set_double(&dev->reg,REG_EXPR,exp[0]);
sanei_genesys_set_double(&dev->reg,REG_EXPG,exp[1]);
sanei_genesys_set_double(&dev->reg,REG_EXPB,exp[2]);
// set these values as final ones for scan
dev->reg.set16(REG_EXPR, exp[0]);
dev->reg.set16(REG_EXPG, exp[1]);
dev->reg.set16(REG_EXPB, exp[2]);
/* store in this struct since it is the one used by cache calibration */
sensor.exposure.red = exp[0];

5
backend/genesys_low.h
Wyświetl plik

@ -563,11 +563,6 @@ extern void sanei_genesys_test_buffer_empty(Genesys_Device* dev, SANE_Bool* empt
extern void sanei_genesys_read_data_from_scanner(Genesys_Device* dev, uint8_t* data, size_t size);
inline void sanei_genesys_set_double(Genesys_Register_Set* regs, uint16_t addr, uint16_t value)
{
regs->set16(addr, value);
}
inline void sanei_genesys_set_triple(Genesys_Register_Set* regs, uint16_t addr, uint32_t value)
{
regs->set24(addr, value);