pixma: bumped minor, added compilation type debug message, updated MX330 doc.

- doc/descriptions/pixma.desc
  doc/sane-pixma.man
  backend/pixma_mp150.c
            updated doc and desc (support for MX330)
- backend/pixma.h
  backend/pixma.c
            bumped backend minor

ChangeLog

@@ -1,3 +1,9 @@
+2009-12-04  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* doc/descriptions/pixma.desc, doc/sane-pixma.man, 
+	backend/pixma.h, backend/pixma.c, backend/pixma_mp150.c:
+	pixma: bumped minor, added compilation type debug message.
+	       updated doc and desc (support for MX330)
+
 2009-12-05  Stéphane Voltz <stef.dev at free.fr>
 	* backend/genesys.c backend/genesys_gl841.c backend/genesys_devices.c
 	backend/genesys_low.h backend/genesys.conf.in

backend/pixma.c

@@ -1023,6 +1023,9 @@ sane_init (SANE_Int * version_code, SANE_Auth_Callback authorize)
   DBG_INIT ();
   sanei_thread_init ();
   pixma_set_debug_level (DBG_LEVEL);
+  
+  PDBG(pixma_dbg(2, "pixma is compiled %s pthread support.\n",
+                   (sanei_thread_is_forked () ? "without" : "with")));
 
   for (i = 0; i < MAX_CONF_DEVICES; i++)
     conf_devices[i] = NULL;

backend/pixma.h

@@ -109,7 +109,7 @@ typedef uint32_t uint32_t;
 /**@{*/
 #define PIXMA_VERSION_MAJOR 0
 #define PIXMA_VERSION_MINOR 16
-#define PIXMA_VERSION_BUILD 1
+#define PIXMA_VERSION_BUILD 2
 /**@}*/
 
 /** \name Error codes */

backend/pixma_mp150.c

@@ -143,7 +143,7 @@
 /* PIXMA 2009 vintage */
 #define MX860_PID 0x1735
 #define MX320_PID 0x1736    /* untested */
-#define MX330_PID 0x1737    /* untested */
+#define MX330_PID 0x1737
 
 /* Generation 4 */
 #define MP250_PID 0x173a

doc/descriptions/pixma.desc

@@ -234,8 +234,8 @@
 :model "PIXMA MX330"
 :interface "USB"
 :usbid "0x04a9" "0x1737"
-:status :untested
-:comment "Same protocol as Pixma Generation 3? Testers needed!"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
 
 :model "PIXMA MX700"
 :interface "USB Ethernet"

doc/sane-pixma.man

@@ -24,7 +24,7 @@ PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
 .br
 PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
 .br
-PIXMA MX300, MX310, MX700, MX850, MX860, MX7600
+PIXMA MX300, MX310, MX330, MX700, MX850, MX860, MX7600
 .br
 MultiPASS MP700, MP730, PIXMA MP750 (no grayscale)
 .br
@@ -54,7 +54,7 @@ Feedback in the Sane-dev mailing list welcome.
 .RS
 PIXMA MP740
 .br
-PIXMA MX320, MX330, MP490, MP550, MP560
+PIXMA MX320, MP490, MP550, MP560
 .br
 ImageCLASS MF3240, MF5630, MF5650, MF5730, MF5750, MF8170c
 .RE