summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/boot/conf.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/i386/stand/boot/conf.c')
-rw-r--r--sys/arch/i386/stand/boot/conf.c24
1 files changed, 21 insertions, 3 deletions
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c
index f6b90a6c977..8fe3b541c12 100644
--- a/sys/arch/i386/stand/boot/conf.c
+++ b/sys/arch/i386/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.27 2003/10/23 18:33:45 fgsch Exp $ */
+/* $OpenBSD: conf.c,v 1.28 2004/03/19 13:48:19 tom Exp $ */
/*
* Copyright (c) 1996 Michael Shalayeff
@@ -41,11 +41,30 @@
#include <lib/libsa/unixdev.h>
#include <biosdev.h>
#include <dev/cons.h>
+#include "debug.h"
-const char version[] = "2.05";
+const char version[] = "2.06";
int debug = 1;
+void (*sa_cleanup)(void) = NULL;
+
+
+void (*i386_probe1[])(void) = {
+ ps2probe, gateA20on, debug_init, cninit,
+ apmprobe, pciprobe, /* smpprobe, */ memprobe
+};
+void (*i386_probe2[])(void) = {
+ diskprobe
+};
+
+struct i386_boot_probes probe_list[] = {
+ { "probing", i386_probe1, NENTS(i386_probe1) },
+ { "disk", i386_probe2, NENTS(i386_probe2) }
+};
+int nibprobes = NENTS(probe_list);
+
+
struct fs_ops file_system[] = {
{ ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek,
ufs_stat, ufs_readdir },
@@ -93,4 +112,3 @@ struct consdev constab[] = {
{ NULL }
};
struct consdev *cn_tab = constab;
-