summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/amiga/amiga/swapgeneric.c6
-rw-r--r--sys/arch/i386/i386/swapgeneric.c35
-rw-r--r--sys/arch/macppc/macppc/swapgeneric.c8
-rw-r--r--sys/arch/mvme68k/mvme68k/swapgeneric.c12
-rw-r--r--sys/arch/mvme88k/mvme88k/swapgeneric.c12
-rw-r--r--sys/arch/mvmeppc/mvmeppc/swapgeneric.c8
-rw-r--r--sys/arch/sparc/sparc/swapgeneric.c9
-rw-r--r--sys/arch/sparc64/sparc64/swapgeneric.c9
-rw-r--r--sys/arch/sun3/sun3/swapgeneric.c17
-rw-r--r--sys/arch/vax/vax/swapgeneric.c68
10 files changed, 39 insertions, 145 deletions
diff --git a/sys/arch/amiga/amiga/swapgeneric.c b/sys/arch/amiga/amiga/swapgeneric.c
index 18b362c8711..5fca640b54f 100644
--- a/sys/arch/amiga/amiga/swapgeneric.c
+++ b/sys/arch/amiga/amiga/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.12 1999/07/30 19:41:29 deraadt Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.13 2001/09/29 18:40:29 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.27 1997/01/26 22:58:32 rat Exp $ */
/*
@@ -65,8 +65,8 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { NODEV, 1, 0 },
- { NODEV, 0, 0 },
+ { NODEV, 0, 0 }, /* to be filled in */
+ { NODEV, 0, 0 }
};
#if NFD > 0
diff --git a/sys/arch/i386/i386/swapgeneric.c b/sys/arch/i386/i386/swapgeneric.c
index 9bdcc3870a3..eb3fa21ba4b 100644
--- a/sys/arch/i386/i386/swapgeneric.c
+++ b/sys/arch/i386/i386/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.10 1999/07/18 22:40:52 csapuntz Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.11 2001/09/29 18:40:32 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.12 1996/05/03 19:42:28 christos Exp $ */
/*-
@@ -39,36 +39,19 @@
* @(#)swapgeneric.c 5.5 (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 <sys/disklabel.h>
-#include <dev/cons.h>
-
-#include <machine/pte.h>
-#include <machine/cpu.h>
-
-#include "fdc.h"
-#include "sd.h"
-#include "cd.h"
-#include "mcd.h"
+int (*mountroot) __P((void)) = NULL;
-/*
- * Generic configuration; all in one
- */
dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
+
struct swdevt swdevt[] = {
- { makedev(4, 1), 0, 0 }, /* sd0 */
- { makedev(4, 17), 0, 0 }, /* sd1 */
- { makedev(4, 33), 0, 0 }, /* sd2 */
- { makedev(4, 49), 0, 0 }, /* sd3 */
- { NODEV, 0, 0 },
- { NODEV, 0, 0 },
+ { NODEV, 0, 0 }, /* to be filled in */
+ { NODEV, 0, 0 }
};
-
-int (*mountroot) __P((void)) = NULL;
diff --git a/sys/arch/macppc/macppc/swapgeneric.c b/sys/arch/macppc/macppc/swapgeneric.c
index b4fd47baf7e..6d59e1a50b3 100644
--- a/sys/arch/macppc/macppc/swapgeneric.c
+++ b/sys/arch/macppc/macppc/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.1 2001/09/01 15:44:20 drahn Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.1 1996/09/30 16:34:55 ws Exp $ */
/*-
@@ -49,8 +49,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { NODEV, 0, 0 }, /* Setup by autoconf.c/disksubr.c */
- { NODEV, 0, 0 },
- { NODEV, 0, 0 },
- { NODEV, 0, 0 },
+ { NODEV, 0, 0 }, /* to be filled in */
+ { NODEV, 0, 0 }
};
diff --git a/sys/arch/mvme68k/mvme68k/swapgeneric.c b/sys/arch/mvme68k/mvme68k/swapgeneric.c
index 3597a905aa6..0e73cc89e30 100644
--- a/sys/arch/mvme68k/mvme68k/swapgeneric.c
+++ b/sys/arch/mvme68k/mvme68k/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.5 1996/11/06 01:45:05 deraadt Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.6 2001/09/29 18:40:32 miod Exp $ */
/*-
* Copyright (c) 1994
@@ -41,7 +41,6 @@
#include <sys/param.h>
#include <sys/conf.h>
-#include <machine/disklabel.h>
int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */
@@ -49,13 +48,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { makedev(4, 0*MAXPARTITIONS+1), 0, 0 }, /* sd0b */
- { makedev(4, 1*MAXPARTITIONS+1), 0, 0 }, /* sd1b */
- { makedev(4, 2*MAXPARTITIONS+1), 0, 0 }, /* sd2b */
- { makedev(4, 3*MAXPARTITIONS+1), 0, 0 }, /* sd3b */
- { makedev(4, 4*MAXPARTITIONS+1), 0, 0 }, /* sd4b */
- { makedev(4, 5*MAXPARTITIONS+1), 0, 0 }, /* sd5b */
- { makedev(4, 6*MAXPARTITIONS+1), 0, 0 }, /* sd6b */
- { makedev(4, 7*MAXPARTITIONS+1), 0, 0 }, /* sd7b */
+ { NODEV, 0, 0 }, /* to be filled in */
{ NODEV, 0, 0 }
};
diff --git a/sys/arch/mvme88k/mvme88k/swapgeneric.c b/sys/arch/mvme88k/mvme88k/swapgeneric.c
index 59ea8913a58..c31ddc38861 100644
--- a/sys/arch/mvme88k/mvme88k/swapgeneric.c
+++ b/sys/arch/mvme88k/mvme88k/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.4 1998/12/15 05:11:02 smurph Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.5 2001/09/29 18:40:32 miod Exp $ */
/*-
* Copyright (c) 1994
@@ -41,7 +41,6 @@
#include <sys/param.h>
#include <sys/conf.h>
-#include <machine/disklabel.h>
int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */
@@ -49,13 +48,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { makedev(4, 0*MAXPARTITIONS+1), 0, 0 }, /* sd0b */
- { makedev(4, 1*MAXPARTITIONS+1), 0, 0 }, /* sd1b */
- { makedev(4, 2*MAXPARTITIONS+1), 0, 0 }, /* sd2b */
- { makedev(4, 3*MAXPARTITIONS+1), 0, 0 }, /* sd3b */
- { makedev(4, 4*MAXPARTITIONS+1), 0, 0 }, /* sd4b */
- { makedev(4, 5*MAXPARTITIONS+1), 0, 0 }, /* sd5b */
- { makedev(4, 6*MAXPARTITIONS+1), 0, 0 }, /* sd6b */
- { makedev(4, 7*MAXPARTITIONS+1), 0, 0 }, /* sd7b */
+ { NODEV, 0, 0 }, /* to be filled in */
{ NODEV, 0, 0 }
};
diff --git a/sys/arch/mvmeppc/mvmeppc/swapgeneric.c b/sys/arch/mvmeppc/mvmeppc/swapgeneric.c
index b418837bdff..6d59e1a50b3 100644
--- a/sys/arch/mvmeppc/mvmeppc/swapgeneric.c
+++ b/sys/arch/mvmeppc/mvmeppc/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.1 2001/06/26 21:57:55 smurph Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.1 1996/09/30 16:34:55 ws Exp $ */
/*-
@@ -49,8 +49,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { NODEV, 0, 0 }, /* Setup by autoconf.c/disksubr.c */
- { NODEV, 0, 0 },
- { NODEV, 0, 0 },
- { NODEV, 0, 0 },
+ { NODEV, 0, 0 }, /* to be filled in */
+ { NODEV, 0, 0 }
};
diff --git a/sys/arch/sparc/sparc/swapgeneric.c b/sys/arch/sparc/sparc/swapgeneric.c
index 42e4690ac66..4869f641952 100644
--- a/sys/arch/sparc/sparc/swapgeneric.c
+++ b/sys/arch/sparc/sparc/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.5 2001/07/04 08:43:30 niklas Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.6 2001/09/29 18:40:32 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.8 1996/03/14 21:09:32 christos Exp $ */
/*-
@@ -42,7 +42,6 @@
#include <sys/param.h>
#include <sys/conf.h>
-#include <sys/systm.h>
int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */
@@ -50,10 +49,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { makedev(7, 1), 0, 0 }, /* sd0b */
- { makedev(7, 17), 0, 0 }, /* sd1b */
- { makedev(7, 33), 0, 0 }, /* sd2b */
- { makedev(7, 49), 0, 0 }, /* sd3b */
- { NODEV, 0, 0 },
+ { NODEV, 0, 0 }, /* to be filled in */
{ NODEV, 0, 0 }
};
diff --git a/sys/arch/sparc64/sparc64/swapgeneric.c b/sys/arch/sparc64/sparc64/swapgeneric.c
index 64f35caa66d..61e1048813a 100644
--- a/sys/arch/sparc64/sparc64/swapgeneric.c
+++ b/sys/arch/sparc64/sparc64/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.1 2001/08/18 20:04:47 jason Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.2 2001/09/29 18:40:32 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.8 1996/03/14 21:09:32 christos Exp $ */
/*-
@@ -42,7 +42,6 @@
#include <sys/param.h>
#include <sys/conf.h>
-#include <sys/systm.h>
int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */
@@ -50,10 +49,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { makedev(7, 1), 0, 0 }, /* sd0b */
- { makedev(7, 17), 0, 0 }, /* sd1b */
- { makedev(7, 33), 0, 0 }, /* sd2b */
- { makedev(7, 49), 0, 0 }, /* sd3b */
- { NODEV, 0, 0 },
+ { NODEV, 0, 0 }, /* to be filled in */
{ NODEV, 0, 0 }
};
diff --git a/sys/arch/sun3/sun3/swapgeneric.c b/sys/arch/sun3/sun3/swapgeneric.c
index 238606cadf5..049738b45ec 100644
--- a/sys/arch/sun3/sun3/swapgeneric.c
+++ b/sys/arch/sun3/sun3/swapgeneric.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: swapgeneric.c,v 1.6 2001/05/30 20:37:54 miod Exp $ */
+/* $OpenBSD: swapgeneric.c,v 1.7 2001/09/29 18:40:33 miod Exp $ */
/* $NetBSD: swapgeneric.c,v 1.14 1995/04/26 23:30:08 gwr Exp $ */
/*
@@ -32,12 +32,11 @@
*/
/*
- * Generic swap locations
+ * fake swapgeneric.c -- should do this differently.
*/
#include <sys/param.h>
#include <sys/conf.h>
-#include <sys/systm.h>
int (*mountroot) __P((void)) = NULL; /* tells autoconf.c that we are "generic" */
@@ -45,14 +44,6 @@ dev_t rootdev = NODEV;
dev_t dumpdev = NODEV;
struct swdevt swdevt[] = {
- { makedev(7, 1), 0, 0 }, /* sd0b */
- { makedev(7, 17), 0, 0 }, /* sd1b */
- { makedev(7, 33), 0, 0 }, /* sd2b */
- { makedev(7, 49), 0, 0 }, /* sd3b */
- { makedev(3, 1), 0, 0 }, /* xy0b */
- { makedev(3, 17), 0, 0 }, /* xy1b */
- { makedev(10, 1), 0, 0 }, /* xd0b */
- { makedev(10, 17), 0, 0 }, /* xd1b */
- { NODEV, 0, 0 },
- { NODEV, 0, 0 }
+ { NODEV, 0, 0 }, /* to be filled in */
+ { NODEV, 0, 0 }
};
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 }
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 20:31:58 +0000