Declared Pixma MX320 in the pixma backend. Yet untested.

- backend/pixma_mp150.c: added MX320
- doc/descriptions/pixma.desc and doc/sane-pixma.man: documentation update for MX320

ChangeLog

@@ -1,3 +1,7 @@
+2009-06-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	Declared Pixma MX320 in the pixma backend. Yet untested.
+
 2009-06-16 Julien Blache <jb@jblache.org>
 	* frontend/saned.c: fix strict aliasing issues, now problematic
 	with gcc 4.4.

backend/pixma_mp150.c

@@ -141,6 +141,7 @@
 #define MP190_PID 0x1734
 
 /* PIXMA 2009 vintage */
+#define MX320_PID 0x1736    /* untested */
 #define MX330_PID UNKNOWN_PID    /* TBD, untested */
 #define MX860_PID UNKNOWN_PID    /* TBD, untested */
 
@@ -1440,6 +1441,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA MP190", "MP190", MP190_PID, 600, 638, 877, PIXMA_CAP_CIS),
 
   /* PIXMA 2009 vintage */
+  DEVICE ("Canon PIXMA MX320", "MX320", MX330_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX330", "MX330", MX330_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX860", "MX860", MX860_PID, 2400, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
 

doc/descriptions/pixma.desc

@@ -225,6 +225,12 @@
 :status :good
 :comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
 
+:model "PIXMA MX320"
+:interface "USB"
+:usbid "0x04a9" "0x1736"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MX700"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x1729"

doc/sane-pixma.man

@@ -50,7 +50,7 @@ Feedback in the Sane-dev mailing list welcome.
 .RS
 PIXMA MP740
 .br
-PIXMA MP260
+PIXMA MP260, MX320
 .br
 ImageCLASS MF3110, MF3240
 .br