More USB quirks (STR #4263)

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@10858 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/CHANGES-1.6.txt b/CHANGES-1.6.txt
index 3b40efd383807b45fb28952bc8f5bcd2a1b8f788..2ed8f7293fd90321ef0f7282eb6d8b84e5ad58f8 100644 (file)
--- a/CHANGES-1.6.txt
+++ b/CHANGES-1.6.txt
@@ -14,7 +14,8 @@ CHANGES IN CUPS V1.6.2
        - Updated the Catalan localization (STR #4202)
        - The lp command did not show errors for unknown "--foo" (STR #4261)
        - Bad IPP responses could crash ipptool (STR #4262)
-       - Added a USB quirk rule for Xerox Phaser 3124 printers (STR #4217)
+       - Updated USB quirk rules for Canon and Xerox printers (STR #4217,
+         STR #4263)
        - Added USB blacklisting for printers that require a custom backend
          (STR #4218)
        - The PPD compiler did not correctly JCL options (STR #4115, STR #4203)

diff --git a/backend/usb-libusb.c b/backend/usb-libusb.c
index 65c797078fdeaafb3b59384e8ce9acd93bd1994d..ca9e1a87be31e9c5ffe58f59deb9224f5713aebd 100644 (file)
--- a/backend/usb-libusb.c
+++ b/backend/usb-libusb.c
@@ -148,6 +148,8 @@ static const struct quirk_printer_struct quirk_printers[] = {
                            Printer, http://www.cups.org/str.php?L4155 */
        { 0x04a9, 0x10b6, USBLP_QUIRK_BIDIR }, /* Canon, Inc. PIXMA iP4300
                            Printer, https://bugs.launchpad.net/bugs/1032385 */
+       { 0x04a9, 0x1721, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP210
+                     https://bugzilla.redhat.com/show_bug.cgi?id=847923#c53 */
        { 0x04a9, 0x170c, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP500
                            Printer, https://bugs.launchpad.net/bugs/1032456 */
        { 0x04a9, 0x1717, USBLP_QUIRK_BIDIR }, /* Canon, Inc. MP510
@@ -175,6 +177,8 @@ static const struct quirk_printer_struct quirk_printers[] = {
                          USBLP_QUIRK_RESET },
        { 0x0924, 0x3ce9, USBLP_QUIRK_NO_REATTACH }, /* Xerox Phaser 3124
                          https://bugzilla.redhat.com/show_bug.cgi?id=867392 */
+       { 0x0924, 0x4293, USBLP_QUIRK_NO_REATTACH }, /* Xerox WorkCentre 3210
+                                    https://bugs.launchpad.net/bugs/1102470 */
        /* Prolific Technology, Inc. PL2305 Parallel Port
           (USB -> Parallel adapter), https://bugs.launchpad.net/bugs/987485 */
        { 0x04e8, 0x0000, USBLP_QUIRK_RESET }, /* All Samsung devices,