I got tired of seeing all the cdevsw[major(foo)] all over the place.

Made a new (inline) function devsw(dev_t dev) and substituted it.

Changed to the BDEV variant to this format as well: bdevsw(dev_t dev)

DEVFS will eventually benefit from this change too.

10 files changed, 43 insertions, 43 deletions

diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c
index 2e303b2..8a8b326 100644
--- a/sys/kern/kern_conf.c
+++ b/sys/kern/kern_conf.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: kern_conf.c,v 1.31 1999/03/23 21:11:47 dfr Exp $
+ * $Id: kern_conf.c,v 1.32 1999/05/07 10:10:50 phk Exp $
  */
 
 #include <sys/param.h>
@@ -58,7 +58,7 @@ chrtoblk(dev_t dev)
 {
 	struct cdevsw *cd;
 
-	if((cd = cdevsw[major(dev)]) != NULL) {
+	if((cd = devsw(dev)) != NULL) {
           if (cd->d_bmaj != -1)
 	    return(makedev(cd->d_bmaj,minor(dev)));
 	}
diff --git a/sys/kern/kern_physio.c b/sys/kern/kern_physio.c
index c2cbb69..5f685b5 100644
--- a/sys/kern/kern_physio.c
+++ b/sys/kern/kern_physio.c
@@ -16,7 +16,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- * $Id: kern_physio.c,v 1.32 1999/05/06 20:00:25 phk Exp $
+ * $Id: kern_physio.c,v 1.33 1999/05/07 07:03:39 phk Exp $
  */
 
 #include <sys/param.h>
@@ -35,13 +35,13 @@ static struct buf * phygetvpbuf(dev_t dev, int resid);
 int
 physread(dev_t dev, struct uio *uio, int ioflag)
 {
-	return(physio(cdevsw[major(dev)]->d_strategy, NULL, dev, 1, minphys, uio));
+	return(physio(devsw(dev)->d_strategy, NULL, dev, 1, minphys, uio));
 }
 
 int
 physwrite(dev_t dev, struct uio *uio, int ioflag)
 {
-	return(physio(cdevsw[major(dev)]->d_strategy, NULL, dev, 0, minphys, uio));
+	return(physio(devsw(dev)->d_strategy, NULL, dev, 0, minphys, uio));
 }
 
 int
@@ -181,7 +181,7 @@ minphys(bp)
 	u_int maxphys = DFLTPHYS;
 	struct cdevsw *bdsw;
 
-	bdsw = cdevsw[major(bp->b_dev)];
+	bdsw = devsw(bp->b_dev);
 
 	if (bdsw && bdsw->d_maxio) {
 		maxphys = bdsw->d_maxio;
@@ -206,7 +206,7 @@ phygetvpbuf(dev_t dev, int resid)
 	struct cdevsw *bdsw;
 	int maxio;
 
-	bdsw = cdevsw[major(dev)];
+	bdsw = devsw(dev);
 	if ((bdsw == NULL) || (bdsw->d_bmaj == -1))
 		return getpbuf(NULL);
 
diff --git a/sys/kern/kern_shutdown.c b/sys/kern/kern_shutdown.c
index 2c51ac7..23f4ac8 100644
--- a/sys/kern/kern_shutdown.c
+++ b/sys/kern/kern_shutdown.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_shutdown.c	8.3 (Berkeley) 1/21/94
- * $Id: kern_shutdown.c,v 1.49 1999/05/06 18:12:44 peter Exp $
+ * $Id: kern_shutdown.c,v 1.50 1999/05/07 10:10:53 phk Exp $
  */
 
 #include "opt_ddb.h"
@@ -377,14 +377,14 @@ dumpsys(void)
 		return;
 	if (dumpdev == NODEV)
 		return;
-	if (!(bdevsw(major(dumpdev))))
+	if (!(bdevsw(dumpdev)))
 		return;
-	if (!(bdevsw(major(dumpdev))->d_dump))
+	if (!(bdevsw(dumpdev)->d_dump))
 		return;
 	dumpsize = Maxmem;
 	printf("\ndumping to dev %lx, offset %ld\n", (u_long)dumpdev, dumplo);
 	printf("dump ");
-	switch ((*bdevsw(major(dumpdev))->d_dump)(dumpdev)) {
+	switch ((*bdevsw(dumpdev)->d_dump)(dumpdev)) {
 
 	case ENXIO:
 		printf("device bad\n");
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 4201196..8b946cf 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty.c	8.8 (Berkeley) 1/21/94
- * $Id: tty.c,v 1.116 1999/04/27 11:16:17 phk Exp $
+ * $Id: tty.c,v 1.117 1999/05/06 18:12:47 peter Exp $
  */
 
 /*-
@@ -419,7 +419,7 @@ parmrk:
 #ifdef sun4c						/* XXX */
 					(*tp->t_stop)(tp, 0);
 #else
-					(*cdevsw[major(tp->t_dev)]->d_stop)(tp,
+					(*devsw(tp->t_dev)->d_stop)(tp,
 					   0);
 #endif
 					return (0);
@@ -996,7 +996,7 @@ ttioctl(tp, cmd, data, flag)
 #ifdef sun4c				/* XXX */
 			(*tp->t_stop)(tp, 0);
 #else
-			(*cdevsw[major(tp->t_dev)]->d_stop)(tp, 0);
+			(*devsw(tp->t_dev)->d_stop)(tp, 0);
 #endif
 		}
 		splx(s);
@@ -1097,7 +1097,7 @@ ttpoll(dev, events, p)
 	int events;
 	struct proc *p;
 {
-	return ttypoll((*cdevsw[major(dev)]->d_devtotty)(dev), events, p);
+	return ttypoll((*devsw(dev)->d_devtotty)(dev), events, p);
 }
 
 /*
@@ -1189,7 +1189,7 @@ again:
 #ifdef sun4c						/* XXX */
 	(*tp->t_stop)(tp, rw);
 #else
-	(*cdevsw[major(tp->t_dev)]->d_stop)(tp, rw);
+	(*devsw(tp->t_dev)->d_stop)(tp, rw);
 #endif
 	if (rw & FREAD) {
 		FLUSHQ(&tp->t_canq);
@@ -1374,7 +1374,7 @@ ttymodem(tp, flag)
 #ifdef sun4c						/* XXX */
 			(*tp->t_stop)(tp, 0);
 #else
-			(*cdevsw[major(tp->t_dev)]->d_stop)(tp, 0);
+			(*devsw(tp->t_dev)->d_stop)(tp, 0);
 #endif
 		}
 	} else if (flag == 0) {
diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c
index 9540125..32b181d 100644
--- a/sys/kern/tty_cons.c
+++ b/sys/kern/tty_cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.63 1999/04/27 12:21:03 phk Exp $
+ *	$Id: cons.c,v 1.64 1999/04/28 10:52:04 dt Exp $
  */
 
 #include "opt_devfs.h"
@@ -158,7 +158,7 @@ cninit_finish()
 	/*
 	 * Hook the open and close functions.
 	 */
-	cdp = cdevsw[major(cn_tab->cn_dev)];
+	cdp = devsw(cn_tab->cn_dev);
 	cn_phys_close = cdp->d_close;
 	cdp->d_close = cnclose;
 	cn_phys_open = cdp->d_open;
@@ -178,7 +178,7 @@ cnuninit(void)
 	/*
 	 * Unhook the open and close functions.
 	 */
-	cdp = cdevsw[major(cn_tab->cn_dev)];
+	cdp = devsw(cn_tab->cn_dev);
 	cdp->d_close = cn_phys_close;
 	cn_phys_close = NULL;
 	cdp->d_open = cn_phys_open;
@@ -321,7 +321,7 @@ cnread(dev, uio, flag)
 	if ((cn_tab == NULL) || cn_mute)
 		return (0);
 	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)]->d_read)(dev, uio, flag));
+	return ((*devsw(dev)->d_read)(dev, uio, flag));
 }
 
 static int
