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 unused two-table feeding support from gl124

release-1.1.x
Povilas Kanapickas 2021-12-27 22:20:54 +02:00
rodzic c6df5fd69a
commit 491a08ba96
1 zmienionych plików z 1 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
backend/genesys/gl124.cpp
Wyświetl plik

@ -453,7 +453,6 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
ScanFlag flags) ScanFlag flags)
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
int use_fast_fed;
unsigned int lincnt, fast_dpi; unsigned int lincnt, fast_dpi;
unsigned int feedl,dist; unsigned int feedl,dist;
uint32_t z1, z2; uint32_t z1, z2;
@ -467,9 +466,6 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
feed_steps, static_cast<unsigned>(scan_mode), feed_steps, static_cast<unsigned>(scan_mode),
static_cast<unsigned>(flags)); static_cast<unsigned>(flags));
/* we never use fast fed since we do manual feed for the scans */
use_fast_fed=0;
/* enforce motor minimal scan speed /* enforce motor minimal scan speed
* @TODO extend motor struct for this value */ * @TODO extend motor struct for this value */
if (scan_mode == ScanColorMode::COLOR_SINGLE_PASS) if (scan_mode == ScanColorMode::COLOR_SINGLE_PASS)
@ -516,12 +512,6 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
/* compute register 02 value */ /* compute register 02 value */
uint8_t r02 = REG_0x02_NOTHOME; uint8_t r02 = REG_0x02_NOTHOME;
if (use_fast_fed) {
r02 |= REG_0x02_FASTFED;
} else {
r02 &= ~REG_0x02_FASTFED;
}
if (has_flag(flags, ScanFlag::AUTO_GO_HOME)) { if (has_flag(flags, ScanFlag::AUTO_GO_HOME)) {
r02 |= REG_0x02_AGOHOME; r02 |= REG_0x02_AGOHOME;
} }
@ -573,9 +563,6 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
if (has_flag(flags, ScanFlag::FEEDING)) { if (has_flag(flags, ScanFlag::FEEDING)) {
dist *= 2; dist *= 2;
} }
if (use_fast_fed) {
dist += fast_table.table.size() * 2;
}
/* get sure we don't use insane value */ /* get sure we don't use insane value */
if (dist < feedl) { if (dist < feedl) {
@ -587,7 +574,7 @@ static void gl124_init_motor_regs_scan(Genesys_Device* dev,
reg->set24(REG_FEEDL, feedl); reg->set24(REG_FEEDL, feedl);
/* doesn't seem to matter that much */ /* doesn't seem to matter that much */
sanei_genesys_calculate_zmod(use_fast_fed, sanei_genesys_calculate_zmod(false,
scan_exposure_time, scan_exposure_time,
scan_table.table, scan_table.table,
scan_table.table.size(), scan_table.table.size(),