summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/dev/usb/usbdevs.h9
-rw-r--r--sys/dev/usb/usbdevs_data.h20
2 files changed, 25 insertions, 4 deletions
diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 1c013c6a903..b32465bd7ff 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs.h,v 1.300 2007/09/02 04:14:19 jsg Exp $ */
+/* $OpenBSD: usbdevs.h,v 1.301 2007/09/06 20:42:35 fkr Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.291 2007/09/02 04:13:33 jsg Exp
+ * OpenBSD: usbdevs,v 1.292 2007/09/06 20:41:19 fkr Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -481,6 +481,7 @@
#define USB_VENDOR_OQO 0x1557 /* OQO */
#define USB_VENDOR_UMEDIA 0x157e /* U-MEDIA Communications */
#define USB_VENDOR_FIBERLINE 0x1582 /* Fiberline */
+#define USB_VENDOR_OLIMEX 0x15ba /* Olimex */
#define USB_VENDOR_SOHOWARE 0x15e8 /* SOHOware */
#define USB_VENDOR_UMAX 0x1606 /* UMAX Data Systems */
#define USB_VENDOR_INSIDEOUT 0x1608 /* Inside Out Networks */
@@ -1140,6 +1141,7 @@
/* Future Technology Devices products */
#define USB_PRODUCT_FTDI_SERIAL_8U232AM 0x6001 /* 8U232AM Serial */
#define USB_PRODUCT_FTDI_SERIAL_2232C 0x6010 /* 2232C Serial */
+#define USB_PRODUCT_FTDI_SERIAL_2232L 0xcff8 /* 2232L Serial */
#define USB_PRODUCT_FTDI_PS2KBDMS 0x8371 /* PS/2 Keyboard/Mouse */
#define USB_PRODUCT_FTDI_SERIAL_8U100AX 0x8372 /* Serial */
#define USB_PRODUCT_FTDI_MJS_SIRIUS_PC 0xca81 /* MJS Sirius To PC Interface */
@@ -1173,6 +1175,7 @@
#define USB_PRODUCT_GMATE_YP3X00 0x1001 /* YP3X00 PDA */
/* Garmin International products */
+#define USB_PRODUCT_GARMIN_GPSMAP60CSX 0x0003 /* GPSmap 60Csx */
#define USB_PRODUCT_GARMIN_IQUE3600 0x0004 /* Ique 3600 */
/* Genesys Logic products */
@@ -1758,6 +1761,8 @@
#define USB_PRODUCT_NOVATEL_ES620 0x2100 /* ES620 CDMA */
#define USB_PRODUCT_NOVATEL_U720 0x2110 /* U720 */
+#define USB_PRODUCT_OLIMEX_OPENOCD_JTAG 0x0003 /* OpenOCD JTAG */
+
/* Olympus products */
#define USB_PRODUCT_OLYMPUS_C1 0x0102 /* C-1 */
#define USB_PRODUCT_OLYMPUS_C700 0x0105 /* C-700 Ultra Zoom */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index f3d7a537a6a..8fdd723889e 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,10 +1,10 @@
-/* $OpenBSD: usbdevs_data.h,v 1.297 2007/09/02 04:14:19 jsg Exp $ */
+/* $OpenBSD: usbdevs_data.h,v 1.298 2007/09/06 20:42:35 fkr Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * OpenBSD: usbdevs,v 1.291 2007/09/02 04:13:33 jsg Exp
+ * OpenBSD: usbdevs,v 1.292 2007/09/06 20:41:19 fkr Exp
*/
/* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
@@ -1585,6 +1585,10 @@ const struct usb_known_product usb_known_products[] = {
"2232C Serial",
},
{
+ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232L,
+ "2232L Serial",
+ },
+ {
USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PS2KBDMS,
"PS/2 Keyboard/Mouse",
},
@@ -1685,6 +1689,10 @@ const struct usb_known_product usb_known_products[] = {
"YP3X00 PDA",
},
{
+ USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_GPSMAP60CSX,
+ "GPSmap 60Csx",
+ },
+ {
USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE3600,
"Ique 3600",
},
@@ -3277,6 +3285,10 @@ const struct usb_known_product usb_known_products[] = {
"U720",
},
{
+ USB_VENDOR_OLIMEX, USB_PRODUCT_OLIMEX_OPENOCD_JTAG,
+ "OpenOCD JTAG",
+ },
+ {
USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1,
"C-1",
},
@@ -6637,6 +6649,10 @@ const struct usb_known_vendor usb_known_vendors[] = {
"Fiberline",
},
{
+ USB_VENDOR_OLIMEX,
+ "Olimex",
+ },
+ {
USB_VENDOR_SOHOWARE,
"SOHOware",
},