@@ -338,7 +338,7 @@ cnwrite(dev, uio, flag)
 		dev = constty->t_dev;
 	else
 		dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)]->d_write)(dev, uio, flag));
+	return ((*devsw(dev)->d_write)(dev, uio, flag));
 }
 
 static int
@@ -365,7 +365,7 @@ cnioctl(dev, cmd, data, flag, p)
 		return (0);
 	}
 	dev = cn_tab->cn_dev;
-	return ((*cdevsw[major(dev)]->d_ioctl)(dev, cmd, data, flag, p));
+	return ((*devsw(dev)->d_ioctl)(dev, cmd, data, flag, p));
 }
 
 static int
@@ -379,7 +379,7 @@ cnpoll(dev, events, p)
 
 	dev = cn_tab->cn_dev;
 
-	return ((*cdevsw[major(dev)]->d_poll)(dev, events, p));
+	return ((*devsw(dev)->d_poll)(dev, events, p));
 }
 
 int
diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c
index d8b4893..c7c0313 100644
--- a/sys/kern/tty_pty.c
+++ b/sys/kern/tty_pty.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)tty_pty.c	8.4 (Berkeley) 2/20/95
- * $Id: tty_pty.c,v 1.55 1999/01/30 12:17:37 phk Exp $
+ * $Id: tty_pty.c,v 1.56 1999/04/27 11:16:19 phk Exp $
  */
 
 /*
@@ -675,7 +675,7 @@ ptyioctl(dev, cmd, data, flag, p)
 		}
 		return(0);
 	} else
-	if (cdevsw[major(dev)]->d_open == ptcopen)
+	if (devsw(dev)->d_open == ptcopen)
 		switch (cmd) {
 
 		case TIOCGPGRP:
diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c
index ebffb2a..204088c 100644
--- a/sys/kern/tty_snoop.c
+++ b/sys/kern/tty_snoop.c
@@ -71,7 +71,7 @@ snpdevtotty (dev)
 	maj = major(dev);
 	if ((u_int)maj >= nchrdev)
 		return (NULL);
-	cdp = cdevsw[maj];
+	cdp = devsw(dev);
 	if (cdp == NULL)
 		return (NULL);
 	return ((*cdp->d_devtotty)(dev));
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index cd5c2ff..e614631 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -13,7 +13,7 @@
  * bad that happens because of using this software isn't the responsibility
  * of the author.  This software is distributed AS-IS.
  *
- * $Id: vfs_aio.c,v 1.47 1999/05/06 18:44:42 peter Exp $
+ * $Id: vfs_aio.c,v 1.48 1999/05/06 20:00:25 phk Exp $
  */
 
 /*
@@ -963,7 +963,7 @@ aio_qphysio(p, aiocbe)
 		return -1;
 	}
 
-	cdev = cdevsw[major(vp->v_rdev)];
+	cdev = devsw(vp->v_rdev);
 	if (cdev == NULL) {
 		return -1;
 	}
diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 258d8e5..c33406e 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.190 1999/05/03 23:57:24 billf Exp $
+ * $Id: vfs_subr.c,v 1.191 1999/05/07 10:10:58 phk Exp $
  */
 
 /*
@@ -1177,7 +1177,7 @@ bdevvp(dev, vpp)
 
 	/* XXX 255 is for mfs. */
 	if (dev == NODEV || (major(dev) != 255 && (major(dev) >= nblkdev ||
-	    bdevsw(major(dev)) == NULL))) {
+	    bdevsw(dev) == NULL))) {
 		*vpp = NULLVP;
 		return (ENXIO);
 	}
