diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-12-26 19:03:28 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-12-26 19:03:28 +0000 |
| commit | d7736702264afdd928eafec9e103477a234c3014 (patch) | |
| tree | 5c2b4596c3b934547ddc4325e7fb7d533983228b /sys/dev/usb/wlan/if_ural.c | |
| parent | 9cd4207b89f0d656c941fe4a94ea110bd5dafc91 (diff) | |
| download | FreeBSD-src-d7736702264afdd928eafec9e103477a234c3014.zip FreeBSD-src-d7736702264afdd928eafec9e103477a234c3014.tar.gz | |
Use macros to strip off USB_VENDOR_ and USB_PRODUCT_ from some id tables to make
them more compact and readable.
Diffstat (limited to 'sys/dev/usb/wlan/if_ural.c')
| -rw-r--r-- | sys/dev/usb/wlan/if_ural.c | 60 |
1 files changed, 31 insertions, 29 deletions
diff --git a/sys/dev/usb/wlan/if_ural.c b/sys/dev/usb/wlan/if_ural.c index c2e6d75..25fb86f 100644 --- a/sys/dev/usb/wlan/if_ural.c +++ b/sys/dev/usb/wlan/if_ural.c @@ -92,35 +92,37 @@ SYSCTL_INT(_hw_usb_ural, OID_AUTO, debug, CTLFLAG_RW, &ural_debug, 0, /* 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; |
