bdevtomaj worked well, but is no longer needed.

2 files changed, 2 insertions, 48 deletions

diff --git a/sys/arch/vax/include/cpu.h b/sys/arch/vax/include/cpu.h
index bb24a2bc2d4..5a85ebad627 100644
--- a/sys/arch/vax/include/cpu.h
+++ b/sys/arch/vax/include/cpu.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: cpu.h,v 1.12 2002/03/14 01:26:48 millert Exp $      */
+/*      $OpenBSD: cpu.h,v 1.13 2002/06/12 12:36:13 hugh Exp $      */
 /*      $NetBSD: cpu.h,v 1.41 1999/10/21 20:01:36 ragge Exp $      */
 
 /*
@@ -118,10 +118,6 @@ struct device;
 /* Some low-level prototypes */
 int	badaddr(caddr_t, int);
 void	cpu_swapin(struct proc *);
-int	hp_getdev(int, int, struct device **);
-int	sd_getdev(int, int, int, int, char **);
-int	ra_getdev(int, int, int, char **);
-int	bdevtomaj(int);
 void	dumpconf(void);
 void	dumpsys(void);
 void	swapconf(void);
diff --git a/sys/arch/vax/vax/conf.c b/sys/arch/vax/vax/conf.c
index 1f265f7a9e5..231dd01b6f0 100644
--- a/sys/arch/vax/vax/conf.c
+++ b/sys/arch/vax/vax/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.34 2002/05/16 21:11:19 miod Exp $ */
+/*	$OpenBSD: conf.c,v 1.35 2002/06/12 12:36:14 hugh Exp $ */
 /*	$NetBSD: conf.c,v 1.44 1999/10/27 16:38:54 ragge Exp $	*/
 
 /*-
@@ -44,8 +44,6 @@
 #include <sys/conf.h>
 #include <sys/vnode.h>
 
-#include <vax/include/rpb.h> 
-
 #include "hp.h" /* 0 */
 bdev_decl(hp);
 
@@ -144,46 +142,6 @@ struct bdevsw	bdevsw[] =
 };
 int	nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
 
-struct bdevmajtpl {
-	int bdev;
-	int maj;
-} bdevtpls[] = {
-	{ BDEV_HP,	0 },
-	{ BDEV_RK,	3 }, 
-	{ BDEV_UDA,	9 },
-	{ BDEV_IDC,	11 },
-	{ BDEV_RL,	14 },
-	{ BDEV_KDB,	16 },
-	{ BDEV_RD,	19 },
-	{ BDEV_SD,	20 },
-	{ BDEV_SDN,	20 },
-	{ BDEV_ST,	21 },
-	
-	/* some things need these network devices, do not change them */
-	{ BDEV_QE, BDEV_QE },
-	{ BDEV_DE, BDEV_DE },
-	{ BDEV_NI, BDEV_NI },
-	{ BDEV_LE, BDEV_LE },
-	{ BDEV_ZE, BDEV_ZE },
-
-	{ -1, -1 }
-};
-
-/* 
- * BDEV_* -> major table (for bootable block devices)
- */
-int	bdevtomaj (bdev)
-	int bdev;
-{
-	struct bdevmajtpl *bd; 
-
-	for(bd = bdevtpls; bd; bd++) {
-		if(bdev == bd->bdev || bd->bdev == -1)
-			return bd->maj;
-	}
-	return bd != NULL ? bd->maj : NULL;
-}
-
 /*
  * Console routines for VAX console.
  */