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

genesys: Fix inconsistent check of scanner status in *_stop_action()

merge-requests/213/head
Povilas Kanapickas 2019-12-01 10:08:57 +02:00
rodzic a90ab552a9
commit c2863d6ba1
4 zmienionych plików z 8 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -1006,12 +1006,12 @@ void gl124_stop_action(Genesys_Device* dev)
unsigned int loop; unsigned int loop;
dev->cmd_set->update_home_sensor_gpio(*dev); dev->cmd_set->update_home_sensor_gpio(*dev);
scanner_read_print_status(*dev); auto status = scanner_read_status(*dev);
val40 = dev->interface->read_register(REG_0x100); val40 = dev->interface->read_register(REG_0x100);
/* only stop action if needed */ /* only stop action if needed */
if (!(val40 & REG_0x100_DATAENB) && !(val40 & REG_0x100_MOTMFLG)) { if (!(val40 & REG_0x100_DATAENB) && !(val40 & REG_0x100_MOTMFLG) && !status.is_motor_enabled) {
DBG (DBG_info, "%s: already stopped\n", __func__); DBG (DBG_info, "%s: already stopped\n", __func__);
return; return;
} }

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

@ -1320,12 +1320,12 @@ void gl843_stop_action(Genesys_Device* dev)
DBG_HELPER(dbg); DBG_HELPER(dbg);
unsigned int loop; unsigned int loop;
scanner_read_print_status(*dev); auto status = scanner_read_status(*dev);
uint8_t val40 = dev->interface->read_register(REG_0x40); uint8_t val40 = dev->interface->read_register(REG_0x40);
/* only stop action if needed */ /* only stop action if needed */
if (!(val40 & REG_0x40_DATAENB) && !(val40 & REG_0x40_MOTMFLG)) if (!(val40 & REG_0x40_DATAENB) && !(val40 & REG_0x40_MOTMFLG) && !status.is_motor_enabled)
{ {
DBG(DBG_info, "%s: already stopped\n", __func__); DBG(DBG_info, "%s: already stopped\n", __func__);
return; return;

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

@ -846,12 +846,12 @@ void gl846_stop_action(Genesys_Device* dev)
unsigned int loop; unsigned int loop;
dev->cmd_set->update_home_sensor_gpio(*dev); dev->cmd_set->update_home_sensor_gpio(*dev);
scanner_read_print_status(*dev); auto status = scanner_read_status(*dev);
uint8_t val40 = dev->interface->read_register(REG_0x40); uint8_t val40 = dev->interface->read_register(REG_0x40);
/* only stop action if needed */ /* only stop action if needed */
if (!(val40 & REG_0x40_DATAENB) && !(val40 & REG_0x40_MOTMFLG)) { if (!(val40 & REG_0x40_DATAENB) && !(val40 & REG_0x40_MOTMFLG) && !status.is_motor_enabled) {
DBG(DBG_info, "%s: already stopped\n", __func__); DBG(DBG_info, "%s: already stopped\n", __func__);
return; return;
} }

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

@ -850,12 +850,12 @@ void gl847_stop_action(Genesys_Device* dev)
unsigned int loop; unsigned int loop;
dev->cmd_set->update_home_sensor_gpio(*dev); dev->cmd_set->update_home_sensor_gpio(*dev);
scanner_read_print_status(*dev); auto status = scanner_read_status(*dev);
uint8_t val40 = dev->interface->read_register(REG_0x40); uint8_t val40 = dev->interface->read_register(REG_0x40);
/* only stop action if needed */ /* only stop action if needed */
if (!(val40 & REG_0x40_DATAENB) && !(val40 & REG_0x40_MOTMFLG)) { if (!(val40 & REG_0x40_DATAENB) && !(val40 & REG_0x40_MOTMFLG) && !status.is_motor_enabled) {
DBG(DBG_info, "%s: already stopped\n", __func__); DBG(DBG_info, "%s: already stopped\n", __func__);
return; return;
} }