pixma: fixes Gen 4 XML error code, support for ImageClass MF4380dn, bump backend version

- backend/pixma_mp150.c: some error condition fixes to Generation 4 (MP640, ...) XML code
- backend/pixma_imageclass.c: added support for ImageClass MF4360dn-MF4390dn
- include/pixma.h: bumped backend version to 0.16.1
- doc/descriptions/pixma.desc, doc/sane-pixma.man: doc updates

ChangeLog

@@ -1,3 +1,11 @@
+2009-10-18  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, backend/pixma_imageclass.c, include/pixma.h, 
+	doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	pixma:
+	- bumped backend version to 0.16.1
+	- Some error condition fixes to Generation 4 (MP640, ...) XML code
+	- Added ImageClass MF4360dn-MF4390dn
+
 2009-10-18  Troy Rollo <trollo-guest at users.alioth.debian.org>
 	* backend/hp3500.c: Stop backed from calling exit(), which is not
 	helpful when using threads instead of processes.

backend/pixma.h

@@ -109,7 +109,7 @@ typedef uint32_t uint32_t;
 /**@{*/
 #define PIXMA_VERSION_MAJOR 0
 #define PIXMA_VERSION_MINOR 16
-#define PIXMA_VERSION_BUILD 0
+#define PIXMA_VERSION_BUILD 1
 /**@}*/
 
 /** \name Error codes */

backend/pixma_imageclass.c

@@ -73,6 +73,7 @@
 #define MF4600_PID 0x26b0
 #define MF4010_PID 0x26b4
 #define D480_PID   0x26ed
+#define MF4360_PID 0x26ec
 /* the following are all untested */
 #define MF5630_PID 0x264e
 #define MF5650_PID 0x264f
@@ -179,6 +180,7 @@ activate (pixma_t * s, uint8_t x)
     case MF4200_PID:
     case MF4600_PID:
     case D480_PID:
+    case MF4360_PID:
       return iclass_exec (s, &mf->cb, 1);
       break;
     case MF4100_PID:
@@ -207,6 +209,7 @@ select_source (pixma_t * s)
     case MF4200_PID:
     case MF4600_PID:
     case D480_PID:
+    case MF4360_PID:
       return iclass_exec (s, &mf->cb, 0);
       break;
     case MF4100_PID:
@@ -238,6 +241,7 @@ send_scan_param (pixma_t * s)
     case MF4200_PID:
     case MF4600_PID:
     case D480_PID:
+    case MF4360_PID:
       return iclass_exec (s, &mf->cb, 0);
       break;
     case MF4100_PID:
@@ -319,7 +323,8 @@ read_error_info (pixma_t * s, void *buf, unsigned size)
     {
     case MF4200_PID:
     case MF4600_PID:
-    case D480_PID:    
+    case D480_PID:
+    case MF4360_PID:
       error = iclass_exec (s, &mf->cb, 0);
       break;
     case MF4100_PID:
@@ -686,6 +691,7 @@ const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon imageCLASS MF4150", "MF4100", MF4100_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS MF4690", "MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS D480", "D480", D480_PID, 600, 640, 877, PIXMA_CAP_ADFDUP),
+  DEV ("Canon imageCLASS MF4360", "MF4360", MF4360_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),

backend/pixma_mp150.c

@@ -1198,10 +1198,10 @@ mp150_scan (pixma_t * s)
   /* Generation 4: send XML dialog */
   if (mp->generation == 4 && s->param->adf_pageid == 0)
     {
-      if ((error = send_xml_dialog (s, XML_START_1)) < 0)
-        return error;
-      if ((error = send_xml_dialog (s, XML_START_2)) < 0)
-        return error;
+      if (!send_xml_dialog (s, XML_START_1))
+        return PIXMA_EPROTO;
+      if (!send_xml_dialog (s, XML_START_2))
+        return PIXMA_EPROTO;
     }
 
   /* clear interrupt packets buffer */
@@ -1417,7 +1417,10 @@ mp150_finish_scan (pixma_t * s)
 
           /* Generation 4: send XML end of scan dialog */
           if (mp->generation == 4)
-              send_xml_dialog (s, XML_END);
+            {
+              if (!send_xml_dialog (s, XML_END))
+                PDBG (pixma_dbg (1, "WARNING:XML_END dialog failed \n"));
+            }
         }
       /* fall through */
     case state_idle:

doc/descriptions/pixma.desc

@@ -11,7 +11,7 @@
 ; See doc/descriptions.txt for details.
 
 :backend "pixma"                  ; name of backend
-:version "0.16.0"                 ; version of backend (or "unmaintained")
+:version "0.16.1"                 ; version of backend (or "unmaintained")
 :manpage "sane-pixma"             ; name of manpage (if it exists)
 :url "http://home.arcor.de/wittawat/pixma/" ; 0.13.1 backend's web page
 :url "http://mp610.blogspot.com/"            ; the pixma backend blog
@@ -417,6 +417,12 @@
 :status :good
 :comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS MF4380dn"
+:interface "USB"
+:usbid "0x04a9" "0x26ec"
+:status :good
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
+
 :model "imageCLASS MF4270"
 :interface "USB"
 :usbid "0x04a9" "0x26b5"

doc/sane-pixma.man

@@ -30,7 +30,7 @@ MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
 .br
 ImageCLASS MF4010, MF4018, MF4120, MF4122, MF4140, MF4150
 .br
-ImageCLASS MF4270, MF4660, MF4690, MF5770, D480
+ImageCLASS MF4270, MF4380dn, MF4660, MF4690, MF5770, D480
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs
@@ -52,7 +52,7 @@ PIXMA MP740
 .br
 PIXMA MX320, MX330, MP250, MP270, MP490, MP560, MP990
 .br
-ImageCLASS MF3110, MF3240
+ImageCLASS MF3110, MF3240, MF4370dn
 .br
 ImageCLASS MF5630, MF5650, MF5730, MF5750, MF8170c
 .RE