regen

2 files changed, 61 insertions, 17 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 2b4f9199934..ab74e6cb0d0 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.141 2005/03/08 09:53:45 dlg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.142 2005/03/08 12:12:33 dlg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.137 2005/03/08 09:53:21 dlg Exp 
+ *	OpenBSD: usbdevs,v 1.138 2005/03/08 12:12:08 dlg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -165,6 +165,7 @@
 #define	USB_VENDOR_VISION	0x0553		/* VLSI Vision */
 #define	USB_VENDOR_ASAHIKASEI	0x0556		/* Asahi Kasei Microsystems */
 #define	USB_VENDOR_ATEN	0x0557		/* ATEN International */
+#define	USB_VENDOR_SAMSUNG	0x055d		/* Samsung */
 #define	USB_VENDOR_MUSTEK	0x055f		/* Mustek Systems */
 #define	USB_VENDOR_TELEX	0x0562		/* Telex Communications */
 #define	USB_VENDOR_PERACOM	0x0565		/* Peracom Networks */
@@ -468,6 +469,7 @@
 
 /* Accton products */
 #define	USB_PRODUCT_ACCTON_USB320_EC	0x1046		/* USB320-EC Ethernet */
+#define	USB_PRODUCT_ACCTON_2664W	0x3501		/* 2664W */
 #define	USB_PRODUCT_ACCTON_111	0x3503		/* T-Sinus 111 WLAN */
 #define	USB_PRODUCT_ACCTON_SS1001	0x5046		/* SpeedStream Ethernet */
 
@@ -607,11 +609,13 @@
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
 #define	USB_PRODUCT_ATMEL_WN210	0x3301		/* W-Buddie WN210 */
 #define	USB_PRODUCT_ATMEL_DWL900AP	0x5601		/* DWL-900AP Wireless access point */
-#define	USB_PRODUCT_ATMEL_AT76C503	0x7603		/* AT76C503 */
-#define	USB_PRODUCT_ATMEL_AT76C503RFMD	0x7605		/* AT76C503 RFMD */
-#define	USB_PRODUCT_ATMEL_AT76C505RFMD2958	0x7613		/* AT76C503 RFMD 2958 */
-#define	USB_PRODUCT_ATMEL_AT76C505A	0x7614		/* AT76C505A RFMD 2958 */
-#define	USB_PRODUCT_ATMEL_AT76C505AS	0x7617		/* AT76C505AS RFMD 2958 */
+#define	USB_PRODUCT_ATMEL_AT76C503I1	0x7603		/* AT76C503 (Intersil 3861 Radio) */
+#define	USB_PRODUCT_ATMEL_AT76C503I2	0x7604		/* AT76C503 (Intersil 3863 Radio) */
+#define	USB_PRODUCT_ATMEL_AT76C503RFMD	0x7605		/* AT76C503 (RFMD Radio) */
+#define	USB_PRODUCT_ATMEL_AT76C505RFMD	0x7606		/* AT76C505 (RFMD Radio) */
+#define	USB_PRODUCT_ATMEL_AT76C505RFMD2958	0x7613		/* AT76C505 (RFMD 2958 Radio) */
+#define	USB_PRODUCT_ATMEL_AT76C505A	0x7614		/* AT76C505A (RFMD 2958 Radio) */
+#define	USB_PRODUCT_ATMEL_AT76C505AS	0x7617		/* AT76C505AS (RFMD 2958 Radio) */
 
 /* Audio-Technica products */
 #define	USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB	0x0009		/* ATC-HA4USB USB headphone */
@@ -767,7 +771,7 @@
 #define	USB_PRODUCT_DICKSMITH_WL200U	0x0002		/* WL-200U */
 #define	USB_PRODUCT_DICKSMITH_CHUSB611G	0x0013		/* CHUSB 611G */
 #define	USB_PRODUCT_DICKSMITH_WL240U	0x0014		/* WL-240U */
-#define	USB_PRODUCT_DICKSMITH_XH1153	0x5743		/* HX1153 802.11b */
+#define	USB_PRODUCT_DICKSMITH_XH1153	0x5743		/* XH1153 802.11b */
 
 /* Digi International products */
 #define	USB_PRODUCT_DIGI_ACCELEPORT2	0x0002		/* AccelePort 2 */
