sync

2 files changed, 60 insertions, 16 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 0380d11e811..2701c154c5a 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.94 2004/07/11 06:21:11 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.95 2004/07/11 07:18:15 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.91 2004/07/11 06:21:06 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.92 2004/07/11 07:17:58 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -314,6 +314,7 @@
 #define	USB_VENDOR_CONCORDCAMERA	0x0919		/* Concord Camera */
 #define	USB_VENDOR_GOHUBS	0x0921		/* GoHubs */
 #define	USB_VENDOR_BIOMETRIC	0x0929		/* American Biometric Company */
+#define	USB_VENDOR_INTREPIDCS	0x093c		/* Intrepid */
 #define	USB_VENDOR_YANO	0x094f		/* Yano */
 #define	USB_VENDOR_KINGSTON	0x0951		/* Kingston Technology */
 #define	USB_VENDOR_BLUEWATER	0x0956		/* BlueWater Systems */
@@ -344,6 +345,7 @@
 #define	USB_VENDOR_GEOCAST	0x0a79		/* Geocast Network Systems */
 #define	USB_VENDOR_NEODIO	0x0aec		/* Neodio */
 #define	USB_VENDOR_TODOS	0x0b0c		/* Todos Data System */
+#define	USB_VENDOR_SIIG2	0x0b39		/* SIIG */
 #define	USB_VENDOR_NEC2	0x0b62		/* NEC */
 #define	USB_VENDOR_ATI2	0x0b6f		/* ATI */
 #define	USB_VENDOR_KURUSUGAWA	0x0b7e		/* Kurusugawa Electronics, Inc. */
@@ -731,12 +733,13 @@
 #define	USB_PRODUCT_FTDI_SERIAL_8U232AM	0x6001		/* 8U232AM Serial converter */
 #define	USB_PRODUCT_FTDI_PS2KBDMS	0x8371		/* PS/2 Keyboard/Mouse */
 #define	USB_PRODUCT_FTDI_SERIAL_8U100AX	0x8372		/* Serial converter */
-#define	USB_PRODUCT_FTDI_LCD_MX200_USB	0xfa01		/* Matrix Orbital MX200 Series LCD */
-#define	USB_PRODUCT_FTDI_LCD_LK202_24_USB	0xfa03		/* Matrix Orbital LK202-24 LCD */
-#define	USB_PRODUCT_FTDI_LCD_CFA631_USB	0xfc0c		/* Crystalfontz CFA-631 LCD */
-#define	USB_PRODUCT_FTDI_LCD_CFA632_USB	0xfc08		/* Crystalfontz CFA-632 LCD */
-#define	USB_PRODUCT_FTDI_LCD_CFA633_USB	0xfc0b		/* Crystalfontz CFA-633 LCD */
-#define	USB_PRODUCT_FTDI_LCD_CFA634_USB	0xfc09		/* Crystalfontz CFA-634 LCD */
+#define	USB_PRODUCT_FTDI_LCD_MX200	0xfa01		/* Matrix Orbital MX200 Series LCD */
+#define	USB_PRODUCT_FTDI_LCD_LK202_24	0xfa03		/* Matrix Orbital LK202-24 LCD */
+#define	USB_PRODUCT_FTDI_LCD_CFA_631	0xfc0c		/* Crystalfontz CFA-631 LCD */
+#define	USB_PRODUCT_FTDI_LCD_CFA_632	0xfc08		/* Crystalfontz CFA-632 LCD */
+#define	USB_PRODUCT_FTDI_LCD_CFA_633	0xfc0b		/* Crystalfontz CFA-633 LCD */
+#define	USB_PRODUCT_FTDI_LCD_CFA_634	0xfc09		/* Crystalfontz CFA-634 LCD */
+#define	USB_PRODUCT_FTDI_SEMC_DSS20	0xfc82		/* SEMC DSS-20 SyncStation */
 
 /* Fuji photo products */
 #define	USB_PRODUCT_FUJIPHOTO_MASS0100	0x0100		/* Mass Storage */
@@ -869,6 +872,10 @@
 /* Intersil products */
 #define	USB_PRODUCT_INTERSIL_PRISM_2X	0x3642		/* Prism2.x WLAN */
 
+/* Interpid Control Systems products */
+#define	USB_PRODUCT_INTREPIDCS_VALUECAN	0x0601		/* ValueCAN CAN */
+#define	USB_PRODUCT_INTREPIDCS_NEOVI	0x0701		/* NeoVI Blue */
+
 /* I/O DATA products */
 #define	USB_PRODUCT_IODATA_USBSSMRW	0x0314		/* USB-SSMRW SD-card */
 #define	USB_PRODUCT_IODATA_USBSDRW	0x031e		/* USB-SDRW SD-card */
@@ -1365,6 +1372,7 @@
 /* SIIG products */
 #define	USB_PRODUCT_SIIG_DIGIFILMREADER	0x0004		/* DigiFilm-Combo */
 #define	USB_PRODUCT_SIIG_MULTICARDREADER	0x0201		/* MULTICARDREADER */
+#define	USB_PRODUCT_SIIG2_US2308	0x0421		/* Serial */
 
 /* Silicon Portals Inc. */
 #define	USB_PRODUCT_SILICONPORTALS_YAPPH_NF	0x0200		/* YAP Phone (no firmware) */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 5308e9bce20..e7b9b94482e 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.94 2004/07/11 06:21:11 deraadt Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.95 2004/07/11 07:18:15 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.91 2004/07/11 06:21:06 deraadt Exp 
+ *	OpenBSD: usbdevs,v 1.92 2004/07/11 07:17:58 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -1253,42 +1253,48 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Serial converter",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200_USB,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_MX200,
 	    0,
 	    "Future Technology Devices",
 	    "Matrix Orbital MX200 Series LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24_USB,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_LK202_24,
 	    0,
 	    "Future Technology Devices",
 	    "Matrix Orbital LK202-24 LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA631_USB,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_631,
 	    0,
 	    "Future Technology Devices",
 	    "Crystalfontz CFA-631 LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA632_USB,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_632,
 	    0,
 	    "Future Technology Devices",
 	    "Crystalfontz CFA-632 LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA633_USB,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_633,
 	    0,
 	    "Future Technology Devices",
 	    "Crystalfontz CFA-633 LCD",
 	},
 	{
-	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA634_USB,
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LCD_CFA_634,
 	    0,
 	    "Future Technology Devices",
 	    "Crystalfontz CFA-634 LCD",
 	},
 	{
+	    USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20,
+	    0,
+	    "Future Technology Devices",
+	    "SEMC DSS-20 SyncStation",
+	},
+	{
 	    USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100,
 	    0,
 	    "Fuji Photo Film",
@@ -1823,6 +1829,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Prism2.x WLAN",
 	},
 	{
+	    USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN,
+	    0,
+	    "Intrepid",
+	    "ValueCAN CAN",
+	},
+	{
+	    USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI,
+	    0,
+	    "Intrepid",
+	    "NeoVI Blue",
+	},
+	{
 	    USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBSSMRW,
 	    0,
 	    "I/O Data",
@@ -3767,6 +3785,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "MULTICARDREADER",
 	},
 	{
+	    USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308,
+	    0,
+	    "SIIG",
+	    "Serial",
+	},
+	{
 	    USB_VENDOR_SILICONPORTALS, USB_PRODUCT_SILICONPORTALS_YAPPH_NF,
 	    0,
 	    "Silicon Portals",
@@ -5837,6 +5861,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_INTREPIDCS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Intrepid",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_YANO, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Yano",
@@ -6017,6 +6047,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SIIG2, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "SIIG",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_NEC2, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "NEC",