summaryrefslogtreecommitdiffstats
path: root/sys/dev/usb/serial/uplcom.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/usb/serial/uplcom.c')
-rw-r--r--sys/dev/usb/serial/uplcom.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/sys/dev/usb/serial/uplcom.c b/sys/dev/usb/serial/uplcom.c
index ef5db40..c5d58e4 100644
--- a/sys/dev/usb/serial/uplcom.c
+++ b/sys/dev/usb/serial/uplcom.c
@@ -243,57 +243,57 @@ static struct ucom_callback uplcom_callback = {
.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),
OpenPOWER on IntegriCloud