diff options
| author | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1999-05-31 11:29:30 +0000 |
| commit | 6a5dc97620c08ad609e1b3c3c042f150feb46dd3 (patch) | |
| tree | 6cfc9338ae83f67fd38a853cd0782713c73cad13 /sys/dev/speaker | |
| parent | 881e2636833297a207a791fabd8befc818b1b3fb (diff) | |
| download | FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.zip FreeBSD-src-6a5dc97620c08ad609e1b3c3c042f150feb46dd3.tar.gz | |
Simplify cdevsw registration.
The cdevsw_add() function now finds the major number(s) in the
struct cdevsw passed to it. cdevsw_add_generic() is no longer
needed, cdevsw_add() does the same thing.
cdevsw_add() will print an message if the d_maj field looks bogus.
Remove nblkdev and nchrdev variables. Most places they were used
bogusly. Instead check a dev_t for validity by seeing if devsw()
or bdevsw() returns NULL.
Move bdevsw() and devsw() functions to kern/kern_conf.c
Bump __FreeBSD_version to 400006
This commit removes:
72 bogus makedev() calls
26 bogus SYSINIT functions
if_xe.c bogusly accessed cdevsw[], author/maintainer please fix.
I4b and vinum not changed. Patches emailed to authors. LINT
probably broken until they catch up.
Diffstat (limited to 'sys/dev/speaker')
| -rw-r--r-- | sys/dev/speaker/spkr.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/sys/dev/speaker/spkr.c b/sys/dev/speaker/spkr.c index 759a9fc..f594b8b 100644 --- a/sys/dev/speaker/spkr.c +++ b/sys/dev/speaker/spkr.c @@ -4,7 +4,7 @@ * v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993 * modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su> * - * $Id: spkr.c,v 1.35 1998/08/24 02:28:16 bde Exp $ + * $Id: spkr.c,v 1.36 1999/05/30 16:52:27 phk Exp $ */ #include "speaker.h" @@ -601,24 +601,14 @@ spkrioctl(dev, cmd, cmdarg, flags, p) return(EINVAL); } - -static int spkr_devsw_installed; - static void spkr_drvinit(void *unused) { - dev_t dev; - - if( ! spkr_devsw_installed ) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&spkr_cdevsw, NULL); - spkr_devsw_installed = 1; + cdevsw_add(&spkr_cdevsw); #ifdef DEVFS - devfs_token = devfs_add_devswf(&spkr_cdevsw, 0, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, - "speaker"); + devfs_token = devfs_add_devswf(&spkr_cdevsw, 0, DV_CHR, + UID_ROOT, GID_WHEEL, 0600, "speaker"); #endif - } } SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL) |
