From f66590ae42e170ddcc16499ac27319971e41a063 Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Tue, 14 Aug 2007 11:31:02 +0000 Subject: [PATCH] Add some new uslcom(4) device ids found in Linux driver. --- share/man/man4/uslcom.4 | 13 +++++++++---- sys/bus/usb/usbdevs.h | 16 ++++++++++------ sys/bus/usb/usbdevs_data.h | 36 ++++++++++++++++++++++++++++++------ sys/dev/usbmisc/uslcom/uslcom.c | 11 ++++++++--- 4 files changed, 57 insertions(+), 19 deletions(-) diff --git a/share/man/man4/uslcom.4 b/share/man/man4/uslcom.4 index 7fb62d1491..b273e98651 100644 --- a/share/man/man4/uslcom.4 +++ b/share/man/man4/uslcom.4 @@ -1,4 +1,4 @@ -.\" $DragonFly: src/share/man/man4/uslcom.4,v 1.2 2007/08/14 10:11:07 hasso Exp $ +.\" $DragonFly: src/share/man/man4/uslcom.4,v 1.3 2007/08/14 11:31:01 hasso Exp $ .\" $OpenBSD: uslcom.4,v 1.4 2007/02/17 01:47:47 jsg Exp $ .\" .\" Copyright (c) 2006 Jonathan Gray @@ -46,16 +46,21 @@ The following devices should work with the .Nm driver: .Bd -literal -offset indent -Argussoft ISP +Argussoft In-System Programmer Baltech card reader Burnside Telecom Desktop Mobile chip45.com Crumb128 module +Enfora EDG1228 EDGE modem +Helicomm IP-Link 1220-DVM Jablotron PC-60B Lipowsky Baby-JTAG Lipowsky Baby-LIN Lipowsky HARP-1 -Pololu USB to Serial -Silicon Laboratories CP210x +Pololu USB to serial adapter +Suunto USB to serial adapter +Tracient RFID readers +West Mountain Radio RIGblaster +West Mountain Radio RIGtalk .Ed .Sh SEE ALSO .Xr tty 4 , diff --git a/sys/bus/usb/usbdevs.h b/sys/bus/usb/usbdevs.h index e495d988b9..7962dee683 100644 --- a/sys/bus/usb/usbdevs.h +++ b/sys/bus/usb/usbdevs.h @@ -1,10 +1,10 @@ -/* $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.20 2007/08/14 08:53:58 hasso Exp $ */ +/* $DragonFly: src/sys/bus/usb/Attic/usbdevs.h,v 1.21 2007/08/14 11:31:01 hasso Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * DragonFly: src/sys/bus/usb/usbdevs,v 1.25 2007/08/14 08:42:34 hasso Exp + * DragonFly: src/sys/bus/usb/usbdevs,v 1.26 2007/08/14 11:04:52 hasso Exp */ /* $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ */ /* $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */ @@ -2316,17 +2316,21 @@ /* Silicon Labs products */ #define USB_PRODUCT_SILABS_POLOLU 0x803b /* Pololu Serial */ -#define USB_PRODUCT_SILABS_ARGUSISP 0x8066 /* Argussoft ISP */ -#define USB_PRODUCT_SILABS_CRUMB128 0x807a /* Crumb128 */ +#define USB_PRODUCT_SILABS_EDG1228 0x8053 /* Enfora EDG1228 */ +#define USB_PRODUCT_SILABS_ARGUSISP 0x8066 /* Argussoft In-System Programmer */ +#define USB_PRODUCT_SILABS_CRUMB128 0x807a /* Crumb128 board */ #define USB_PRODUCT_SILABS_DEGREECONT 0x80ca /* Degree Controls */ +#define USB_PRODUCT_SILABS_TRACIENT_RFID 0x80dd /* Tracient RFID */ #define USB_PRODUCT_SILABS_SUNNTO 0x80f6 /* Suunto sports */ #define USB_PRODUCT_SILABS_DESKTOPMOBILE 0x813d /* Burnside Desktop mobile */ +#define USB_PRODUCT_SILABS_RIGBLASTER 0x814a /* West Mountain Radio RIGblaster P&P */ +#define USB_PRODUCT_SILABS_RIGTALK 0x814b /* West Mountain Radio RIGtalk */ #define USB_PRODUCT_SILABS_IPLINK1220 0x815e /* IP-Link 1220 */ #define USB_PRODUCT_SILABS_LIPOWSKY_JTAG 0x81c8 /* Lipowsky Baby-JTAG */ #define USB_PRODUCT_SILABS_LIPOWSKY_LIN 0x81e2 /* Lipowsky Baby-LIN */ #define USB_PRODUCT_SILABS_LIPOWSKY_HARP 0x8218 /* Lipowsky HARP-1 */ -#define USB_PRODUCT_SILABS_CP210X_1 0xea60 /* CP210x Serial */ -#define USB_PRODUCT_SILABS_CP210X_2 0xea61 /* CP210x Serial */ +#define USB_PRODUCT_SILABS_CP210X_1 0xea60 /* Silicon Labs CP210x */ +#define USB_PRODUCT_SILABS_CP210X_2 0xea61 /* Silicon Labs CP210x */ #define USB_PRODUCT_SILABS2_DCU11CLONE 0xaa26 /* DCU-11 clone */ diff --git a/sys/bus/usb/usbdevs_data.h b/sys/bus/usb/usbdevs_data.h index c42b5e4347..204c471ffe 100644 --- a/sys/bus/usb/usbdevs_data.h +++ b/sys/bus/usb/usbdevs_data.h @@ -1,10 +1,10 @@ -/* $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.20 2007/08/14 08:53:58 hasso Exp $ */ +/* $DragonFly: src/sys/bus/usb/Attic/usbdevs_data.h,v 1.21 2007/08/14 11:31:01 hasso Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * DragonFly: src/sys/bus/usb/usbdevs,v 1.25 2007/08/14 08:42:34 hasso Exp + * DragonFly: src/sys/bus/usb/usbdevs,v 1.26 2007/08/14 11:04:52 hasso Exp */ /* $FreeBSD: src/sys/dev/usb/usbdevs,v 1.203 2004/09/20 04:56:13 sanpei Exp $ */ /* $NetBSD: usbdevs,v 1.387 2004/10/27 07:02:47 augustss Exp $ */ @@ -6630,16 +6630,22 @@ const struct usb_knowndev usb_knowndevs[] = { "Pololu Serial", }, { + USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EDG1228, + 0, + "Silicon Labs", + "Enfora EDG1228", + }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP, 0, "Silicon Labs", - "Argussoft ISP", + "Argussoft In-System Programmer", }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128, 0, "Silicon Labs", - "Crumb128", + "Crumb128 board", }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREECONT, @@ -6648,6 +6654,12 @@ const struct usb_knowndev usb_knowndevs[] = { "Degree Controls", }, { + USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRACIENT_RFID, + 0, + "Silicon Labs", + "Tracient RFID", + }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUNNTO, 0, "Silicon Labs", @@ -6660,6 +6672,18 @@ const struct usb_knowndev usb_knowndevs[] = { "Burnside Desktop mobile", }, { + USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGBLASTER, + 0, + "Silicon Labs", + "West Mountain Radio RIGblaster P&P", + }, + { + USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGTALK, + 0, + "Silicon Labs", + "West Mountain Radio RIGtalk", + }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IPLINK1220, 0, "Silicon Labs", @@ -6687,13 +6711,13 @@ const struct usb_knowndev usb_knowndevs[] = { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_1, 0, "Silicon Labs", - "CP210x Serial", + "Silicon Labs CP210x", }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2, 0, "Silicon Labs", - "CP210x Serial", + "Silicon Labs CP210x", }, { USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE, diff --git a/sys/dev/usbmisc/uslcom/uslcom.c b/sys/dev/usbmisc/uslcom/uslcom.c index 4be9fc7e7c..18d3c51bf8 100644 --- a/sys/dev/usbmisc/uslcom/uslcom.c +++ b/sys/dev/usbmisc/uslcom/uslcom.c @@ -1,4 +1,4 @@ -/* $DragonFly: src/sys/dev/usbmisc/uslcom/uslcom.c,v 1.1 2007/08/14 08:53:59 hasso Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/uslcom/uslcom.c,v 1.2 2007/08/14 11:31:02 hasso Exp $ */ /* $OpenBSD: uslcom.c,v 1.12 2007/06/13 06:25:03 mbalmer Exp $ */ /* @@ -110,18 +110,23 @@ static const struct usb_devno uslcom_devs[] = { { USB_VENDOR_BALTECH, USB_PRODUCT_BALTECH_CARDREADER }, { USB_VENDOR_DYNASTREAM, USB_PRODUCT_DYNASTREAM_ANTDEVBOARD }, { USB_VENDOR_JABLOTRON, USB_PRODUCT_JABLOTRON_PC60B }, + { USB_VENDOR_PLX, USB_PRODUCT_PLX_CA42 }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_ARGUSISP }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_1 }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2 }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CRUMB128 }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DEGREECONT }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_DESKTOPMOBILE }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_EDG1228 }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_IPLINK1220 }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_HARP }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_JTAG }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_LIPOWSKY_LIN }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_POLOLU }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_1 }, - { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_CP210X_2 }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGBLASTER }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_RIGTALK }, { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_SUNNTO }, + { USB_VENDOR_SILABS, USB_PRODUCT_SILABS_TRACIENT_RFID }, { USB_VENDOR_SILABS2, USB_PRODUCT_SILABS2_DCU11CLONE }, { USB_VENDOR_USI, USB_PRODUCT_USI_MC60 } }; -- 2.11.4.GIT