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

genesys: Pass the register set to modify to init_regs_for_scan()

merge-requests/340/head
Povilas Kanapickas 2020-02-03 00:41:53 +02:00
rodzic 5fb5da4f78
commit c1791e6c83
14 zmienionych plików z 34 dodań i 21 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
backend/genesys/command_set.h
Wyświetl plik

@ -74,7 +74,8 @@ public:
Genesys_Register_Set& regs) const = 0; Genesys_Register_Set& regs) const = 0;
virtual void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, virtual void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const = 0; Genesys_Register_Set& regs) const = 0;
virtual void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const = 0; virtual void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const = 0;
/** Set up registers for a scan. Similar to init_regs_for_scan except that the session is /** Set up registers for a scan. Similar to init_regs_for_scan except that the session is
already computed from the session already computed from the session

2
backend/genesys/genesys.cpp
Wyświetl plik

@ -3384,7 +3384,7 @@ static void genesys_start_scan(Genesys_Device* dev, bool lamp_off)
dev->cmd_set->move_to_ta(dev); dev->cmd_set->move_to_ta(dev);
} }
dev->cmd_set->init_regs_for_scan(dev, sensor); dev->cmd_set->init_regs_for_scan(dev, sensor, dev->reg);
/* no lamp during scan */ /* no lamp during scan */
if (lamp_off) { if (lamp_off) {

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

@ -1259,7 +1259,8 @@ void CommandSetGl124::wait_for_motor_stop(Genesys_Device* dev) const
/** @brief set up registers for the actual scan /** @brief set up registers for the actual scan
*/ */
void CommandSetGl124::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const void CommandSetGl124::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
float move; float move;
@ -1304,7 +1305,7 @@ void CommandSetGl124::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sens
session.params.flags = ScanFlag::NONE; session.params.flags = ScanFlag::NONE;
compute_session(dev, session, sensor); compute_session(dev, session, sensor);
init_regs_for_scan_session(dev, sensor, &dev->reg, session); init_regs_for_scan_session(dev, sensor, &regs, session);
} }
/** /**

3
backend/genesys/gl124.h
Wyświetl plik

@ -131,7 +131,8 @@ public:
void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override; Genesys_Register_Set& regs) const override;
void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override; void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override;
void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set* reg, Genesys_Register_Set* reg,

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

@ -1744,7 +1744,8 @@ bool CommandSetGl646::needs_home_before_init_regs_for_scan(Genesys_Device* dev)
* set up registers for the actual scan. The scan's parameters are given * set up registers for the actual scan. The scan's parameters are given
* through the device settings. It allocates the scan buffers. * through the device settings. It allocates the scan buffers.
*/ */
void CommandSetGl646::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const void CommandSetGl646::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
@ -1752,11 +1753,11 @@ void CommandSetGl646::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sens
ScanSession session = calculate_scan_session(dev, sensor, dev->settings); ScanSession session = calculate_scan_session(dev, sensor, dev->settings);
init_regs_for_scan_session(dev, sensor, &dev->reg, session); init_regs_for_scan_session(dev, sensor, &regs, session);
/* gamma is only enabled at final scan time */ /* gamma is only enabled at final scan time */
if (dev->settings.depth < 16) { if (dev->settings.depth < 16) {
dev->reg.find_reg(0x05).value |= REG_0x05_GMMENB; regs.find_reg(0x05).value |= REG_0x05_GMMENB;
} }
} }

3
backend/genesys/gl646.h
Wyświetl plik

@ -455,7 +455,8 @@ public:
void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override; Genesys_Register_Set& regs) const override;
void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override; void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override;
void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set* reg, Genesys_Register_Set* reg,

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

@ -2492,14 +2492,15 @@ void CommandSetGl841::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
} }
// set up registers for the actual scan // set up registers for the actual scan
void CommandSetGl841::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const void CommandSetGl841::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
debug_dump(DBG_info, dev->settings); debug_dump(DBG_info, dev->settings);
auto session = calculate_scan_session(dev, sensor, dev->settings); auto session = calculate_scan_session(dev, sensor, dev->settings);
init_regs_for_scan_session(dev, sensor, &dev->reg, session); init_regs_for_scan_session(dev, sensor, &regs, session);
} }

3
backend/genesys/gl841.h
Wyświetl plik

@ -69,7 +69,8 @@ public:
void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override; Genesys_Register_Set& regs) const override;
void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override; void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override;
void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set* reg, Genesys_Register_Set* reg,

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

@ -1782,12 +1782,13 @@ void CommandSetGl843::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
/** @brief set up registers for the actual scan /** @brief set up registers for the actual scan
*/ */
void CommandSetGl843::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const void CommandSetGl843::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
ScanSession session = calculate_scan_session(dev, sensor, dev->settings); ScanSession session = calculate_scan_session(dev, sensor, dev->settings);
init_regs_for_scan_session(dev, sensor, &dev->reg, session); init_regs_for_scan_session(dev, sensor, &regs, session);
} }
/** /**

3
backend/genesys/gl843.h
Wyświetl plik

@ -69,7 +69,8 @@ public:
void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override; Genesys_Register_Set& regs) const override;
void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override; void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override;
void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set* reg, Genesys_Register_Set* reg,

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

@ -1013,7 +1013,8 @@ void CommandSetGl846::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
/** @brief set up registers for the actual scan /** @brief set up registers for the actual scan
*/ */
void CommandSetGl846::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const void CommandSetGl846::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
float move; float move;
@ -1085,7 +1086,7 @@ void CommandSetGl846::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sens
session.params.flags = ScanFlag::DISABLE_BUFFER_FULL_MOVE; session.params.flags = ScanFlag::DISABLE_BUFFER_FULL_MOVE;
compute_session(dev, session, sensor); compute_session(dev, session, sensor);
init_regs_for_scan_session(dev, sensor, &dev->reg, session); init_regs_for_scan_session(dev, sensor, &regs, session);
} }

3
backend/genesys/gl846.h
Wyświetl plik

@ -144,7 +144,8 @@ public:
void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override; Genesys_Register_Set& regs) const override;
void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override; void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override;
void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set* reg, Genesys_Register_Set* reg,

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

@ -1013,7 +1013,8 @@ void CommandSetGl847::init_regs_for_shading(Genesys_Device* dev, const Genesys_S
/** @brief set up registers for the actual scan /** @brief set up registers for the actual scan
*/ */
void CommandSetGl847::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const void CommandSetGl847::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const
{ {
DBG_HELPER(dbg); DBG_HELPER(dbg);
float move; float move;
@ -1085,7 +1086,7 @@ void CommandSetGl847::init_regs_for_scan(Genesys_Device* dev, const Genesys_Sens
session.params.flags = ScanFlag::DISABLE_BUFFER_FULL_MOVE; session.params.flags = ScanFlag::DISABLE_BUFFER_FULL_MOVE;
compute_session(dev, session, sensor); compute_session(dev, session, sensor);
init_regs_for_scan_session(dev, sensor, &dev->reg, session); init_regs_for_scan_session(dev, sensor, &regs, session);
} }

3
backend/genesys/gl847.h
Wyświetl plik

@ -132,7 +132,8 @@ public:
void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_shading(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override; Genesys_Register_Set& regs) const override;
void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor) const override; void init_regs_for_scan(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set& regs) const override;
void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor, void init_regs_for_scan_session(Genesys_Device* dev, const Genesys_Sensor& sensor,
Genesys_Register_Set* reg, Genesys_Register_Set* reg,