Enable the biosdisk driver, duplicate -lstand as it both calls and is called

by the i386 platform library.
This commit is contained in:
Mike Smith 1998-09-18 02:03:30 +00:00
parent 819ab203c3
commit 6bc32d7d5e
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=39450
3 changed files with 12 additions and 10 deletions

View File

@ -1,4 +1,4 @@
# $Id: Makefile,v 1.2 1998/09/14 18:27:06 msmith Exp $
# $Id: Makefile,v 1.3 1998/09/17 23:52:15 msmith Exp $
# from $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
BASE= loader
@ -47,10 +47,12 @@ vers.o:
${CC} -c vers.c
${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN}
btxld -v -f aout -e 0x100000 -o ${.TARGET} -l ${BTXLDR} -b ${BTXKERN} ${BASE}.bin
btxld -v -f aout -e 0x100000 -o ${.TARGET} -l ${BTXLDR} -b ${BTXKERN} \
${BASE}.bin
${BASE}.bin: ${OBJS} ${LIBI386} vers.o setdef0.o setdef1.o
${LD} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} setdef0.o ${OBJS} vers.o setdef1.o -lstand ${LIBI386}
${LD} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} setdef0.o ${OBJS} vers.o \
setdef1.o -lstand ${LIBI386} -lstand
setdef0.o: setdefs.h

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: conf.c,v 1.2 1998/09/14 18:27:06 msmith Exp $
* $Id: conf.c,v 1.3 1998/09/17 23:52:15 msmith Exp $
*/
#include <stand.h>
@ -43,7 +43,7 @@
/* Exported for libstand */
struct devsw *devsw[] = {
/* &biosdisk, XXX BTX */
&biosdisk,
/* XXX network devices? */
NULL
};

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: main.c,v 1.4 1998/09/14 18:27:06 msmith Exp $
* $Id: main.c,v 1.5 1998/09/17 23:52:15 msmith Exp $
*/
/*
@ -83,16 +83,16 @@ main(void)
printf("diskbuf at %p, %d sectors\n", &diskbuf, diskbuf_size);
printf("using %d bytes of stack at %p\n", (&stacktop - &stackbase), &stacktop);
#endif
/* We're booting from a BIOS disk, try to spiff this */
currdev.d_dev = devsw[0]; /* XXX presumes that biosdisk is first in devsw */
currdev.d_type = currdev.d_dev->dv_type;
currdev.d_kind.biosdisk.unit = 0; /* XXX wrong, need to get from bootinfo etc. */
currdev.d_kind.biosdisk.slice = -1; /* XXX should be able to detect this, default to autoprobe */
currdev.d_kind.biosdisk.partition = 0; /* default to 'a' */
/* Create i386-specific variables */
/* Create i386-specific variables */
env_setenv("currdev", EV_VOLATILE, i386_fmtdev(&currdev), i386_setcurrdev, env_nounset);
env_setenv("loaddev", EV_VOLATILE, i386_fmtdev(&currdev), env_noset, env_nounset);
setenv("LINES", "24", 1); /* optional */
@ -122,7 +122,7 @@ command_reboot(int argc, char *argv[])
__exit(0);
}
/* provide this for panic */
/* provide this for panic, as it's not in the startup code */
void
exit(int code)
{