Add Canon imageCLASS D480 support to the pixma backend.

- backend/pixma_imageclass.c: new model imageCLASS D480 declaration.
- doc/descriptions/pixma.desc and doc/sane-pixma.man: documentation update.

ChangeLog

@@ -1,3 +1,7 @@
+2009-06-20  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_imageclass.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	Added Canon imageCLASS D480 support to the pixma backend.
+
 2009-06-17  Stéphane Voltz <stef.dev at free.fr>
 	* backend/lexmark_low.c: f3/f4 registers assignement cleanup
 

backend/pixma_imageclass.c

@@ -71,17 +71,17 @@
 #define MF4100_PID 0x26a3
 #define MF4600_PID 0x26b0
 #define MF4010_PID 0x26b4
+#define D480_PID   0x26ed
 /* the following are all untested */
 #define MF5630_PID 0x264e
 #define MF5650_PID 0x264f
 #define MF8100_PID 0x2659
-#define MF5730_PID 0x265d
-#define MF5750_PID 0x265e
 #define MF3110_PID 0x2660
 #define MF3200_PID 0x2684
 #define MF6500_PID 0x2686
 
 
+
 enum iclass_state_t
 {
   state_idle,
@@ -667,16 +667,15 @@ static const pixma_scan_ops_t pixma_iclass_ops = {
 const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon imageCLASS MF4270", "MF4270", MF4200_PID, 600, 640, 877, PIXMA_CAP_ADF),
   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_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 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 MF3110", "MF3110", MF3110_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),
-  DEV ("Canon imageCLASS MF4690", "MF4690", MF4600_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)
 };

doc/descriptions/pixma.desc

@@ -297,6 +297,12 @@
 :status :good
 :comment "All resolutions supported (up to 600DPI)"
 
+:model "imageCLASS D480"
+:interface "USB"
+:usbid "0x04a9" "0x26ed"
+:status :good
+:comment "All resolutions supported (up to 600DPI)"
+
 :model "imageCLASS MF5630"
 :interface "USB"
 :usbid "0x04a9" "0x264e"

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