From 18670166a68c90394de1366e3d7fffcf69ed5136 Mon Sep 17 00:00:00 2001
From: Ordissimo <thierry@ordissimo.com>
Date: Sat, 28 Dec 2019 12:53:52 +0000
Subject: [PATCH] pixma: Add model 2019: G6000, G6080, TS5300, TS5380, TS6300,
 TS6380, TS7330, TS8300, TS8380, TS8330, XK60, TS6330, TS3300 and E3300

---
 backend/pixma_mp150.c       | 27 ++++++++++++
 doc/descriptions/pixma.desc | 84 +++++++++++++++++++++++++++++++++++++
 doc/sane-pixma.man          | 12 +++---
 3 files changed, 118 insertions(+), 5 deletions(-)

diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 74f7ad25a..61859f8c9 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -283,6 +283,20 @@
 #define TS9580_PID 0x185d
 #define TR9530_PID 0x185e
 #define XK80_PID 0x1873
+#define G6000_PID 0x1865
+#define G6080_PID 0x1866
+#define TS5300_PID 0x188b
+#define TS5380_PID 0x188c
+#define TS6300_PID 0x188d
+#define TS6380_PID 0x188e
+#define TS7330_PID 0x188f
+#define TS8300_PID 0x1890
+#define TS8380_PID 0x1891
+#define TS8330_PID 0x1892
+#define XK60_PID   0x1893
+#define TS6330_PID 0x1894
+#define TS3300_PID 0x18a2
+#define E3300_PID  0x18a3
 
 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */
 #define XML_START_1   \
@@ -1785,6 +1799,19 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA TS9580 Series", "TS9580", TS9580_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXMA TR9530 Series", "TR9530", TR9530_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF),
   DEVICE ("Canon PIXUS XK80 Series", "XK80", XK80_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G6000 Series", "G6000", G6000_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA G6080 Series", "G6080", G6080_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS5300 Series", "TS5300", TS5300_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS5380 Series", "TS5380", TS5380_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS6300 Series", "TS6300", TS6300_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS6380 Series", "TS6380", TS6380_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS7330 Series", "TS7330", TS7330_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS8380 Series", "TS8380", TS8380_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS8330 Series", "TS8330", TS8330_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA XK60 Series", "XK60", XK60_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS6330 Series", "TS6330", TS6330_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA TS3300 Series", "TS3300", TS3300_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA E3300 Series", "E3300", E3300_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
   END_OF_DEVICE_LIST
 };
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 897c2acf5..f71b50ddc 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -88,6 +88,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA E3300 Series"
+:interface "USB"
+:usbid "0x04a9" "0x18a3"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA E4200 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1855"
@@ -136,6 +142,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA G6000"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1865"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA G6080"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1866"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA MG2100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x1751"
@@ -881,6 +899,12 @@
 :status :good
 :comment "All resolutions supported (up to 600DPI). WiFi not working."
 
+:model "PIXMA TS3300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x18a2"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS5000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1802"
@@ -893,6 +917,18 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS5300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188b"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS5380 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188c"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS6000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1801"
@@ -935,6 +971,30 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS6300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188b"
+:status :good
+:comment "Testers needed!"
+
+:model "PIXMA TS6330 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1894"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS6380 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188e"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS7330 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x188f"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS8000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1800"
@@ -977,6 +1037,24 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "PIXMA TS8300 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1890"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8330 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1892"
+:status :untested
+:comment "Testers needed!"
+
+:model "PIXMA TS8380 Series"
+:interface "USB WiFi"
+:usbid "0x04a9" "0x1891"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXMA TS9000 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x179f"
@@ -1025,6 +1103,12 @@
 :status :untested
 :comment "Testers needed!"
 
+:model "CanoScan XK 60"
+:interface "USB"
+:usbid "0x04a9" "0x1893"
+:status :untested
+:comment "Testers needed!"
+
 :model "PIXUS XK70 Series"
 :interface "USB WiFi"
 :usbid "0x04a9" "0x1847"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index bf3415bbd..450356ae4 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -99,7 +99,7 @@ Feedback in the sane\-devel mailing list welcome.
 .RS
 PIXMA E400, E410, E460, E470, E480, E500, E560, E600, E610
 .br
-PIXMA E3100, E4200
+PIXMA E3100, E3300, E4200
 .br
 PIXMA MG4100, MG6500, MG6600, MG6800, MG6900, MG8100
 .br
@@ -107,17 +107,19 @@ PIXMA MP375R, MP493, MP495, MP740
 .br
 PIXMA MX320, MX390, MX430, MX450, MX490, MX710
 .br
-PIXMA G3000, G3010, G4000, G4010
+PIXMA G3000, G3010, G4000, G4010, G6000, G6080
 .br
 PIXMA TR4500, TR7500, TR7530, TR8500, TR8530, TR8580, TR9530
 .br
-PIXMA TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS8100
+PIXMA TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS6300
 .br
-PIXMA TS8130, TS8180, TS8230, TS8280, TS9000, TS9100, TS9180
+PIXMA TS6330, TS6380, TS7330, TS8100, TS8130, TS8180, TS8230
+.br
+PIXMA TS8280,, TS8300, TS8330, TS8380, TS9000, TS9100, TS9180
 .br
 PIXMA TS9500, TS9580
 .br
-PIXUS MP5, XK50, XK70, XK80
+PIXUS MP5, XK50, XK60, XK70, XK80
 .br
 imageCLASS MF810/820, MF5630, MF5650, MF5750, MF8170c
 .br