Index: if_atu.c =================================================================== RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/if_atu.c,v retrieving revision 1.26 diff -u -r1.26 if_atu.c --- if_atu.c 13 Mar 2007 13:51:54 -0000 1.26 +++ if_atu.c 5 Jul 2007 22:55:06 -0000 @@ -114,11 +114,11 @@ * Various supported device vendors/products/radio type. */ struct atu_type atu_devs[] = { - { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_BW002, + { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503RFMD, RadioRFMD, ATU_NO_QUIRK }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D6050, RadioRFMD, ATU_NO_QUIRK }, - { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503A, + { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I1, RadioIntersil, ATU_NO_QUIRK }, { USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_2662WAR, RadioRFMD, ATU_NO_QUIRK }, @@ -133,14 +133,14 @@ RadioRFMD, ATU_NO_QUIRK }, { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL400, RadioRFMD, ATU_NO_QUIRK }, - { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_WL1130, + { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505R, RadioRFMD2958, ATU_NO_QUIRK }, { USB_VENDOR_LINKSYS3, USB_PRODUCT_LINKSYS3_WUSB11V28, RadioRFMD2958, ATU_NO_QUIRK }, { USB_VENDOR_AINCOMM, USB_PRODUCT_AINCOMM_AWU2000B, RadioRFMD2958, ATU_NO_QUIRK }, /* SMC2662 V.4 */ - { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C505A, + { USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_AT76C503I1, RadioRFMD2958_SMC, ATU_QUIRK_NO_REMAP | ATU_QUIRK_FW_DELAY }, { USB_VENDOR_ACERP, USB_PRODUCT_ACERP_AWL300, RadioIntersil, ATU_NO_QUIRK }, Index: if_cdce.c =================================================================== RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/if_cdce.c,v retrieving revision 1.14 diff -u -r1.14 if_cdce.c --- if_cdce.c 13 Mar 2007 13:51:54 -0000 1.14 +++ if_cdce.c 5 Jul 2007 22:59:24 -0000 @@ -119,7 +119,7 @@ {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500 }, CDCE_ZAURUS }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_A300 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C700 }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_C750 }, CDCE_ZAURUS | CDCE_NO_UNION }, }; #define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p)) Index: if_rum.c =================================================================== RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/if_rum.c,v retrieving revision 1.12 diff -u -r1.12 if_rum.c --- if_rum.c 9 Jun 2007 12:13:12 -0000 1.12 +++ if_rum.c 5 Jul 2007 22:33:19 -0000 @@ -93,8 +93,8 @@ { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_3 }, { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_4 }, { USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO }, - { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL167G_2 }, - { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL167G_3 }, + { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G_2 }, + { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G_3 }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3 }, { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC }, @@ -124,7 +124,6 @@ { USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573 }, { USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573_2 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573 }, - { USB_VENDOR_RALINK_2, USB_PRODUCT_RALINK_2_RT2573 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2 }, { USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172 }, Index: if_ural.c =================================================================== RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/if_ural.c,v retrieving revision 1.22 diff -u -r1.22 if_ural.c --- if_ural.c 9 Jun 2007 12:13:12 -0000 1.22 +++ if_ural.c 5 Jul 2007 22:33:19 -0000 @@ -86,8 +86,9 @@ /* various supported device vendors/products */ static const struct usb_devno ural_devs[] = { - { USB_VENDOR_ASUSTEK, USB_PRODUCT_ASUSTEK_WL167G }, - { USB_VENDOR_ASUSTEK, USB_PRODUCT_RALINK_RT2570 }, + { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G }, + { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G2 }, +/* { USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570 },*/ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050 }, { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G }, { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP }, @@ -107,7 +108,6 @@ { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2 }, { USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3 }, - { USB_VENDOR_RALINK_2, USB_PRODUCT_RALINK_2_RT2570 }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG }, { USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R }, { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_EP9001G }, Index: if_zyd.c =================================================================== RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/if_zyd.c,v retrieving revision 1.7 diff -u -r1.7 if_zyd.c --- if_zyd.c 21 Jun 2007 04:04:29 -0000 1.7 +++ if_zyd.c 5 Jul 2007 22:33:19 -0000 @@ -98,7 +98,7 @@ } zyd_devs[] = { ZYD_ZD1211_DEV(3COM2, 3CRUSB10075), ZYD_ZD1211_DEV(ABOCOM, WL54), - ZYD_ZD1211_DEV(ASUSTEK, WL159G), + ZYD_ZD1211_DEV(ASUS, WL159G), ZYD_ZD1211_DEV(CYBERTAN, TG54USB), ZYD_ZD1211_DEV(DRAYTEK, VIGOR550), ZYD_ZD1211_DEV(PLANEX2, GWUS54GZL), @@ -123,7 +123,7 @@ ZYD_ZD1211B_DEV(ACCTON, SMCWUSBG), ZYD_ZD1211B_DEV(ACCTON, ZD1211B), - ZYD_ZD1211B_DEV(ASUSTEK, A9T_WIFI), + ZYD_ZD1211B_DEV(ASUS, A9T_WIFI), ZYD_ZD1211B_DEV(BELKIN, F5D7050C), ZYD_ZD1211B_DEV(BELKIN, ZD1211B), ZYD_ZD1211B_DEV(CISCOLINKSYS, WUSBF54G), Index: ubsa.c =================================================================== RCS file: /data/netbsd/cvsroot/src/sys/dev/usb/ubsa.c,v retrieving revision 1.19 diff -u -r1.19 ubsa.c --- ubsa.c 13 Mar 2007 13:51:55 -0000 1.19 +++ ubsa.c 5 Jul 2007 22:33:19 -0000 @@ -236,11 +236,11 @@ /* Peracom */ { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_SERIAL1 }, /* Option N.V. */ - { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_MC3G }, - { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS2 }, - { USB_VENDOR_OPTIONNV, USB_PRODUCT_OPTIONNV_QUADUMTS }, + { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_MC3G }, + { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_QUADUMTS2 }, + { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_QUADUMTS }, /* AnyDATA ADU-E100H */ - { USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100H }, + { USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100X }, }; #define ubsa_lookup(v, p) usb_lookup(ubsa_devs, v, p) @@ -286,10 +286,10 @@ * control com settings and only some. */ sc->sc_quadumts = 0; - if (uaa->vendor == USB_VENDOR_OPTIONNV) { + if (uaa->vendor == USB_VENDOR_OPTION) { switch (uaa->product) { - case USB_PRODUCT_OPTIONNV_QUADUMTS: - case USB_PRODUCT_OPTIONNV_QUADUMTS2: + case USB_PRODUCT_OPTION_QUADUMTS: + case USB_PRODUCT_OPTION_QUADUMTS2: sc->sc_quadumts = 1; break; }