svn commit: r201316 - in stable/8/sys/dev/usb: . net serial wlan
Andrew Thompson
thompsa at FreeBSD.org
Thu Dec 31 00:20:54 UTC 2009
Author: thompsa
Date: Thu Dec 31 00:20:54 2009
New Revision: 201316
URL: http://svn.freebsd.org/changeset/base/201316
Log:
MFC r201028
Use macros to strip off USB_VENDOR_ and USB_PRODUCT_ from some id tables to make
them more compact and readable.
Modified:
stable/8/sys/dev/usb/net/if_aue.c
stable/8/sys/dev/usb/net/if_axe.c
stable/8/sys/dev/usb/net/if_cue.c
stable/8/sys/dev/usb/net/if_kue.c
stable/8/sys/dev/usb/serial/uftdi.c
stable/8/sys/dev/usb/serial/uplcom.c
stable/8/sys/dev/usb/serial/uslcom.c
stable/8/sys/dev/usb/serial/uvisor.c
stable/8/sys/dev/usb/usbdevs
stable/8/sys/dev/usb/wlan/if_rum.c
stable/8/sys/dev/usb/wlan/if_ural.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/usb/net/if_aue.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_aue.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/net/if_aue.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -112,74 +112,76 @@ SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug,
* Various supported device vendors/products.
*/
static const struct usb_device_id aue_devs[] = {
- {USB_VPI(USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460B, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_DSB650TX_PNA, 0)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UFE1000, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX10, 0)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX1, AUE_FLAG_PNA | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX2, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX4, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX5, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX6, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX7, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX8, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_XX9, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_SS1001, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ACCTON, USB_PRODUCT_ACCTON_USB320_EC, 0)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUS, AUE_FLAG_PNA | AUE_FLAG_DUAL_PHY)},
- {USB_VPI(USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100, 0)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBE100, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBEL100, 0)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TXS, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB_TX, 0)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX1, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX4, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX_PNA, AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN, AUE_FLAG_PNA | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0, 0)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2, 0)},
- {USB_VPI(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET, 0)},
- {USB_VPI(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W, 0)},
- {USB_VPI(USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_HP, USB_PRODUCT_HP_HN210E, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTXS, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX, 0)},
- {USB_VPI(USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_KNU101TX, 0)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1, AUE_FLAG_LSYS | AUE_FLAG_PNA)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100TX, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX1, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2, AUE_FLAG_LSYS | AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, AUE_FLAG_LSYS)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1, 0)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5, 0)},
- {USB_VPI(USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB, 0)},
- {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB, AUE_FLAG_PII)},
- {USB_VPI(USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100, 0)},
- {USB_VPI(USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110, AUE_FLAG_PII)},
+#define AUE_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
+ AUE_DEV(3COM, 3C460B, AUE_FLAG_PII),
+ AUE_DEV(ABOCOM, DSB650TX_PNA, 0),
+ AUE_DEV(ABOCOM, UFE1000, AUE_FLAG_LSYS),
+ AUE_DEV(ABOCOM, XX10, 0),
+ AUE_DEV(ABOCOM, XX1, AUE_FLAG_PNA | AUE_FLAG_PII),
+ AUE_DEV(ABOCOM, XX2, AUE_FLAG_PII),
+ AUE_DEV(ABOCOM, XX4, AUE_FLAG_PNA),
+ AUE_DEV(ABOCOM, XX5, AUE_FLAG_PNA),
+ AUE_DEV(ABOCOM, XX6, AUE_FLAG_PII),
+ AUE_DEV(ABOCOM, XX7, AUE_FLAG_PII),
+ AUE_DEV(ABOCOM, XX8, AUE_FLAG_PII),
+ AUE_DEV(ABOCOM, XX9, AUE_FLAG_PNA),
+ AUE_DEV(ACCTON, SS1001, AUE_FLAG_PII),
+ AUE_DEV(ACCTON, USB320_EC, 0),
+ AUE_DEV(ADMTEK, PEGASUSII_2, AUE_FLAG_PII),
+ AUE_DEV(ADMTEK, PEGASUSII_3, AUE_FLAG_PII),
+ AUE_DEV(ADMTEK, PEGASUSII_4, AUE_FLAG_PII),
+ AUE_DEV(ADMTEK, PEGASUSII, AUE_FLAG_PII),
+ AUE_DEV(ADMTEK, PEGASUS, AUE_FLAG_PNA | AUE_FLAG_DUAL_PHY),
+ AUE_DEV(AEI, FASTETHERNET, AUE_FLAG_PII),
+ AUE_DEV(ALLIEDTELESYN, ATUSB100, AUE_FLAG_PII),
+ AUE_DEV(ATEN, UC110T, AUE_FLAG_PII),
+ AUE_DEV(BELKIN, USB2LAN, AUE_FLAG_PII),
+ AUE_DEV(BILLIONTON, USB100, 0),
+ AUE_DEV(BILLIONTON, USBE100, AUE_FLAG_PII),
+ AUE_DEV(BILLIONTON, USBEL100, 0),
+ AUE_DEV(BILLIONTON, USBLP100, AUE_FLAG_PNA),
+ AUE_DEV(COREGA, FETHER_USB_TXS, AUE_FLAG_PII),
+ AUE_DEV(COREGA, FETHER_USB_TX, 0),
+ AUE_DEV(DLINK, DSB650TX1, AUE_FLAG_LSYS),
+ AUE_DEV(DLINK, DSB650TX2, AUE_FLAG_LSYS | AUE_FLAG_PII),
+ AUE_DEV(DLINK, DSB650TX3, AUE_FLAG_LSYS | AUE_FLAG_PII),
+ AUE_DEV(DLINK, DSB650TX4, AUE_FLAG_LSYS | AUE_FLAG_PII),
+ AUE_DEV(DLINK, DSB650TX_PNA, AUE_FLAG_PNA),
+ AUE_DEV(DLINK, DSB650TX, AUE_FLAG_LSYS),
+ AUE_DEV(DLINK, DSB650, AUE_FLAG_LSYS),
+ AUE_DEV(ELCON, PLAN, AUE_FLAG_PNA | AUE_FLAG_PII),
+ AUE_DEV(ELECOM, LDUSB20, AUE_FLAG_PII),
+ AUE_DEV(ELECOM, LDUSBLTX, AUE_FLAG_PII),
+ AUE_DEV(ELECOM, LDUSBTX0, 0),
+ AUE_DEV(ELECOM, LDUSBTX1, AUE_FLAG_LSYS),
+ AUE_DEV(ELECOM, LDUSBTX2, 0),
+ AUE_DEV(ELECOM, LDUSBTX3, AUE_FLAG_LSYS),
+ AUE_DEV(ELSA, USB2ETHERNET, 0),
+ AUE_DEV(GIGABYTE, GNBR402W, 0),
+ AUE_DEV(HAWKING, UF100, AUE_FLAG_PII),
+ AUE_DEV(HP, HN210E, AUE_FLAG_PII),
+ AUE_DEV(IODATA, USBETTXS, AUE_FLAG_PII),
+ AUE_DEV(IODATA, USBETTX, 0),
+ AUE_DEV(KINGSTON, KNU101TX, 0),
+ AUE_DEV(LINKSYS, USB100H1, AUE_FLAG_LSYS | AUE_FLAG_PNA),
+ AUE_DEV(LINKSYS, USB100TX, AUE_FLAG_LSYS),
+ AUE_DEV(LINKSYS, USB10TA, AUE_FLAG_LSYS),
+ AUE_DEV(LINKSYS, USB10TX1, AUE_FLAG_LSYS | AUE_FLAG_PII),
+ AUE_DEV(LINKSYS, USB10TX2, AUE_FLAG_LSYS | AUE_FLAG_PII),
+ AUE_DEV(LINKSYS, USB10T, AUE_FLAG_LSYS),
+ AUE_DEV(MELCO, LUA2TX5, AUE_FLAG_PII),
+ AUE_DEV(MELCO, LUATX1, 0),
+ AUE_DEV(MELCO, LUATX5, 0),
+ AUE_DEV(MICROSOFT, MN110, AUE_FLAG_PII),
+ AUE_DEV(NETGEAR, FA101, AUE_FLAG_PII),
+ AUE_DEV(SIEMENS, SPEEDSTREAM, AUE_FLAG_PII),
+ AUE_DEV(SIIG2, USBTOETHER, AUE_FLAG_PII),
+ AUE_DEV(SMARTBRIDGES, SMARTNIC, AUE_FLAG_PII),
+ AUE_DEV(SMC, 2202USB, 0),
+ AUE_DEV(SMC, 2206USB, AUE_FLAG_PII),
+ AUE_DEV(SOHOWARE, NUB100, 0),
+ AUE_DEV(SOHOWARE, NUB110, AUE_FLAG_PII),
+#undef AUE_DEV
};
/* prototypes */
Modified: stable/8/sys/dev/usb/net/if_axe.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_axe.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/net/if_axe.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -135,32 +135,34 @@ SYSCTL_INT(_hw_usb_axe, OID_AUTO, debug,
* Various supported device vendors/products.
*/
static const struct usb_device_id axe_devs[] = {
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_UF200, 0)},
- {USB_VPI(USB_VENDOR_ACERCM, USB_PRODUCT_ACERCM_EP1427X2, 0)},
- {USB_VPI(USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ETHERNET, AXE_FLAG_772)},
- {USB_VPI(USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88172, 0)},
- {USB_VPI(USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88178, AXE_FLAG_178)},
- {USB_VPI(USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88772, AXE_FLAG_772)},
- {USB_VPI(USB_VENDOR_ASIX, USB_PRODUCT_ASIX_AX88772A, AXE_FLAG_772)},
- {USB_VPI(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC210T, 0)},
- {USB_VPI(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D5055, AXE_FLAG_178)},
- {USB_VPI(USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB2AR, 0)},
- {USB_VPI(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_USB200MV2, AXE_FLAG_772)},
- {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_FETHER_USB2_TX, 0)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100, 0)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DUBE100B1, AXE_FLAG_772)},
- {USB_VPI(USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_GWUSB2E, 0)},
- {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_ETGUS2, AXE_FLAG_178)},
- {USB_VPI(USB_VENDOR_JVC, USB_PRODUCT_JVC_MP_PRX1, 0)},
- {USB_VPI(USB_VENDOR_LINKSYS2, USB_PRODUCT_LINKSYS2_USB200M, 0)},
- {USB_VPI(USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_USB1000, AXE_FLAG_178)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUAU2KTX, 0)},
- {USB_VPI(USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA120, 0)},
- {USB_VPI(USB_VENDOR_OQO, USB_PRODUCT_OQO_ETHER01PLUS, AXE_FLAG_772)},
- {USB_VPI(USB_VENDOR_PLANEX3, USB_PRODUCT_PLANEX3_GU1000T, AXE_FLAG_178)},
- {USB_VPI(USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_LN029, 0)},
- {USB_VPI(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_LN028, AXE_FLAG_178)},
- {USB_VPI(USB_VENDOR_SYSTEMTALKS, USB_PRODUCT_SYSTEMTALKS_SGCX2UL, 0)},
+#define AXE_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
+ AXE_DEV(ABOCOM, UF200, 0),
+ AXE_DEV(ACERCM, EP1427X2, 0),
+ AXE_DEV(APPLE, ETHERNET, AXE_FLAG_772),
+ AXE_DEV(ASIX, AX88172, 0),
+ AXE_DEV(ASIX, AX88178, AXE_FLAG_178),
+ AXE_DEV(ASIX, AX88772, AXE_FLAG_772),
+ AXE_DEV(ASIX, AX88772A, AXE_FLAG_772),
+ AXE_DEV(ATEN, UC210T, 0),
+ AXE_DEV(BELKIN, F5D5055, AXE_FLAG_178),
+ AXE_DEV(BILLIONTON, USB2AR, 0),
+ AXE_DEV(CISCOLINKSYS, USB200MV2, AXE_FLAG_772),
+ AXE_DEV(COREGA, FETHER_USB2_TX, 0),
+ AXE_DEV(DLINK, DUBE100, 0),
+ AXE_DEV(DLINK, DUBE100B1, AXE_FLAG_772),
+ AXE_DEV(GOODWAY, GWUSB2E, 0),
+ AXE_DEV(IODATA, ETGUS2, AXE_FLAG_178),
+ AXE_DEV(JVC, MP_PRX1, 0),
+ AXE_DEV(LINKSYS2, USB200M, 0),
+ AXE_DEV(LINKSYS4, USB1000, AXE_FLAG_178),
+ AXE_DEV(MELCO, LUAU2KTX, 0),
+ AXE_DEV(NETGEAR, FA120, 0),
+ AXE_DEV(OQO, ETHER01PLUS, AXE_FLAG_772),
+ AXE_DEV(PLANEX3, GU1000T, AXE_FLAG_178),
+ AXE_DEV(SITECOM, LN029, 0),
+ AXE_DEV(SITECOMEU, LN028, AXE_FLAG_178),
+ AXE_DEV(SYSTEMTALKS, SGCX2UL, 0),
+#undef AXE_DEV
};
static device_probe_t axe_probe;
Modified: stable/8/sys/dev/usb/net/if_cue.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_cue.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/net/if_cue.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -90,9 +90,11 @@ __FBSDID("$FreeBSD$");
/* Belkin F5U111 adapter covered by NETMATE entry */
static const struct usb_device_id cue_devs[] = {
- {USB_VPI(USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE, 0)},
- {USB_VPI(USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2, 0)},
- {USB_VPI(USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK, 0)},
+#define CUE_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+ CUE_DEV(CATC, NETMATE),
+ CUE_DEV(CATC, NETMATE2),
+ CUE_DEV(SMARTBRIDGES, SMARTLINK),
+#undef CUE_DEV
};
/* prototypes */
Modified: stable/8/sys/dev/usb/net/if_kue.c
==============================================================================
--- stable/8/sys/dev/usb/net/if_kue.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/net/if_kue.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -102,40 +102,41 @@ __FBSDID("$FreeBSD$");
* Various supported device vendors/products.
*/
static const struct usb_device_id kue_devs[] = {
- {USB_VPI(USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250, 0)},
- {USB_VPI(USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460, 0)},
- {USB_VPI(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450, 0)},
- {USB_VPI(USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT, 0)},
- {USB_VPI(USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX, 0)},
- {USB_VPI(USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101, 0)},
- {USB_VPI(USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA, 0)},
- {USB_VPI(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C, 0)},
- {USB_VPI(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T, 0)},
- {USB_VPI(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T, 0)},
- {USB_VPI(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C, 0)},
- {USB_VPI(USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45, 0)},
- {USB_VPI(USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1, 0)},
- {USB_VPI(USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2, 0)},
- {USB_VPI(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT, 0)},
- {USB_VPI(USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA, 0)},
- {USB_VPI(USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1, 0)},
- {USB_VPI(USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101, 0)},
- {USB_VPI(USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT, 0)},
- {USB_VPI(USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN, 0)},
- {USB_VPI(USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T, 0)},
- {USB_VPI(USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA, 0)},
- {USB_VPI(USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101, 0)},
- {USB_VPI(USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101X, 0)},
- {USB_VPI(USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET, 0)},
- {USB_VPI(USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2, 0)},
- {USB_VPI(USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3, 0)},
- {USB_VPI(USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8, 0)},
- {USB_VPI(USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA9, 0)},
- {USB_VPI(USB_VENDOR_PORTSMITH, USB_PRODUCT_PORTSMITH_EEA, 0)},
- {USB_VPI(USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA, 0)},
- {USB_VPI(USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE, 0)},
- {USB_VPI(USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E, 0)},
- {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB, 0)},
+#define KUE_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+ KUE_DEV(3COM, 3C19250),
+ KUE_DEV(3COM, 3C460),
+ KUE_DEV(ABOCOM, URE450),
+ KUE_DEV(ADS, UBS10BT),
+ KUE_DEV(ADS, UBS10BTX),
+ KUE_DEV(AOX, USB101),
+ KUE_DEV(ASANTE, EA),
+ KUE_DEV(ATEN, DSB650C),
+ KUE_DEV(ATEN, UC10T),
+ KUE_DEV(COREGA, ETHER_USB_T),
+ KUE_DEV(DLINK, DSB650C),
+ KUE_DEV(ENTREGA, E45),
+ KUE_DEV(ENTREGA, XX1),
+ KUE_DEV(ENTREGA, XX2),
+ KUE_DEV(IODATA, USBETT),
+ KUE_DEV(JATON, EDA),
+ KUE_DEV(KINGSTON, XX1),
+ KUE_DEV(KLSI, DUH3E10BT),
+ KUE_DEV(KLSI, DUH3E10BTN),
+ KUE_DEV(LINKSYS, USB10T),
+ KUE_DEV(MOBILITY, EA),
+ KUE_DEV(NETGEAR, EA101),
+ KUE_DEV(NETGEAR, EA101X),
+ KUE_DEV(PERACOM, ENET),
+ KUE_DEV(PERACOM, ENET2),
+ KUE_DEV(PERACOM, ENET3),
+ KUE_DEV(PORTGEAR, EA8),
+ KUE_DEV(PORTGEAR, EA9),
+ KUE_DEV(PORTSMITH, EEA),
+ KUE_DEV(SHARK, PA),
+ KUE_DEV(SILICOM, GPE),
+ KUE_DEV(SILICOM, U2E),
+ KUE_DEV(SMC, 2102USB),
+#undef KUE_DEV
};
/* prototypes */
Modified: stable/8/sys/dev/usb/serial/uftdi.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uftdi.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/serial/uftdi.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -216,43 +216,46 @@ MODULE_DEPEND(uftdi, ucom, 1, 1, 1);
MODULE_DEPEND(uftdi, usb, 1, 1, 1);
static struct usb_device_id uftdi_devs[] = {
- {USB_VPI(USB_VENDOR_ATMEL, USB_PRODUCT_ATMEL_STK541, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_DRESDENELEKTRONIK, USB_PRODUCT_DRESDENELEKTRONIK_SENSORTERMINALBOARD, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_DRESDENELEKTRONIK, USB_PRODUCT_DRESDENELEKTRONIK_WIRELESSHANDHELDTERMINAL, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX, UFTDI_TYPE_SIO)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232D, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U232AM4, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SEMC_DSS20, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_631, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_632, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_633, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_634, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CFA_635, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_USBSERIAL, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MX2_3, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MX4_5, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LK202, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_LK204, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EISCOU, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_UOPTBR, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EMCU2D, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_PCMSFU, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_EMCU2H, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_MAXSTREAM, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CTI_USB_NANO_485, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_FTDI, USB_PRODUCT_FTDI_CTI_USB_MINI_485, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_US2308, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_VALUECAN, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_INTREPIDCS, USB_PRODUCT_INTREPIDCS_NEOVI, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_BBELECTRONICS, USB_PRODUCT_BBELECTRONICS_USOTL4, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_MARVELL, USB_PRODUCT_MARVELL_SHEEVAPLUG, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_PCOPRS1, UFTDI_TYPE_8U232AM)},
- {USB_VPI(USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60F, UFTDI_TYPE_8U232AM)},
+#define UFTDI_DEV(v,p,t) \
+ { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, UFTDI_TYPE_##t) }
+ UFTDI_DEV(ATMEL, STK541, 8U232AM),
+ UFTDI_DEV(DRESDENELEKTRONIK, SENSORTERMINALBOARD, 8U232AM),
+ UFTDI_DEV(DRESDENELEKTRONIK, WIRELESSHANDHELDTERMINAL, 8U232AM),
+ UFTDI_DEV(FTDI, SERIAL_8U100AX, SIO),
+ UFTDI_DEV(FTDI, SERIAL_2232C, 8U232AM),
+ UFTDI_DEV(FTDI, SERIAL_2232D, 8U232AM),
+ UFTDI_DEV(FTDI, SERIAL_8U232AM, 8U232AM),
+ UFTDI_DEV(FTDI, SERIAL_8U232AM4, 8U232AM),
+ UFTDI_DEV(FTDI, SEMC_DSS20, 8U232AM),
+ UFTDI_DEV(FTDI, CFA_631, 8U232AM),
+ UFTDI_DEV(FTDI, CFA_632, 8U232AM),
+ UFTDI_DEV(FTDI, CFA_633, 8U232AM),
+ UFTDI_DEV(FTDI, CFA_634, 8U232AM),
+ UFTDI_DEV(FTDI, CFA_635, 8U232AM),
+ UFTDI_DEV(FTDI, USBSERIAL, 8U232AM),
+ UFTDI_DEV(FTDI, MX2_3, 8U232AM),
+ UFTDI_DEV(FTDI, MX4_5, 8U232AM),
+ UFTDI_DEV(FTDI, LK202, 8U232AM),
+ UFTDI_DEV(FTDI, LK204, 8U232AM),
+ UFTDI_DEV(FTDI, TACTRIX_OPENPORT_13M, 8U232AM),
+ UFTDI_DEV(FTDI, TACTRIX_OPENPORT_13S, 8U232AM),
+ UFTDI_DEV(FTDI, TACTRIX_OPENPORT_13U, 8U232AM),
+ UFTDI_DEV(FTDI, EISCOU, 8U232AM),
+ UFTDI_DEV(FTDI, UOPTBR, 8U232AM),
+ UFTDI_DEV(FTDI, EMCU2D, 8U232AM),
+ UFTDI_DEV(FTDI, PCMSFU, 8U232AM),
+ UFTDI_DEV(FTDI, EMCU2H, 8U232AM),
+ UFTDI_DEV(FTDI, MAXSTREAM, 8U232AM),
+ UFTDI_DEV(FTDI, CTI_USB_NANO_485, 8U232AM),
+ UFTDI_DEV(FTDI, CTI_USB_MINI_485, 8U232AM),
+ UFTDI_DEV(SIIG2, US2308, 8U232AM),
+ UFTDI_DEV(INTREPIDCS, VALUECAN, 8U232AM),
+ UFTDI_DEV(INTREPIDCS, NEOVI, 8U232AM),
+ UFTDI_DEV(BBELECTRONICS, USOTL4, 8U232AM),
+ UFTDI_DEV(MARVELL, SHEEVAPLUG, 8U232AM),
+ UFTDI_DEV(MELCO, PCOPRS1, 8U232AM),
+ UFTDI_DEV(RATOC, REXUSB60F, 8U232AM),
+#undef UFTDI_DEV
};
static int
Modified: stable/8/sys/dev/usb/serial/uplcom.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uplcom.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/serial/uplcom.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -243,57 +243,57 @@ static struct ucom_callback uplcom_callb
.ucom_poll = &uplcom_poll,
};
-#define USB_UPL(v,p,rl,rh,t) \
- USB_VENDOR(v), USB_PRODUCT(p), USB_DEV_BCD_GTEQ(rl), \
- USB_DEV_BCD_LTEQ(rh), USB_DRIVER_INFO(t)
+#define UPLCOM_DEV(v,p,rl,rh,t) \
+ { USB_VENDOR(USB_VENDOR_##v), USB_PRODUCT(USB_PRODUCT_##v##_##p), \
+ USB_DEV_BCD_GTEQ(rl), USB_DEV_BCD_LTEQ(rh), USB_DRIVER_INFO(TYPE_##t) }
static const struct usb_device_id uplcom_devs[] = {
/* Belkin F5U257 */
- {USB_UPL(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U257, 0, 0xFFFF, TYPE_PL2303X)},
+ UPLCOM_DEV(BELKIN, F5U257, 0, 0xFFFF, PL2303X),
/* I/O DATA USB-RSAQ */
- {USB_UPL(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(IODATA, USBRSAQ, 0, 0xFFFF, PL2303),
/* I/O DATA USB-RSAQ2 */
- {USB_UPL(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(PROLIFIC, RSAQ2, 0, 0xFFFF, PL2303),
/* I/O DATA USB-RSAQ3 */
- {USB_UPL(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ3, 0, 0xFFFF, TYPE_PL2303X)},
+ UPLCOM_DEV(PROLIFIC, RSAQ3, 0, 0xFFFF, PL2303X),
/* PLANEX USB-RS232 URS-03 */
- {USB_UPL(USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(ATEN, UC232A, 0, 0xFFFF, PL2303),
/* TrendNet TU-S9 */
- {USB_UPL(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x0400, 0xFFFF, TYPE_PL2303X)},
+ UPLCOM_DEV(PROLIFIC, PL2303, 0x0400, 0xFFFF, PL2303X),
/* ST Lab USB-SERIAL-4 */
- {USB_UPL(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0x0300, 0x03FF, TYPE_PL2303X)},
+ UPLCOM_DEV(PROLIFIC, PL2303, 0x0300, 0x03FF, PL2303X),
/* IOGEAR/ATEN UC-232A (also ST Lab USB-SERIAL-1) */
- {USB_UPL(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303, 0, 0x02FF, TYPE_PL2303)},
+ UPLCOM_DEV(PROLIFIC, PL2303, 0, 0x02FF, PL2303),
/* TDK USB-PHS Adapter UHA6400 */
- {USB_UPL(USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(TDK, UHA6400, 0, 0xFFFF, PL2303),
/* RATOC REX-USB60 */
- {USB_UPL(USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(RATOC, REXUSB60, 0, 0xFFFF, PL2303),
/* ELECOM UC-SGT */
- {USB_UPL(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT, 0, 0xFFFF, TYPE_PL2303)},
- {USB_UPL(USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(ELECOM, UCSGT, 0, 0xFFFF, PL2303),
+ UPLCOM_DEV(ELECOM, UCSGT0, 0, 0xFFFF, PL2303),
/* Sagem USB-Serial Controller */
- {USB_UPL(USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_USBSERIAL, 0, 0xFFFF, TYPE_PL2303X)},
+ UPLCOM_DEV(SAGEM, USBSERIAL, 0, 0xFFFF, PL2303X),
/* Sony Ericsson USB Cable */
- {USB_UPL(USB_VENDOR_SONYERICSSON, USB_PRODUCT_SONYERICSSON_DCU10, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(SONYERICSSON, DCU10, 0, 0xFFFF, PL2303),
/* SOURCENEXT KeikaiDenwa 8 */
- {USB_UPL(USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(SOURCENEXT, KEIKAI8, 0, 0xFFFF, PL2303),
/* SOURCENEXT KeikaiDenwa 8 with charger */
- {USB_UPL(USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG, 0, 0, TYPE_PL2303)},
+ UPLCOM_DEV(SOURCENEXT, KEIKAI8_CHG, 0, 0, PL2303),
/* HAL Corporation Crossam2+USB */
- {USB_UPL(USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(HAL, IMR001, 0, 0xFFFF, PL2303),
/* Sitecom USB to Serial */
- {USB_UPL(USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_SERIAL, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(SITECOM, SERIAL, 0, 0xFFFF, PL2303),
/* Tripp-Lite U209-000-R */
- {USB_UPL(USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209, 0, 0xFFFF, TYPE_PL2303X)},
- {USB_UPL(USB_VENDOR_RADIOSHACK, USB_PRODUCT_RADIOSHACK_USBCABLE, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(TRIPPLITE, U209, 0, 0xFFFF, PL2303X),
+ UPLCOM_DEV(RADIOSHACK, USBCABLE, 0, 0xFFFF, PL2303),
/* Prolific Pharos */
- {USB_UPL(USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PHAROS, 0, 0xFFFF, TYPE_PL2303)},
+ UPLCOM_DEV(PROLIFIC, PHAROS, 0, 0xFFFF, PL2303),
/* Willcom W-SIM */
- {USB_UPL(USB_VENDOR_PROLIFIC2, USB_PRODUCT_PROLIFIC2_WSIM, 0, 0xFFFF, TYPE_PL2303X)},
+ UPLCOM_DEV(PROLIFIC2, WSIM, 0, 0xFFFF, PL2303X),
/* Mobile Action MA-620 Infrared Adapter */
- {USB_UPL(USB_VENDOR_MOBILEACTION, USB_PRODUCT_MOBILEACTION_MA620, 0, 0xFFFF, TYPE_PL2303X)},
-
+ UPLCOM_DEV(MOBILEACTION, MA620, 0, 0xFFFF, PL2303X),
};
+#undef UPLCOM_DEV
static device_method_t uplcom_methods[] = {
DEVMETHOD(device_probe, uplcom_probe),
Modified: stable/8/sys/dev/usb/serial/uslcom.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uslcom.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/serial/uslcom.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -175,24 +175,26 @@ static struct ucom_callback uslcom_callb
};
static const struct usb_device_id uslcom_devs[] = {
- { USB_VPI(USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER, 0) },
- { USB_VPI(USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD, 0) },
- { USB_VPI(USB_VENDOR_JABLOTRON, USB_PRODUCT_JABLOTRON_PC60B, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREE, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_BURNSIDE, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_HELICOM, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_LIN, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP2102, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUUNTO, 0) },
- { USB_VPI(USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRAQMATE, 0) },
- { USB_VPI(USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE, 0) },
- { USB_VPI(USB_VENDOR_USI, USB_PRODUCT_USI_MC60, 0) },
+#define USLCOM_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+ USLCOM_DEV(BALTECH, CARDREADER),
+ USLCOM_DEV(DYNASTREAM, ANTDEVBOARD),
+ USLCOM_DEV(JABLOTRON, PC60B),
+ USLCOM_DEV(SILABS, ARGUSISP),
+ USLCOM_DEV(SILABS, CRUMB128),
+ USLCOM_DEV(SILABS, DEGREE),
+ USLCOM_DEV(SILABS, BURNSIDE),
+ USLCOM_DEV(SILABS, HELICOM),
+ USLCOM_DEV(SILABS, LIPOWSKY_HARP),
+ USLCOM_DEV(SILABS, LIPOWSKY_JTAG),
+ USLCOM_DEV(SILABS, LIPOWSKY_LIN),
+ USLCOM_DEV(SILABS, POLOLU),
+ USLCOM_DEV(SILABS, CP2102),
+ USLCOM_DEV(SILABS, CP210X_2),
+ USLCOM_DEV(SILABS, SUUNTO),
+ USLCOM_DEV(SILABS, TRAQMATE),
+ USLCOM_DEV(SILABS2, DCU11CLONE),
+ USLCOM_DEV(USI, MC60),
+#undef USLCOM_DEV
};
static device_method_t uslcom_methods[] = {
Modified: stable/8/sys/dev/usb/serial/uvisor.c
==============================================================================
--- stable/8/sys/dev/usb/serial/uvisor.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/serial/uvisor.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -261,32 +261,34 @@ MODULE_DEPEND(uvisor, ucom, 1, 1, 1);
MODULE_DEPEND(uvisor, usb, 1, 1, 1);
static const struct usb_device_id uvisor_devs[] = {
- {USB_VPI(USB_VENDOR_ACEECA, USB_PRODUCT_ACEECA_MEZ1000, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_GARMIN, USB_PRODUCT_GARMIN_IQUE_3600, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_FOSSIL, USB_PRODUCT_FOSSIL_WRISTPDA, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_VISOR, UVISOR_FLAG_VISOR)},
- {USB_VPI(USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_HANDSPRING, USB_PRODUCT_HANDSPRING_TREO600, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_M500, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_M505, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_M515, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_I705, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_M125, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_M130, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_Z, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_TUNGSTEN_T, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_PALM, USB_PRODUCT_PALM_ZIRE31, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_SAMSUNG, USB_PRODUCT_SAMSUNG_I500, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40, 0)},
- {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_41, 0)},
- {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_S360, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_NX60, UVISOR_FLAG_PALM4)},
- {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_35, UVISOR_FLAG_PALM35)},
-/* {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_25, UVISOR_FLAG_PALM4 )}, */
- {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TJ37, UVISOR_FLAG_PALM4)},
-/* {USB_VPI(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_TH55, UVISOR_FLAG_PALM4 )}, See PR 80935 */
- {USB_VPI(USB_VENDOR_TAPWAVE, USB_PRODUCT_TAPWAVE_ZODIAC, UVISOR_FLAG_PALM4)},
+#define UVISOR_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) }
+ UVISOR_DEV(ACEECA, MEZ1000, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(GARMIN, IQUE_3600, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(FOSSIL, WRISTPDA, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(HANDSPRING, VISOR, UVISOR_FLAG_VISOR),
+ UVISOR_DEV(HANDSPRING, TREO, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(HANDSPRING, TREO600, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, M500, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, M505, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, M515, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, I705, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, M125, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, M130, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, TUNGSTEN_Z, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, TUNGSTEN_T, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, ZIRE, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(PALM, ZIRE31, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(SAMSUNG, I500, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(SONY, CLIE_40, 0),
+ UVISOR_DEV(SONY, CLIE_41, 0),
+ UVISOR_DEV(SONY, CLIE_S360, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(SONY, CLIE_NX60, UVISOR_FLAG_PALM4),
+ UVISOR_DEV(SONY, CLIE_35, UVISOR_FLAG_PALM35),
+/* UVISOR_DEV(SONY, CLIE_25, UVISOR_FLAG_PALM4 ), */
+ UVISOR_DEV(SONY, CLIE_TJ37, UVISOR_FLAG_PALM4),
+/* UVISOR_DEV(SONY, CLIE_TH55, UVISOR_FLAG_PALM4 ), See PR 80935 */
+ UVISOR_DEV(TAPWAVE, ZODIAC, UVISOR_FLAG_PALM4),
+#undef UVISOR_DEV
};
static int
Modified: stable/8/sys/dev/usb/usbdevs
==============================================================================
--- stable/8/sys/dev/usb/usbdevs Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/usbdevs Thu Dec 31 00:20:54 2009 (r201316)
@@ -941,6 +941,7 @@ product ASUS RT2573_2 0x1724 RT2573
product ASUS LCM 0x1726 LCM display
product ASUS P535 0x420f ASUS P535 PDA
product ASUS GMSC 0x422f ASUS Generic Mass Storage
+product ASUS RT2570 0x1706 RT2500USB Wireless Adapter
/* ATen products */
product ATEN UC1284 0x2001 Parallel printer
Modified: stable/8/sys/dev/usb/wlan/if_rum.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_rum.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/wlan/if_rum.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -86,54 +86,56 @@ SYSCTL_INT(_hw_usb_rum, OID_AUTO, debug,
#endif
static const struct usb_device_id rum_devs[] = {
- { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_HWU54DM) },
- { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_2) },
- { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_3) },
- { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_RT2573_4) },
- { USB_VP(USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_WUG2700) },
- { USB_VP(USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO) },
- { USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_1) },
- { USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_2) },
- { USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A) },
- { USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3) },
- { USB_VP(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC) },
- { USB_VP(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GR) },
- { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU2) },
- { USB_VP(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB2GL) },
- { USB_VP(USB_VENDOR_COREGA, USB_PRODUCT_COREGA_CGWLUSB2GPX) },
- { USB_VP(USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_CWD854F) },
- { USB_VP(USB_VENDOR_DICKSMITH, USB_PRODUCT_DICKSMITH_RT2573) },
- { USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWLG122C1) },
- { USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_WUA1340) },
- { USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA111) },
- { USB_VP(USB_VENDOR_DLINK2, USB_PRODUCT_DLINK2_DWA110) },
- { USB_VP(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWB01GS) },
- { USB_VP(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWI05GS) },
- { USB_VP(USB_VENDOR_GIGASET, USB_PRODUCT_GIGASET_RT2573) },
- { USB_VP(USB_VENDOR_GOODWAY, USB_PRODUCT_GOODWAY_RT2573) },
- { USB_VP(USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254LB) },
- { USB_VP(USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254V2AP) },
- { USB_VP(USB_VENDOR_HUAWEI3COM, USB_PRODUCT_HUAWEI3COM_WUB320G) },
- { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_G54HP) },
- { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_SG54HP) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_1) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_2) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_3) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2573_4) },
- { USB_VP(USB_VENDOR_NOVATECH, USB_PRODUCT_NOVATECH_RT2573) },
- { USB_VP(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54HP) },
- { USB_VP(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUS54MINI2) },
- { USB_VP(USB_VENDOR_PLANEX2, USB_PRODUCT_PLANEX2_GWUSMM) },
- { USB_VP(USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573) },
- { USB_VP(USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573_2) },
- { USB_VP(USB_VENDOR_QCOM, USB_PRODUCT_QCOM_RT2573_3) },
- { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573) },
- { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573_2) },
- { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2671) },
- { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL113R2) },
- { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_WL172) },
- { USB_VP(USB_VENDOR_SPARKLAN, USB_PRODUCT_SPARKLAN_RT2573) },
- { USB_VP(USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2573) },
+#define RUM_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+ RUM_DEV(ABOCOM, HWU54DM),
+ RUM_DEV(ABOCOM, RT2573_2),
+ RUM_DEV(ABOCOM, RT2573_3),
+ RUM_DEV(ABOCOM, RT2573_4),
+ RUM_DEV(ABOCOM, WUG2700),
+ RUM_DEV(AMIT, CGWLUSB2GO),
+ RUM_DEV(ASUS, RT2573_1),
+ RUM_DEV(ASUS, RT2573_2),
+ RUM_DEV(BELKIN, F5D7050A),
+ RUM_DEV(BELKIN, F5D9050V3),
+ RUM_DEV(CISCOLINKSYS, WUSB54GC),
+ RUM_DEV(CISCOLINKSYS, WUSB54GR),
+ RUM_DEV(CONCEPTRONIC2, C54RU2),
+ RUM_DEV(COREGA, CGWLUSB2GL),
+ RUM_DEV(COREGA, CGWLUSB2GPX),
+ RUM_DEV(DICKSMITH, CWD854F),
+ RUM_DEV(DICKSMITH, RT2573),
+ RUM_DEV(DLINK2, DWLG122C1),
+ RUM_DEV(DLINK2, WUA1340),
+ RUM_DEV(DLINK2, DWA111),
+ RUM_DEV(DLINK2, DWA110),
+ RUM_DEV(GIGABYTE, GNWB01GS),
+ RUM_DEV(GIGABYTE, GNWI05GS),
+ RUM_DEV(GIGASET, RT2573),
+ RUM_DEV(GOODWAY, RT2573),
+ RUM_DEV(GUILLEMOT, HWGUSB254LB),
+ RUM_DEV(GUILLEMOT, HWGUSB254V2AP),
+ RUM_DEV(HUAWEI3COM, WUB320G),
+ RUM_DEV(MELCO, G54HP),
+ RUM_DEV(MELCO, SG54HP),
+ RUM_DEV(MSI, RT2573_1),
+ RUM_DEV(MSI, RT2573_2),
+ RUM_DEV(MSI, RT2573_3),
+ RUM_DEV(MSI, RT2573_4),
+ RUM_DEV(NOVATECH, RT2573),
+ RUM_DEV(PLANEX2, GWUS54HP),
+ RUM_DEV(PLANEX2, GWUS54MINI2),
+ RUM_DEV(PLANEX2, GWUSMM),
+ RUM_DEV(QCOM, RT2573),
+ RUM_DEV(QCOM, RT2573_2),
+ RUM_DEV(QCOM, RT2573_3),
+ RUM_DEV(RALINK, RT2573),
+ RUM_DEV(RALINK, RT2573_2),
+ RUM_DEV(RALINK, RT2671),
+ RUM_DEV(SITECOMEU, WL113R2),
+ RUM_DEV(SITECOMEU, WL172),
+ RUM_DEV(SPARKLAN, RT2573),
+ RUM_DEV(SURECOM, RT2573),
+#undef RUM_DEV
};
MODULE_DEPEND(rum, wlan, 1, 1, 1);
Modified: stable/8/sys/dev/usb/wlan/if_ural.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_ural.c Thu Dec 31 00:19:52 2009 (r201315)
+++ stable/8/sys/dev/usb/wlan/if_ural.c Thu Dec 31 00:20:54 2009 (r201316)
@@ -92,35 +92,37 @@ SYSCTL_INT(_hw_usb_ural, OID_AUTO, debug
/* various supported device vendors/products */
static const struct usb_device_id ural_devs[] = {
- { USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G) },
- { USB_VP(USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570) },
- { USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050) },
- { USB_VP(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7051) },
- { USB_VP(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS) },
- { USB_VP(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G) },
- { USB_VP(USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP) },
- { USB_VP(USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU) },
- { USB_VP(USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122) },
- { USB_VP(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GN54G) },
- { USB_VP(USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG) },
- { USB_VP(USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254) },
- { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54) },
- { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI) },
- { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54YB) },
- { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_NINWIFI) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_2) },
- { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT2570_3) },
- { USB_VP(USB_VENDOR_NOVATECH, USB_PRODUCT_NOVATECH_NV902) },
- { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570) },
- { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2) },
- { USB_VP(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3) },
- { USB_VP(USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WL54G) },
- { USB_VP(USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG) },
- { USB_VP(USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R) },
- { USB_VP(USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570) },
- { USB_VP(USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570) },
- { USB_VP(USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570) },
+#define URAL_DEV(v,p) { USB_VP(USB_VENDOR_##v, USB_PRODUCT_##v##_##p) }
+ URAL_DEV(ASUS, WL167G),
+ URAL_DEV(ASUS, RT2570),
+ URAL_DEV(BELKIN, F5D7050),
+ URAL_DEV(BELKIN, F5D7051),
+ URAL_DEV(CISCOLINKSYS, HU200TS),
+ URAL_DEV(CISCOLINKSYS, WUSB54G),
+ URAL_DEV(CISCOLINKSYS, WUSB54GP),
+ URAL_DEV(CONCEPTRONIC2, C54RU),
+ URAL_DEV(DLINK, DWLG122),
+ URAL_DEV(GIGABYTE, GN54G),
+ URAL_DEV(GIGABYTE, GNWBKG),
+ URAL_DEV(GUILLEMOT, HWGUSB254),
+ URAL_DEV(MELCO, KG54),
+ URAL_DEV(MELCO, KG54AI),
+ URAL_DEV(MELCO, KG54YB),
+ URAL_DEV(MELCO, NINWIFI),
+ URAL_DEV(MSI, RT2570),
+ URAL_DEV(MSI, RT2570_2),
+ URAL_DEV(MSI, RT2570_3),
+ URAL_DEV(NOVATECH, NV902),
+ URAL_DEV(RALINK, RT2570),
+ URAL_DEV(RALINK, RT2570_2),
+ URAL_DEV(RALINK, RT2570_3),
+ URAL_DEV(SIEMENS2, WL54G),
+ URAL_DEV(SMC, 2862WG),
+ URAL_DEV(SPHAIRON, UB801R),
+ URAL_DEV(SURECOM, RT2570),
+ URAL_DEV(VTECH, RT2570),
+ URAL_DEV(ZINWELL, RT2570),
+#undef URAL_DEV
};
static usb_callback_t ural_bulk_read_callback;
More information about the svn-src-stable-8
mailing list