@@ -1547,6 +1551,9 @@
 /* Sanyo Electric products */
 #define	USB_PRODUCT_SANYO_SCP4900	0x0701		/* Sanyo SCP-4900 Phone */
 
+/* Samsung products */
+#define	USB_PRODUCT_SAMSUNG_SWL2100W	0xa000		/* SWL-2100U */
+
 /* ScanLogic products */
 #define	USB_PRODUCT_SCANLOGIC_SL11R	0x0002		/* SL11R-IDE */
 #define	USB_PRODUCT_SCANLOGIC_336CX	0x0300		/* Phantom 336CX - C3 */
@@ -1621,6 +1628,7 @@
 #define	USB_PRODUCT_SMC_2206USB	0x0201		/* EZ Connect Ethernet */
 #define	USB_PRODUCT_SMC2_2020HUB	0x2020		/* Hub */
 #define	USB_PRODUCT_SMC3_2662WV1	0xa001		/* EZ Connect 11Mbps */
+#define	USB_PRODUCT_SMC3_2662WV2	0xa002		/* EZ Connect 11Mbps v2 */
 
 /* SOHOware products */
 #define	USB_PRODUCT_SOHOWARE_NUB100	0x9100		/* NUB100 Ethernet */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 72b82871bc3..c45ce04917e 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.141 2005/03/08 09:53:45 dlg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.142 2005/03/08 12:12:33 dlg Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.137 2005/03/08 09:53:21 dlg Exp 
+ *	OpenBSD: usbdevs,v 1.138 2005/03/08 12:12:08 dlg Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -203,6 +203,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB320-EC Ethernet",
 	},
 	{
+	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_2664W,
+	    0,
+	    "Accton Technology",
+	    "2664W",
+	},
+	{
 	    USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_111,
 	    0,
 	    "Accton Technology",
@@ -647,34 +653,46 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWL-900AP Wireless access point",
 	},
 	{
-	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503,
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I1,
+	    0,
+	    "Atmel",
+	    "AT76C503 (Intersil 3861 Radio)",
+	},
+	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I2,
 	    0,
 	    "Atmel",
-	    "AT76C503",
+	    "AT76C503 (Intersil 3863 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503RFMD,
 	    0,
 	    "Atmel",
-	    "AT76C503 RFMD",
+	    "AT76C503 (RFMD Radio)",
+	},
+	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD,
+	    0,
+	    "Atmel",
+	    "AT76C505 (RFMD Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505RFMD2958,
 	    0,
 	    "Atmel",
-	    "AT76C503 RFMD 2958",
+	    "AT76C505 (RFMD 2958 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A,
 	    0,
 	    "Atmel",
-	    "AT76C505A RFMD 2958",
+	    "AT76C505A (RFMD 2958 Radio)",
 	},
 	{
 	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505AS,
 	    0,
 	    "Atmel",
-	    "AT76C505AS RFMD 2958",
+	    "AT76C505AS (RFMD 2958 Radio)",
 	},
 	{
 	    USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
@@ -1208,7 +1226,7 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_XH1153,
 	    0,
 	    "Dick Smith Electronics",
-	    "HX1153 802.11b",
+	    "XH1153 802.11b",
 	},
 	{
 	    USB_VENDOR_DIGI, USB_PRODUCT_DIGI_ACCELEPORT2,
@@ -4295,6 +4313,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "Sanyo SCP-4900 Phone",
 	},
 	{
+	    USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_SWL2100W,
+	    0,
+	    "Samsung",
+	    "SWL-2100U",
+	},
+	{
 	    USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R,
 	    0,
 	    "ScanLogic",
@@ -4565,6 +4589,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "EZ Connect 11Mbps",
 	},
 	{
+	    USB_VENDOR_SMC3, USB_PRODUCT_SMC3_2662WV2,
+	    0,
+	    "SMC",
+	    "EZ Connect 11Mbps v2",
+	},
+	{
 	    USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
 	    0,
 	    "SOHOware",
@@ -5801,6 +5831,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_SAMSUNG, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Samsung",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MUSTEK, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Mustek Systems",