sync

2 files changed, 90 insertions, 4 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 6efc2f4a839..20c6609808e 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.118 2004/10/20 12:57:35 jsg Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.119 2004/10/22 13:04:42 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.114 2004/10/20 12:56:39 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.115 2004/10/22 13:04:32 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -380,6 +380,7 @@
 #define	USB_VENDOR_ACERCM	0x1189		/* Acer Communications & Multimedia */
 #define	USB_VENDOR_TSUNAMI	0x1241		/* Tsunami */
 #define	USB_VENDOR_BELKIN2	0x1293		/* Belkin Components */
+#define	USB_VENDOR_AINCOMM	0x12fd		/* Aincomm */
 #define	USB_VENDOR_MOBILITY	0x1342		/* Mobility */
 #define	USB_VENDOR_SHARK	0x13d2		/* Shark */
 #define	USB_VENDOR_SILICOM	0x1485		/* Silicom */
@@ -389,6 +390,7 @@
 #define	USB_VENDOR_INSIDEOUT	0x1608		/* Inside Out Networks */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
+#define	USB_VENDOR_LINKSYS3	0x1915		/* Linksys */
 #define	USB_VENDOR_DLINK	0x2001		/* D-Link */
 #define	USB_VENDOR_TRIPPLITE	0x2478		/* Tripp-Lite */
 #define	USB_VENDOR_NHJ	0x2770		/* NHJ */
@@ -451,6 +453,8 @@
 #define	USB_PRODUCT_ACERP_ACERSCAN_640U	0x2040		/* Acerscan 640U */
 #define	USB_PRODUCT_ACERP_ACERSCAN_620U	0x2060		/* Acerscan 620U */
 #define	USB_PRODUCT_ACERP_ATAPI	0x6003		/* ATA/ATAPI */
+#define	USB_PRODUCT_ACERP_AWL300	0x9000		/* AWL300 */
+#define	USB_PRODUCT_ACERP_AWL400	0x9001		/* AWL400 */
 
 /* Actiontec products */
 #define	USB_PRODUCT_ACTIONTEC_PRISM_25	0x0408		/* Prism2.5 WLAN */
@@ -494,6 +498,9 @@
 #define	USB_PRODUCT_AGFA_SNAPSCANE26	0x2097		/* SnapScan e26 */
 #define	USB_PRODUCT_AGFA_SNAPSCANE52	0x20fd		/* SnapScan e52 */
 
+/* Aincomm products */
+#define	USB_PRODUCT_AINCOMM_AWU2000B	0x1001		/* AWU2000B */
+
 /* AKS products */
 #define	USB_PRODUCT_AKS_USBHASP	0x0001		/* USB-HASP 0.06 */
 
@@ -545,6 +552,10 @@
 #define	USB_PRODUCT_ATMEL_UHB124	0x3301		/* UHB124 hub */
 #define	USB_PRODUCT_ATMEL_DWL900AP	0x5601		/* DWL-900AP Wireless access point */
 #define	USB_PRODUCT_ATMEL_DWL120	0x7602		/* DWL-120 Wireless */
+#define	USB_PRODUCT_ATMEL_BW002	0x7605		/* BW002 */
+#define	USB_PRODUCT_ATMEL_WL1130	0x7613		/* WL-1130 */
+#define	USB_PRODUCT_ATMEL_AT76C505A	0x7614		/* AT76C505A */
+#define	USB_PRODUCT_ATMEL_DWL_120	0x7603		/* DWL-120 */
 
 /* Audio-Technica products */
 #define	USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB	0x0009		/* ATC-HA4USB USB headphone */
@@ -1032,6 +1043,7 @@
 
 /* Lexar products */
 #define	USB_PRODUCT_LEXAR_JUMPSHOT	0x0001		/* jumpSHOT CompactFlash */
+#define	USB_PRODUCT_LEXAR_2662WAR	0xa002		/* 2662W-AR */
 
 /* Lexmark products */
 #define	USB_PRODUCT_LEXMARK_S2450	0x0009		/* Optra S 2450 */
@@ -1048,6 +1060,8 @@
 #define	USB_PRODUCT_LINKSYS_WUSB12_11	0x2213		/* WUSB12 802.11b v1.1 */
 #define	USB_PRODUCT_LINKSYS2_USB200M	0x2226		/* USB 2.0 10/100 ethernet controller */
 #define	USB_PRODUCT_LINKSYS_USB10TX2	0x400b		/* USB10TX */
+#define	USB_PRODUCT_LINKSYS2_WUSB11	0x2219		/* WUSB11 */
+#define	USB_PRODUCT_LINKSYS3_WUSB11V28	0x2233		/* WUSB11-V28 */
 
 /* Logitech products */
 #define	USB_PRODUCT_LOGITECH_M2452	0x0203		/* M2452 keyboard */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 8f2bb6dc4d3..5641af51bbe 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.118 2004/10/20 12:57:35 jsg Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.119 2004/10/22 13:04:42 deraadt Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.114 2004/10/20 12:56:39 jsg Exp 
+ *	OpenBSD: usbdevs,v 1.115 2004/10/22 13:04:32 deraadt Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -233,6 +233,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "ATA/ATAPI",
 	},
 	{
+	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL300,
+	    0,
+	    "Acer Peripherals",
+	    "AWL300",
+	},
+	{
+	    USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL400,
+	    0,
+	    "Acer Peripherals",
+	    "AWL400",
+	},
+	{
 	    USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_PRISM_25,
 	    0,
 	    "Actiontec Electronics",
@@ -377,6 +389,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "SnapScan e52",
 	},
 	{
+	    USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B,
+	    0,
+	    "Aincomm",
+	    "AWU2000B",
+	},
+	{
 	    USB_VENDOR_AKS, USB_PRODUCT_AKS_USBHASP,
 	    0,
 	    "Aladdin Knowledge Systems",
@@ -527,6 +545,30 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "DWL-120 Wireless",
 	},
 	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_BW002,
+	    0,
+	    "Atmel",
+	    "BW002",
+	},
+	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WL1130,
+	    0,
+	    "Atmel",
+	    "WL-1130",
+	},
+	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A,
+	    0,
+	    "Atmel",
+	    "AT76C505A",
+	},
+	{
+	    USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_DWL_120,
+	    0,
+	    "Atmel",
+	    "DWL-120",
+	},
+	{
 	    USB_VENDOR_AUDIOTECHNICA, USB_PRODUCT_AUDIOTECHNICA_ATCHA4USB,
 	    0,
 	    "Audio-Technica",
@@ -2399,6 +2441,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "jumpSHOT CompactFlash",
 	},
 	{
+	    USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_2662WAR,
+	    0,
+	    "Lexar Media",
+	    "2662W-AR",
+	},
+	{
 	    USB_VENDOR_LEXMARK, USB_PRODUCT_LEXMARK_S2450,
 	    0,
 	    "Lexmark International",
@@ -2471,6 +2519,18 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    "USB10TX",
 	},
 	{
+	    USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_WUSB11,
+	    0,
+	    "Linksys",
+	    "WUSB11",
+	},
+	{
+	    USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11V28,
+	    0,
+	    "Linksys",
+	    "WUSB11-V28",
+	},
+	{
 	    USB_VENDOR_LOGITECH, USB_PRODUCT_LOGITECH_M2452,
 	    0,
 	    "Logitech",
@@ -6521,6 +6581,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_AINCOMM, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Aincomm",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_MOBILITY, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "Mobility",
@@ -6575,6 +6641,12 @@ const struct usb_knowndev usb_knowndevs[] = {
 	    NULL,
 	},
 	{
+	    USB_VENDOR_LINKSYS3, 0,
+	    USB_KNOWNDEV_NOPROD,
+	    "Linksys",
+	    NULL,
+	},
+	{
 	    USB_VENDOR_DLINK, 0,
 	    USB_KNOWNDEV_NOPROD,
 	    "D-Link",