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/rp | |
| 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/rp')
| -rw-r--r-- | sys/dev/rp/rp.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c index a3c2382..c1913a0 100644 --- a/sys/dev/rp/rp.c +++ b/sys/dev/rp/rp.c @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: rp.c,v 1.26 1999/05/09 17:07:20 peter Exp $ + * $Id: rp.c,v 1.27 1999/05/30 16:52:22 phk Exp $ */ /* @@ -1085,7 +1085,6 @@ struct isa_device *dev; static void rp_pciattach(pcici_t tag, int unit) { - dev_t rp_dev; int success, oldspl; u_short iobase; int num_ports, num_chan, num_aiops; @@ -1140,8 +1139,7 @@ rp_pciattach(pcici_t tag, int unit) rp_addr(unit) = rp; splx(oldspl); - rp_dev = makedev(CDEV_MAJOR, unit); - cdevsw_add(&rp_dev, &rp_cdevsw, NULL); + cdevsw_add(&rp_cdevsw); port = 0; for(aiop=0; aiop < num_aiops; aiop++) { @@ -1196,7 +1194,6 @@ int rpattach(dev) struct isa_device *dev; { - dev_t rp_dev; int iobase, unit, /*rpmajor,*/ oldspl; int num_ports, num_chan, num_aiops; int aiop, chan, port; @@ -1252,8 +1249,7 @@ struct isa_device *dev; rp_addr(unit) = rp; splx(oldspl); - rp_dev = makedev(CDEV_MAJOR, unit); - cdevsw_add(&rp_dev, &rp_cdevsw, NULL); + cdevsw_add(&rp_cdevsw); port = 0; for(aiop=0; aiop < num_aiops; aiop++) { |
