move kentry() in boot

4 files changed, 18 insertions, 31 deletions

diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index c6c17f9ab84..c236bdbae8e 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,7 +1,7 @@
-#	$OpenBSD: Makefile,v 1.8 1997/07/17 23:30:31 mickey Exp $
+#	$OpenBSD: Makefile,v 1.9 1997/08/02 22:23:07 mickey Exp $
 
 PROG=	boot
-SRCS=	srt0.S boot.c cmd.c conf.c
+SRCS=	srt0.S boot.c cmd.c kentry.c conf.c
 #AFLAGS+=-Wa,-R
 # AFLAGS+=-Wa,-a
 LD=ld
diff --git a/sys/arch/i386/stand/libsa/kentry.c b/sys/arch/i386/stand/boot/kentry.c
index 9f6c4d63b14..6a8be5eda5d 100644
--- a/sys/arch/i386/stand/libsa/kentry.c
+++ b/sys/arch/i386/stand/boot/kentry.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kentry.c,v 1.1 1997/07/18 01:09:53 mickey Exp $	*/
+/*	$OpenBSD: kentry.c,v 1.1 1997/08/02 22:23:08 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -34,12 +34,23 @@
 
 #include <sys/param.h>
 #include <machine/biosvar.h>
-
+#include "cmd.h"
 
 int
 kentry(cmd, data)
 	u_int cmd;
 	void *data;
 {
+	switch(cmd) {
+	case BOOTC_CHECK:
+		return 0;
+	case BOOTC_BOOT:
+		return 0;
+	case BOOTC_GETENV:
+		return 0;
+	case BOOTC_SETENV:
+		return 0;
+	}
+
 	return -1;
 }
diff --git a/sys/arch/i386/stand/libsa/Makefile b/sys/arch/i386/stand/libsa/Makefile
index 938719c6945..39776acc29a 100644
--- a/sys/arch/i386/stand/libsa/Makefile
+++ b/sys/arch/i386/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 1997/07/18 01:09:53 mickey Exp $
+#	$OpenBSD: Makefile,v 1.17 1997/08/02 22:23:09 mickey Exp $
 
 
 LIB=	sa
@@ -15,7 +15,7 @@ DIR_KERN=$S/lib/libkern
 # i386 stuff (so, it will possibly load in the same 64k)
 SRCS=	unixsys.S bioscom.S biosdisk.S bioskbd.S biostime.S biosmem.S gidt.S \
 	debug_i386.S dev_i386.c exec_i386.c biosdev.c gateA20.c memprobe.c \
-	time.c alloca.S apm_init.S machdep.c kentry.c 
+	time.c alloca.S apm_init.S machdep.c
 
 # stand routines
 SRCS+=	alloc.c exit.c exec.c getfile.c gets.c globals.c strcmp.c strlen.c \
diff --git a/sys/arch/i386/stand/libsa/gidt.S b/sys/arch/i386/stand/libsa/gidt.S
index ed0ddb51ac1..ab90cc44b22 100644
--- a/sys/arch/i386/stand/libsa/gidt.S
+++ b/sys/arch/i386/stand/libsa/gidt.S
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gidt.S,v 1.12 1997/08/01 21:06:03 mickey Exp $	*/
+/*	$OpenBSD: gidt.S,v 1.13 1997/08/02 22:23:09 mickey Exp $	*/
 
 /*
  * Copyright (c) 1997 Michael Shalayeff
@@ -228,8 +228,6 @@ idt:
 	idtb(30); idtb(31); idtb(32); idtb(33); idtb(34); idtb(35)
 	idtb(36); idtb(37); idtb(38); idtb(39); idtb(40); idtb(41)
 	idtb(42); idtb(43); idtb(44); idtb(45); idtb(46); idtb(47)
-		/* kernel entry point */
-	idte(kent)
 #undef idte
 Idtr:	.word	. - idt - 1
 	.long	idt
@@ -418,25 +416,3 @@ intno	= . - 1
 	popal
 	iret
 
-	.globl	_C_LABEL(kentry)
-
-IPROC(kent):
-	pushal
-	pushl	%ds
-	pushl	%es
-	pushl	%fs
-	pushl	%gs
-
-	/* call kent */
-	pushl	%edx
-	pushl	%eax
-	call	_C_LABEL(kentry)
-	addl	$8, %esp
-
-	popl	%gs
-	popl	%fs
-	popl	%es
-	popl	%ds
-	popal
-	iret
-