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

Merge branch 'master' into 'master' 

magicolor: don't use finish scan command on e-STUDIO devices

See merge request sane-project/backends!864
merge-requests/868/head
Ralph Little 2025-04-07 09:42:08 -07:00
rodzic 82db180e1b 19bd90800e
commit a9ad50fe56
1 zmienionych plików z 3 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
backend/magicolor.c
Wyświetl plik

@ -797,8 +797,7 @@ cmd_finish_scan (SANE_Handle handle)
return status; return status;
} }
memset (&returned[0], 0x00, 0x0b); memset (&returned[0], 0x00, 0x0b);
/* e-STUDIO device returns 1 byte ack, while Magicolor 11 bytes */ status = mc_txrx (s, buf, buflen, returned, 0x0b);
status = mc_txrx (s, buf, buflen, returned, ESTUDIO_DEVICE(s) ? 1 : 0x0b);
free (buf); free (buf);
if (status != SANE_STATUS_GOOD) if (status != SANE_STATUS_GOOD)
DBG(8, "%s: Data NOT successfully sent\n", __func__); DBG(8, "%s: Data NOT successfully sent\n", __func__);
@ -1340,6 +1339,7 @@ mc_scan_finish(Magicolor_Scanner * s)
s->buf = s->end = s->ptr = NULL; s->buf = s->end = s->ptr = NULL;
/* TODO: Any magicolor command for "scan finished"? */ /* TODO: Any magicolor command for "scan finished"? */
if (!ESTUDIO_DEVICE(s))
status = cmd_finish_scan (s); status = cmd_finish_scan (s);
status = cmd_request_error(s); status = cmd_request_error(s);