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

genesys: Return errors as exceptions from *start_motor()

merge-requests/104/head
Povilas Kanapickas 2019-07-20 11:02:08 +03:00
rodzic 3477b827ee
commit 0bc253de07
2 zmienionych plików z 4 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
backend/genesys_gl646.cc
Wyświetl plik

@ -187,12 +187,10 @@ print_status (uint8_t val)
* start scanner's motor
* @param dev scanner's device
*/
static SANE_Status
gl646_start_motor (Genesys_Device * dev)
static void gl646_start_motor(Genesys_Device* dev)
{
DBG_HELPER(dbg);
sanei_genesys_write_register(dev, 0x0f, 0x01);
return SANE_STATUS_GOOD;
}
@ -1685,12 +1683,8 @@ gl646_load_document (Genesys_Device * dev)
sanei_genesys_bulk_write_register(dev, regs);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG(DBG_error, "%s: failed to start motor: %s\n", __func__, sane_strstatus(status));
return SANE_STATUS_IO_ERROR;
}
gl646_start_motor(dev);
count = 0;
do
@ -1879,12 +1873,7 @@ gl646_eject_document (Genesys_Device * dev)
sanei_genesys_bulk_write_register(dev, regs);
status = gl646_start_motor (dev);
if (status != SANE_STATUS_GOOD)
{
DBG(DBG_error, "%s: failed to start motor: %s\n", __func__, sane_strstatus (status));
return SANE_STATUS_IO_ERROR;
}
gl646_start_motor(dev);
/* loop until paper sensor tells paper is out, and till motor is running */
/* use a 30 timeout */

2
backend/genesys_low.h
Wyświetl plik

@ -1885,8 +1885,6 @@ std::vector<uint16_t> get_gamma_table(Genesys_Device* dev, const Genesys_Sensor&
void sanei_genesys_send_gamma_table(Genesys_Device* dev, const Genesys_Sensor& sensor);
extern SANE_Status sanei_genesys_start_motor (Genesys_Device * dev);
extern void sanei_genesys_stop_motor(Genesys_Device* dev);
extern SANE_Status