From ed96067735fbe4280aa640a666321e5f56833d97 Mon Sep 17 00:00:00 2001
From: Nicolas Martin <nicols-guest@users.alioth.debian.org>
Date: Wed, 16 Sep 2009 22:13:23 +0200
Subject: [PATCH] pixma backend: Updated documentation for MP260 and new
 models:

- Pixma MP260 confirmed to be supported.
- descriptions updates for 5 new models recently declared in backend.
---
 ChangeLog                   |  7 +++++++
 backend/pixma_mp150.c       |  2 +-
 doc/descriptions/pixma.desc | 36 +++++++++++++++++++++++++++++++++---
 doc/sane-pixma.man          |  8 +++-----
 4 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 85642fd6d..90a899218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-16  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, 
+	doc/sane-pixma.man:
+	pixma backend: Updated documentation for:
+	- Pixma MP260 support
+	- descriptions for recently added new models
+
 2009-09-14 m. allan noah <kitno455 at gmail dot com>
 	* sanei/sanei_usb.c: reset the libusb device handle after bus scan.
 	patch from Hans Petter Selasky
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 0e623803f..d98690416 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -137,7 +137,7 @@
 #define MP540_PID 0x1730
 #define MP480_PID 0x1731
 #define MP240_PID 0x1732
-#define MP260_PID 0x1733    /* Untested */
+#define MP260_PID 0x1733
 #define MP190_PID 0x1734
 
 /* PIXMA 2009 vintage */
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index d77cfcbea..8a3896bee 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -267,6 +267,18 @@
 :status :good
 :comment "Reported to be working fine at all resolutions."
 
+:model "PIXMA MP990"
+:interface "USB Ethernet"
+:usbid "0x04a9" "0x1740"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
+:model "PIXMA MP640"
+:interface "USB"
+:usbid "0x04a9" "0x173f"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MP630"
 :interface "USB"
 :usbid "0x04a9" "0x172e"
@@ -279,18 +291,36 @@
 :status :good
 :comment "All resolutions supported (up to 2400DPI)"
 
+:model "PIXMA MP560"
+:interface "USB"
+:usbid "0x04a9" "0x173e"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MP540"
 :interface "USB"
 :usbid "0x04a9" "0x1730"
 :status :good
 :comment "All resolutions supported (up to 2400DPI)"
 
+:model "PIXMA MP490"
+:interface "USB"
+:usbid "0x04a9" "0x173c"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MP480"
 :interface "USB"
 :usbid "0x04a9" "0x1731"
 :status :good
 :comment "All resolutions supported (up to 2400DPI)"
 
+:model "PIXMA MP250"
+:interface "USB"
+:usbid "0x04a9" "0x173a"
+:status :untested
+:comment "Same protocol as Pixma Generation 3? Testers needed!"
+
 :model "PIXMA MP240"
 :interface "USB"
 :usbid "0x04a9" "0x1732"
@@ -300,8 +330,8 @@
 :model "PIXMA MP260"
 :interface "USB"
 :usbid "0x04a9" "0x1733"
-:status :untested
-:comment "Same protocol as Pixma Generation 3? Testers needed!"
+:status :good
+:comment "All resolutions supported (up to 1200DPI)"
 
 :model "PIXMA MP190"
 :interface "USB"
@@ -396,7 +426,7 @@
 :model "imageCLASS MF4690"
 :interface "USB"
 :usbid "0x04a9" "0x26b0"
-:status :untested
+:status :good
 :comment "Flatbed and ADF scan.  All resolutions supported (up to 600DPI)"
 
 :model "imageCLASS MF4010"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ed78cc4c2..4c062d824 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "3 Aug 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "13 Sep 2009" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon PIXMA MP series
@@ -14,7 +14,7 @@ Currently, the following models work with this backend:
 .RS
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
-PIXMA MP210, MP220, MP240
+PIXMA MP210, MP220, MP240, MP260
 .br
 PIXMA MP450, MP460, MP470, MP480
 .br
@@ -40,8 +40,6 @@ and must be switched off and on.
 SmartBase MP360, MP370, MP390
 .br
 MultiPASS PIXMA MP760, PIXMA MP780
-.br
-PIXMA MX320, MX330
 .RE
 .PP
 The following models may use the same Pixma protocol as those listed 
@@ -52,7 +50,7 @@ Feedback in the Sane-dev mailing list welcome.
 .RS
 PIXMA MP740
 .br
-PIXMA MP260, MX320
+PIXMA MX320, MX330, MP250, MP490, MP560, MP640, MP990
 .br
 ImageCLASS MF3110, MF3240
 .br