aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorAndrew Thompson <thompsa@FreeBSD.org>2010-04-07 00:30:25 +0000
committerAndrew Thompson <thompsa@FreeBSD.org>2010-04-07 00:30:25 +0000
commitfb8f1e2afc389d2518b8f7df946fda6c30f9033b (patch)
tree40471b807eadcfd6f826900a0d92d810f09bcb2c /sys/dev
parent3769678a8262f91d4826e7518560acc8dd3f280c (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/quirk/usb_quirk.c2
-rw-r--r--sys/dev/usb/usbdevs7
2 files changed, 9 insertions, 0 deletions
diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c
index f21fab419734..b829ac1d307e 100644
--- a/sys/dev/usb/quirk/usb_quirk.c
+++ b/sys/dev/usb/quirk/usb_quirk.c
@@ -227,6 +227,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
USB_QUIRK(IOMEGA, ZIP100, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
UQ_MSC_FORCE_PROTO_SCSI,
UQ_MSC_NO_TEST_UNIT_READY), /* XXX ZIP drives can also use ATAPI */
+ USB_QUIRK(JMICRON, JM20336, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
USB_QUIRK(JMICRON, JM20337, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
UQ_MSC_FORCE_PROTO_SCSI,
UQ_MSC_NO_SYNC_CACHE),
@@ -444,6 +445,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = {
USB_QUIRK(ACTIONS, MP4, 0x0000, 0xffff, UQ_MSC_FORCE_WIRE_BBB,
UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_SYNC_CACHE),
USB_QUIRK(ASUS, GMSC, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
+ USB_QUIRK(UNKNOWN4, USBMEMSTICK, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE),
};
#undef USB_QUIRK_VP
#undef USB_QUIRK
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index c2ceb883318a..312beabb1a4c 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -65,6 +65,7 @@ $FreeBSD$
vendor UNKNOWN1 0x0053 Unknown vendor
vendor UNKNOWN2 0x0105 Unknown vendor
vendor EGALAX2 0x0123 eGalax, Inc.
+vendor UNKNOWN4 0x0204 Unknown vendor
vendor HUMAX 0x02ad HUMAX
vendor LTS 0x0386 LTS
vendor BWCT 0x03da Bernd Walter Computer Technology
@@ -1105,6 +1106,7 @@ product BROADCOM BCM2033 0x2033 BCM2033 Bluetooth USB dongle
/* Brother Industries products */
product BROTHER HL1050 0x0002 HL-1050 laser printer
+product BROTHER MFC8600_9650 0x0100 MFC8600/9650 multifunction device
/* Behavior Technology Computer products */
product BTC BTC7932 0x6782 Keyboard with mouse port
@@ -1819,6 +1821,7 @@ product JABLOTRON PC60B 0x0001 PC-60B
product JATON EDA 0x5704 Ethernet
/* JMicron products */
+product JMICRON JM20336 0x2336 USB to SATA Bridge
product JMICRON JM20337 0x2338 USB to ATA/ATAPI Bridge
/* JVC products */
@@ -2134,6 +2137,7 @@ product MUSTEK 1200UB 0x0006 1200 UB scanner
product MUSTEK 1200USBPLUS 0x0007 1200 USB Plus scanner
product MUSTEK 1200CUPLUS 0x0008 1200 CU Plus scanner
product MUSTEK BEARPAW1200F 0x0010 BearPaw 1200F scanner
+product MUSTEK BEARPAW2400TA 0x0218 BearPaw 2400TA scanner
product MUSTEK BEARPAW1200TA 0x021e BearPaw 1200TA scanner
product MUSTEK 600USB 0x0873 600 USB scanner
product MUSTEK MDC800 0xa800 MDC-800 digital camera
@@ -3034,6 +3038,9 @@ product UMEDIA AR5523_2_NF 0x3206 AR5523 (no firmware)
/* Universal Access products */
product UNIACCESS PANACHE 0x0101 Panache Surf USB ISDN Adapter
+/* Unknown vendors */
+product UNKNOWN4 USBMEMSTICK 0x6025 Flash Disk CBM
+
/* U.S. Robotics products */
product USR USR5423 0x0121 USR5423 WLAN