patch for Canon Pixma MP280

- PIXMA_EOF mapped to PIXMA_ETIMEDOUT
- maximum resolution reduced to 600dpi
- scanner added to doc files

ChangeLog

@@ -1,3 +1,11 @@
+2012-05-03 Rolf Bensch <rolf at bensch hyphen online dot de>
+	* backend/pixma_io_sanei.c, backend/pixma_mp150.c, 
+	doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	Patch for Canon Pixma MP280 from Daniel Beer.
+	- PIXMA_EOF mapped to PIXMA_ETIMEDOUT.
+	- Maximum resolution reduced to 600dpi.
+	- Scanner added to doc files.
+
 2012-04-23 Rolf Bensch <rolf at bensch hyphen online dot de>
 	* AUTHORS: Pixma backend and email addresses updates.
 

backend/pixma_io_sanei.c

@@ -567,7 +567,8 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsigned size, int timeout)
 #endif
       error = map_error (sanei_usb_read_int (io->dev, buf, &count));
     }
-  if (error == PIXMA_EIO)
+  if (error == PIXMA_EIO
+      || (io->interface == INT_USB && error == PIXMA_EOF))
     error = PIXMA_ETIMEDOUT;	/* FIXME: SANE doesn't have ETIMEDOUT!! */
   if (error == 0)
     error = count;

backend/pixma_mp150.c

@@ -1609,7 +1609,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA MP270", "MP270", MP270_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
   /* Latest devices (2010) Generation 4 CIS/CCD */
-  DEVICE ("Canon PIXMA MP280",  "MP280",  MP280_PID,  1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MP280",  "MP280",  MP280_PID,  600, 0, 0, 638, 877, PIXMA_CAP_CIS), /* TODO: 1200dpi doesn't work yet */
   DEVICE ("Canon PIXMA MP495",  "MP495",  MP495_PID,  1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA MG5100", "MG5100", MG5100_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA MG5200", "MG5200", MG5200_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),

doc/descriptions/pixma.desc

@@ -63,6 +63,12 @@
 :status :complete
 :comment "All resolutions supported (up to 1200DPI)."
 
+:model "PIXMA MP280"
+:interface "USB"
+:usbid "0x04a9" "0x1746"
+:status :complete
+:comment "All resolutions supported (up to 600DPI)."
+
 :model "PIXMA MP450"
 :interface "USB"
 :usbid "0x04a9" "0x170b"

doc/sane-pixma.man

@@ -17,7 +17,7 @@ Currently, the following models work with this backend:
 .RS
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
-PIXMA MP210, MP220, MP240, MP250, MP260, MP270
+PIXMA MP210, MP220, MP240, MP250, MP260, MP270, MP280
 .br
 PIXMA MP360, MP370, MP390
 .br