From dfc5f5ed760b7922c98280e03099aed5bcc719ad Mon Sep 17 00:00:00 2001
From: Rolf Bensch <rolf@bensch-online.de>
Date: Mon, 11 Mar 2019 17:45:27 +0100
Subject: [PATCH] pixma: new scanners Canon PIXUS XK50, XK70, XK80 Series

---
 backend/pixma_mp150.c       |  6 ++++++
 doc/descriptions/pixma.desc | 41 ++++++++++++++++++++++++++-----------
 doc/sane-pixma.man          |  2 +-
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 057907e0b..5f0a4ac8c 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -276,6 +276,8 @@
 #define TS6130_PID 0x1843
 #define TR8530_PID 0x1844
 #define TR7530_PID 0x1845
+#define XK50_PID 0x1846
+#define XK70_PID 0x1847
 #define TR4500_PID 0x1854
 #define E4200_PID 0x1855
 #define TS6200_PID 0x1856
@@ -286,6 +288,7 @@
 #define TS8230_PID 0x185b
 #define TS9580_PID 0x185d
 #define TR9530_PID 0x185e
+#define XK80_PID 0x1873
 
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
@@ -1992,6 +1995,8 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA TS6130 Series", "TS6130", TS6130_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA TR8530 Series", "TR8530", TR8530_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA TR7530 Series", "TR7530", TR7530_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXUS XK50 Series", "XK50", XK50_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXUS XK70 Series", "XK70", XK70_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA TR4500 Series", "TR4500", TR4500_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA E4200 Series", "E4200", E4200_PID, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA TS6200 Series", "TS6200", TS6200_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
@@ -2002,6 +2007,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA TS8230 Series", "TS8230", TS8230_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA TS9580 Series", "TS9580", TS9580_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA TR9530 Series", "TR9530", TR9530_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
+  DEVICE ("Canon PIXUS XK80 Series", "XK80", XK80_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 f36f21882..62684324e 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -322,18 +322,6 @@
 :status :complete
 :comment "All resolutions supported (up to 4800DPI)."
 
-:model "PIXUS MP5"
-:interface "USB"
-:usbid "0x04a9" "0x2635"
-:status :untested
-:comment "Testers needed! Identical with imageCLASS MPC190."
-
-:model "PIXUS MP10"
-:interface "USB"
-:usbid "0x04a9" "0x261f"
-:status :complete
-:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
-
 :model "PIXMA MP140"
 :interface "USB"
 :usbid "0x04a9" "0x172b"
@@ -1010,7 +998,36 @@
 :model "PIXMA TS9580 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x185d"
+:status :untested
+:comment "Testers needed!"
 
+:model "PIXUS MP5"
+:interface "USB"
+:usbid "0x04a9" "0x2635"
+:status :untested
+:comment "Testers needed! Identical with imageCLASS MPC190."
+
+:model "PIXUS MP10"
+:interface "USB"
+:usbid "0x04a9" "0x261f"
+:status :complete
+:comment "All resolutions supported (up to 600DPI). Identical with imageCLASS MPC200."
+
+:model "PIXUS XK50 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1846"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK70 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1847"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXUS XK80 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1873"
 :status :untested
 :comment "Testers needed!"
 
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 93f24addb..590ea6dd3 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -115,7 +115,7 @@ PIXMA TS8100, TS8130, TS8180, TS8200, TS8230, TS8280, TS9000
 .br
 PIXMA TS9100, TS9180, TS9500, TS9580
 .br
-PIXUS MP5
+PIXUS MP5, XK50, XK70, XK80
 .br
 imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br