summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2006-07-01 04:23:32 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2006-07-01 04:23:32 +0000
commit546456db72ce87fce98c1ee5e51b108d6e00dbe8 (patch)
treec506b9114fe25a09aca4027ccfb206e27d7542fa /sys/dev
parent47e3f6618b17ae8ff83acca35f935a9e7a4acae1 (diff)
Remove comments in device list that duplicate man page,
sort device list while here. ok deraadt@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/uplcom.c53
1 files changed, 18 insertions, 35 deletions
diff --git a/sys/dev/usb/uplcom.c b/sys/dev/usb/uplcom.c
index 7816743f4b7..3d5df50921b 100644
--- a/sys/dev/usb/uplcom.c
+++ b/sys/dev/usb/uplcom.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: uplcom.c,v 1.30 2006/06/23 06:27:12 miod Exp $ */
+/* $OpenBSD: uplcom.c,v 1.31 2006/07/01 04:23:31 jsg Exp $ */
/* $NetBSD: uplcom.c,v 1.29 2002/09/23 05:51:23 simonb Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -151,56 +151,39 @@ struct ucom_methods uplcom_methods = {
};
static const struct usb_devno uplcom_devs[] = {
- /* I/O DATA USB-RSAQ2 */
- { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2 },
- /* I/O DATA USB-RSAQ */
- { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ },
- /* PLANEX USB-RS232 URS-03 */
+ { USB_VENDOR_ALCATEL, USB_PRODUCT_ALCATEL_OT535 },
+ { USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_SERIAL },
{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC232A },
- /* IOGEAR/ATEN UC-232A */
- { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303 },
- /* IOGEAR/ATENTRIPPLITE U209 */
- { USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209 },
- /* ELECOM UC-SGT */
{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT },
{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_UCSGT0 },
- /* Panasonic 50" Touch Panel */
- { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_TYTP50P6S },
- /* RATOC REX-USB60 */
- { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60 },
- /* TDK USB-PHS Adapter UHA6400 */
- { USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400 },
- /* TDK USB-PDC Adapter UPA9664 */
- { USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664 },
- /* Ericsson DCU-10 & DCU-11, made by Susteen, Inc. */
- { USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU11 },
- /* Sitecom USB to Serial. */
- { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104 },
- /* Pharos USB GPS - Microsoft version */
- { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X },
- /* IODATA USB-RSAQ3 */
- { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X2 },
- /* SOURCENEXT KeikaiDenwa 8 */
- { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8 },
- /* SOURCENEXT KeikaiDenwa 8 with charger */
- { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG },
- /* HAL Corporation Crossam2+USB */
{ USB_VENDOR_HAL, USB_PRODUCT_HAL_IMR001 },
- { USB_VENDOR_ALCATEL, USB_PRODUCT_ALCATEL_OT535 },
- { USB_VENDOR_ANCHOR, USB_PRODUCT_ANCHOR_SERIAL },
+ { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBRSAQ },
{ USB_VENDOR_LEADTEK, USB_PRODUCT_LEADTEK_9531 },
{ USB_VENDOR_MOBILEACTION, USB_PRODUCT_MOBILEACTION_MA620 },
{ USB_VENDOR_NOKIA, USB_PRODUCT_NOKIA_CA42 },
{ USB_VENDOR_OTI, USB_PRODUCT_OTI_DKU5 },
{ USB_VENDOR_PLX, USB_PRODUCT_PLX_CA42 },
+ { USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_TYTP50P6S },
+ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303 },
+ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X },
+ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2303X2 },
+ { USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_RSAQ2 },
{ USB_VENDOR_RADIOSHACK, USB_PRODUCT_RADIOSHACK_PL2303 },
+ { USB_VENDOR_RATOC, USB_PRODUCT_RATOC_REXUSB60 },
{ USB_VENDOR_SAGEM, USB_PRODUCT_SAGEM_SERIAL },
{ USB_VENDOR_SAMSUNG2, USB_PRODUCT_SAMSUNG2_I330 },
{ USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_SX1 },
{ USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X65 },
{ USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_X75 },
+ { USB_VENDOR_SITECOM, USB_PRODUCT_SITECOM_CN104 },
+ { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8 },
+ { USB_VENDOR_SOURCENEXT, USB_PRODUCT_SOURCENEXT_KEIKAI8_CHG },
{ USB_VENDOR_SPEEDDRAGON, USB_PRODUCT_SPEEDDRAGON_MS3303H },
- { USB_VENDOR_SYNTECH, USB_PRODUCT_SYNTECH_SERIAL }
+ { USB_VENDOR_SUSTEEN, USB_PRODUCT_SUSTEEN_DCU11 },
+ { USB_VENDOR_SYNTECH, USB_PRODUCT_SYNTECH_SERIAL },
+ { USB_VENDOR_TDK, USB_PRODUCT_TDK_UHA6400 },
+ { USB_VENDOR_TDK, USB_PRODUCT_TDK_UPA9664 },
+ { USB_VENDOR_TRIPPLITE, USB_PRODUCT_TRIPPLITE_U209 }
};
#define uplcom_lookup(v, p) usb_lookup(uplcom_devs, v, p)