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

Set minimum timeout to 10ms.

merge-requests/1/head
Wittawat Yamwong 2006-06-08 17:47:34 +00:00
rodzic 763f0fecde
commit 653e3c2226
1 zmienionych plików z 4 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
backend/pixma_io_sanei.c
Wyświetl plik

@ -397,8 +397,8 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsigned size, int timeout)
/* FIXME: What is the meaning of "timeout" in sanei_usb? */ /* FIXME: What is the meaning of "timeout" in sanei_usb? */
if (timeout < 0) if (timeout < 0)
timeout = INT_MAX; timeout = INT_MAX;
else if (timeout == 0) else if (timeout < 10)
timeout = 1; timeout = 10;
sanei_usb_set_timeout (timeout); sanei_usb_set_timeout (timeout);
#endif #endif
error = map_error (sanei_usb_read_int (io->usb, buf, &count)); error = map_error (sanei_usb_read_int (io->usb, buf, &count));
@ -406,7 +406,8 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsigned size, int timeout)
error = -ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */ error = -ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */
if (error == 0) if (error == 0)
error = count; error = count;
PDBG (pixma_dump (10, "INTR", buf, error, -1, -1)); if (error != -ETIMEDOUT)
PDBG (pixma_dump (10, "INTR", buf, error, -1, -1));
return error; return error;
} }