Added MAC OS X usb interrupt read wrapper for darwin libusb, updated doc

ChangeLog

@@ -1,3 +1,13 @@
+2009-04-05  Nicolas Martin <nicols-guest at users.alioth.debian.org> 
+	* backend/pixma_io.h, backend/pixma_io_sanei.c, doc/sane-pixma.man:
+	  Increased timeouts for read bulk and write bulk operations to 10s
+	  Changed minimum timeout for interrupt read to 100ms
+	  For MAC OS X : added a wrapper to sanei_usb_read_int as darwin libusb
+	  does not handle timeouts in interrupt reads. This disables button scan
+	  for MAC OS X, updated man page with this info.
+	* backend/pixma_mp150.c: 
+	  Added 2 new Canon Pixma models but usb pid/vid yet unknown.
+
 2009-04-05  m. allan noah <kitno455 a t gmail d o t com>
 	* backend/canon_dr.[ch], backend/canon_dr.conf.in: backend v24
 	- fix DR-2510C duplex deinterlacing code

backend/pixma_io.h

@@ -57,9 +57,9 @@
  */
 
 /** Timeout for pixma_read() in milliseconds */
-#define PIXMA_BULKIN_TIMEOUT  1000
+#define PIXMA_BULKIN_TIMEOUT  10000
 /** Timeout for pixma_write() in milliseconds */
-#define PIXMA_BULKOUT_TIMEOUT 1000
+#define PIXMA_BULKOUT_TIMEOUT 10000
 
 
 struct pixma_io_t;

backend/pixma_io_sanei.c

@@ -62,6 +62,13 @@
 # define UNUSED(v)
 #endif
 
+/* MAC OS X does not support timeouts in darwin/libusb interrupt reads
+ * This is a very basic turnaround for MAC OS X
+ * Button scan will not work with this wrapper */
+#ifdef __APPLE__
+# define sanei_usb_read_int sanei_usb_read_bulk
+#endif
+
 
 struct pixma_io_t
 {
@@ -539,8 +546,8 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsigned size, int timeout)
   /* FIXME: What is the meaning of "timeout" in sanei_usb? */
   if (timeout < 0)
     timeout = INT_MAX;
-  else if (timeout < 10)
-    timeout = 10;
+  else if (timeout < 100)
+    timeout = 100;
   if (io-> interface == INT_BJNP)
     {
       sanei_bjnp_set_timeout (io->dev, timeout);

backend/pixma_mp150.c

@@ -140,6 +140,9 @@
 #define MP260_PID 0x1733    /* Untested */
 #define MP190_PID 0x1734
 
+/* PIXMA 2008 vintage */
+#define MX330_PID UNKNOWN_PID    /* TBD, untested */
+#define MX860_PID UNKNOWN_PID    /* TBD, untested */
 
 
 enum mp150_state_t
@@ -1467,5 +1470,9 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA MP260", "MP260", MP260_PID, 1200, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA MP190", "MP190", MP190_PID, 600, 638, 877, PIXMA_CAP_CIS),
 
+  /* PIXMA 2009 vintage */
+  DEVICE ("Canon PIXMA MX330", "MX330", MX330_PID, 1200, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA MX860", "MX860", MX860_PID, 2400, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
+
   END_OF_DEVICE_LIST
 };

doc/sane-pixma.man

@@ -87,6 +87,9 @@ Besides "well-known" options (e.g. resolution, mode etc.) pixma backend also
 provides the following
 \#.B experimental
 options for button handling, i.e. the options might change in the future.
+.br
+Button scan is disabled on MAC OS X due to darwin libusb not handling
+timeouts in usb interrupt reads. 
 .TP
 .I button\-controlled
 This option can be used in combination with