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 'epson2/ignore_cancel' into 'master' 

epson2: ignore 'cancel request' status bit for more scanners

Closes #716

See merge request sane-project/backends!823
merge-requests/827/head
Wolfram Sang 2024-02-04 19:07:33 +00:00
rodzic 05c770546f fc6516afc1
commit ee5f9a89e1
1 zmienionych plików z 10 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
backend/epson2-ops.c
Wyświetl plik

@ -1774,10 +1774,16 @@ e2_ext_read(struct Epson_Scanner *s)
return status; return status;
} }
if (e2_dev_model(dev, "GT-8200") || e2_dev_model(dev, "Perfection1650")) { /* Some scanners wrongly set FSG_STATUS_CANCEL_REQ. Mask it out.
/* See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597922#127 */ * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=597922#127
s->buf[buf_len] &= 0xc0; * https://gitlab.com/sane-project/backends/-/issues/716
} */
if (e2_dev_model(dev, "GT-8200") || e2_dev_model(dev, "Perfection1650") ||
e2_dev_model(dev, "GT-10000") || e2_dev_model(dev, "ES-6000") ||
e2_dev_model(dev, "Perfection610") || e2_dev_model(dev, "GT-6600") ||
e2_dev_model(dev, "Perfection1200") || e2_dev_model(dev, "GT-7600") ||
e2_dev_model(dev, "Expression1600") || e2_dev_model(dev, "ES-2000"))
s->buf[buf_len] &= FSG_STATUS_FER | FSG_STATUS_NOT_READY;
if (s->buf[buf_len] & FSG_STATUS_CANCEL_REQ) { if (s->buf[buf_len] & FSG_STATUS_CANCEL_REQ) {
DBG(0, "%s: cancel request received\n", __func__); DBG(0, "%s: cancel request received\n", __func__);