sync

2 files changed, 38 insertions, 6 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 5fc581004ad..a6294ce36e0 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs.h,v 1.56 2002/07/25 02:22:41 nate Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.57 2002/07/29 03:10:55 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.53 2002/07/25 02:18:11 nate Exp 
+ *	OpenBSD: usbdevs,v 1.54 2002/07/29 03:10:15 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.257 2002/06/20 09:20:36 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.261 2002/07/16 09:19:29 abs Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -213,6 +213,7 @@
 #define	USB_VENDOR_APEX	0x0624		/* Apex */
 #define	USB_VENDOR_AVISION	0x0638		/* Avision */
 #define	USB_VENDOR_TEAC	0x0644		/* TEAC */
+#define	USB_VENDOR_SGI	0x065e		/* Silicon Graphics */
 #define	USB_VENDOR_SANWASUPPLY	0x0663		/* Sanwa Supply */
 #define	USB_VENDOR_LINKSYS	0x066b		/* Linksys */
 #define	USB_VENDOR_ACERSA	0x066e		/* Acer Semiconductor America */
@@ -248,6 +249,7 @@
 #define	USB_VENDOR_MIDIMAN	0x0763		/* Midiman */
 #define	USB_VENDOR_GRIFFIN	0x077d		/* Griffin Technology */
 #define	USB_VENDOR_SANDISK	0x0781		/* SanDisk */
+#define	USB_VENDOR_JENOPTIK	0x0784		/* Jenoptik */
 #define	USB_VENDOR_BRIMAX	0x078e		/* Brimax */
 #define	USB_VENDOR_AXIS	0x0792		/* Axis Communications */
 #define	USB_VENDOR_ABL	0x0794		/* ABL Electronics */
@@ -793,6 +795,9 @@
 /* Jaton products */
 #define	USB_PRODUCT_JATON_EDA	0x5704		/* Ethernet Device Adapter */
 
+/* Jenoptik products */
+#define	USB_PRODUCT_JENOPTIK_JD350	0x5300		/* JD 350 Camera/mp3 player */
+
 /* Kawasaki LSI products */
 #define	USB_PRODUCT_KLSI_DUH3E10BT	0x0008		/* 10BT Ethernet */
 #define	USB_PRODUCT_KLSI_DUH3E10BTN	0x0009		/* 10BT Ethernet */
@@ -1152,6 +1157,9 @@
 #define	USB_PRODUCT_SCANLOGIC_SL11R	0x0002		/* SL11R-IDE */
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 scanner */
 
+/* SGI products */
+#define	USB_PRODUCT_SGI_SN1_L1_SC	0x1234		/* SN1 L1 System Controller */
+
 /* Shark products */
 #define	USB_PRODUCT_SHARK_PA	0x0400		/* Pocket Adapter */
 
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 30c9dd8c77e..d26a9b4517d 100644
--- a/sys/dev/usb/usbdevs_data.h
+++ b/sys/dev/usb/usbdevs_data.h
@@ -1,12 +1,12 @@
-/*	$OpenBSD: usbdevs_data.h,v 1.56 2002/07/25 02:22:41 nate Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.57 2002/07/29 03:10:55 nate Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.53 2002/07/25 02:18:11 nate Exp 
+ *	OpenBSD: usbdevs,v 1.54 2002/07/29 03:10:15 nate Exp 
  */
-/* $NetBSD: usbdevs,v 1.257 2002/06/20 09:20:36 augustss Exp $ */
+/* $NetBSD: usbdevs,v 1.261 2002/07/16 09:19:29 abs Exp $ */
 
 /*
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -1619,6 +1619,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Ethernet Device Adapter",
 	},
 	{
+	    USB_VENDOR_JENOPTIK, USB_PRODUCT_JENOPTIK_JD350,
+	    0,
+	    "Jenoptik",
+	    "JD 350 Camera/mp3 player",
+	},
+	{
 	    USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT,
 	    0,
 	    "Kawasaki LSI",
@@ -3017,6 +3023,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Phantom 336CX - C3 scanner",
 	},
 	{
+	    USB_VENDOR_SGI, USB_PRODUCT_SGI_SN1_L1_SC,
+	    0,
+	    "Silicon Graphics",
+	    "SN1 L1 System Controller",
+	},
+	{
 	    USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA,
 	    0,
 	    "Shark",
@@ -4475,6 +4487,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SGI, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Silicon Graphics",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_SANWASUPPLY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Sanwa Supply",
@@ -4685,6 +4703,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_JENOPTIK, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Jenoptik",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_BRIMAX, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Brimax",