Module Name: src Committed By: christos Date: Sat Mar 30 02:37:48 UTC 2013
Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.634 -r1.635 src/sys/dev/usb/usbdevs.h cvs rdiff -u -r1.635 -r1.636 src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.634 src/sys/dev/usb/usbdevs.h:1.635 --- src/sys/dev/usb/usbdevs.h:1.634 Thu Mar 28 00:07:55 2013 +++ src/sys/dev/usb/usbdevs.h Fri Mar 29 22:37:47 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.634 2013/03/28 04:07:55 garbled Exp $ */ +/* $NetBSD: usbdevs.h,v 1.635 2013/03/30 02:37:47 christos Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp + * NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp */ /* @@ -80,6 +80,7 @@ #define USB_VENDOR_FTDI 0x0403 /* Future Technology Devices */ #define USB_VENDOR_NEC 0x0409 /* NEC */ #define USB_VENDOR_KODAK 0x040a /* Eastman Kodak */ +#define USB_VENDOR_VIA 0x040d /* VIA */ #define USB_VENDOR_MELCO 0x0411 /* Melco */ #define USB_VENDOR_CREATIVE 0x041e /* Creative Labs */ #define USB_VENDOR_NOKIA 0x0421 /* Nokia */ @@ -503,6 +504,7 @@ #define USB_VENDOR_SUPERTOP 0x14cd /* SuperTop */ #define USB_VENDOR_PLANEX3 0x14ea /* Planex Communications */ #define USB_VENDOR_SILICONPORTALS 0x1527 /* Silicon Portals */ +#define USB_VENDOR_JMICRON 0x152d /* JMicron */ #define USB_VENDOR_OQO 0x1557 /* OQO */ #define USB_VENDOR_UMEDIA 0x157e /* U-MEDIA Communications */ #define USB_VENDOR_FIBERLINE 0x1582 /* Fiberline */ @@ -664,6 +666,7 @@ #define USB_PRODUCT_ACCTON_RT3070_1 0xa701 /* RT3070 */ #define USB_PRODUCT_ACCTON_RT3070_2 0xa702 /* RT3070 */ #define USB_PRODUCT_ACCTON_RT3070_6 0xa703 /* RT3070 */ ++product ACCTON AR9280 0xa704 AR9280+AR7010 #define USB_PRODUCT_ACCTON_RT2870_1 0xb522 /* RT2870 */ #define USB_PRODUCT_ACCTON_RTL8192SU 0xc512 /* RTL8192SU */ #define USB_PRODUCT_ACCTON_RT3070_3 0xc522 /* RT3070 */ @@ -694,6 +697,7 @@ /* Actiontec products */ #define USB_PRODUCT_ACTIONTEC_PRISM_25 0x0408 /* Prism2.5 WLAN */ #define USB_PRODUCT_ACTIONTEC_PRISM_25A 0x0421 /* Prism2.5 WLAN A */ +#define USB_PRODUCT_ACTIONTEC_AR9287 0x1200 /* AR9287+AR7010 */ #define USB_PRODUCT_ACTIONTEC_FREELAN 0x6106 /* ROPEX FreeLan 802.11b */ #define USB_PRODUCT_ACTIONTEC_UAT1 0x7605 /* UAT1 Wireless Ethernet adapter */ @@ -878,6 +882,7 @@ #define USB_PRODUCT_ASIX_AX88772B_1 0x7e2b /* AX88772B1 USB 2.0 10/100 Ethernet adapter */ /* ASUSTeK computer products */ +#define USB_PRODUCT_ASUSTEK_RT2570 0x1706 /* RT2570 */ #define USB_PRODUCT_ASUSTEK_WL167G 0x1707 /* WL-167g USB2.0 WLAN Adapter */ #define USB_PRODUCT_ASUSTEK_WL159G 0x170c /* WL-159g */ #define USB_PRODUCT_ASUSTEK_A9T_WIFI 0x171b /* A9T wireless */ @@ -919,10 +924,14 @@ #define USB_PRODUCT_ATHEROS2_AR5523_3_NF 0x0006 /* AR5523 */ #define USB_PRODUCT_ATHEROS2_TG121N 0x1001 /* TG121N */ #define USB_PRODUCT_ATHEROS2_WN821NV2 0x1002 /* WN821NV2 */ +#define USB_PRODUCT_ATHEROS2_AR9271_1 0x1006 /* AR9271 */ #define USB_PRODUCT_ATHEROS2_3CRUSBN275 0x1010 /* 3CRUSBN275 */ #define USB_PRODUCT_ATHEROS2_WN612 0x1011 /* WN612 */ #define USB_PRODUCT_ATHEROS2_AR3011 0x3000 /* AR3011 */ +#define USB_PRODUCT_ATHEROS2_AR9280 0x7010 /* AR9280+AR7010 */ +#define USB_PRODUCT_ATHEROS2_AR9287 0x7015 /* AR9287+AR7010 */ #define USB_PRODUCT_ATHEROS2_AR9170 0x9170 /* AR9170 */ +#define USB_PRODUCT_ATHEROS2_AR9271_3 0xb003 /* AR9271 */ /* ATI products */ #define USB_PRODUCT_ATI2_205 0xa001 /* USB Cable 205 */ @@ -968,6 +977,12 @@ #define USB_PRODUCT_AZUREWAVE_RTL8192SU_4 0x3311 /* RTL8192SU */ #define USB_PRODUCT_AZUREWAVE_RT3070_5 0x3321 /* RT3070 */ #define USB_PRODUCT_AZUREWAVE_RTL8192SU_5 0x3325 /* RTL8192SU */ +#define USB_PRODUCT_AZUREWAVE_AR9271_1 0x3327 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_2 0x3328 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_3 0x3346 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_4 0x3348 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_5 0x3349 /* AR9271 */ +#define USB_PRODUCT_AZUREWAVE_AR9271_6 0x3350 /* AR9271 */ #define USB_PRODUCT_AZUREWAVE_RTL8188CU 0x3357 /* RTL8188CU */ #define USB_PRODUCT_AZUREWAVE_RTL8188CE_1 0x3358 /* RTL8188CE */ #define USB_PRODUCT_AZUREWAVE_RTL8188CE_2 0x3359 /* RTL8188CE */ @@ -1322,8 +1337,11 @@ #define USB_PRODUCT_DLINK2_RTL8192SU_1 0x3300 /* RTL8192SU */ #define USB_PRODUCT_DLINK2_RTL8192SU_2 0x3302 /* RTL8192SU */ #define USB_PRODUCT_DLINK2_DWA131A1 0x3303 /* DWA-131 A1 */ +#define USB_PRODUCT_DLINK2_WUA2340 0x3a07 /* WUA-2340 */ +#define USB_PRODUCT_DLINK2_WUA2340_NF 0x3a08 /* WUA-2340 */ #define USB_PRODUCT_DLINK2_DWA160A2 0x3a09 /* DWA-160 A2 */ #define USB_PRODUCT_DLINK2_DWA130D1 0x3a0f /* DWA-130 rev D1 */ +#define USB_PRODUCT_DLINK2_AR9271 0x3a10 /* AR9271 */ #define USB_PRODUCT_DLINK2_DWLG122C1 0x3c03 /* DWL-G122 rev C1 */ #define USB_PRODUCT_DLINK2_WUA1340 0x3c04 /* WUA-1340 */ #define USB_PRODUCT_DLINK2_DWA111 0x3c06 /* DWA-111 */ @@ -1807,6 +1825,11 @@ /* Jenoptik products */ #define USB_PRODUCT_JENOPTIK_JD350 0x5300 /* JD 350 Camera/mp3 player */ +/* JMicron products */ +#define USB_PRODUCT_JMICRON_JM20329 0x2329 /* USB to ATA/ATAPI Bridge */ +#define USB_PRODUCT_JMICRON_JM20336 0x2336 /* USB to SATA Bridge */ +#define USB_PRODUCT_JMICRON_JM20337 0x2338 /* USB to ATA/ATAPI Bridge */ + /* JRC products */ #define USB_PRODUCT_JRC_AH_J3001V_J3002V 0x0001 /* AirH\"PHONE AH-J3001V/J3002V */ @@ -1931,6 +1954,9 @@ #define USB_PRODUCT_LINKSYS4_RT3070 0x0078 /* RT3070 */ #define USB_PRODUCT_LINKSYS4_WUSB600NV2 0x0079 /* WUSB600N v2 */ +/* Lite-On Technology */ +#define USB_PRODUCT_LITEON_AR9271 0x4605 /* AR9271 */ + /* Logitec products */ #define USB_PRODUCT_LOGITEC_LDR_H443SU2 0x0033 /* DVD Multi-plus unit LDR-H443SU2 */ #define USB_PRODUCT_LOGITEC_LDR_H443U2 0x00b3 /* DVD Multi-plus unit LDR-H443U2 */ @@ -2238,7 +2264,9 @@ #define USB_PRODUCT_NETGEAR_XA601 0x8100 /* USB to PL Adapter */ #define USB_PRODUCT_NETGEAR_WN111V2 0x9001 /* WN111V2 */ #define USB_PRODUCT_NETGEAR_WNDA3100 0x9010 /* WNDA3100 */ +#define USB_PRODUCT_NETGEAR_WNDA3200 0x9018 /* WNDA3200 */ #define USB_PRODUCT_NETGEAR_RTL8192CU 0x9021 /* RTL8192CU */ +#define USB_PRODUCT_NETGEAR_WNA1100 0x9030 /* WNA1100 */ #define USB_PRODUCT_NETGEAR_WNA1000 0x9040 /* WNA1000 */ #define USB_PRODUCT_NETGEAR_WNA1000M 0x9041 /* WNA1000M */ @@ -3159,6 +3187,9 @@ /* VidzMedia products */ #define USB_PRODUCT_VIDZMEDIA_MONSTERTV 0x4fb1 /* MonsterTV P2H */ +/* VIA products */ +#define USB_PRODUCT_VIA_AR9271 0x3801 /* AR9271 */ + /* ViewSonic products */ #define USB_PRODUCT_VIEWSONIC_G773HUB 0x00fe /* G773 Monitor Hub */ #define USB_PRODUCT_VIEWSONIC_P815HUB 0x00ff /* P815 Monitor Hub */ Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.635 src/sys/dev/usb/usbdevs_data.h:1.636 --- src/sys/dev/usb/usbdevs_data.h:1.635 Thu Mar 28 00:07:55 2013 +++ src/sys/dev/usb/usbdevs_data.h Fri Mar 29 22:37:47 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.635 2013/03/28 04:07:55 garbled Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.636 2013/03/30 02:37:47 christos Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.641 2013/03/28 04:05:17 garbled Exp + * NetBSD: usbdevs,v 1.642 2013/03/30 02:37:18 christos Exp */ /* @@ -99,6 +99,10 @@ const struct usb_vendor usb_vendors[] = "Eastman Kodak", }, { + USB_VENDOR_VIA, + "VIA", + }, + { USB_VENDOR_MELCO, "Melco", }, @@ -1791,6 +1795,10 @@ const struct usb_vendor usb_vendors[] = "Silicon Portals", }, { + USB_VENDOR_JMICRON, + "JMicron", + }, + { USB_VENDOR_OQO, "OQO", }, @@ -2115,7 +2123,7 @@ const struct usb_vendor usb_vendors[] = "GNU Radio USRP", }, }; -const int usb_nvendors = 519; +const int usb_nvendors = 521; const struct usb_product usb_products[] = { { @@ -2459,6 +2467,10 @@ const struct usb_product usb_products[] "Prism2.5 WLAN A", }, { + USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_AR9287, + "AR9287+AR7010", + }, + { USB_VENDOR_ACTIONTEC, USB_PRODUCT_ACTIONTEC_FREELAN, "ROPEX FreeLan 802.11b", }, @@ -2919,6 +2931,10 @@ const struct usb_product usb_products[] "AX88772B1 USB 2.0 10/100 Ethernet adapter", }, { + USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_RT2570, + "RT2570", + }, + { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL167G, "WL-167g USB2.0 WLAN Adapter", }, @@ -3059,6 +3075,10 @@ const struct usb_product usb_products[] "WN821NV2", }, { + USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9271_1, + "AR9271", + }, + { USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_3CRUSBN275, "3CRUSBN275", }, @@ -3071,10 +3091,22 @@ const struct usb_product usb_products[] "AR3011", }, { + USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9280, + "AR9280+AR7010", + }, + { + USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9287, + "AR9287+AR7010", + }, + { USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9170, "AR9170", }, { + USB_VENDOR_ATHEROS2, USB_PRODUCT_ATHEROS2_AR9271_3, + "AR9271", + }, + { USB_VENDOR_ATI2, USB_PRODUCT_ATI2_205, "USB Cable 205", }, @@ -3191,6 +3223,30 @@ const struct usb_product usb_products[] "RTL8192SU", }, { + USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_AR9271_1, + "AR9271", + }, + { + USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_AR9271_2, + "AR9271", + }, + { + USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_AR9271_3, + "AR9271", + }, + { + USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_AR9271_4, + "AR9271", + }, + { + USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_AR9271_5, + "AR9271", + }, + { + USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_AR9271_6, + "AR9271", + }, + { USB_VENDOR_AZUREWAVE, USB_PRODUCT_AZUREWAVE_RTL8188CU, "RTL8188CU", }, @@ -4259,6 +4315,14 @@ const struct usb_product usb_products[] "DWA-131 A1", }, { + USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA2340, + "WUA-2340", + }, + { + USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA2340_NF, + "WUA-2340", + }, + { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA160A2, "DWA-160 A2", }, @@ -4267,6 +4331,10 @@ const struct usb_product usb_products[] "DWA-130 rev D1", }, { + USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_AR9271, + "AR9271", + }, + { USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1, "DWL-G122 rev C1", }, @@ -5603,6 +5671,18 @@ const struct usb_product usb_products[] "JD 350 Camera/mp3 player", }, { + USB_VENDOR_JMICRON, USB_PRODUCT_JMICRON_JM20329, + "USB to ATA/ATAPI Bridge", + }, + { + USB_VENDOR_JMICRON, USB_PRODUCT_JMICRON_JM20336, + "USB to SATA Bridge", + }, + { + USB_VENDOR_JMICRON, USB_PRODUCT_JMICRON_JM20337, + "USB to ATA/ATAPI Bridge", + }, + { USB_VENDOR_JRC, USB_PRODUCT_JRC_AH_J3001V_J3002V, "AirH\"PHONE AH-J3001V/J3002V", }, @@ -5963,6 +6043,10 @@ const struct usb_product usb_products[] "WUSB600N v2", }, { + USB_VENDOR_LITEON, USB_PRODUCT_LITEON_AR9271, + "AR9271", + }, + { USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2, "DVD Multi-plus unit LDR-H443SU2", }, @@ -6891,10 +6975,18 @@ const struct usb_product usb_products[] "WNDA3100", }, { + USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WNDA3200, + "WNDA3200", + }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_RTL8192CU, "RTL8192CU", }, { + USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WNA1100, + "WNA1100", + }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_WNA1000, "WNA1000", }, @@ -9471,6 +9563,10 @@ const struct usb_product usb_products[] "MonsterTV P2H", }, { + USB_VENDOR_VIA, USB_PRODUCT_VIA_AR9271, + "AR9271", + }, + { USB_VENDOR_VIEWSONIC, USB_PRODUCT_VIEWSONIC_G773HUB, "G773 Monitor Hub", }, @@ -9883,4 +9979,4 @@ const struct usb_product usb_products[] "Prestige", }, }; -const int usb_nproducts = 1941; +const int usb_nproducts = 1963;