put values into BIOS_vars so kernel will get 'em soon

1 files changed, 12 insertions, 9 deletions

diff --git a/sys/arch/i386/stand/libsa/exec_i386.c b/sys/arch/i386/stand/libsa/exec_i386.c
index 9c259d8282c..eb855e7ab96 100644
--- a/sys/arch/i386/stand/libsa/exec_i386.c
+++ b/sys/arch/i386/stand/libsa/exec_i386.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_i386.c,v 1.12 1997/08/21 20:18:52 mickey Exp $	*/
+/*	$OpenBSD: exec_i386.c,v 1.13 1997/08/22 20:13:43 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -37,11 +37,10 @@
 #include <sys/param.h>
 #include <sys/exec.h>
 #include <sys/reboot.h>
+#include <dev/cons.h>
 #include <machine/biosvar.h>
 #include "libsa.h"
 
-int	bootdev, bootdev_geometry;
-
 #define round_to_size(x) (((int)(x) + sizeof(int) - 1) & ~(sizeof(int) - 1))
 
 void
@@ -59,19 +58,23 @@ machdep_start(startaddr, howto, loadaddr, ssym, esym)
 	       x->a_midmag, x->a_text, x->a_data, x->a_bss, x->a_syms,
 	       x->a_entry, x->a_trsize, x->a_drsize);
 
-	printf("/bsd(%x,%x,%x,%x,%x,%x,%x,%x)\n",
-		howto, bootdev, 0, round_to_size(esym),
-		extmem, cnvmem, (int)&apminfo, (int)&kentry);
+	printf("/bsd(%x,%x,%x,%x,%x,%x,%x)\n",
+	       howto, bootdev, 0, round_to_size(esym),
+	       BIOS_vars.bios_extmem, BIOS_vars.bios_cnvmem,
+	       (int)&BIOS_vars);
 	getchar();
 #endif
+	if (cn_tab != NULL)
+		BIOS_vars.boot_consdev = cn_tab->cn_dev;
 
 	(int)startaddr &= 0xffffff;
 
 	printf("entry point at 0x%x\n", (int)startaddr);
 	/* stack and the gung is ok at this point, so, no need for asm setup */
-	(*(int __attribute__((noreturn))(*)(int,int,int,int,int,int,int,int))
-		startaddr)(howto, bootdev, 0, round_to_size(esym),
-			   extmem, cnvmem, (int)&apminfo, (int)&kentry);
+	(*(int __attribute__((noreturn))(*)(int,int,int,int,int,int,int))
+	 startaddr)(howto, bootdev, 0, round_to_size(esym),
+		    BIOS_vars.bios_extmem, BIOS_vars.bios_cnvmem,
+		    (int)&BIOS_vars);
 	/* not reached */
 }