From cb199d7f667abb1a4baea415c78b6d6eb8689bd1 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <nicols-guest@users.alioth.debian.org>
Date: Thu, 2 Jul 2009 22:07:39 +0200
Subject: [PATCH] Declared new models (yet untested) Pixma MX330 and MX860 in
 pixma backend, bump minor version number.

- backend/pixma_mp150.c: declared new models (yet untested) Pixma MX330 and MX860.
- doc/descriptions/pixma.desc, doc/sane-pixma.man: updated docs.
- backend/pixma.h: bump backend minor version number.
---
 ChangeLog                   |  5 +++++
 backend/pixma.h             |  2 +-
 backend/pixma_mp150.c       |  4 ++--
 doc/descriptions/pixma.desc | 12 ++++++++++++
 doc/sane-pixma.man          |  2 ++
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 27e19b130..8175dc1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-02  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma.h, backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	- Declared new models (yet untested) Pixma MX330 and MX860, updated docs.
+	- Bump backend minor version number. 
+
 2009-07-01 Alex Belkin <abc at telekom.ru>
 	* backend/xerox_mfp.conf.in: usbid for Samsung SCX-4500W
 
diff --git a/backend/pixma.h b/backend/pixma.h
index a0993d730..23200b62a 100644
--- a/backend/pixma.h
+++ b/backend/pixma.h
@@ -108,7 +108,7 @@ typedef uint32_t uint32_t;
 /** \name Version of the driver */
 /**@{*/
 #define PIXMA_VERSION_MAJOR 0
-#define PIXMA_VERSION_MINOR 15
+#define PIXMA_VERSION_MINOR 16
 #define PIXMA_VERSION_BUILD 0
 /**@}*/
 
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index f819dfafa..be0d3ac4b 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -141,9 +141,9 @@
 #define MP190_PID 0x1734
 
 /* PIXMA 2009 vintage */
+#define MX860_PID 0x1735    /* untested */
 #define MX320_PID 0x1736    /* untested */
-#define MX330_PID UNKNOWN_PID    /* TBD, untested */
-#define MX860_PID UNKNOWN_PID    /* TBD, untested */
+#define MX330_PID 0x1737    /* untested */
 
 
 enum mp150_state_t
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index b75fce9f9..63296459e 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -231,6 +231,12 @@
 :status :untested
 :comment "Same protocol as Pixma Generation 3? Testers needed!"
 
+:model "PIXMA MX330"
+:interface "USB"
+:usbid "0x04a9" "0x1737"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MX700"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x1729"
@@ -243,6 +249,12 @@
 :status :good
 :comment "All resolutions supported (up to 2400DPI). Flatbed, ADF simplex and Duplex supported."
 
+:model "PIXMA MX860"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x1735"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MX7600"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x171c"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 8acb349db..1991a60ca 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -40,6 +40,8 @@ and must be switched off and on.
 SmartBase MP360, MP370, MP390
 .br
 MultiPASS PIXMA MP760, PIXMA MP780
+.br
+PIXMA MX320, MX330, MX860
 .RE
 .PP
 The following models may use the same Pixma protocol as those listed