summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsanpei <sanpei@FreeBSD.org>2003-12-18 05:55:52 +0000
committersanpei <sanpei@FreeBSD.org>2003-12-18 05:55:52 +0000
commit3be6b5ab6fa324424b1ee1e9c54d7b5231569e1d (patch)
tree487d6a380c0d00a10ea85c17d259690edfe2b83a
parent9f57d816526021184b2e75a03054d6d0aff052ec (diff)
downloadFreeBSD-src-3be6b5ab6fa324424b1ee1e9c54d7b5231569e1d.zip
FreeBSD-src-3be6b5ab6fa324424b1ee1e9c54d7b5231569e1d.tar.gz
Sync to 1.147 of usbdevs
-rw-r--r--sys/dev/usb/usbdevs.h7
-rw-r--r--sys/dev/usb/usbdevs_data.h20
2 files changed, 25 insertions, 2 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 66b90f7..99b0b9d 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -4,7 +4,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.146 2003/12/17 14:23:07 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.147 2003/12/18 05:47:10 sanpei Exp
*/
/*
@@ -356,6 +356,7 @@
#define USB_VENDOR_DMI 0x0c0b /* DMI */
#define USB_VENDOR_LUWEN 0x0c76 /* Luwen */
#define USB_VENDOR_SMC3 0x0d5c /* Standard Microsystems */
+#define USB_VENDOR_PNY 0x0d7d /* PNY */
#define USB_VENDOR_HAWKING 0x0e66 /* Hawking Technologies */
#define USB_VENDOR_MOTOROLA 0x1063 /* Motorola */
#define USB_VENDOR_PLX 0x10b5 /* PLX */
@@ -924,6 +925,7 @@
#define USB_PRODUCT_MINOLTA_2300 0x4001 /* Dimage 2300 */
#define USB_PRODUCT_MINOLTA_S304 0x4007 /* Dimage S304 */
#define USB_PRODUCT_MINOLTA_X 0x4009 /* Dimage X */
+#define USB_PRODUCT_MINOLTA_5400 0x400e /* Dimage 5400 */
/* Mitsumi products */
#define USB_PRODUCT_MITSUMI_CDRRW 0x0000 /* CD-R/RW Drive */
@@ -1019,6 +1021,9 @@
/* PLX products */
#define USB_PRODUCT_PLX_TESTBOARD 0x9060 /* test board */
+/* PNY products */
+#define USB_PRODUCT_PNY_ATTACHE 0x1300 /* USB 2.0 Flash Drive */
+
/* Primax products */
#define USB_PRODUCT_PRIMAX_G2X300 0x0300 /* G2-200 scanner */
#define USB_PRODUCT_PRIMAX_G2E300 0x0301 /* G2E-300 scanner */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 91878e6..94c7a8d 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -4,7 +4,7 @@
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * FreeBSD: src/sys/dev/usb/usbdevs,v 1.146 2003/12/17 14:23:07 sanpei Exp
+ * FreeBSD: src/sys/dev/usb/usbdevs,v 1.147 2003/12/18 05:47:10 sanpei Exp
*/
/*
@@ -2026,6 +2026,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"Dimage X",
},
{
+ USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_5400,
+ 0,
+ "Minolta",
+ "Dimage 5400",
+ },
+ {
USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW,
0,
"Mitsumi",
@@ -2350,6 +2356,12 @@ const struct usb_knowndev usb_knowndevs[] = {
"test board",
},
{
+ USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE,
+ 0,
+ "PNY",
+ "USB 2.0 Flash Drive",
+ },
+ {
USB_VENDOR_PRIMAX, USB_PRODUCT_PRIMAX_G2X300,
0,
"Primax Electronics",
@@ -4834,6 +4846,12 @@ const struct usb_knowndev usb_knowndevs[] = {
NULL,
},
{
+ USB_VENDOR_PNY, 0,
+ USB_KNOWNDEV_NOPROD,
+ "PNY",
+ NULL,
+ },
+ {
USB_VENDOR_HAWKING, 0,
USB_KNOWNDEV_NOPROD,
"Hawking Technologies",
OpenPOWER on IntegriCloud