From b040b150a08b0b5394ad3bc91a45966d97f58152 Mon Sep 17 00:00:00 2001
From: Rolf Bensch <roben-guest@alioth.debian.org>
Date: Fri, 8 Jan 2016 16:54:30 +0100
Subject: [PATCH] pixma: fix for [#315244] Add support for Canon PIXMA MG5700,
 MG6800, MG6900 and MG7700

       These scanners are new and need further testing!
---
 backend/pixma_mp150.c       |  8 ++++++++
 doc/descriptions/pixma.desc | 24 ++++++++++++++++++++++++
 doc/sane-pixma.man          |  6 ++++--
 3 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 3fee379c2..1fb6eee90 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -228,6 +228,10 @@
 #define MX490_PID 0x1787
 #define E480_PID 0x1789
 #define MG3600_PID 0x178a
+#define MG7700_PID 0x178b
+#define MG6900_PID 0x178c
+#define MG6800_PID 0x178d
+#define MG5700_PID 0x178e
 
 
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
@@ -1828,6 +1832,10 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA MX490 Series", "MX490", MX490_PID, 600, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA E480 Series",  "E480",  E480_PID,  600, 0, 0, 638, 1050, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA MG3600 Series", "MG3600", MG3600_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG7700 Series", "MG7700", MG7700_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG6900 Series", "MG6900", MG6900_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG6800 Series", "MG6800", MG6800_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG5700 Series", "MG5700", MG5700_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
   END_OF_DEVICE_LIST
 };
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index fd904660d..8ebf2c955 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -172,6 +172,12 @@
 :status :complete
 :comment "All resolutions supported (up to 1200DPI)."
 
+:model "PIXMA MG5700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178e"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG6100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174a"
@@ -208,6 +214,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA MG6800 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178d"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA MG6900 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG7100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1772"
@@ -220,6 +238,12 @@
 :status :complete
 :comment "All resolutions supported (up to 2400DPI)."
 
+:model "PIXMA MG7700 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x178b"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG8100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174b"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 386587953..5e8ab71d1 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "14 Oct 2015" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "08 Jan 2016" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 sane\-pixma \- SANE backend for Canon Multi-Function Printers and CanoScan Scanners
@@ -83,7 +83,9 @@ Feedback in the sane\-devel mailing list welcome.
 .RS
 PIXMA E400, E460, E480, E500, E510, E560, E600, E610
 .br
-PIXMA MG3600, MG4100, MG5400, MG6500, MG6600, MG8100
+PIXMA MG3600, MG4100, MG5400, MG5700, MG6500, MG6600, MG6800
+.br
+PIXMA MG6900, MG7700, MG8100
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br