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

genesys: Move color filter setup to gl646_setup_registers()

merge-requests/82/head
Povilas Kanapickas 2019-06-08 14:04:09 +03:00
rodzic 8184699bbf
commit a843704cc1
1 zmienionych plików z 23 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

49
backend/genesys_gl646.cc
Wyświetl plik

@ -1009,9 +1009,31 @@ gl646_setup_registers (Genesys_Device * dev,
((scan_settings.pixels * scan_settings.lines) / 8 +
(((scan_settings.pixels * scan_settings.lines) % 8) ? 1 : 0)) *
channels;
else
else {
dev->total_bytes_to_read =
scan_settings.pixels * scan_settings.lines * channels * bpp;
}
/* select color filter based on settings */
regs->find_reg(0x04).value &= ~REG04_FILTER;
if (params.channels == 1) {
switch (params.color_filter) {
/* red */
case 0:
regs->find_reg(0x04).value |= 0x04;
break;
/* green */
case 1:
regs->find_reg(0x04).value |= 0x08;
break;
/* blue */
case 2:
regs->find_reg(0x04).value |= 0x0c;
break;
default:
break;
}
}
DBG(DBG_proc, "%s: end\n", __func__);
return SANE_STATUS_GOOD;
@ -2985,31 +3007,6 @@ setup_for_scan (Genesys_Device * dev,
return status;
}
/* now post-process values for register and options fine tuning */
/* select color filter based on settings */
regs->find_reg(0x04).value &= ~REG04_FILTER;
if (params.channels == 1)
{
switch (params.color_filter)
{
/* red */
case 0:
regs->find_reg(0x04).value |= 0x04;
break;
/* green */
case 1:
regs->find_reg(0x04).value |= 0x08;
break;
/* blue */
case 2:
regs->find_reg(0x04).value |= 0x0c;
break;
default:
break;
}
}
/* send computed slope tables */
status =
gl646_send_slope_table (dev, 0, slope_table0,