Added a tempo before failing in NO PAPER in ADF scan, declared MX850, changed MP970 to Generation 3.

ChangeLog

@@ -1,3 +1,10 @@
+2008-04-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, backend/pixma.c, doc/sane-pixma.man, 
+	  doc/descriptions/pixma.desc: 
+	  Added a 10s tempo before "NO PAPER" fail message appears in  ADF scan, 
+	  declared PIXMA MX850, moved MP970 to Generation 3 protocol, but yet
+	  untested.
+
 2008-03-28  Julien Blache <jb@jblache.org>
 	* sanei/sanei_usb.c, include/sane/sanei_usb.h: add
 	sanei_usb_get_vendor_product_byname().

backend/pixma.c

@@ -640,7 +640,7 @@ init_option_descriptors (pixma_sane_t * ss)
       ss->source_map[i] = PIXMA_SOURCE_ADF;
       i++;
     }
-#if 0
+#if 1
   if (cfg->cap & PIXMA_CAP_ADFDUP)
     {
       ss->source_list[i] = SANE_I18N ("ADF Duplex");

backend/pixma_mp150.c

@@ -99,15 +99,17 @@
 
 /* Generation 3 */
 #define MP210_PID 0x1721
-#define MP220_PID 0x1722	/* untested */
+#define MP220_PID 0x1722  /* untested */
 #define MP470_PID 0x1723
 #define MP520_PID 0x1724
 #define MP610_PID 0x1725
-#define MP970_PID 0x1726	/* untested */
-#define MX300_PID 0x1727	/* untested */
-#define MX310_PID 0x1728	/* untested */
+#define MP970_PID 0x1726  /* untested. Generation 3 ? */
+#define MX300_PID 0x1727  /* untested */
+#define MX310_PID 0x1728  /* untested */
 #define MX700_PID 0x1729
 
+#define MX850_PID 0x172c  /* untested */
+
 enum mp150_state_t
 {
   state_idle,
@@ -755,11 +757,21 @@ mp150_scan (pixma_t * s)
   /* FIXME: Duplex ADF: check paper status only before odd pages (1,3,5,...). */
   if (is_scanning_from_adf (s))
     {
-      error = query_status (s);
-      if (error < 0)
-	return error;
-      if (!has_paper (s))
-	return PIXMA_ENO_PAPER;
+      if ((error = query_status (s)) < 0)
+        return error;
+      tmo = 10;
+      while (!has_paper(s) && --tmo >= 0)
+        {
+          error = handle_interrupt (s, 1000);
+          if (s->cancel)
+            return PIXMA_ECANCELED;
+          if (error != PIXMA_ECANCELED && error < 0)
+            return error;
+          PDBG (pixma_dbg
+            (2, "No paper in ADF. Timed out in %d sec.\n", tmo));
+        }
+      if (!has_paper(s))
+        return PIXMA_ENO_PAPER;
     }
 
   if (has_ccd_sensor (s))
@@ -1029,10 +1041,12 @@ const pixma_config_t pixma_mp150_devices[] = {
 	  PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX700", MX700_PID, 2400,
 	  PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA MX850", MX850_PID, 2400,
+	  PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_ADFDUP | PIXMA_CAP_EXPERIMENT),
 
-  /* Generation 3: CCD */
+  /* Generation 3 CCD not managed as Generation 2 */
   DEVICE ("Canon PIXMA MP970", MP970_PID, 4800,
-	  PIXMA_CAP_CCD | PIXMA_CAP_TPU | PIXMA_CAP_EXPERIMENT),
+	  PIXMA_CAP_CIS | PIXMA_CAP_TPU | PIXMA_CAP_EXPERIMENT),
 
   END_OF_DEVICE_LIST
 };

doc/descriptions/pixma.desc

@@ -169,7 +169,7 @@
 :interface "USB"
 :usbid "0x04a9" "0x1726"
 :status :untested
-:comment "Testers needed!"
+:comment "Not working yet, need a USB snoop."
 
 :model "SmartBase MP360"
 :interface "USB"
@@ -230,3 +230,9 @@
 :usbid "0x04a9" "0x1729"
 :status :good
 :comment "Flatbed and ADF scan. All resolutions supported (up to 2400DPI)"
+
+:model "PIXMA MX850"
+:interface "USB"
+:usbid "0x04a9" "0x172c"
+:status :untested
+:comment "Does it use Generation 3 protocol ? TBD."

doc/sane-pixma.man

@@ -36,17 +36,18 @@ in the backend so that they get recognized and activated.
 Feedback in the Sane-dev mailing list welcome.
 .PP
 .RS
-PIXMA MP220, MP740, MP970, MX300, MX310
+PIXMA MP220, MP740, MX300, MX310
+.RE
+.PP
+The following models may use partly the same Pixma protocol as MPs listed
+above, but may still need some work. They are declared in the backend as 
+experimental. Snoop logs are required to further investigate, please contact 
+the Sane-dev mailing list.
+.PP
+.RS
+PIXMA MX850, MP970
 .RE
 .PP
-.\"The following models may use partly the same Pixma protocol as MPs listed
-.\"above, but may still need some work. They are declared in the backend as 
-.\"experimental. Snoop logs are required to further investigate, please contact 
-.\"the Sane-dev mailing list.
-.\".PP
-.\".RS
-.\"PIXMA MX300, MX310, MX700
-.\".RE
 .\".PP
 The backend supports
 .br