diff options
author | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 1999-08-23 20:59:21 +0000 |
commit | 663cbe4fc26065f7af7d10faaee492a626156145 (patch) | |
tree | 32e619fadb473bfb85ff8e06044176f2ff323cce /sys/isa | |
parent | 2a5ff1f726f814a9e4717afe3f14250f8030cace (diff) | |
download | FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.zip FreeBSD-src-663cbe4fc26065f7af7d10faaee492a626156145.tar.gz |
Convert DEVFS hooks in (most) drivers to make_dev().
Diskslice/label code not yet handled.
Vinum, i4b, alpha, pc98 not dealt with (left to respective Maintainers)
Add the correct hook for devfs to kern_conf.c
The net result of this excercise is that a lot less files depends on DEVFS,
and devtoname() gets more sensible output in many cases.
A few drivers had minor additional cleanups performed relating to cdevsw
registration.
A few drivers don't register a cdevsw{} anymore, but only use make_dev().
Diffstat (limited to 'sys/isa')
-rw-r--r-- | sys/isa/fd.c | 120 | ||||
-rw-r--r-- | sys/isa/joy.c | 15 | ||||
-rw-r--r-- | sys/isa/psm.c | 20 | ||||
-rw-r--r-- | sys/isa/sio.c | 46 |
4 files changed, 18 insertions, 183 deletions
diff --git a/sys/isa/fd.c b/sys/isa/fd.c index c86bc86..dc1a699 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -47,12 +47,11 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.151 1999/07/29 11:27:33 joerg Exp $ + * $Id: fd.c,v 1.152 1999/08/14 11:40:41 phk Exp $ * */ #include "fd.h" -#include "opt_devfs.h" #include "opt_fdc.h" #if NFDC > 0 @@ -80,10 +79,6 @@ #include <machine/resource.h> #include <machine/stdarg.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif /* DEVFS */ - #include <isa/isavar.h> #include <isa/isareg.h> #include <isa/fdreg.h> @@ -184,10 +179,6 @@ struct fd_data { struct callout_handle toffhandle; struct callout_handle tohandle; struct devstat device_stats; -#ifdef DEVFS - void *bdevs[1 + NUMDENS + MAXPARTITIONS]; - void *cdevs[1 + NUMDENS + MAXPARTITIONS]; -#endif device_t dev; fdu_t fdu; }; @@ -915,78 +906,9 @@ static int fd_attach(device_t dev) { struct fd_data *fd; -#ifdef DEVFS - int i; - int mynor; - int typemynor; - int typesize; -#endif fd = device_get_softc(dev); -#ifdef DEVFS /* XXX bitrot */ - mynor = fd->fdu << 6; - fd->bdevs[0] = devfs_add_devswf(&fd_cdevsw, mynor, DV_BLK, - UID_ROOT, GID_OPERATOR, 0640, - "fd%d", fd->fdu); - fd->cdevs[0] = devfs_add_devswf(&fd_cdevsw, mynor, DV_CHR, - UID_ROOT, GID_OPERATOR, 0640, - "rfd%d", fd->fdu); - for (i = 1; i < 1 + NUMDENS; i++) { - /* - * XXX this and the lookup in Fdopen() should be - * data driven. - */ - switch (fd->type) { - case FD_360: - if (i != FD_360) - continue; - break; - case FD_720: - if (i != FD_720 && i != FD_800 && i != FD_820) - continue; - break; - case FD_1200: - if (i != FD_360 && i != FD_720 && i != FD_800 - && i != FD_820 && i != FD_1200 - && i != FD_1440 && i != FD_1480) - continue; - break; - case FD_1440: - if (i != FD_720 && i != FD_800 && i != FD_820 - && i != FD_1200 && i != FD_1440 - && i != FD_1480 && i != FD_1720) - continue; - break; - } - typesize = fd_types[i - 1].size / 2; - /* - * XXX all these conversions give bloated code and - * confusing names. - */ - if (typesize == 1476) - typesize = 1480; - if (typesize == 1722) - typesize = 1720; - typemynor = mynor | i; - fd->bdevs[i] = - devfs_add_devswf(&fd_cdevsw, typemynor, DV_BLK, - UID_ROOT, GID_OPERATOR, 0640, - "fd%d.%d", fd->fdu, typesize); - fd->cdevs[i] = - devfs_add_devswf(&fd_cdevsw, typemynor, DV_CHR, - UID_ROOT, GID_OPERATOR, 0640, - "rfd%d.%d", fd->fdu, typesize); - } - - for (i = 0; i < MAXPARTITIONS; i++) { - fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0], - "fd%d%c", fd->fdu, 'a' + i); - fd->cdevs[1 + NUMDENS + i] = - devfs_makelink(fd->cdevs[0], - "rfd%d%c", fd->fdu, 'a' + i); - } -#endif /* DEVFS */ /* * Export the drive to the devstat interface. */ @@ -1010,11 +932,6 @@ static int yeattach(struct isa_device *dev) fdu_t fdu; fd_p fd; int st0, st3, i; -#ifdef DEVFS - int mynor; - int typemynor; - int typesize; -#endif fdc->fdcu = fdcu; /* * the FDC_PCMCIA flag is used to to indicate special PIO is used @@ -1090,41 +1007,6 @@ static int yeattach(struct isa_device *dev) printf("fdc%d: 1.44MB 3.5in PCMCIA\n", fdcu); fd->type = FD_1440; -#ifdef DEVFS - mynor = fdcu << 6; - fd->bdevs[0] = devfs_add_devswf(&fd_cdevsw, mynor, DV_BLK, - UID_ROOT, GID_OPERATOR, 0640, - "fd%d", fdu); - fd->cdevs[0] = devfs_add_devswf(&fd_cdevsw, mynor, DV_CHR, - UID_ROOT, GID_OPERATOR, 0640, - "rfd%d", fdu); - /* - * XXX this and the lookup in Fdopen() should be - * data driven. - */ - typemynor = mynor | FD_1440; - typesize = fd_types[FD_1440 - 1].size / 2; - /* - * XXX all these conversions give bloated code and - * confusing names. - */ - if (typesize == 1476) - typesize = 1480; - if (typesize == 1722) - typesize = 1720; - fd->bdevs[FD_1440] = devfs_add_devswf(&fd_cdevsw, typemynor, - DV_BLK, UID_ROOT, GID_OPERATOR, - 0640, "fd%d.%d", fdu, typesize); - fd->cdevs[FD_1440] = devfs_add_devswf(&fd_cdevsw, typemynor, - DV_CHR, UID_ROOT, GID_OPERATOR, - 0640,"rfd%d.%d", fdu, typesize); - for (i = 0; i < MAXPARTITIONS; i++) { - fd->bdevs[1 + NUMDENS + i] = devfs_makelink(fd->bdevs[0], - "fd%d%c", fdu, 'a' + i); - fd->cdevs[1 + NUMDENS + i] = devfs_makelink(fd->cdevs[0], - "rfd%d%c", fdu, 'a' + i); - } -#endif /* DEVFS */ return (1); } #endif diff --git a/sys/isa/joy.c b/sys/isa/joy.c index a2edbd5..56c90d1 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -29,16 +29,10 @@ #include "joy.h" #if NJOY > 0 - -#include "opt_devfs.h" - #include <sys/param.h> #include <sys/systm.h> #include <sys/conf.h> #include <sys/kernel.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif /*DEVFS*/ #include <sys/uio.h> #include <machine/clock.h> @@ -75,9 +69,6 @@ static struct { int port; int x_off[2], y_off[2]; int timeout[2]; -#ifdef DEVFS - void *devfs_token; -#endif } joy[NJOY]; @@ -141,11 +132,7 @@ joyattach (struct isa_device *dev) joy[unit].port = dev->id_iobase; joy[unit].timeout[0] = joy[unit].timeout[1] = 0; printf("joy%d: joystick\n", unit); -#ifdef DEVFS - joy[dev->id_unit].devfs_token = - devfs_add_devswf(&joy_cdevsw, 0, DV_CHR, 0, 0, - 0600, "joy%d", unit); -#endif + make_dev(&joy_cdevsw, 0, 0, 0, 0600, "joy%d", unit); return 1; } diff --git a/sys/isa/psm.c b/sys/isa/psm.c index bdc39dc..e7c82c9 100644 --- a/sys/isa/psm.c +++ b/sys/isa/psm.c @@ -20,7 +20,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: psm.c,v 1.15 1999/08/17 12:14:13 yokota Exp $ + * $Id: psm.c,v 1.16 1999/08/22 06:11:52 yokota Exp $ */ /* @@ -65,7 +65,6 @@ #ifdef __i386__ #include "apm.h" #endif -#include "opt_devfs.h" #include "opt_psm.h" #if NPSM > 0 @@ -81,9 +80,6 @@ #include <sys/malloc.h> #include <machine/bus.h> #include <sys/rman.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <sys/select.h> #include <sys/uio.h> @@ -181,10 +177,6 @@ struct psm_softc { /* Driver status information */ int button; /* the latest button state */ int xold; /* previous absolute X position */ int yold; /* previous absolute Y position */ -#ifdef DEVFS - void *devfs_token; - void *b_devfs_token; -#endif #ifdef PSM_HOOKAPM struct apmhook resumehook; #endif @@ -1094,14 +1086,8 @@ psmattach(device_t dev) sc->state = PSM_VALID; /* Done */ -#ifdef DEVFS - sc->devfs_token = - devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, FALSE), - DV_CHR, 0, 0, 0666, "psm%d", unit); - sc->b_devfs_token = - devfs_add_devswf(&psm_cdevsw, PSM_MKMINOR(unit, TRUE), - DV_CHR, 0, 0, 0666, "bpsm%d", unit); -#endif /* DEVFS */ + make_dev(&psm_cdevsw, PSM_MKMINOR(unit, FALSE), 0, 0, 0666, "psm%d", unit); + make_dev(&psm_cdevsw, PSM_MKMINOR(unit, TRUE), 0, 0, 0666, "bpsm%d", unit); #ifdef PSM_HOOKAPM sc->resumehook.ah_name = "PS/2 mouse"; diff --git a/sys/isa/sio.c b/sys/isa/sio.c index 815209b..7a8c247 100644 --- a/sys/isa/sio.c +++ b/sys/isa/sio.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: sio.c,v 1.254 1999/08/09 10:34:55 phk Exp $ + * $Id: sio.c,v 1.255 1999/08/09 11:02:38 phk Exp $ * from: @(#)com.c 7.5 (Berkeley) 5/16/91 * from: i386/isa sio.c,v 1.234 */ @@ -38,7 +38,6 @@ #include "opt_comconsole.h" #include "opt_compat.h" #include "opt_ddb.h" -#include "opt_devfs.h" #include "opt_sio.h" #include "sio.h" /* #include "pnp.h" */ @@ -70,9 +69,6 @@ #include <sys/bus.h> #include <machine/bus.h> #include <sys/rman.h> -#ifdef DEVFS -#include <sys/devfsext.h> -#endif #include <sys/timepps.h> #include <isa/isareg.h> @@ -298,14 +294,6 @@ struct com_s { */ u_char obuf1[256]; u_char obuf2[256]; -#ifdef DEVFS - void *devfs_token_ttyd; - void *devfs_token_ttyl; - void *devfs_token_ttyi; - void *devfs_token_cuaa; - void *devfs_token_cual; - void *devfs_token_cuai; -#endif }; #ifdef COM_ESP @@ -1124,26 +1112,18 @@ determined_type: ; register_swi(SWI_TTY, siopoll); sio_registered = TRUE; } -#ifdef DEVFS - com->devfs_token_ttyd = devfs_add_devswf(&sio_cdevsw, - unit, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit); - com->devfs_token_ttyi = devfs_add_devswf(&sio_cdevsw, - unit | CONTROL_INIT_STATE, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit); - com->devfs_token_ttyl = devfs_add_devswf(&sio_cdevsw, - unit | CONTROL_LOCK_STATE, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit); - com->devfs_token_cuaa = devfs_add_devswf(&sio_cdevsw, - unit | CALLOUT_MASK, DV_CHR, - UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit); - com->devfs_token_cuai = devfs_add_devswf(&sio_cdevsw, - unit | CALLOUT_MASK | CONTROL_INIT_STATE, DV_CHR, - UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit); - com->devfs_token_cual = devfs_add_devswf(&sio_cdevsw, - unit | CALLOUT_MASK | CONTROL_LOCK_STATE, DV_CHR, - UID_UUCP, GID_DIALER, 0660, "cuala%r", unit); -#endif + make_dev(&sio_cdevsw, unit, + UID_ROOT, GID_WHEEL, 0600, "ttyd%r", unit); + make_dev(&sio_cdevsw, unit | CONTROL_INIT_STATE, + UID_ROOT, GID_WHEEL, 0600, "ttyid%r", unit); + make_dev(&sio_cdevsw, unit | CONTROL_LOCK_STATE, + UID_ROOT, GID_WHEEL, 0600, "ttyld%r", unit); + make_dev(&sio_cdevsw, unit | CALLOUT_MASK, + UID_UUCP, GID_DIALER, 0660, "cuaa%r", unit); + make_dev(&sio_cdevsw, unit | CALLOUT_MASK | CONTROL_INIT_STATE, + UID_UUCP, GID_DIALER, 0660, "cuaia%r", unit); + make_dev(&sio_cdevsw, unit | CALLOUT_MASK | CONTROL_LOCK_STATE, + UID_UUCP, GID_DIALER, 0660, "cuala%r", unit); com->flags = isa_get_flags(dev); /* Heritate id_flags for later */ com->pps.ppscap = PPS_CAPTUREASSERT | PPS_CAPTURECLEAR; pps_init(&com->pps); |