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/i386/isa/loran.c | |
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/i386/isa/loran.c')
-rw-r--r-- | sys/i386/isa/loran.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c index 2769d41..09e8639 100644 --- a/sys/i386/isa/loran.c +++ b/sys/i386/isa/loran.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: loran.c,v 1.18 1999/05/08 14:36:48 phk Exp $ + * $Id: loran.c,v 1.19 1999/05/30 16:52:19 phk Exp $ * * This device-driver helps the userland controlprogram for a LORAN-C * receiver avoid monopolizing the CPU. @@ -196,6 +196,8 @@ struct datapoint { /**********************************************************************/ +extern struct cdevsw loran_cdevsw; + static dphead_t minors[NLORAN], working, holding; static struct datapoint dummy[NDUMMY]; @@ -233,6 +235,10 @@ extern struct timecounter loran_timecounter; int loranprobe(struct isa_device *dvp) { + static int once; + + if (!once++) + cdevsw_add(&loran_cdevsw); /* We need to be a "fast-intr" */ dvp->id_ri_flags |= RI_FAST; @@ -657,20 +663,4 @@ static struct cdevsw loran_cdevsw = { /* bmaj */ -1 }; - -static int loran_devsw_installed; - -static void loran_drvinit(void *unused) -{ - dev_t dev; - - if(!loran_devsw_installed) { - dev = makedev(CDEV_MAJOR, 0); - cdevsw_add(&dev,&loran_cdevsw, NULL); - loran_devsw_installed = 1; - } -} - -SYSINIT(lorandev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,loran_drvinit,NULL) - #endif /* KERNEL */ |