diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2025-06-09 14:27:29 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2025-06-09 14:27:29 +0200 |
| commit | 652efae78c00b812033ea162d76cd13bd40dcab6 (patch) | |
| tree | 7c139f4d2a28061607cd7e2269693df993e5d60a /backend/genesys | |
| parent | bfa2ae8e43fcbab696f272fffd164d0637e965c5 (diff) | |
New upstream version 1.4.0upstream/1.4.0upstream
Diffstat (limited to 'backend/genesys')
| -rw-r--r-- | backend/genesys/genesys.cpp | 3 | ||||
| -rw-r--r-- | backend/genesys/gl124.cpp | 4 | ||||
| -rw-r--r-- | backend/genesys/gl124_registers.h | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/backend/genesys/genesys.cpp b/backend/genesys/genesys.cpp index ab1367e..74ef74e 100644 --- a/backend/genesys/genesys.cpp +++ b/backend/genesys/genesys.cpp @@ -840,7 +840,8 @@ void scanner_move(Genesys_Device& dev, ScanMethod scan_method, unsigned steps, D // FIXME: should porbably wait for some timeout Status status; - for (unsigned i = 0;; ++i) { +// for (unsigned i = 0;; ++i) { + for(;;) { status = scanner_read_status(dev); if (status.is_feeding_finished || ( direction == Direction::BACKWARD && status.is_at_home)) diff --git a/backend/genesys/gl124.cpp b/backend/genesys/gl124.cpp index af193a3..ef3cca0 100644 --- a/backend/genesys/gl124.cpp +++ b/backend/genesys/gl124.cpp @@ -83,8 +83,8 @@ gl124_init_registers (Genesys_Device * dev) dev->reg.init_reg(0x05, 0x00); if(dev->model->sensor_id == SensorId::CIS_CANON_LIDE_120) { - dev->reg.init_reg(0x06, 0x50); - dev->reg.init_reg(0x07, 0x00); + dev->reg.init_reg(0x06, 0x50); + dev->reg.init_reg(0x07, 0x00); } else { dev->reg.init_reg(0x03, 0x50 & ~REG_0x03_AVEENB); dev->reg.init_reg(0x06, 0x50 | REG_0x06_GAIN4); diff --git a/backend/genesys/gl124_registers.h b/backend/genesys/gl124_registers.h index dfc25f6..2c08e1c 100644 --- a/backend/genesys/gl124_registers.h +++ b/backend/genesys/gl124_registers.h @@ -290,4 +290,4 @@ static constexpr RegAddr REG_TRUEB = 0x112; } // namespace gl124 } // namespace genesys -#endif // BACKEND_GENESYS_GL843_REGISTERS_H +#endif // BACKEND_GENESYS_GL124_REGISTERS_H |