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 *detect_document_end()

merge-requests/104/head
Povilas Kanapickas 2019-07-20 11:02:28 +03:00
rodzic 3862f53f24
commit 4247ced84a
6 zmienionych plików z 6 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/genesys.cc
Wyświetl plik

@ -3929,9 +3929,7 @@ genesys_fill_read_buffer (Genesys_Device * dev)
* the requested scan */
if (dev->model->is_sheetfed == SANE_TRUE)
{
status = dev->model->cmd_set->detect_document_end (dev);
if (status != SANE_STATUS_GOOD)
return status;
dev->model->cmd_set->detect_document_end(dev);
}
space = dev->read_buffer.size() - dev->read_buffer.avail();

6
backend/genesys_gl646.cc
Wyświetl plik

@ -1711,11 +1711,9 @@ static void gl646_load_document(Genesys_Device* dev)
* to take it into account
* used by sheetfed scanners
*/
static SANE_Status
gl646_detect_document_end (Genesys_Device * dev)
static void gl646_detect_document_end(Genesys_Device* dev)
{
DBG_HELPER(dbg);
SANE_Status status = SANE_STATUS_GOOD;
uint8_t val, gpio;
unsigned int bytes_left, lines;
@ -1771,8 +1769,6 @@ gl646_detect_document_end (Genesys_Device * dev)
DBG(DBG_io, "%s: total_bytes_read =%lu\n", __func__, (u_long) dev->total_bytes_read);
DBG(DBG_io, "%s: read_bytes_left =%lu\n", __func__, (u_long) dev->read_bytes_left);
}
return status;
}
/**

3
backend/genesys_gl646.h
Wyświetl plik

@ -253,8 +253,7 @@ static void gl646_init_regs (Genesys_Device * dev);
static void gl646_load_document(Genesys_Device* dev);
static SANE_Status
gl646_detect_document_end (Genesys_Device * dev);
static void gl646_detect_document_end(Genesys_Device* dev);
#define FULL_STEP 0
#define HALF_STEP 1

5
backend/genesys_gl841.cc
Wyświetl plik

@ -2683,8 +2683,7 @@ static void gl841_load_document(Genesys_Device* dev)
* to take it into account
* used by sheetfed scanners
*/
static SANE_Status
gl841_detect_document_end (Genesys_Device * dev)
static void gl841_detect_document_end(Genesys_Device* dev)
{
DBG_HELPER(dbg);
SANE_Bool paper_loaded;
@ -2743,8 +2742,6 @@ gl841_detect_document_end (Genesys_Device * dev)
dev->total_bytes_to_read=total_bytes_to_read;
}
}
return SANE_STATUS_GOOD;
}
// Send the low-level scan command

5
backend/genesys_gl843.cc
Wyświetl plik

@ -1793,8 +1793,7 @@ static void gl843_load_document(Genesys_Device* dev)
* to take it into account
* used by sheetfed scanners
*/
static SANE_Status
gl843_detect_document_end (Genesys_Device * dev)
static void gl843_detect_document_end(Genesys_Device* dev)
{
DBG_HELPER(dbg);
SANE_Bool paper_loaded;
@ -1908,8 +1907,6 @@ gl843_detect_document_end (Genesys_Device * dev)
DBG(DBG_io, "%s: no flushing needed\n", __func__);
}
}
return SANE_STATUS_GOOD;
}
// enables or disables XPA slider motor

2
backend/genesys_low.h
Wyświetl plik

@ -1105,7 +1105,7 @@ struct Genesys_Command_Set
* case it updates the amount of data to read and set up
* flags in the dev struct
*/
SANE_Status (*detect_document_end) (Genesys_Device * dev);
void (*detect_document_end) (Genesys_Device* dev);
/**
* eject document from scanner
*/