Changes Pixma MP600 and MP600R read sequence protocol.

Fixes MP600R network scanning.
merge-requests/1/head
Nicolas Martin 2009-05-12 23:33:09 +02:00
rodzic 3ba551592c
commit a446ecec31
1 zmienionych plików z 2 dodań i 5 usunięć

Wyświetl plik

@ -841,17 +841,14 @@ wait_until_ready (pixma_t * s)
WAIT_INTERRUPT (1000);
if (mp->generation == 3)
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)
{
PDBG (pixma_dbg (1, "WARNING:Timed out in wait_until_ready()\n"));
PDBG (query_status (s));
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;
}