sync

2 files changed, 27 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 7baf89973c6..6d6f8140046 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.68 2003/05/18 18:17:04 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.69 2003/05/21 01:17:26 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.65 2003/05/18 18:16:51 nate Exp 
+ *	OpenBSD: usbdevs,v 1.66 2003/05/21 01:17:06 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -358,6 +358,7 @@
 #define	USB_VENDOR_PLX	0x10b5		/* PLX */
 #define	USB_VENDOR_ASANTE	0x10bd		/* Asante */
 #define	USB_VENDOR_JRC	0x1145		/* Japan Radio Company */
+#define	USB_VENDOR_SERVERWORKS	0x1166		/* ServerWorks */
 #define	USB_VENDOR_ACERCM	0x1189		/* Acer Communications & Multimedia */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
 #define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
@@ -1272,6 +1273,9 @@
 #define	USB_PRODUCT_SCANLOGIC_SL11R	0x0002		/* SL11R-IDE */
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 scanner */
 
+/* Serverworks */
+#define	USB_PRODUCT_SERVERWORKS_HUB	0x0000		/* Root Hub */
+
 /* SGI products */
 #define	USB_PRODUCT_SGI_SN1_L1_SC	0x1234		/* SN1 L1 System Controller */
 
@@ -1290,6 +1294,7 @@
 #define	USB_PRODUCT_SHUTTLE_EUSCSI_B	0x000b		/* eUSCSI Bridge */
 #define	USB_PRODUCT_SHUTTLE_EUSCSI_C	0x000c		/* eUSCSI Bridge */
 #define	USB_PRODUCT_SHUTTLE_CDRW	0x0101		/* CD-RW Device */
+#define	USB_PRODUCT_SHUTTLE_SCM	0x1010		/* SCM Micro */
 
 /* Siemens products */
 #define	USB_PRODUCT_SIEMENS_SPEEDSTREAM	0x1001		/* SpeedStream USB */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index abc6d68c371..00ef7ac8ddf 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.68 2003/05/18 18:17:04 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.69 2003/05/21 01:17:27 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.65 2003/05/18 18:16:51 nate Exp 
+ *	OpenBSD: usbdevs,v 1.66 2003/05/21 01:17:06 nate Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -3401,6 +3401,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Phantom 336CX - C3 scanner",
 	},
 	{
+	    USB_VENDOR_SERVERWORKS, USB_PRODUCT_SERVERWORKS_HUB,
+	    0,
+	    "ServerWorks",
+	    "Root Hub",
+	},
+	{
 	    USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC,
 	    0,
 	    "Silicon Graphics",
@@ -3479,6 +3485,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "CD-RW Device",
 	},
 	{
+	    USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SCM,
+	    0,
+	    "Shuttle Technology",
+	    "SCM Micro",
+	},
+	{
 	    USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM,
 	    0,
 	    "Siemens",
@@ -5795,6 +5807,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SERVERWORKS, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "ServerWorks",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_ACERCM, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Acer Communications & Multimedia",