Author: hselasky
Date: Fri Dec 26 11:25:56 2014
New Revision: 276242
URL: https://svnweb.freebsd.org/changeset/base/276242
Log:
MFC r262128, r262129, r275605, r276239 and r276240:
Add more USB quirks.
PR: 178771
PR: 180617
PR: 195372
Modified:
stable/9/sys/dev/usb/quirk/usb_quirk.c
stable/9/sys/dev/usb/usbdevs
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/usb/quirk/usb_quirk.c
==============================================================================
--- stable/9/sys/dev/usb/quirk/usb_quirk.c Fri Dec 26 11:16:59 2014
(r276241)
+++ stable/9/sys/dev/usb/quirk/usb_quirk.c Fri Dec 26 11:25:56 2014
(r276242)
@@ -59,7 +59,7 @@
MODULE_DEPEND(usb_quirk, usb, 1, 1, 1);
MODULE_VERSION(usb_quirk, 1);
-#define USB_DEV_QUIRKS_MAX 256
+#define USB_DEV_QUIRKS_MAX 384
#define USB_SUB_QUIRKS_MAX 8
struct usb_quirk_entry {
@@ -437,8 +437,28 @@ static struct usb_quirk_entry usb_quirks
USB_QUIRK(WESTERN, MYBOOK, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY_EVPD,
UQ_MSC_NO_SYNC_CACHE),
- USB_QUIRK(WESTERN, MYPASSWORD, 0x0000, 0xffff, UQ_MSC_FORCE_SHORT_INQ),
- USB_QUIRK(WESTERN, MYPASSPORT, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_00, 0x0000, 0xffff,
UQ_MSC_FORCE_SHORT_INQ),
+ USB_QUIRK(WESTERN, MYPASSPORT_01, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_02, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_03, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_04, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_05, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_06, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_07, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_08, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_09, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_10, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORT_11, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_00, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_01, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_02, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_03, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_04, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_05, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_06, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_07, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_08, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(WESTERN, MYPASSPORTES_09, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
USB_QUIRK(WINMAXGROUP, FLASH64MC, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY),
USB_QUIRK(YANO, FW800HD, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
@@ -459,8 +479,8 @@ static struct usb_quirk_entry usb_quirks
UQ_MSC_FORCE_PROTO_ATAPI),
USB_QUIRK(MEIZU, M6_SL, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY, UQ_MSC_NO_SYNC_CACHE),
-
- USB_QUIRK(TOSHIBA, TRANSMEMORY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(TOSHIBA, TRANSMEMORY, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE,
+ UQ_MSC_NO_PREVENT_ALLOW),
USB_QUIRK(VIALABS, USB30SATABRIDGE, 0x0000, 0xffff,
UQ_MSC_NO_SYNC_CACHE),
/* Non-standard USB MIDI devices */
Modified: stable/9/sys/dev/usb/usbdevs
==============================================================================
--- stable/9/sys/dev/usb/usbdevs Fri Dec 26 11:16:59 2014
(r276241)
+++ stable/9/sys/dev/usb/usbdevs Fri Dec 26 11:25:56 2014
(r276242)
@@ -2409,6 +2409,8 @@ product INTEL EASYPC_CAMERA 0x0110 Easy
product INTEL TESTBOARD 0x9890 82930 test board
product INTEL2 IRMH 0x0020 Integrated Rate Matching Hub
product INTEL2 IRMH2 0x0024 Integrated Rate Matching Hub
+product INTEL2 IRMH3 0x8000 Integrated Rate Matching Hub
+product INTEL2 IRMH4 0x8008 Integrated Rate Matching Hub
/* Interbiometric products */
product INTERBIOMETRICS IOBOARD 0x1002 FTDI compatible adapter
@@ -4488,8 +4490,28 @@ product WESTERN COMBO 0x0200 Firewire U
product WESTERN EXTHDD 0x0400 External HDD
product WESTERN HUB 0x0500 USB HUB
product WESTERN MYBOOK 0x0901 MyBook External HDD
-product WESTERN MYPASSWORD 0x0704 MyPassword External HDD
-product WESTERN MYPASSPORT 0x0748 MyPassport External HDD
+product WESTERN MYPASSPORT_00 0x0704 MyPassport External HDD
+product WESTERN MYPASSPORT_11 0x0741 MyPassport External HDD
+product WESTERN MYPASSPORT_01 0x0746 MyPassport External HDD
+product WESTERN MYPASSPORT_02 0x0748 MyPassport External HDD
+product WESTERN MYPASSPORT_03 0x074A MyPassport External HDD
+product WESTERN MYPASSPORT_04 0x074C MyPassport External HDD
+product WESTERN MYPASSPORT_05 0x074E MyPassport External HDD
+product WESTERN MYPASSPORT_06 0x07A6 MyPassport External HDD
+product WESTERN MYPASSPORT_07 0x07A8 MyPassport External HDD
+product WESTERN MYPASSPORT_08 0x07AA MyPassport External HDD
+product WESTERN MYPASSPORT_09 0x07AC MyPassport External HDD
+product WESTERN MYPASSPORT_10 0x07AE MyPassport External HDD
+product WESTERN MYPASSPORTES_00 0x070A MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_01 0x071A MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_02 0x0730 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_03 0x0732 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_04 0x0740 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_05 0x0742 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_06 0x0750 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_07 0x0752 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_08 0x07A0 MyPassport Essential External
HDD
+product WESTERN MYPASSPORTES_09 0x07A2 MyPassport Essential External
HDD
/* WeTelecom products */
product WETELECOM WM_D200 0x6801 WM-D200
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "[email protected]"
