summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/umass_quirks.c24
-rw-r--r--sys/dev/usb/usbdevs3
2 files changed, 18 insertions, 9 deletions
diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c
index dd3bc4ce005..25155b7e558 100644
--- a/sys/dev/usb/umass_quirks.c
+++ b/sys/dev/usb/umass_quirks.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass_quirks.c,v 1.11 2004/04/10 08:11:21 deraadt Exp $ */
+/* $OpenBSD: umass_quirks.c,v 1.12 2004/06/13 19:52:57 mickey Exp $ */
/* $NetBSD: umass_quirks.c,v 1.39 2003/05/08 15:19:47 augustss Exp $ */
/*
@@ -192,6 +192,14 @@ Static const struct umass_quirk umass_quirks[] = {
NULL, NULL
},
+ { { USB_VENDOR_IRIVER, USB_PRODUCT_IRIVER_IFP_1XX },
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ PQUIRK_NOBIGMODESENSE | PQUIRK_NODOORLOCK | PQUIRK_ONLYBIG,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
+
{ { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG },
UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
0,
@@ -440,13 +448,13 @@ Static const struct umass_quirk umass_quirks[] = {
NULL, umass_fixup_yedata
},
- { { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X},
- UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
- 0,
- SDEV_NOSYNCCACHE | PQUIRK_NODOORLOCK,
- UMATCH_VENDOR_PRODUCT,
- NULL, NULL
- },
+ { { USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_DNSSF7X},
+ UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
+ 0,
+ SDEV_NOSYNCCACHE | PQUIRK_NODOORLOCK,
+ UMATCH_VENDOR_PRODUCT,
+ NULL, NULL
+ },
};
const struct umass_quirk *
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 9b5b0d31569..4ae7a1e0db9 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.86 2004/05/26 22:23:16 markus Exp $
+$OpenBSD: usbdevs,v 1.87 2004/06/13 19:52:57 mickey Exp $
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
/*
@@ -876,6 +876,7 @@ product IOMEGA ZIP250_2 0x0032 Zip 250
product IOMEGA CDRW 0x0055 CDRW 9602
/* iRiver products */
+product IRIVER IFP_1XX 0x1101 iFP-1xx
product IRIVER IFP_3XX 0x1103 iFP-3xx
product IRIVER IFP_5XX 0x1105 iFP-5xx