pixma ImageClass doc and capabilities update, PIXMA_EOF return code added.

ChangeLog

@@ -1,3 +1,11 @@
+2009-03-12  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
+	* doc/sane-pixma.man, doc/descriptions/pixma.desc:
+	  Added ImageClass MF4010 support in pixma backend docs.
+	* backend/pixma_imageclass.c:
+	  Removed ADF capability to ImageClass models without ADF
+	* backend/pixma.h, backend/pixma_common.c, backend/pixma_io_sanei.c:
+	  Added a PIXMA_EOF error return code
+
 2009-03-09 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys.c backend/genesys.h backend/genesys_devices.c
 	  backend/genesys_gl646.c doc/descriptions/lexmark.desc: cleanups

backend/pixma.h

@@ -127,6 +127,7 @@ typedef uint32_t uint32_t;
 #define PIXMA_EPAPER_JAMMED     -11
 #define PIXMA_ECOVER_OPEN       -12
 #define PIXMA_ENO_PAPER         -13
+#define PIXMA_EOF               -14
 /**@}*/
 
 /** \name Capabilities for using with pixma_config_t::cap */

backend/pixma_common.c

@@ -228,11 +228,13 @@ pixma_strerror (int error)
     case PIXMA_EPROTO:
       return "EPROTO";
     case PIXMA_EPAPER_JAMMED:
-      return "EPAPAR_JAMMED";
+      return "EPAPER_JAMMED";
     case PIXMA_ECOVER_OPEN:
       return "ECOVER_OPEN";
     case PIXMA_ENO_PAPER:
       return "ENO_PAPER";
+    case PIXMA_EOF:
+      return "EEOF";
     }
   snprintf (buf, sizeof (buf), "EUNKNOWN:%d", error);
   return buf;

backend/pixma_imageclass.c

@@ -674,10 +674,10 @@ const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon imageCLASS MF5730", "MF5730", MF5730_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS MF5750", "MF5750", MF5750_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS MF5770", "MF5770", MF5770_PID, 600, 640, 877, PIXMA_CAP_ADF),
-  DEV ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 640, 877, PIXMA_CAP_ADF),
+  DEV ("Canon imageCLASS MF3110", "MF3110", MF3110_PID, 600, 640, 877, 0),
-  DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, PIXMA_CAP_ADF),
+  DEV ("Canon imageCLASS MF3240", "MF3240", MF3200_PID, 600, 640, 877, 0),
-  DEV ("Canon MF6500 Series", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
+  DEV ("Canon imageClass MF6500", "MF6500", MF6500_PID, 600, 640, 877, PIXMA_CAP_ADF),
   DEV ("Canon imageCLASS MF4690", "MF4690", MF4600_PID, 600, 640, 877, PIXMA_CAP_ADF),
-  DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, PIXMA_CAP_ADF),
+  DEV ("Canon imageCLASS MF4010", "MF4010", MF4010_PID, 600, 640, 877, 0),
   DEV (NULL, NULL, 0, 0, 0, 0, 0)
 };

backend/pixma_io_sanei.c

@@ -298,6 +298,7 @@ map_error (SANE_Status ss)
     case SANE_STATUS_NO_DOCS:
        return PIXMA_ENO_PAPER;
     case SANE_STATUS_EOF:
+       return PIXMA_EOF;
     case SANE_STATUS_HW_LOCKED:       /* unused by pixma */
     case SANE_STATUS_WARMING_UP:      /* unused by pixma */
       break;

doc/descriptions/pixma.desc

@@ -379,7 +379,7 @@
 :interface "USB"
 :usbid "0x04a9" "0x26b4"
 :status :untested
-:comment "Same protocol as imageCLASS MF4270? Testers needed!"
+:comment "All resolutions supported (up to 600DPI)"
 
 :model "imageCLASS MF6500 series"
 :interface "USB"

doc/sane-pixma.man

@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "3 Jan 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "28 Feb 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon PIXMA MP series
@@ -24,7 +24,7 @@ PIXMA MX300, MX310, MX700, MX850, MX7600
 .br
 MultiPASS MP700, PIXMA MP750 (no grayscale)
 .br
-ImageCLASS MF4120, MF4122, MF4140, MF4150, MF4270
+ImageCLASS MF4010, MF4120, MF4122, MF4140, MF4150, MF4270
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs