sync (uath)

2 files changed, 121 insertions, 19 deletions

diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
index 271bb3d8727..626b75aeb67 100644
--- a/sys/dev/usb/usbdevs.h
+++ b/sys/dev/usb/usbdevs.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: usbdevs.h,v 1.226 2006/09/16 14:24:19 damien Exp $	*/
+/*	$OpenBSD: usbdevs.h,v 1.227 2006/09/16 19:55:07 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.220 2006/09/16 14:23:41 damien Exp 
+ *	OpenBSD: usbdevs,v 1.221 2006/09/16 19:54:13 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -391,7 +391,7 @@
 #define	USB_VENDOR_EASYDISK	0x0c76		/* EasyDisk */
 #define	USB_VENDOR_KYOCERA2	0x0c88		/* Kyocera */
 #define	USB_VENDOR_ZCOM	0x0cde		/* Z-Com */
-#define	USB_VENDOR_ATHEROS	0x0cf3		/* Atheros Communications */
+#define	USB_VENDOR_ATHEROS2	0x0cf3		/* Atheros Communications */
 #define	USB_VENDOR_TANGTOP	0x0d3d		/* Tangtop */
 #define	USB_VENDOR_SMC3	0x0d5c		/* SMC */
 #define	USB_VENDOR_PEN	0x0d7d		/* Pen Drive */
@@ -464,7 +464,9 @@
 #define	USB_VENDOR_GOODWAY	0x1631		/* Good Way Technology */
 #define	USB_VENDOR_ENTREGA	0x1645		/* Entrega */
 #define	USB_VENDOR_ACTIONTEC	0x1668		/* Actiontec Electronics */
+#define	USB_VENDOR_ATHEROS	0x168c		/* Atheros Communications */
 #define	USB_VENDOR_GIGASET	0x1690		/* Gigaset */
+#define	USB_VENDOR_GLOBALSUN	0x16ab		/* Global Sun Technology */
 #define	USB_VENDOR_JABLOTRON	0x16d6		/* Jablotron */
 #define	USB_VENDOR_CMOTECH	0x16d8		/* CMOTECH CDMA Technologies */
 #define	USB_VENDOR_METAGEEK	0x1781		/* MetaGeek */
@@ -707,12 +709,14 @@
 #define	USB_PRODUCT_ATEN_DSB650C	0x4000		/* DSB-650C */
 
 /* Atheros Communications products */
-#define	USB_PRODUCT_ATHEROS_AR5523_1_NF	0x0001		/* AR5523 */
-#define	USB_PRODUCT_ATHEROS_AR5523_1	0x0002		/* AR5523 */
-#define	USB_PRODUCT_ATHEROS_AR5523_2_NF	0x0003		/* AR5523 */
-#define	USB_PRODUCT_ATHEROS_AR5523_2	0x0004		/* AR5523 */
-#define	USB_PRODUCT_ATHEROS_AR5523_3_NF	0x0005		/* AR5523 */
-#define	USB_PRODUCT_ATHEROS_AR5523_3	0x0006		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS_AR5523	0x0001		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS_AR5523_NF	0x0002		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS2_AR5523_1	0x0001		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS2_AR5523_1_NF	0x0002		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS2_AR5523_2	0x0003		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS2_AR5523_2_NF	0x0004		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS2_AR5523_3	0x0005		/* AR5523 */
+#define	USB_PRODUCT_ATHEROS2_AR5523_3_NF	0x0006		/* AR5523 */
 
 /* ATI products */
 #define	USB_PRODUCT_ATI2_205	0xa001		/* USB Cable 205 */
@@ -840,7 +844,7 @@
 #define	USB_PRODUCT_COMPAQ_W200	0x0076		/* WLAN MultiPort W200 */
 #define	USB_PRODUCT_COMPAQ_PJB100	0x504a		/* Personal Jukebox PJB100 */
 
-/* Conceptronic products */
+/* Billionton products */
 #define	USB_PRODUCT_BILLIONTON_SNAPPORT	0x90ff		/* SnapPort Ethernet */
 
 /* CMOTECH CDMA Technologies products */
@@ -849,6 +853,10 @@
 /* Conceptronic products */
 #define	USB_PRODUCT_CONCEPTRONIC_C11U	0x7100		/* C11U */
 #define	USB_PRODUCT_CONCEPTRONIC_WL210	0x7110		/* WL-210 */
+#define	USB_PRODUCT_CONCEPTRONIC_AR5523_1	0x7801		/* AR5523 */
+#define	USB_PRODUCT_CONCEPTRONIC_AR5523_1_NF	0x7802		/* AR5523 */
+#define	USB_PRODUCT_CONCEPTRONIC_AR5523_2	0x7811		/* AR5523 */
+#define	USB_PRODUCT_CONCEPTRONIC_AR5523_2_NF	0x7812		/* AR5523 */
 #define	USB_PRODUCT_CONCEPTRONIC2_C54RU	0x3c02		/* C54RU WLAN */
 #define	USB_PRODUCT_CONCEPTRONIC2_C54RU2	0x3c22		/* C54RU */
 
@@ -1091,6 +1099,12 @@
 #define	USB_PRODUCT_GIGASET_WLAN	0x0701		/* WLAN */
 #define	USB_PRODUCT_GIGASET_RT2573	0x0722		/* RT2573 */
 
+/* Global Sun Technology product */
+#define	USB_PRODUCT_GLOBALSUN_AR5523_1	0x7801		/* AR5523 */
+#define	USB_PRODUCT_GLOBALSUN_AR5523_1_NF	0x7802		/* AR5523 */
+#define	USB_PRODUCT_GLOBALSUN_AR5523_2	0x7811		/* AR5523 */
+#define	USB_PRODUCT_GLOBALSUN_AR5523_2_NF	0x7812		/* AR5523 */
+
 /* GoHubs products */
 #define	USB_PRODUCT_GOHUBS_GOCOM232	0x1001		/* GoCOM232 Serial converter */
 
