summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-09-29 23:01:08 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-09-29 23:01:08 +0000
commit6617e872d65ab1044157bad062be1a50d7509fd8 (patch)
treeda2cd8f0c6aca69b78ed55ff5b85ffad24df3fba
parentc4fdf4188dff8725057589b69ba49c8374d49334 (diff)
we won't need this
-rw-r--r--sys/arch/i386/stand/boot/Makefile8
-rw-r--r--sys/arch/i386/stand/boot/kentry.c72
2 files changed, 1 insertions, 79 deletions
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 91ed167d967..90287ec7c96 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 1997/09/21 10:02:09 mickey Exp $
+# $OpenBSD: Makefile,v 1.15 1997/09/29 23:01:06 mickey Exp $
PROG= boot
SRCS= srt0.S boot.c cmd.c conf.c
@@ -22,12 +22,6 @@ machine-links:
@ln -fs ${.CURDIR}/../.. i386
@ln -fs ${.CURDIR}/../../include machine
-kentry.o: kentry.c
- @echo ${COMPILE.c} ${.IMPSRC}
- @${COMPILE.c} -S -o tmp.s ${.IMPSRC}
- @sed 's/ret/lret/g' tmp.s | ${AS} -f -o $@
- @rm tmp.s
-
${PROG}: $(OBJS) $(DPADD)
$(LD) $(LDFLAGS) -o $(PROG) $(OBJS) $(LDADD)
@size $(PROG)
diff --git a/sys/arch/i386/stand/boot/kentry.c b/sys/arch/i386/stand/boot/kentry.c
deleted file mode 100644
index 551bf0912b6..00000000000
--- a/sys/arch/i386/stand/boot/kentry.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* $OpenBSD: kentry.c,v 1.3 1997/08/12 21:49:18 mickey Exp $ */
-
-/*
- * Copyright (c) 1997 Michael Shalayeff
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by Michael Shalayeff.
- * 4. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- */
-
-#include <sys/param.h>
-#include <machine/biosvar.h>
-#include <dev/cons.h>
-#include <libsa.h>
-#include "cmd.h"
-
-int
-kentry(cmd, arg)
- u_int cmd;
- u_int arg;
-{
- switch(cmd) {
- case BOOTC_CHECK:
- return 0;
- case BOOTC_BOOT:
- exit();
- return 0;
- case BOOTC_GETENV:
- switch(arg) {
- case BOOTV_BOOTDEV:
- return bootdev;
- case BOOTV_BDGMTRY:
- return bootdev_geometry;
- case BOOTV_CONSDEV:
- return (cn_tab==NULL)? 0 : cn_tab->cn_dev;
-#ifdef BOOT_APM
- case BOOTV_APMCONN:
- return (int)&apminfo;
-#endif
- default:
- return 0;
- }
- case BOOTC_SETENV:
- return 0;
- default:
- return 0;
- }
-}