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

genesys: Simplify init_regs_for_warmup() on gl646

merge-requests/463/merge
Povilas Kanapickas 2020-05-09 04:10:12 +03:00
rodzic 0bc0f893b2
commit 4b5b2b2f0b
1 zmienionych plików z 1 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
backend/genesys/gl646.cpp
Wyświetl plik

@ -2718,7 +2718,7 @@ void CommandSetGl646::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se
session.params.scan_method = dev->settings.scan_method; session.params.scan_method = dev->settings.scan_method;
session.params.scan_mode = ScanColorMode::GRAY; session.params.scan_mode = ScanColorMode::GRAY;
session.params.color_filter = ColorFilter::RED; session.params.color_filter = ColorFilter::RED;
session.params.flags = ScanFlag::NONE; session.params.flags = ScanFlag::DISABLE_SHADING;
if (dev->settings.scan_method == ScanMethod::TRANSPARENCY) { if (dev->settings.scan_method == ScanMethod::TRANSPARENCY) {
session.params.flags |= ScanFlag::USE_XPA; session.params.flags |= ScanFlag::USE_XPA;
} }
@ -2729,9 +2729,6 @@ void CommandSetGl646::init_regs_for_warmup(Genesys_Device* dev, const Genesys_Se
/* we are not going to move, so clear these bits */ /* we are not going to move, so clear these bits */
dev->reg.find_reg(0x02).value &= ~(REG_0x02_FASTFED | REG_0x02_AGOHOME); dev->reg.find_reg(0x02).value &= ~(REG_0x02_FASTFED | REG_0x02_AGOHOME);
/* don't enable any correction for this scan */
dev->reg.find_reg(0x01).value &= ~REG_0x01_DVDSET;
/* copy to local_reg */ /* copy to local_reg */
*local_reg = dev->reg; *local_reg = dev->reg;