pixma: add support for PIXMA MX870, updated docs.

declared PIXMA MF8030, but not yet working.

	modified:   ChangeLog
	modified:   backend/pixma_imageclass.c
	modified:   backend/pixma_mp150.c
	modified:   doc/descriptions/pixma.desc
	modified:   doc/sane-pixma.man

ChangeLog

@@ -1,3 +1,9 @@
+2010-07-22  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, backend/pixma_imageclass.c, 
+	doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	pixma:  add support for PIXMA MX870.
+		declared PIXMA MF8030, but not yet working.
+
 2010-07-14 Julien Blache <jb@jblache.org>
 	* doc/descriptions/epson.desc, doc/descriptions/epson2.desc: add :scsi
 	keyword for the Perfection 2450 connected through FireWire. Courtesy

backend/pixma_imageclass.c

@@ -76,12 +76,12 @@
 #define D480_PID   0x26ed
 #define MF4320_PID 0x26ee
 #define MF3200_PID 0x2684
+#define MF6500_PID 0x2686
 /* the following are all untested */
 #define MF5630_PID 0x264e
 #define MF5650_PID 0x264f
 #define MF8100_PID 0x2659
-#define MF6500_PID 0x2686
+#define MF8030_PID 0x2707
-
 
 
 enum iclass_state_t
@@ -700,10 +700,11 @@ const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon imageCLASS MF4320", "MF4320", MF4320_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0),
   DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0),
+  DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
   /* FIXME: the following capabilities all need updating/verifying */
   DEV ("Canon imageCLASS MF5630", "MF5630", MF5630_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon laserBase MF5650", "MF5650", MF5650_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS MF8170c", "MF8170c", MF8100_PID, 600, 640, 877, PIXMA_CAP_ADF),
-  DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
+  DEV ("Canon imageClass MF8030", "MF8030", MF8030_PID, 600, 640, 877, PIXMA_CAP_ADF),  
   DEV (NULL, NULL, 0, 0, 0, 0, 0)
 };

backend/pixma_mp150.c

@@ -160,6 +160,7 @@
 /* PIXMA 2010 vintage */
 #define MX340_PID 0x1741
 #define MX350_PID 0x1742
+#define MX870_PID 0x1743
 
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
@@ -1216,6 +1217,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
   /* Those devices can scan up to 14" with ADF, but A4 11.7" in flatbed */
   if (( s->cfg->pid == MX850_PID ||
         s->cfg->pid == MX860_PID ||
+        s->cfg->pid == MX870_PID ||
         s->cfg->pid == MX320_PID ||
         s->cfg->pid == MX330_PID ||
         s->cfg->pid == MX340_PID ||
@@ -1252,6 +1254,24 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
       sp->xdpi *= k;
       sp->ydpi = sp->xdpi;
     }
+
+  if (sp->source == PIXMA_SOURCE_ADF || sp->source == PIXMA_SOURCE_ADFDUP)
+    {
+      uint8_t k = 1;
+
+  /* ADF/ADF duplex mode: max scan res is 600 dpi, at least for generation 4 */
+      if (mp->generation >= 4)
+        k = sp->xdpi / MIN (sp->xdpi, 600);
+      sp->x /= k;
+      sp->xs /= k;
+      sp->y /= k;
+      sp->w /= k;
+      sp->wx /= k;
+      sp->h /= k;
+      sp->xdpi /= k;
+      sp->ydpi = sp->xdpi;
+    }
+
   return 0;
 }
 
@@ -1614,6 +1634,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   /* PIXMA 2010 vintage */
   DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA MX870", "MX870", MX870_PID, 2400, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
 
   /* Generation 4: CIS */
   DEVICE ("Canon PIXMA MP640", "MP640", MP640_PID, 4800, 638, 877, PIXMA_CAP_CIS),

doc/descriptions/pixma.desc

@@ -267,6 +267,12 @@
 :status :complete
 :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported."
 
+:model "PIXMA MX870"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x1743"
+:status :complete
+:comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported, ADF empty buggy."
+
 :model "PIXMA MX7600"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x171c"

doc/sane-pixma.man

@@ -27,7 +27,9 @@ PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
 .br
 PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
 .br
-PIXMA MX300, MX310, MX330, MX340, MX350, MX700, MX850, MX860, MX7600
+PIXMA MX300, MX310, MX330, MX340, MX350
+.br
+PIXMA MX700, MX850, MX860, MX870, MX7600
 .br
 MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
 .br