summaryrefslogtreecommitdiff
path: root/backend/pixma_mp810.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/pixma_mp810.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/pixma_mp810.c')
-rw-r--r--backend/pixma_mp810.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/backend/pixma_mp810.c b/backend/pixma_mp810.c
index 5f9043e..b03bebc 100644
--- a/backend/pixma_mp810.c
+++ b/backend/pixma_mp810.c
@@ -1,6 +1,6 @@
/* SANE - Scanner Access Now Easy.
- Copyright (C) 2011-2015 Rolf Bensch <rolf at bensch hyphen online dot de>
+ Copyright (C) 2011-2016 Rolf Bensch <rolf at bensch hyphen online dot de>
Copyright (C) 2007-2009 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
@@ -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);