@@ -2072,7 +2086,11 @@
 #define	USB_PRODUCT_TWINMOS_G240	0xa006		/* G240 */
 
 /* U-MEDIA Communications products */
+#define	USB_PRODUCT_UMEDIA_AR5523_1	0x3006		/* AR5523 */
+#define	USB_PRODUCT_UMEDIA_AR5523_1_NF	0x3007		/* AR5523 */
 #define	USB_PRODUCT_UMEDIA_TEW429UB	0x300b		/* TEW-429UB */
+#define	USB_PRODUCT_UMEDIA_AR5523_2	0x3205		/* AR5523 */
+#define	USB_PRODUCT_UMEDIA_AR5523_2_NF	0x3206		/* AR5523 */
 
 /* Ultima products */
 #define	USB_PRODUCT_ULTIMA_1200UBPLUS	0x4002		/* 1200 UB Plus */
@@ -2140,6 +2158,10 @@
 
 /* Wistron NeWeb products */
 #define	USB_PRODUCT_WISTRONNEWEB_UR055G	0x0711		/* UR055G */
+#define	USB_PRODUCT_WISTRONNEWEB_AR5523_1	0x0826		/* AR5523 */
+#define	USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF	0x0827		/* AR5523 */
+#define	USB_PRODUCT_WISTRONNEWEB_AR5523_2	0x0828		/* AR5523 */
+#define	USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF	0x0829		/* AR5523 */
 
 /* Xirlink products */
 #define	USB_PRODUCT_XIRLINK_IMAGING	0x800d		/* Imaging Device */
diff --git a/sys/dev/usb/usbdevs_data.h b/sys/dev/usb/usbdevs_data.h
index 38617ce3a4a..cb0fddbb531 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.224 2006/09/16 14:24:19 damien Exp $	*/
+/*	$OpenBSD: usbdevs_data.h,v 1.225 2006/09/16 19:55:07 damien Exp $	*/
 
 /*
  * THIS FILE IS AUTOMATICALLY GENERATED.  DO NOT EDIT.
  *
  * generated from:
- *	OpenBSD: usbdevs,v 1.220 2006/09/16 14:23:41 damien Exp 
+ *	OpenBSD: usbdevs,v 1.221 2006/09/16 19:54:13 damien Exp 
  */
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
@@ -535,27 +535,35 @@ const struct usb_known_product usb_known_products[] = {
 	    "DSB-650C",
 	},
 	{
-	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_1_NF,
+	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523,
 	    "AR5523",
 	},
 	{
-	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_1,
+	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_NF,
 	    "AR5523",
 	},
 	{
-	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_2_NF,
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_1,
 	    "AR5523",
 	},
 	{
-	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_2,
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_1_NF,
 	    "AR5523",
 	},
 	{
-	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_3_NF,
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_2,
 	    "AR5523",
 	},
 	{
-	    USB_VENDOR_ATHEROS, USB_PRODUCT_ATHEROS_AR5523_3,
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_2_NF,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_3,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR5523_3_NF,
 	    "AR5523",
 	},
 	{
@@ -891,6 +899,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "WL-210",
 	},
 	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_1,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_1_NF,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_2,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_CONCEPTRONIC, USB_PRODUCT_CONCEPTRONIC_AR5523_2_NF,
+	    "AR5523",
+	},
+	{
 	    USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU,
 	    "C54RU WLAN",
 	},
@@ -1515,6 +1539,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "RT2573",
 	},
 	{
+	    USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_1,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_1_NF,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_2,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_GLOBALSUN, USB_PRODUCT_GLOBALSUN_AR5523_2_NF,
+	    "AR5523",
+	},
+	{
 	    USB_VENDOR_GOHUBS, USB_PRODUCT_GOHUBS_GOCOM232,
 	    "GoCOM232 Serial converter",
 	},
@@ -4027,10 +4067,26 @@ const struct usb_known_product usb_known_products[] = {
 	    "G240",
 	},
 	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_AR5523_1,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_AR5523_1_NF,
+	    "AR5523",
+	},
+	{
 	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_TEW429UB,
 	    "TEW-429UB",
 	},
 	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_AR5523_2,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_UMEDIA, USB_PRODUCT_UMEDIA_AR5523_2_NF,
+	    "AR5523",
+	},
+	{
 	    USB_VENDOR_ULTIMA, USB_PRODUCT_ULTIMA_1200UBPLUS,
 	    "1200 UB Plus",
 	},
@@ -4195,6 +4251,22 @@ const struct usb_known_product usb_known_products[] = {
 	    "UR055G",
 	},
 	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2,
+	    "AR5523",
+	},
+	{
+	    USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF,
+	    "AR5523",
+	},
+	{
 	    USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
 	    "Imaging Device",
 	},
@@ -5599,7 +5671,7 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Z-Com",
 	},
 	{
-	    USB_VENDOR_ATHEROS,
+	    USB_VENDOR_ATHEROS2,
 	    "Atheros Communications",
 	},
 	{
@@ -5891,10 +5963,18 @@ const struct usb_known_vendor usb_known_vendors[] = {
 	    "Actiontec Electronics",
 	},
 	{
+	    USB_VENDOR_ATHEROS,
+	    "Atheros Communications",
+	},
+	{
 	    USB_VENDOR_GIGASET,
 	    "Gigaset",
 	},
 	{
+	    USB_VENDOR_GLOBALSUN,
+	    "Global Sun Technology",
+	},
+	{
 	    USB_VENDOR_JABLOTRON,
 	    "Jablotron",
 	},