Module Name: src
Committed By: bouyer
Date: Sat Mar 17 18:51:18 UTC 2012
Modified Files:
src/sys/dev/usb [netbsd-5]: umass_quirks.c usbdevs
Log Message:
Apply patch, requested by riz in ticket #1737:
sys/dev/usb/usbdevs patch
sys/dev/usb/umass_quirks.c patch
Add umass quirks for the following devices:
Kingston DT 102 G2
Kingston DT 101 II
Kingston DT Mini 10
Kingston DT 101 G2
Kingston DT 100 G2
Meizo Electronics MiniPlayer M6 (SL)
Philips SA235
Sandisk Sansa Clip
To generate a diff of this commit:
cvs rdiff -u -r1.76.2.1 -r1.76.2.2 src/sys/dev/usb/umass_quirks.c
cvs rdiff -u -r1.519.4.8 -r1.519.4.9 src/sys/dev/usb/usbdevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/umass_quirks.c
diff -u src/sys/dev/usb/umass_quirks.c:1.76.2.1 src/sys/dev/usb/umass_quirks.c:1.76.2.2
--- src/sys/dev/usb/umass_quirks.c:1.76.2.1 Fri Nov 26 17:29:13 2010
+++ src/sys/dev/usb/umass_quirks.c Sat Mar 17 18:51:18 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umass_quirks.c,v 1.76.2.1 2010/11/26 17:29:13 riz Exp $ */
+/* $NetBSD: umass_quirks.c,v 1.76.2.2 2012/03/17 18:51:18 bouyer Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.76.2.1 2010/11/26 17:29:13 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_quirks.c,v 1.76.2.2 2012/03/17 18:51:18 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -199,7 +199,7 @@ Static const struct umass_quirk umass_qu
UMATCH_DEVCLASS_DEVSUBCLASS_DEVPROTO,
NULL, NULL
},
- /* IBEAD devices don't like all SCSI commands */
+ /* Some Sigmatel-based devices don't like all SCSI commands */
{ { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_MUSICSTICK },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
@@ -221,14 +221,108 @@ Static const struct umass_quirk umass_qu
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
- /* Kingston generic HBA errors */
- { { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DTMINI10 },
+ { { USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SA235 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK | PQUIRK_NOSYNCCACHE,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+ /* Creative Nomad MuVo, NetBSD PR 30389, FreeBSD PR 53094 */
+ { { USB_VENDOR_CREATIVE, USB_PRODUCT_CREATIVE_NOMAD },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK | PQUIRK_NOSYNCCACHE,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ /* iRiver iFP-[135]xx players fail on PREVENT/ALLOW, see PR 25440 */
+ { { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+ { { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_3XX },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+ { { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_5XX },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
PQUIRK_NODOORLOCK,
UMATCH_VENDOR_PRODUCT,
NULL, NULL
},
+
+ /* Meizu M6 doesn't like synchronize-cache, see PR 40442 */
+ { { USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NOSYNCCACHE,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ /*
+ * SanDisk Sansa Clip rejects cache sync in unconventional way.
+ * However, unlike some other devices listed in this table,
+ * this is does not cause the device firmware to stop responding.
+ */
+ { { USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SANSA_CLIP },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NOSYNCCACHE,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ /* Kingston USB pendrives don't like being told to lock the door */
+ { { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT101_II },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ { { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT101_G2 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ { { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DT102_G2 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ { { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_DTMINI10 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
+ /* Also, some Kingston pendrives have Toshiba vendor ID */
+ { { USB_VENDOR_TOSHIBA, USB_PRODUCT_KINGSTON_DT100_G2 },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
};
const struct umass_quirk *
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.519.4.8 src/sys/dev/usb/usbdevs:1.519.4.9
--- src/sys/dev/usb/usbdevs:1.519.4.8 Fri Nov 26 17:29:13 2010
+++ src/sys/dev/usb/usbdevs Sat Mar 17 18:51:18 2012
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.519.4.8 2010/11/26 17:29:13 riz Exp $
+$NetBSD: usbdevs,v 1.519.4.9 2012/03/17 18:51:18 bouyer Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -100,6 +100,7 @@ vendor LUCENT 0x047e Lucent
vendor PLANTRONICS 0x047f Plantronics
vendor KYOCERA 0x0482 Kyocera
vendor STMICRO 0x0483 STMicroelectronics
+vendor MEIZU 0x0492 Meizu Electronics
vendor YAMAHA 0x0499 YAMAHA
vendor COMPAQ 0x049f Compaq
vendor HITACHI 0x04a4 Hitachi
@@ -1372,7 +1373,11 @@ product KEYSPAN UIA11 0x0202 UIA-11 rem
/* Kingston products */
product KINGSTON XX1 0x0008 Ethernet Adapter
product KINGSTON KNU101TX 0x000a KNU101TX USB Ethernet
-product KINGSTON DTMINI10 0x162c DT Mini 10
+product KINGSTON DT102_G2 0x1624 DT 102 G2
+product KINGSTON DT101_II 0x1625 DT 101 II
+product KINGSTON DTMINI10 0x162c DT Mini 10
+product KINGSTON DT101_G2 0x1642 DT 101 G2
+product KINGSTON DT100_G2 0x6544 DT 100 G2
/* Kodak products */
product KODAK DC220 0x0100 Digital Science DC220
@@ -1484,6 +1489,9 @@ product MCT ML_4500 0x0302 ML-4500
/* MediaGear products */
product MEDIAGEAR READER9IN1 0x5003 USB2.0 9 in 1 Reader
+/* Meizo Electronics */
+product MEIZU M6_SL 0x0140 MiniPlayer M6 (SL)
+
/* Melco, Inc products */
product MELCO LUATX1 0x0001 LUA-TX Ethernet
product MELCO LUATX5 0x0005 LUA-TX Ethernet
@@ -1779,6 +1787,7 @@ product PERACOM ENET2 0x0005 Ethernet a
/* Philips products */
product PHILIPS DSS350 0x0101 DSS 350 Digital Speaker System
product PHILIPS DSS 0x0104 DSS XXX Digital Speaker System
+product PHILIPS SA235 0x016a SA235
product PHILIPS HUB 0x0201 hub
product PHILIPS PCA645VC 0x0302 PCA645VC PC Camera
product PHILIPS PCA646VC 0x0303 PCA646VC PC Camera
@@ -1976,6 +1985,7 @@ product SANDISK SDDR12 0x0100 ImageMate
product SANDISK SDDR09 0x0200 ImageMate SDDR-09
product SANDISK SDDR86 0x0621 ImageMate SDDR-86
product SANDISK SDDR75 0x0810 ImageMate SDDR-75
+product SANDISK SANSA_CLIP 0x7433 Sansa Clip
/* Sanwa Supply products */
product SANWASUPPLY JYDV9USB 0x9806 JY-DV9USB gamepad
