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

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

27
backend/genesys_gl124.cc
Wyświetl plik

@ -919,7 +919,7 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
unsigned int dpiset, dpihw, factor;
unsigned int bytes;
GenesysRegister *r;
uint32_t expmax, exp;
uint32_t expmax;
// resolution is divided according to ccd_pixels_per_system_pixel
unsigned ccd_pixels_per_system_pixel = sensor.ccd_pixels_per_system_pixel();
@ -1058,17 +1058,10 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
if (channels == 1 && (flags & OPTICAL_FLAG_ENABLE_LEDADD))
{
r->value |= REG60_LEDADD;
sanei_genesys_get_triple(reg,REG_EXPR,&expmax);
sanei_genesys_get_triple(reg,REG_EXPG,&exp);
if(exp>expmax)
{
expmax=exp;
}
sanei_genesys_get_triple(reg,REG_EXPB,&exp);
if(exp>expmax)
{
expmax=exp;
}
expmax = reg->get24(REG_EXPR);
expmax = std::max(expmax, reg->get24(REG_EXPG));
expmax = std::max(expmax, reg->get24(REG_EXPB));
sanei_genesys_set_triple(&dev->reg,REG_EXPR,expmax);
sanei_genesys_set_triple(&dev->reg,REG_EXPG,expmax);
sanei_genesys_set_triple(&dev->reg,REG_EXPB,expmax);
@ -1091,7 +1084,7 @@ static void gl124_init_optical_regs_scan(Genesys_Device* dev, const Genesys_Sens
sanei_genesys_set_triple(reg,REG_STRPIXEL,startx/segnb);
DBG (DBG_io2, "%s: strpixel used=%d\n", __func__, startx/segnb);
sanei_genesys_get_triple(reg,REG_SEGCNT,&segcnt);
segcnt = reg->get24(REG_SEGCNT);
if(endx/segnb==segcnt)
{
endx=0;
@ -2177,9 +2170,9 @@ static void gl124_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
/* logical size of a color as seen by generic code of the frontend */
length = (uint32_t) (size / 3);
sanei_genesys_get_triple(&dev->reg,REG_STRPIXEL,&strpixel);
sanei_genesys_get_triple(&dev->reg,REG_ENDPIXEL,&endpixel);
sanei_genesys_get_triple(&dev->reg,REG_SEGCNT,&segcnt);
strpixel = dev->reg.get24(REG_STRPIXEL);
endpixel = dev->reg.get24(REG_ENDPIXEL);
segcnt = dev->reg.get24(REG_SEGCNT);
if(endpixel==0)
{
endpixel=segcnt;
@ -2196,7 +2189,7 @@ static void gl124_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
if(DBG_LEVEL>=DBG_data)
{
dev->binary=fopen("binary.pnm","wb");
sanei_genesys_get_triple(&dev->reg, REG_LINCNT, &lines);
lines = dev->reg.get24(REG_LINCNT);
channels=dev->current_setup.channels;
if(dev->binary!=NULL)
{

16
backend/genesys_gl646.cc
Wyświetl plik

@ -3204,9 +3204,7 @@ static void gl646_init_regs_for_warmup(Genesys_Device* dev, const Genesys_Sensor
/* returned value to higher level warmup function */
*channels = 1;
uint32_t value = 0;
sanei_genesys_get_triple(local_reg, REG_LINCNT, &value);
lines = value + 1;
lines = local_reg->get24(REG_LINCNT) + 1;
*total_size = lines * settings.pixels;
// now registers are ok, write them to scanner
@ -3253,9 +3251,7 @@ static void gl646_repark_head(Genesys_Device* dev)
// start scan
gl646_begin_scan(dev, sensor, &dev->reg, SANE_TRUE);
uint32_t value32 = 0;
sanei_genesys_get_triple(&dev->reg, REG_FEEDL, &value32);
expected = value32;
expected = dev->reg.get24(REG_FEEDL);
do
{
sanei_genesys_sleep_ms(100);
@ -3478,15 +3474,11 @@ static void simple_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
/* allocate memory fo scan : LINCNT may have been adjusted for CCD reordering */
if (dev->model->is_cis == SANE_TRUE)
{
uint32_t value = 0;
sanei_genesys_get_triple(&dev->reg, REG_LINCNT, &value);
lines = value / 3;
lines = dev->reg.get24(REG_LINCNT) / 3;
}
else
{
uint32_t value = 0;
sanei_genesys_get_triple(&dev->reg, REG_LINCNT, &value);
lines = value + 1;
lines = dev->reg.get24(REG_LINCNT) + 1;
}
size = lines * settings.pixels;
if (settings.depth == 16)

2
backend/genesys_gl841.cc
Wyświetl plik

@ -4579,7 +4579,7 @@ static void gl841_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
if(DBG_LEVEL>=DBG_data)
{
dev->binary=fopen("binary.pnm","wb");
sanei_genesys_get_triple(&dev->reg, REG_LINCNT, &lines);
lines = dev->reg.get24(REG_LINCNT);
channels=dev->current_setup.channels;
if(dev->binary!=NULL)
{

2
backend/genesys_gl846.cc
Wyświetl plik

@ -1940,7 +1940,7 @@ static void gl846_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
if(DBG_LEVEL>=DBG_data)
{
dev->binary=fopen("binary.pnm","wb");
sanei_genesys_get_triple(&dev->reg, REG_LINCNT, &lines);
lines = dev->reg.get24(REG_LINCNT);
channels=dev->current_setup.channels;
if(dev->binary!=NULL)
{

2
backend/genesys_gl847.cc
Wyświetl plik

@ -1992,7 +1992,7 @@ static void gl847_send_shading_data(Genesys_Device* dev, const Genesys_Sensor& s
if(DBG_LEVEL>=DBG_data)
{
dev->binary=fopen("binary.pnm","wb");
sanei_genesys_get_triple(&dev->reg, REG_LINCNT, &lines);
lines = dev->reg.get24(REG_LINCNT);
channels=dev->current_setup.channels;
if(dev->binary!=NULL)
{

5
backend/genesys_low.h
Wyświetl plik

@ -573,11 +573,6 @@ inline void sanei_genesys_set_triple(Genesys_Register_Set* regs, uint16_t addr,
regs->set24(addr, value);
}
inline void sanei_genesys_get_triple(Genesys_Register_Set* regs, uint16_t addr, uint32_t* value)
{
*value = regs->get24(addr);
}
inline void sanei_genesys_set_exposure(Genesys_Register_Set& regs, const SensorExposure& exposure)
{
regs.set8(0x10, (exposure.red >> 8) & 0xff);