From 7024d87be245730679d5815ada8107b5fb4fb1d2 Mon Sep 17 00:00:00 2001 From: Hasso Tepper Date: Mon, 11 Feb 2008 18:13:58 +0000 Subject: [PATCH] umsm(4) -> ugensa(4) as it makes much more sense - there is nothing Qualcomm MSM chipset specific in the driver. Manpage is rewritten in progress. --- Makefile_upgrade.inc | 4 +- share/man/man4/Makefile | 4 +- share/man/man4/ugensa.4 | 121 ++++++++++++++++ share/man/man4/umsm.4 | 173 ----------------------- sys/dev/usbmisc/Makefile | 6 +- sys/dev/usbmisc/ugensa/Makefile | 10 ++ sys/dev/usbmisc/{umsm/umsm.c => ugensa/ugensa.c} | 81 ++++++----- sys/dev/usbmisc/umsm/Makefile | 10 -- 8 files changed, 182 insertions(+), 227 deletions(-) create mode 100644 share/man/man4/ugensa.4 delete mode 100644 share/man/man4/umsm.4 create mode 100644 sys/dev/usbmisc/ugensa/Makefile rename sys/dev/usbmisc/{umsm/umsm.c => ugensa/ugensa.c} (72%) delete mode 100644 sys/dev/usbmisc/umsm/Makefile diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 15496aa156..c59a073d43 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1,4 +1,4 @@ -# $DragonFly: src/Makefile_upgrade.inc,v 1.13 2008/02/10 22:34:25 swildner Exp $ +# $DragonFly: src/Makefile_upgrade.inc,v 1.14 2008/02/11 18:13:58 hasso Exp $ # # Append all obsolete files to this file # Avoid constructs like {foo,bar}. It is parsed by /bin/sh @@ -556,3 +556,5 @@ TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-standard-supfile TO_REMOVE+=/usr/share/examples/cvsup/FreeBSD-www-supfile TO_REMOVE+=/usr/share/examples/cvsup/refuse TO_REMOVE+=/usr/share/examples/cvsup/refuse.README +TO_REMOVE+=/usr/share/man/man4/umsm.4.gz +TO_REMOVE+=/usr/share/man/cat4/umsm.4.gz diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 40528a707e..081368a3f3 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 # $FreeBSD: src/share/man/man4/Makefile,v 1.83.2.66 2003/06/04 17:10:30 sam Exp $ -# $DragonFly: src/share/man/man4/Makefile,v 1.76 2008/02/01 14:22:03 hasso Exp $ +# $DragonFly: src/share/man/man4/Makefile,v 1.77 2008/02/11 18:13:58 hasso Exp $ MAN= aac.4 \ acpi.4 \ @@ -273,6 +273,7 @@ MAN= aac.4 \ ufm.4 \ uftdi.4 \ ugen.4 \ + ugensa.4 \ uhci.4 \ uhid.4 \ uhidev.4 \ @@ -282,7 +283,6 @@ MAN= aac.4 \ umct.4 \ umodem.4 \ ums.4 \ - umsm.4 \ unix.4 \ uplcom.4 \ ural.4 \ diff --git a/share/man/man4/ugensa.4 b/share/man/man4/ugensa.4 new file mode 100644 index 0000000000..362744e24e --- /dev/null +++ b/share/man/man4/ugensa.4 @@ -0,0 +1,121 @@ +.\" $DragonFly: src/share/man/man4/ugensa.4,v 1.1 2008/02/11 18:13:58 hasso Exp $ +.\" $OpenBSD: umsm.4,v 1.20 2007/05/31 19:19:52 jmc Exp $ +.\" +.\" Copyright (c) 2006 Jonathan Gray +.\" +.\" Permission to use, copy, modify, and distribute this software for any +.\" purpose with or without fee is hereby granted, provided that the above +.\" copyright notice and this permission notice appear in all copies. +.\" +.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\" +.Dd February 2, 2008 +.Dt UGENSA 4 +.Os +.Sh NAME +.Nm ugensa +.Nd Generic USB serial device +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device ugensa" +.Cd "device ucom" +.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 +ugensa_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +is the minimal USB serial driver written to support virtual serial ports in +devices where hardware specific settings (baudrate, flow control etc) don't +make sense or just don't apply. +.Pp +The virtual serial ports are accessed through the +.Xr ucom 4 +driver which makes them behave like a +.Xr tty 4 . +.Pp +The +.Nm +driver was originally written to support Qualcomm MSM chipset found in EVDO +and UMTS capable modems, but there is nothing MSM chipset specific in it. +Many devices supported by the driver aren't typical USB devices, but CardBus, +ExpressCard or PCI Express Mini Cards that incorporate a USB controller +with the actual devices attached to it. +.Pp +Communication devices supported by the +.Nm +driver typically have more than one virtual serial port, but only one of +them (usually the first one) can be used with +.Xr ppp 8 +or +.Xr pppd 8 . +At least one of additional ports can usually be used for device/network +monitoring and other communication tasks (like SMS for example). +Protocols and methods used to access these features are out of scope of this +driver. +.Pp +The following devices should work with the +.Nm +driver: +.Pp +.Bl -column "Device " "Bus" -compact -offset 6n +.It Em "Device Bus" +.It Li "AirPrime PC5220" Ta Ta CardBus +.It Li "Dell W5500" Ta Ta PCI Express Mini Card +.It Li "Huawei Mobile Connect" Ta Ta CardBus +.It Li "Kyocera KPC650" Ta Ta CardBus +.It Li "Novatel Wireless ES620" Ta Ta USB +.It Li "Novatel Wireless Merlin V620" Ta CardBus +.It Li "Novatel Wireless Merlin S720" Ta Ta CardBus +.It Li "Novatel Wireless Merlin U720" Ta Ta USB +.It Li "Novatel Wireless Merlin XU870" Ta ExpressCard +.It Li "ONDA Communication H600" Ta Ta CardBus +.It Li "Sierra Wireless MC5720" Ta Ta PCI Express Mini Card +.It Li "Sierra Wireless MC5725" Ta Ta PCI Express Mini Card +.It Li "Sierra Wireless MC8755" Ta Ta PCI Express Mini Card +.It Li "Sierra Wireless MC8765" Ta Ta PCI Express Mini Card +.It Li "Sierra Wireless MC8775" Ta Ta PCI Express Mini Card +.It Li "Sierra Wireless AirCard 580" Ta Ta CardBus +.It Li "Sierra Wireless AirCard 595" Ta Ta CardBus +.It Li "Sierra Wireless AirCard 875" Ta Ta CardBus +.El +.Sh SEE ALSO +.Xr ppp 8 , +.Xr pppd 8 , +.Xr tty 4 , +.Xr ucom 4 , +.Xr usb 4 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Ox 4.0 +as +.Nm umsm . +It was imported into +.Dx 1.11 +with its present name and extended to support multiple virtual serial ports +per device. +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Jonathan Gray +.Aq jsg@openbsd.org . +.Sh CAVEATS +For Verizon Wireless (and possibly other services), cards require a one-time +activation before they will work. diff --git a/share/man/man4/umsm.4 b/share/man/man4/umsm.4 deleted file mode 100644 index 056cb5f7a8..0000000000 --- a/share/man/man4/umsm.4 +++ /dev/null @@ -1,173 +0,0 @@ -.\" $DragonFly: src/share/man/man4/Attic/umsm.4,v 1.4 2008/01/11 12:25:30 hasso Exp $ -.\" $OpenBSD: umsm.4,v 1.20 2007/05/31 19:19:52 jmc Exp $ -.\" -.\" Copyright (c) 2006 Jonathan Gray -.\" -.\" Permission to use, copy, modify, and distribute this software for any -.\" purpose with or without fee is hereby granted, provided that the above -.\" copyright notice and this permission notice appear in all copies. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.\" -.Dd January 11, 2008 -.Dt UMSM 4 -.Os -.Sh NAME -.Nm umsm -.Nd Qualcomm MSM modem device -.Sh SYNOPSIS -To compile this driver into the kernel, -place the following lines in your -kernel configuration file: -.Bd -ragged -offset indent -.Cd "device umsm" -.Cd "device ucom" -.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 -umsm_load="YES" -.Ed -.Sh DESCRIPTION -The -.Nm -driver supports Qualcomm MSM modem adapters. -The MSM chipset is found in EVDO and UMTS capable modems. -Typically these are CardBus and PCI Express Mini Cards that incorporate a -USB controller with the actual device attached to it. -.Pp -The following devices are known to work with the -.Nm -driver: -.Pp -.Bl -column "Device " "Bus" -compact -offset 6n -.It Em "Device Bus" -.It Li "AirPrime PC5220" Ta Ta CardBus -.It Li "Huawei Mobile Connect" Ta Ta CardBus -.It Li "Kyocera KPC650" Ta Ta CardBus -.It Li "Novatel Wireless ES620" Ta Ta USB -.It Li "ONDA Communication H600" Ta Ta CardBus -.It Li "Sierra Wireless MC8755" Ta Ta PCI Express Mini Card -.It Li "Sierra Wireless AirCard 580" Ta Ta CardBus -.It Li "Sierra Wireless AirCard 875" Ta Ta CardBus -.El -.Pp -Devices suspected of being compatible are: -.Pp -.Bl -column "Device " "Bus" -compact -offset 6n -.It Em "Device Bus" -.It Li "Dell W5500" Ta Ta PCI Express Mini Card -.It Li "Novatel Wireless Merlin V620" Ta CardBus -.It Li "Novatel Wireless S720" Ta Ta CardBus -.It Li "Novatel Wireless U720" Ta Ta USB -.It Li "Novatel Wireless XU870 HSDPA" Ta ExpressCard -.It Li "Sierra Wireless AirCard 595" Ta CardBus -.It Li "Sierra Wireless EM5625" Ta Ta USB module -.It Li "Sierra Wireless MC5720" Ta Ta PCI Express Mini Card -.It Li "Sierra Wireless MC5725" Ta Ta PCI Express Mini Card -.It Li "Sierra Wireless MC8765" Ta Ta PCI Express Mini Card -.It Li "Sierra Wireless MC8775" Ta Ta PCI Express Mini Card -.El -.Sh EXAMPLES -An example -.Pa /etc/ppp/ppp.conf -configuration for Verizon Wireless might look something like below; -see -.Xr ppp 8 -for more information. -.Bd -literal -offset indent -default: - set device /dev/cuaU0 - set speed 230400 - set dial "ABORT BUSY ABORT NO\e\esCARRIER TIMEOUT 5 \e - \e"\e" AT OK-AT-OK ATE1Q0s7=60 OK \e\edATDT\e\eT TIMEOUT 40 CONNECT" - set phone "#777" - set login - set authname 4517654321@vzw3g.com - set authkey vzw - set timeout 120 - set ifaddr 10.0.0.1/0 10.0.0.2/0 255.255.255.0 0.0.0.0 - add default HISADDR - enable dns -.Ed -.Pp -In this example the phone number is (451) 765-4321: replace this with -the number issued for the card or your phone's number if a handset is being -used. -.Pp -An example demand dial configuration for Cingular Wireless using -.Xr pppd 8 -appears below. -.Pp -.Pa /etc/ppp/cingular-chat : -.Bd -literal -offset indent -TIMEOUT 10 -REPORT CONNECT -ABORT BUSY -ABORT 'NO CARRIER' -ABORT ERROR -\'\' ATZ OK AT&F OK -AT+CGDCONT=1,"IP","isp.cingular" OK -ATD*99***1# CONNECT -.Ed -.Pp -.Pa /etc/ppp/peers/ac875 : -.Bd -literal -offset indent -cuaU0 -115200 -debug -noauth -nocrtscts -:10.254.254.1 -ipcp-accept-remote -defaultroute -user isp@cingulargprs.com -demand -active-filter 'not udp port 123' -persist -idle 600 -connect "/usr/sbin/chat -v -f /etc/ppp/cingular-chat" -.Ed -.Pp -.Pa /etc/ppp/chap-secrets : -.Bd -literal -offset indent -# Secrets for authentication using CHAP -# client server secret IP addresses -isp@cingulargprs.com * CINGULAR1 -.Ed -.Pp -.Xr pppd 8 -is then started using: -.Pp -.Dl # pppd call ac875 -.Sh SEE ALSO -.Xr ucom 4 , -.Xr usb 4 , -.Xr pppd 8 -.Sh HISTORY -The -.Nm -device driver first appeared in -.Ox 4.0 -and was imported into -.Dx 1.11 . -.Sh AUTHORS -.An -nosplit -The -.Nm -driver was written by -.An Jonathan Gray -.Aq jsg@openbsd.org . -.Sh CAVEATS -For Verizon Wireless (and possibly other services), -cards require a one-time activation before they will work; -.Nm -does not currently support this. diff --git a/sys/dev/usbmisc/Makefile b/sys/dev/usbmisc/Makefile index 7c9e7d443f..f4575c83dd 100644 --- a/sys/dev/usbmisc/Makefile +++ b/sys/dev/usbmisc/Makefile @@ -1,8 +1,8 @@ -# $DragonFly: src/sys/dev/usbmisc/Makefile,v 1.9 2007/12/30 20:02:56 hasso Exp $ +# $DragonFly: src/sys/dev/usbmisc/Makefile,v 1.10 2008/02/11 18:13:58 hasso Exp $ # -SUBDIR= moscom uark ubsa ubt uchcom ucom ufm uftdi ugen uhid ukbd ulpt \ - umass umct umodem ums umsm uplcom uscanner uslcom uticom uvisor \ +SUBDIR= moscom uark ubsa ubt uchcom ucom ufm uftdi ugen ugensa uhid ukbd ulpt \ + umass umct umodem ums uplcom uscanner uslcom uticom uvisor \ uvscom umct .include diff --git a/sys/dev/usbmisc/ugensa/Makefile b/sys/dev/usbmisc/ugensa/Makefile new file mode 100644 index 0000000000..1c9d2b7c8b --- /dev/null +++ b/sys/dev/usbmisc/ugensa/Makefile @@ -0,0 +1,10 @@ +# $DragonFly: src/sys/dev/usbmisc/ugensa/Makefile,v 1.1 2008/02/11 18:13:58 hasso Exp $ + +.PATH: ${.CURDIR}/../ucom + +KMOD= ugensa +SRCS= ugensa.c opt_usb.h device_if.h bus_if.h +NOMAN= +KMODDEPS= ucom + +.include diff --git a/sys/dev/usbmisc/umsm/umsm.c b/sys/dev/usbmisc/ugensa/ugensa.c similarity index 72% rename from sys/dev/usbmisc/umsm/umsm.c rename to sys/dev/usbmisc/ugensa/ugensa.c index 5823e9a9e3..ba84e71bea 100644 --- a/sys/dev/usbmisc/umsm/umsm.c +++ b/sys/dev/usbmisc/ugensa/ugensa.c @@ -1,5 +1,5 @@ -/* $DragonFly: src/sys/dev/usbmisc/umsm/Attic/umsm.c,v 1.8 2008/01/15 14:19:11 hasso Exp $ */ -/* $OpenBSD: umsm.c,v 1.15 2007/06/14 10:11:16 mbalmer Exp $ */ +/* $DragonFly: src/sys/dev/usbmisc/ugensa/ugensa.c,v 1.1 2008/02/11 18:13:58 hasso Exp $ */ +/* $OpenBSD: umsm.c,v 1.15 2007/06/14 10:11:16 mbalmer Exp $ */ /* * Copyright (c) 2006 Jonathan Gray @@ -17,7 +17,11 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* Driver for Qualcomm MSM EVDO and UMTS communication devices */ +/* + * Generic USB serial driver used for devices where hardware specific + * don't apply or doesn't make sense (for example Qualcomm MSM EVDO, UMTS + * and other similar communication devices). + */ #include #include @@ -34,21 +38,21 @@ #include #include -#ifdef UMSM_DEBUG -static int umsmdebug = 1; -#define DPRINTFN(n, x) do { if (umsmdebug > (n)) kprintf x; } while (0) +#ifdef UGENSA_DEBUG +static int ugensadebug = 1; +#define DPRINTFN(n, x) do { if (ugensadebug > (n)) kprintf x; } while (0) #else #define DPRINTFN(n, x) #endif #define DPRINTF(x) DPRINTFN(0, x) -#define UMSMBUFSZ 4096 +#define UGENSABUFSZ 4096 -struct umsm_softc { +struct ugensa_softc { struct ucom_softc sc_ucom; }; -struct ucom_callback umsm_callback = { +struct ucom_callback ugensa_callback = { NULL, NULL, NULL, @@ -59,7 +63,7 @@ struct ucom_callback umsm_callback = { NULL }; -static const struct usb_devno umsm_devs[] = { +static const struct usb_devno ugensa_devs[] = { { USB_DEVICE(0x05c6, 0x6613) }, /* Qualcomm HSDPA MSM */ { USB_DEVICE(0x0c88, 0x17da) }, /* Kyocera KPC650 */ { USB_DEVICE(0x0f3d, 0x0112) }, /* AirPrime PC5220 */ @@ -79,51 +83,52 @@ static const struct usb_devno umsm_devs[] = { { USB_DEVICE(0x1410, 0x1100) }, /* Novatel Wireless ExpressCard 3G */ { USB_DEVICE(0x1410, 0x1110) }, /* Novatel Wireless Merlin V620 */ { USB_DEVICE(0x1410, 0x1130) }, /* Novatel Wireless S720 */ + { USB_DEVICE(0x1410, 0x1410) }, /* Novatel Wireless U740 */ { USB_DEVICE(0x1410, 0x1430) }, /* Novatel Wireless XU870 */ { USB_DEVICE(0x1410, 0x2100) }, /* Novatel Wireless ES620 */ { USB_DEVICE(0x1410, 0x2110) }, /* Novatel Wireless U720 */ { USB_DEVICE(0x413c, 0x8115) }, /* Dell W5500 */ }; -static device_probe_t umsm_match; -static device_attach_t umsm_attach; -static device_detach_t umsm_detach; +static device_probe_t ugensa_match; +static device_attach_t ugensa_attach; +static device_detach_t ugensa_detach; -static device_method_t umsm_methods[] = { +static device_method_t ugensa_methods[] = { /* Device interface */ - DEVMETHOD(device_probe, umsm_match), - DEVMETHOD(device_attach, umsm_attach), - DEVMETHOD(device_detach, umsm_detach), + DEVMETHOD(device_probe, ugensa_match), + DEVMETHOD(device_attach, ugensa_attach), + DEVMETHOD(device_detach, ugensa_detach), { 0, 0 } }; -static driver_t umsm_driver = { +static driver_t ugensa_driver = { "ucom", - umsm_methods, - sizeof (struct umsm_softc) + ugensa_methods, + sizeof (struct ugensa_softc) }; -DRIVER_MODULE(umsm, uhub, umsm_driver, ucom_devclass, usbd_driver_load, 0); -MODULE_DEPEND(umsm, usb, 1, 1, 1); -MODULE_DEPEND(umsm, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); -MODULE_VERSION(umsm, 1); +DRIVER_MODULE(ugensa, uhub, ugensa_driver, ucom_devclass, usbd_driver_load, 0); +MODULE_DEPEND(ugensa, usb, 1, 1, 1); +MODULE_DEPEND(ugensa, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); +MODULE_VERSION(ugensa, 1); static int -umsm_match(device_t self) +ugensa_match(device_t self) { struct usb_attach_arg *uaa = device_get_ivars(self); if (uaa->iface == NULL) return UMATCH_NONE; - return (usb_lookup(umsm_devs, uaa->vendor, uaa->product) != NULL) ? + return (usb_lookup(ugensa_devs, uaa->vendor, uaa->product) != NULL) ? UMATCH_VENDOR_IFACESUBCLASS : UMATCH_NONE; } static int -umsm_attach(device_t self) +ugensa_attach(device_t self) { - struct umsm_softc *sc = device_get_softc(self); + struct ugensa_softc *sc = device_get_softc(self); struct usb_attach_arg *uaa = device_get_ivars(self); struct ucom_softc *ucom; usb_interface_descriptor_t *id; @@ -131,7 +136,7 @@ umsm_attach(device_t self) int i; ucom = &sc->sc_ucom; - bzero(sc, sizeof (struct umsm_softc)); + bzero(sc, sizeof (struct ugensa_softc)); ucom->sc_dev = self; ucom->sc_udev = uaa->device; @@ -162,11 +167,11 @@ umsm_attach(device_t self) ucom->sc_parent = sc; ucom->sc_portno = UCOM_UNK_PORTNO; - ucom->sc_ibufsize = UMSMBUFSZ; - ucom->sc_obufsize = UMSMBUFSZ; - ucom->sc_ibufsizepad = UMSMBUFSZ; + ucom->sc_ibufsize = UGENSABUFSZ; + ucom->sc_obufsize = UGENSABUFSZ; + ucom->sc_ibufsizepad = UGENSABUFSZ; ucom->sc_opkthdrlen = 0; - ucom->sc_callback = &umsm_callback; + ucom->sc_callback = &ugensa_callback; usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, ucom->sc_udev, ucom->sc_dev); @@ -185,12 +190,12 @@ error: } static int -umsm_detach(device_t self) +ugensa_detach(device_t self) { - struct umsm_softc *sc = device_get_softc(self); + struct ugensa_softc *sc = device_get_softc(self); int rv = 0; - DPRINTF(("umsm_detach: sc=%p\n", sc)); + DPRINTF(("ugensa_detach: sc=%p\n", sc)); sc->sc_ucom.sc_dying = 1; rv = ucom_detach(&sc->sc_ucom); usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_ucom.sc_udev, @@ -201,9 +206,9 @@ umsm_detach(device_t self) #if 0 /* not yet */ int -umsm_activate(struct device *self, enum devact act) +ugensa_activate(struct device *self, enum devact act) { - struct umsm_softc *sc = (struct umsm_softc *)self; + struct ugensa_softc *sc = (struct ugensa_softc *)self; int rv = 0; switch (act) { diff --git a/sys/dev/usbmisc/umsm/Makefile b/sys/dev/usbmisc/umsm/Makefile deleted file mode 100644 index a4e5dbe4d4..0000000000 --- a/sys/dev/usbmisc/umsm/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $DragonFly: src/sys/dev/usbmisc/umsm/Attic/Makefile,v 1.2 2007/09/29 21:13:09 swildner Exp $ - -.PATH: ${.CURDIR}/../ucom - -KMOD= umsm -SRCS= umsm.c opt_usb.h device_if.h bus_if.h -NOMAN= -KMODDEPS= ucom - -.include -- 2.11.4.GIT