diff options
| author | nyan <nyan@FreeBSD.org> | 1999-09-26 03:24:37 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 1999-09-26 03:24:37 +0000 |
| commit | 07038f1e994b4a14bbf31e08277be3a83b8b95d1 (patch) | |
| tree | 2e34174488b022821f071145260e3e8c8fb6f22f /sys/pc98 | |
| parent | 4dd63577dfca12d987e869334aed071073f51c49 (diff) | |
| download | FreeBSD-src-07038f1e994b4a14bbf31e08277be3a83b8b95d1.zip FreeBSD-src-07038f1e994b4a14bbf31e08277be3a83b8b95d1.tar.gz | |
Merge from sys/i386/isa/spkr.c revision 1.37 and 1.39.
Diffstat (limited to 'sys/pc98')
| -rw-r--r-- | sys/pc98/pc98/spkr.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c index fbea735..3a2098e 100644 --- a/sys/pc98/pc98/spkr.c +++ b/sys/pc98/pc98/spkr.c @@ -15,7 +15,6 @@ #if NSPEAKER > 0 - #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -585,8 +584,8 @@ spkrioctl(dev, cmd, cmdarg, flags, p) struct proc *p; { #ifdef DEBUG - (void) printf("spkrioctl: entering with dev = %lx, cmd = %lx\n", - (unsigned long)dev, cmd); + (void) printf("spkrioctl: entering with dev = %s, cmd = %lx\n", + devtoname(dev), cmd); #endif /* DEBUG */ if (minor(dev) != 0) @@ -623,18 +622,10 @@ spkrioctl(dev, cmd, cmdarg, flags, p) return(EINVAL); } - -static int spkr_devsw_installed; - static void spkr_drvinit(void *unused) { - - if( ! spkr_devsw_installed ) { - cdevsw_add(&spkr_cdevsw); - spkr_devsw_installed = 1; - make_dev(&spkr_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "speaker"); - } + make_dev(&spkr_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "speaker"); } SYSINIT(spkrdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,spkr_drvinit,NULL) |
