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_read_reg_from_set()

merge-requests/115/head
Povilas Kanapickas 2019-07-21 18:41:49 +03:00
rodzic e6dbfd64a3
commit 36714a7810
5 zmienionych plików z 17 dodań i 39 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
backend/genesys_gl646.cc
Wyświetl plik

@ -1878,8 +1878,8 @@ static void gl646_begin_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
// FIXME: SEQUENTIAL not really needed in this case
Genesys_Register_Set local_reg(Genesys_Register_Set::SEQUENTIAL);
local_reg.init_reg(0x03, sanei_genesys_read_reg_from_set(reg, 0x03));
local_reg.init_reg(0x01, sanei_genesys_read_reg_from_set(reg, 0x01) | REG01_SCAN); /* set scan bit */
local_reg.init_reg(0x03, reg->get8(0x03));
local_reg.init_reg(0x01, reg->get8(0x01) | REG01_SCAN);
if (start_motor) {
local_reg.init_reg(0x0f, 0x01);
@ -1913,8 +1913,8 @@ static void end_scan(Genesys_Device* dev, Genesys_Register_Set* reg, SANE_Bool c
}
/* ends scan */
val = sanei_genesys_read_reg_from_set (reg, 0x01);
val &= ~REG01_SCAN;
val = reg->get8(0x01);
val &= ~REG01_SCAN;
sanei_genesys_set_reg_from_set (reg, 0x01, val);
dev->write_register(0x01, val);
@ -2415,9 +2415,8 @@ static void setup_for_scan(Genesys_Device* dev,
gl646_setup_registers(dev, sensor, regs, params, slope_table0, slope_table1, xcorrection);
// send computed slope tables
gl646_send_slope_table(dev, 0, slope_table0, sanei_genesys_read_reg_from_set (regs, 0x21));
gl646_send_slope_table(dev, 1, slope_table1, sanei_genesys_read_reg_from_set (regs, 0x6b));
gl646_send_slope_table(dev, 0, slope_table0, regs->get8(0x21));
gl646_send_slope_table(dev, 1, slope_table1, regs->get8(0x6b));
}
/**

6
backend/genesys_gl841.cc
Wyświetl plik

@ -2724,13 +2724,13 @@ static void gl841_begin_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
}
if (dev->model->ccd_type != CCD_PLUSTEK_3600) {
local_reg.init_reg(0x03, sanei_genesys_read_reg_from_set(reg, 0x03) | REG03_LAMPPWR);
local_reg.init_reg(0x03, reg->get8(0x03) | REG03_LAMPPWR);
} else {
// TODO PLUSTEK_3600: why ??
local_reg.init_reg(0x03, sanei_genesys_read_reg_from_set(reg, 0x03));
local_reg.init_reg(0x03, reg->get8(0x03));
}
local_reg.init_reg(0x01, sanei_genesys_read_reg_from_set(reg, 0x01) | REG01_SCAN); /* set scan bit */
local_reg.init_reg(0x01, reg->get8(0x01) | REG01_SCAN);
local_reg.init_reg(0x0d, 0x01);
if (start_motor) {

2
backend/genesys_gl843.cc
Wyświetl plik

@ -1701,7 +1701,7 @@ static void gl843_start_action(Genesys_Device* dev)
static void gl843_stop_action_no_move(Genesys_Device* dev, Genesys_Register_Set* reg)
{
DBG_HELPER(dbg);
uint8_t val = sanei_genesys_read_reg_from_set(reg, REG01);
uint8_t val = reg->get8(REG01);
val &= ~REG01_SCAN;
sanei_genesys_set_reg_from_set(reg, REG01, val);
dev->write_register(REG01, val);

26
backend/genesys_low.cc
Wyświetl plik

@ -342,7 +342,7 @@ void sanei_genesys_bulk_write_data(Genesys_Device* dev, uint8_t addr, uint8_t* d
* @param reg LSB of register address
* @param val value to write
*/
void sanei_genesys_write_hregister(Genesys_Device* dev, uint16_t reg, uint8_t val)
static void sanei_genesys_write_hregister(Genesys_Device* dev, uint16_t reg, uint8_t val)
{
DBG_HELPER(dbg);
@ -365,7 +365,7 @@ void sanei_genesys_write_hregister(Genesys_Device* dev, uint16_t reg, uint8_t va
* @param reg LSB of register address
* @param val value to write
*/
void sanei_genesys_read_hregister(Genesys_Device* dev, uint16_t reg, uint8_t* val)
static void sanei_genesys_read_hregister(Genesys_Device* dev, uint16_t reg, uint8_t* val)
{
DBG_HELPER(dbg);
@ -626,17 +626,12 @@ void sanei_genesys_print_status (uint8_t val)
static int
genesys_pixels_per_line (Genesys_Register_Set * reg)
{
int pixels_per_line;
int pixels_per_line;
pixels_per_line =
sanei_genesys_read_reg_from_set (reg,
0x32) * 256 +
sanei_genesys_read_reg_from_set (reg, 0x33);
pixels_per_line -=
(sanei_genesys_read_reg_from_set (reg, 0x30) * 256 +
sanei_genesys_read_reg_from_set (reg, 0x31));
pixels_per_line = reg->get8(0x32) * 256 + reg->get8(0x33);
pixels_per_line -= (reg->get8(0x30) * 256 + reg->get8(0x31));
return pixels_per_line;
return pixels_per_line;
}
/* returns dpiset from register set */
@ -644,14 +639,7 @@ genesys_pixels_per_line (Genesys_Register_Set * reg)
static int
genesys_dpiset (Genesys_Register_Set * reg)
{
int dpiset;
dpiset =
sanei_genesys_read_reg_from_set (reg,
0x2c) * 256 +
sanei_genesys_read_reg_from_set (reg, 0x2d);
return dpiset;
return reg->get8(0x2c) * 256 + reg->get8(0x2d);
}
#endif

9
backend/genesys_low.h
Wyświetl plik

@ -415,11 +415,6 @@ inline GenesysRegister* sanei_genesys_get_address(Genesys_Register_Set* regs, ui
return ret;
}
inline uint8_t sanei_genesys_read_reg_from_set(Genesys_Register_Set* regs, uint16_t address)
{
return regs->get8(address);
}
inline void sanei_genesys_set_reg_from_set(Genesys_Register_Set* regs, uint16_t address,
uint8_t value)
{
@ -432,10 +427,6 @@ extern void sanei_genesys_read_register(Genesys_Device* dev, uint16_t reg, uint8
extern void sanei_genesys_write_register(Genesys_Device* dev, uint16_t reg, uint8_t val);
extern void sanei_genesys_read_hregister(Genesys_Device* dev, uint16_t reg, uint8_t* val);
extern void sanei_genesys_write_hregister(Genesys_Device* dev, uint16_t reg, uint8_t val);
extern void sanei_genesys_bulk_write_register(Genesys_Device* dev,
const Genesys_Register_Set& regs);