The "swap generic" configuration needs only two entries in swdevt[].

So shrink it when necessary, and remove unwanted stuff as well.

1 files changed, 9 insertions, 59 deletions

diff --git a/sys/arch/vax/vax/swapgeneric.c b/sys/arch/vax/vax/swapgeneric.c
index ceb05191e4c..af82ffe0a5c 100644
--- a/sys/arch/vax/vax/swapgeneric.c
+++ b/sys/arch/vax/vax/swapgeneric.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: swapgeneric.c,v 1.8 2001/04/09 00:59:31 hugh Exp $	*/
+/*	$OpenBSD: swapgeneric.c,v 1.9 2001/09/29 18:40:33 miod Exp $	*/
 /*	$NetBSD: swapgeneric.c,v 1.13 1996/10/13 03:36:01 christos Exp $	*/
 
 /*-
@@ -36,69 +36,19 @@
  *	@(#)swapgeneric.c	7.11 (Berkeley) 5/9/91
  */
 
+/*
+ * fake swapgeneric.c -- should do this differently.
+ */
+
 #include <sys/param.h>
 #include <sys/conf.h>
-#include <sys/buf.h>
-#include <sys/systm.h>
-#include <sys/reboot.h>
-#include <sys/device.h>
-
-#include <dev/cons.h>
 
-#include <machine/pte.h>
-#include <machine/mtpr.h>
-#include <machine/cpu.h>
-
-#include "hp.h"
-#include "ra.h"
-#include "hdc.h"
-#include "sd.h"
-#include "st.h"
-
-void	gets __P((char *));
+int (*mountroot) __P((void)) = NULL;
 
-/*
- * Generic configuration;  all in one
- */
 dev_t	rootdev = NODEV;
-dev_t	argdev = NODEV;
 dev_t	dumpdev = NODEV;
-int	nswap;
-struct	swdevt swdevt[] = {
-	{ -1,	1,	0 },
-	{ -1,	1,	0 },
-	{ -1,	1,	0 },
-	{ 0,	0,	0 },
-};
-long	dumplo;
-int	dmmin, dmmax, dmtext;
 
-int (*mountroot) __P((void)) = NULL;
-
-extern	struct cfdriver hp_cd;
-extern	struct cfdriver ra_cd;
-extern	struct cfdriver hd_cd;
-extern	struct cfdriver sd_cd;
-extern	struct cfdriver st_cd;
-
-struct	ngcconf {
-	struct	cfdriver *ng_cf;
-	dev_t	ng_root;
-} ngcconf[] = {
-#if NHP > 0
-	{ &hp_cd,	makedev(0, 0), },
-#endif
-#if NRA > 0
-	{ &ra_cd,	makedev(9, 0), },
-#endif
-#if NHDC > 0
-	{ &hd_cd,	makedev(19, 0), },
-#endif
-#if NSD > 0
-	{ &sd_cd,	makedev(20, 0), },
-#endif
-#if NST > 0
-	{ &st_cd,	makedev(21, 0), },
-#endif
-	{ 0 },
+struct	swdevt swdevt[] = {
+	{ NODEV, 0, 0 },	/* to be filled in */
+	{ NODEV, 0, 0 }
 };