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

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

2
backend/genesys_gl646.cc
Wyświetl plik

@ -1915,7 +1915,7 @@ static void end_scan(Genesys_Device* dev, Genesys_Register_Set* reg, SANE_Bool c
/* ends scan */ /* ends scan */
val = reg->get8(0x01); val = reg->get8(0x01);
val &= ~REG01_SCAN; val &= ~REG01_SCAN;
sanei_genesys_set_reg_from_set (reg, 0x01, val); reg->set8(0x01, val);
dev->write_register(0x01, val); dev->write_register(0x01, val);
/* for sheetfed scanners, we may have to eject document */ /* for sheetfed scanners, we may have to eject document */

2
backend/genesys_gl843.cc
Wyświetl plik

@ -1703,7 +1703,7 @@ static void gl843_stop_action_no_move(Genesys_Device* dev, Genesys_Register_Set*
DBG_HELPER(dbg); DBG_HELPER(dbg);
uint8_t val = reg->get8(REG01); uint8_t val = reg->get8(REG01);
val &= ~REG01_SCAN; val &= ~REG01_SCAN;
sanei_genesys_set_reg_from_set(reg, REG01, val); reg->set8(REG01, val);
dev->write_register(REG01, val); dev->write_register(REG01, val);
sanei_genesys_sleep_ms(100); sanei_genesys_sleep_ms(100);
} }

2
backend/genesys_gl846.cc
Wyświetl plik

@ -232,7 +232,7 @@ static void gl846_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& senso
dpihw = sensor.get_register_hwdpi(dpi); dpihw = sensor.get_register_hwdpi(dpi);
Sensor_Profile* sensor_profile = get_sensor_profile(dev->model->ccd_type, dpihw); Sensor_Profile* sensor_profile = get_sensor_profile(dev->model->ccd_type, dpihw);
sanei_genesys_set_reg_from_set(regs,REG_EXPDMY,(uint8_t)((sensor_profile->expdummy) & 0xff)); regs->set8(REG_EXPDMY, (uint8_t)((sensor_profile->expdummy) & 0xff));
/* if no calibration has been done, set default values for exposures */ /* if no calibration has been done, set default values for exposures */
exp = sensor.exposure.red; exp = sensor.exposure.red;

4
backend/genesys_gl847.cc
Wyświetl plik

@ -227,7 +227,7 @@ static void gl847_setup_sensor(Genesys_Device * dev, const Genesys_Sensor& senso
dpihw = sensor.get_register_hwdpi(dpi); dpihw = sensor.get_register_hwdpi(dpi);
Sensor_Profile* sensor_profile=get_sensor_profile(dev->model->ccd_type, dpihw); Sensor_Profile* sensor_profile=get_sensor_profile(dev->model->ccd_type, dpihw);
sanei_genesys_set_reg_from_set(regs,REG_EXPDMY,(uint8_t)((sensor_profile->expdummy) & 0xff)); regs->set8(REG_EXPDMY, (uint8_t)((sensor_profile->expdummy) & 0xff));
/* if no calibration has been done, set default values for exposures */ /* if no calibration has been done, set default values for exposures */
exp = sensor.exposure.red; exp = sensor.exposure.red;
@ -1383,7 +1383,7 @@ static void gl847_stop_action(Genesys_Device* dev)
/* ends scan */ /* ends scan */
val = dev->reg.get8(REG01); val = dev->reg.get8(REG01);
val &= ~REG01_SCAN; val &= ~REG01_SCAN;
sanei_genesys_set_reg_from_set(&dev->reg, REG01, val); dev->reg.set8(REG01, val);
dev->write_register(REG01, val); dev->write_register(REG01, val);
sanei_genesys_sleep_ms(100); sanei_genesys_sleep_ms(100);

6
backend/genesys_low.h
Wyświetl plik

@ -415,12 +415,6 @@ inline GenesysRegister* sanei_genesys_get_address(Genesys_Register_Set* regs, ui
return ret; return ret;
} }
inline void sanei_genesys_set_reg_from_set(Genesys_Register_Set* regs, uint16_t address,
uint8_t value)
{
regs->set8(address, value);
}
extern void sanei_genesys_init_cmd_set(Genesys_Device* dev); extern void sanei_genesys_init_cmd_set(Genesys_Device* dev);
extern void sanei_genesys_read_register(Genesys_Device* dev, uint16_t reg, uint8_t* val); extern void sanei_genesys_read_register(Genesys_Device* dev, uint16_t reg, uint8_t* val);