From 5ab0b2024ceeb59a86ef7674343c559e23a4216c Mon Sep 17 00:00:00 2001
From: Nicolas Martin <nicols-guest@users.alioth.debian.org>
Date: Sat, 13 Sep 2008 12:32:52 +0000
Subject: [PATCH] Changes for MP970 (to be continued), add MX7600 pid (untested
 yet).

---
 ChangeLog                   |  5 +++++
 backend/pixma_mp150.c       | 10 +++++++---
 doc/descriptions/pixma.desc |  6 ++++++
 doc/sane-pixma.man          |  2 +-
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d90f41164..8e83fb1ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-13  Nicolas Martin <nicols-guest at users.alioth.debian.org>
+	* backend/pixma_mp150.c, doc/sane-pixma.man, doc/description/pixma.desc:
+	Changes in pixma backend for PIXMA MP970 at 4800 dpi (to be continued).
+	Declare MX7600 but yet untested.
+
 2008-08-21  Stéphane Voltz <stef.dev@free.fr>
 	* backend/rts8891.c backend/rts8891_low.c backend/rts8891_low.h: fix
 	parking for HP4400, tune dark calibration for HP4400
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 32d11cfef..3be832dd6 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -98,6 +98,7 @@
 #define MP140_PID 0x172b
 
 /* Generation 3 */
+#define MX7600_PID 0x171c  /* untested */
 #define MP210_PID 0x1721
 #define MP220_PID 0x1722
 #define MP470_PID 0x1723
@@ -107,8 +108,7 @@
 #define MX300_PID 0x1727
 #define MX310_PID 0x1728
 #define MX700_PID 0x1729
-
-#define MX850_PID 0x172c  /* untested */
+#define MX850_PID 0x172c
 
 enum mp150_state_t
 {
@@ -769,7 +769,7 @@ mp150_open (pixma_t * s)
 
   /* General rules for setting Pixma protocol generation # */
   mp->generation = (s->cfg->pid >= MP160_PID) ? 2 : 1;
-  if (s->cfg->pid >= MP210_PID)
+  if (s->cfg->pid >= MX7600_PID)
     mp->generation = 3;
 
   /* And exceptions to be added here */
@@ -987,6 +987,8 @@ post_process_image_data (pixma_t * s, pixma_imagebuf_t * ib)
     n = s->param->xdpi / 600;
   else    /* FIXME: maybe need different values for CIS and CCD sensors */
     n = s->param->xdpi / 2400;
+  if (s->cfg->pid == MP970_PID) 
+    n = MIN (n, 4);
   
   m = (n > 0) ? s->param->w / n : 1;
   sptr = dptr = gptr = mp->imgbuf;
@@ -1219,6 +1221,8 @@ const pixma_config_t pixma_mp150_devices[] = {
 	  PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX850", MX850_PID, 2400,
 	  PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
+  DEVICE ("Canon PIXMA MX7600", MX7600_PID, 4800,
+	  PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
 
   /* Generation 3 CCD not managed as Generation 2 */
   DEVICE ("Canon PIXMA MP970", MP970_PID, 4800,
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 7980ae791..c84898043 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -237,6 +237,12 @@
 :status :basic
 :comment "Works in flatbed. Speed issue in ADF simplex ? USB Snoops needed to set up ADF Duplex"
 
+:model "PIXMA MX7600"
+:interface "USB"
+:usbid "0x04a9" "0x171c"
+:status :untested
+:comment "Generation 3 protocol? Testers needed!"
+
 :model "imageCLASS MF5630"
 :interface "USB"
 :usbid "0x04a9" "0x264e"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index f5ef46d84..c4dccc932 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -40,7 +40,7 @@ in the backend so that they get recognized and activated.
 Feedback in the Sane-dev mailing list welcome.
 .PP
 .RS
-PIXMA MP740
+PIXMA MP740, MX7600
 .br
 ImageCLASS MF3110, MF3240
 .br