diff options
| -rw-r--r-- | share/man/man4/Makefile | 2 | ||||
| -rw-r--r-- | share/man/man4/ucom.4 | 2 | ||||
| -rw-r--r-- | share/man/man4/umcs.4 (renamed from share/man/man4/umcs7840.4) | 14 | ||||
| -rw-r--r-- | sys/conf/files | 4 | ||||
| -rw-r--r-- | sys/dev/usb/serial/umcs.c (renamed from sys/dev/usb/serial/umcs7840.c) | 10 | ||||
| -rw-r--r-- | sys/dev/usb/serial/umcs.h (renamed from sys/dev/usb/serial/umcs7840.h) | 0 | ||||
| -rw-r--r-- | sys/modules/usb/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/usb/umcs/Makefile (renamed from sys/modules/usb/umcs7840/Makefile) | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index a94d828..7ccccfb 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -475,7 +475,7 @@ MAN= aac.4 \ ukbd.4 \ ulpt.4 \ umass.4 \ - umcs7840.4 \ + umcs.4 \ umct.4 \ umodem.4 \ ums.4 \ diff --git a/share/man/man4/ucom.4 b/share/man/man4/ucom.4 index ee9c517..8898872 100644 --- a/share/man/man4/ucom.4 +++ b/share/man/man4/ucom.4 @@ -78,7 +78,7 @@ multiple external ports. .Xr uark 4 , .Xr uchcom 4 , .Xr uftdi 4 , -.Xr umcs7840 4 , +.Xr umcs 4 , .Xr umct 4 , .Xr umodem 4 , .Xr uplcom 4 , diff --git a/share/man/man4/umcs7840.4 b/share/man/man4/umcs.4 index f44d5cc..f57b084 100644 --- a/share/man/man4/umcs7840.4 +++ b/share/man/man4/umcs.4 @@ -29,24 +29,24 @@ .\" $FreeBSD$ .\" .Dd December 10, 2010 -.Dt UMCS7840 4 +.Dt UMCS 4 .Os .Sh NAME -.Nm umcs7840 +.Nm umcs .Nd USB support for serial adapters based on the MCS7820 and MCS7840 chips .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your kernel configuration file: .Bd -ragged -offset indent -.Cd "device umcs7840" +.Cd "device umcs" .Ed .Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent -umcs7840_load="YES" +umcs_load="YES" .Ed .Sh DESCRIPTION The @@ -80,6 +80,9 @@ ST Lab U-400 four-port serial USB adapter .Xr tty 4 , .Xr ucom 4 , .Xr usb 4 +.Sh BUGS +This driver doesn't support access to any fine tunes of +chip, like RS522/RS485 mode, non-standard baudrates, etc. .Sh HISTORY The .Nm @@ -92,6 +95,3 @@ The driver was written by .An Lev Serebryakov .Aq lev@FreeBSD.org . -.Sh BUGS -This driver doesn't support access to any fine tunes of -chip, like RS522/RS485 mode, non-standard baudrates, etc. diff --git a/sys/conf/files b/sys/conf/files index 0f5c512..59286a5 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1958,7 +1958,7 @@ dev/usb/serial/uftdi.c optional uftdi dev/usb/serial/ugensa.c optional ugensa dev/usb/serial/uipaq.c optional uipaq dev/usb/serial/ulpt.c optional ulpt -dev/usb/serial/umcs7840.c optional umcs7840 +dev/usb/serial/umcs.c optional umcs dev/usb/serial/umct.c optional umct dev/usb/serial/umodem.c optional umodem dev/usb/serial/umoscom.c optional umoscom @@ -1968,7 +1968,7 @@ dev/usb/serial/uvisor.c optional uvisor dev/usb/serial/uvscom.c optional uvscom dev/usb/serial/usb_serial.c optional ucom | u3g | uark | ubsa | ubser | \ uchcom | ucycom | ufoma | uftdi | \ - ugensa | uipaq | umcs7840 | umct | \ + ugensa | uipaq | umcs | umct | \ umodem | umoscom | uplcom | uslcom | \ uvisor | uvscom # diff --git a/sys/dev/usb/serial/umcs7840.c b/sys/dev/usb/serial/umcs.c index 34b68a1..c74044e 100644 --- a/sys/dev/usb/serial/umcs7840.c +++ b/sys/dev/usb/serial/umcs.c @@ -66,21 +66,21 @@ __FBSDID("$FreeBSD$"); #include <dev/usb/usb_cdc.h> #include "usbdevs.h" -#define USB_DEBUG_VAR umcs7840_debug +#define USB_DEBUG_VAR umcs_debug #include <dev/usb/usb_debug.h> #include <dev/usb/usb_process.h> #include <dev/usb/serial/usb_serial.h> -#include <dev/usb/serial/umcs7840.h> +#include <dev/usb/serial/umcs.h> #define UMCS7840_MODVER 1 #ifdef USB_DEBUG -static int umcs7840_debug = 0; +static int umcs_debug = 0; -SYSCTL_NODE(_hw_usb, OID_AUTO, umcs7840, CTLFLAG_RW, 0, "USB umcs7840 quadport serial adapter"); -SYSCTL_INT(_hw_usb_umcs7840, OID_AUTO, debug, CTLFLAG_RW, &umcs7840_debug, 0, "Debug level"); +SYSCTL_NODE(_hw_usb, OID_AUTO, umcs, CTLFLAG_RW, 0, "USB umcs quadport serial adapter"); +SYSCTL_INT(_hw_usb_umcs, OID_AUTO, debug, CTLFLAG_RW, &umcs_debug, 0, "Debug level"); #endif /* USB_DEBUG */ diff --git a/sys/dev/usb/serial/umcs7840.h b/sys/dev/usb/serial/umcs.h index 310b4af..310b4af 100644 --- a/sys/dev/usb/serial/umcs7840.h +++ b/sys/dev/usb/serial/umcs.h diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index ddff357..6288d66 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -30,7 +30,7 @@ SUBDIR += ehci musb ohci uhci xhci uss820dci ${_at91dci} ${_atmegadci} SUBDIR += rum run uath upgt ural zyd ${_urtw} SUBDIR += atp uhid ukbd ums udbp ufm uep SUBDIR += ucom u3g uark ubsa ubser uchcom ucycom ufoma uftdi ugensa uipaq ulpt \ - umct umcs7840 umodem umoscom uplcom uslcom uvisor uvscom + umct umcs umodem umoscom uplcom uslcom uvisor uvscom SUBDIR += uether aue axe cdce cue kue mos rue udav uhso ipheth SUBDIR += usfs umass urio SUBDIR += quirk template diff --git a/sys/modules/usb/umcs7840/Makefile b/sys/modules/usb/umcs/Makefile index fa03a9e..be75fb5 100644 --- a/sys/modules/usb/umcs7840/Makefile +++ b/sys/modules/usb/umcs/Makefile @@ -29,8 +29,8 @@ S= ${.CURDIR}/../../.. .PATH: $S/dev/usb/serial -KMOD= umcs7840 +KMOD= umcs SRCS= opt_bus.h opt_usb.h device_if.h bus_if.h usb_if.h usbdevs.h \ - umcs7840.c + umcs.c .include <bsd.kmod.mk> |
