From 2ffa16dcdd913a621f0beed81e7b24b9fb93fe9a Mon Sep 17 00:00:00 2001
From: Rolf Bensch <roben-guest@alioth.debian.org>
Date: Mon, 6 Feb 2012 16:48:00 +0100
Subject: [PATCH] new scanner Canon PIXMA MX360

---
 ChangeLog                   | 4 ++++
 backend/pixma_mp150.c       | 3 +++
 doc/descriptions/pixma.desc | 6 ++++++
 doc/sane-pixma.man          | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8aaf53ed8..0622c64a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-06 Rolf Bensch <rolf at bensch hyphen online dot de>
+	* backend/pixma_mp150, doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	New scanner Canon PIXMA MX360.
+
 2012-02-03 Rolf Bensch <rolf at bensch hyphen online dot de>
 	* backend/pixma.[ch], backend/pixma_common.[ch], 
 	backend/pixma_sane_options.[ch], backend/pixma_mp{150,810}.c:
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 358317844..5948e0c22 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -160,6 +160,7 @@
 #define MG5100_PID 0x1748
 #define MG5200_PID 0x1749
 #define MG6100_PID 0x174a
+#define MX360_PID 0x174d
 
 /* PIXMA 2011 vintage */
 #define MX880_PID 0x1750
@@ -1195,6 +1196,7 @@ mp150_check_param (pixma_t * s, pixma_scan_param_t * sp)
         s->cfg->pid == MX330_PID ||
         s->cfg->pid == MX340_PID ||
         s->cfg->pid == MX350_PID ||
+        s->cfg->pid == MX360_PID ||
         s->cfg->pid == MX7600_PID )
        &&
         sp->source == PIXMA_SOURCE_FLATBED)
@@ -1587,6 +1589,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   /* PIXMA 2010 vintage */
   DEVICE ("Canon PIXMA MX340", "MX340", MX340_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX350", "MX350", MX350_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXMA MX360", "MX360", MX350_PID, 1200, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MX870", "MX870", MX870_PID, 2400, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADFDUP),
 
   /* PIXMA 2011 vintage */
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 0a54f9275..9ce0ae9aa 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -259,6 +259,12 @@
 :status :complete
 :comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
 
+:model "PIXMA MX360"
+:interface "USB"
+:usbid "0x04a9" "0x174d"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 1200DPI)"
+
 :model "PIXMA MX700"
 :interface "USB Ethernet"
 :usbid "0x04a9" "0x1729"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index ae0bc3ddb..575e98fd7 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -29,7 +29,7 @@ PIXMA MP600, MP600R, MP610, MP620, MP630, MP640, MP710
 .br
 PIXMA MP800, MP800R, MP810, MP830, MP960, MP970, MP980, MP990
 .br
-PIXMA MX300, MX310, MX330, MX340, MX350
+PIXMA MX300, MX310, MX330, MX340, MX350, MX360
 .br
 PIXMA MX700, MX850, MX860, MX870, MX7600
 .br