@@ -1275,12 +1275,12 @@ loop:
 		 */
 
 		if (nvp->v_type == VBLK && rmaj < nblkdev) {
-			if (bdevsw(rmaj) && bdevsw(rmaj)->d_parms)
+			if (bdevsw(nvp_rdev) && bdevsw(nvp_rdev)->d_parms)
 				
-				(*bdevsw(rmaj)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
+				(*bdevsw(nvp_rdev)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
 		} else if (nvp->v_type == VCHR && rmaj < nchrdev) {
-			if (cdevsw[rmaj] && cdevsw[rmaj]->d_parms)
-				(*cdevsw[rmaj]->d_parms)(nvp_rdev, sinfo, DPARM_GET);
+			if (devsw(nvp_rdev) && devsw(nvp_rdev)->d_parms)
+				(*devsw(nvp_rdev)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
 		}
 
 		simple_unlock(&spechash_slock);
@@ -2585,7 +2585,7 @@ retry:
 				goto retn;
 			object = vnode_pager_alloc(vp, vat.va_size, 0, 0);
 		} else if (major(vp->v_rdev) < nblkdev &&
-		    bdevsw(major(vp->v_rdev)) != NULL) {
+		    bdevsw(vp->v_rdev) != NULL) {
 			/*
 			 * This simply allocates the biggest object possible
 			 * for a VBLK vnode.  This should be fixed, but doesn't
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 258d8e5..c33406e 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.190 1999/05/03 23:57:24 billf Exp $
+ * $Id: vfs_subr.c,v 1.191 1999/05/07 10:10:58 phk Exp $
  */
 
 /*
@@ -1177,7 +1177,7 @@ bdevvp(dev, vpp)
 
 	/* XXX 255 is for mfs. */
 	if (dev == NODEV || (major(dev) != 255 && (major(dev) >= nblkdev ||
-	    bdevsw(major(dev)) == NULL))) {
+	    bdevsw(dev) == NULL))) {
 		*vpp = NULLVP;
 		return (ENXIO);
 	}
@@ -1275,12 +1275,12 @@ loop:
 		 */
 
 		if (nvp->v_type == VBLK && rmaj < nblkdev) {
-			if (bdevsw(rmaj) && bdevsw(rmaj)->d_parms)
+			if (bdevsw(nvp_rdev) && bdevsw(nvp_rdev)->d_parms)
 				
-				(*bdevsw(rmaj)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
+				(*bdevsw(nvp_rdev)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
 		} else if (nvp->v_type == VCHR && rmaj < nchrdev) {
-			if (cdevsw[rmaj] && cdevsw[rmaj]->d_parms)
-				(*cdevsw[rmaj]->d_parms)(nvp_rdev, sinfo, DPARM_GET);
+			if (devsw(nvp_rdev) && devsw(nvp_rdev)->d_parms)
+				(*devsw(nvp_rdev)->d_parms)(nvp_rdev, sinfo, DPARM_GET);
 		}
 
 		simple_unlock(&spechash_slock);
@@ -2585,7 +2585,7 @@ retry:
 				goto retn;
 			object = vnode_pager_alloc(vp, vat.va_size, 0, 0);
 		} else if (major(vp->v_rdev) < nblkdev &&
-		    bdevsw(major(vp->v_rdev)) != NULL) {
+		    bdevsw(vp->v_rdev) != NULL) {
 			/*
 			 * This simply allocates the biggest object possible
 			 * for a VBLK vnode.  This should be fixed, but doesn't