pixma_mp[150|810]: disable send_time()

The function send_time() makes trouble with a lot of scanners.
We send a warning to the debug output instead of sending the time.

fix for [#315248] Canon MP250 with pixma backend is not working
merge-requests/1/head
Rolf Bensch 2016-01-08 17:32:36 +01:00
rodzic b040b150a0
commit 0f47b47b75
2 zmienionych plików z 11 dodań i 1 usunięć

Wyświetl plik

@ -828,6 +828,7 @@ query_status (pixma_t * s)
return error;
}
#if 0
static int
send_time (pixma_t * s)
{
@ -847,6 +848,7 @@ send_time (pixma_t * s)
PDBG (pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
return pixma_exec (s, &mp->cb);
}
#endif
/* TODO: Simplify this function. Read the whole data packet in one shot. */
static int
@ -972,7 +974,10 @@ handle_interrupt (pixma_t * s, int timeout)
{
/* More than one event can be reported at the same time. */
if (buf[3] & 1)
/* FIXME: This function makes trouble with a lot of scanners
send_time (s);
*/
PDBG (pixma_dbg (1, "WARNING:send_time() disabled!\n"));
if (buf[9] & 2)
query_status (s);
if (buf[0] & 2)

Wyświetl plik

@ -1009,6 +1009,7 @@ static int query_status (pixma_t * s)
return error;
}
#if 0
static int send_time (pixma_t * s)
{
/* Why does a scanner need a time? */
@ -1025,6 +1026,7 @@ static int send_time (pixma_t * s)
PDBG(pixma_dbg (3, "Sending time: '%s'\n", (char *) data));
return pixma_exec (s, &mp->cb);
}
#endif
/* TODO: Simplify this function. Read the whole data packet in one shot. */
static int read_image_block (pixma_t * s, uint8_t * header, uint8_t * data)
@ -1157,7 +1159,10 @@ static int handle_interrupt (pixma_t * s, int timeout)
{
/* More than one event can be reported at the same time. */
if (buf[3] & 1)
send_time (s); /* FIXME: some scanners hang here */
/* FIXME: This function makes trouble with a lot of scanners
send_time (s);
*/
PDBG (pixma_dbg (1, "WARNING:send_time() disabled!\n"));
if (buf[9] & 2)
query_status (s);