pixma backend: updates for ImageClass MF3110 and MF4660, and Pixma MP980, and doc updates.

- MF3110: fix interrupt messages handling.
- MF4660: added support for this ImageClass device.
- MP980:  Following a report, tuned the color planes shifting values.
- All:    Documentation updates.

ChangeLog

@@ -1,6 +1,10 @@
 2009-09-03  Nicolas Martin <nicols-guest at users.alioth.debian.org>
-	* backend/pixma_mp730.c:
-	pixma backend: change for MF3110 image encoding.
+	* backend/pixma_mp730.c, backend/pixma_imageclass.c, backend/pixma_mp150.c,
+	doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	pixma backend: 
+	- Fix usb interrupt messages handling for MF3110
+	- New support for ImageClass MF4660
+	- Documentation updates
 
 2009-08-29  Nicolas Martin <nicols-guest at users.alioth.debian.org>
 	* backend/pixma_imageclass.c, backend/pixma_mp730.c:

backend/pixma_imageclass.c

@@ -1,5 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
+   Copyright (C) 2007-2009 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2008 Dennis Lou, dlou 99 at yahoo dot com
 
    This file is part of the SANE package.

backend/pixma_mp150.c

@@ -1,6 +1,6 @@
 /* SANE - Scanner Access Now Easy.
 
-   Copyright (C) 2007-2008 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
+   Copyright (C) 2007-2009 Nicolas Martin, <nicols-guest at alioth dot debian dot org>
    Copyright (C) 2006-2007 Wittawat Yamwong <wittawat@web.de>
 
    This file is part of the SANE package.
@@ -551,6 +551,16 @@ calc_shifting (pixma_t * s)
             mp->shift[2] = 2 * mp->shift[1];
             break;
 
+          case MP980_PID:
+            if (s->param->ydpi > 150)
+              {
+                mp->color_shift = s->param->ydpi / 75;
+                mp->shift[1] = mp->color_shift * get_cis_ccd_line_size (s);
+                mp->shift[0] = 0;
+                mp->shift[2] = 2 * mp->shift[1];
+               }
+            break;
+
           case MP800_PID:
           case MP800R_PID:
           case MP830_PID:
@@ -569,7 +579,7 @@ calc_shifting (pixma_t * s)
             mp->shift[0] = 2 * mp->shift[1];
             mp->shift[2] = 0;
             break;
-            
+
           default:
             break;
         }

doc/descriptions/pixma.desc

@@ -265,7 +265,7 @@
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x172d"
 :status :good
-:comment "Reported to be working fine."
+:comment "Reported to be working fine at all resolutions."
 
 :model "PIXMA MP630"
 :interface "USB"
@@ -349,7 +349,7 @@
 :interface "USB"
 :usbid "0x04a9" "0x265f"
 :status :good
-:comment "All resolutions supported (up to 600DPI)."
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
 
 :model "imageCLASS MF3110"
 :interface "USB"
@@ -397,7 +397,7 @@
 :interface "USB"
 :usbid "0x04a9" "0x26b0"
 :status :untested
-:comment "Same protocol as imageCLASS MF4270? Testers needed!"
+:comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
 :model "imageCLASS MF4010"
 :interface "USB"

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, MF5770, D480
+ImageCLASS MF4270, MF4660, MF4690, MF5770, D480
 .RE
 .PP
 The following models are not well tested and/or the scanner sometimes hangs