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' of ssh://stefdev-guest@git.debian.org/git/sane/sane-backends

merge-requests/1/head
Stphane Voltz 2009-05-16 06:58:53 +02:00
rodzic 2b3e4d4a0e 4015ecf55d
commit be5063a5e2
2 zmienionych plików z 7 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
ChangeLog
Wyświetl plik

@ -1,3 +1,8 @@
2009-05-13 Nicolas Martin <nicols-guest at users.alioth.debian.org>
* backend/pixma_mp150.c:
Fixed Pixma MP600R for network scan. Changes apply to MP600R _and_ MP600,
to use now a strict clone of Canon's driver protocol.
2009-05-09 Chris Bagwell <cbagwell-guest at users.alioth.debian.org> 2009-05-09 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* */*.c: standardize including local sane include files. * */*.c: standardize including local sane include files.

7
backend/pixma_mp150.c
Wyświetl plik

@ -841,17 +841,14 @@ wait_until_ready (pixma_t * s)
WAIT_INTERRUPT (1000); WAIT_INTERRUPT (1000);
if (mp->generation == 3) if (mp->generation == 3)
RET_IF_ERR (query_status_3 (s)); RET_IF_ERR (query_status_3 (s));
else if (s->cfg->pid == MP600_PID || s->cfg->pid == MP600R_PID)
RET_IF_ERR (query_status (s));
if (--tmo == 0) if (--tmo == 0)
{ {
PDBG (pixma_dbg (1, "WARNING:Timed out in wait_until_ready()\n")); PDBG (pixma_dbg (1, "WARNING:Timed out in wait_until_ready()\n"));
PDBG (query_status (s)); PDBG (query_status (s));
return PIXMA_ETIMEDOUT; return PIXMA_ETIMEDOUT;
} }
#if 0
/* If we use sanei_usb_*, we sometimes lose interrupts! So poll the
* status here. */
RET_IF_ERR (query_status (s));
#endif
} }
return 0; return 0;
} }