diff options
| author | Tom Cosgrove <tom@cvs.openbsd.org> | 2005-05-03 13:18:06 +0000 |
|---|---|---|
| committer | Tom Cosgrove <tom@cvs.openbsd.org> | 2005-05-03 13:18:06 +0000 |
| commit | 0abf960e363302baa2c0397873d3df08b798e323 (patch) | |
| tree | cec6879437eb2cc5896e05db845f34f7e71d58f7 /sys/arch/i386 | |
| parent | c52f261e4b7932fc610c4eb688acc22544d1dca3 (diff) | |
The return value from getEBDAaddr() (info) is not used in bios_E820(),
so nuke it. amd64 no longer needs biosprobe.c listed in SRCS. Trims
100 bytes from the boot blocks.
Bump versions on boot, cdboot and pxeboot, as I'm getting cautious in
my old age.
ok weingart@
Diffstat (limited to 'sys/arch/i386')
| -rw-r--r-- | sys/arch/i386/stand/boot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/cdboot/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/memprobe.c | 4 | ||||
| -rw-r--r-- | sys/arch/i386/stand/pxeboot/conf.c | 4 |
4 files changed, 7 insertions, 9 deletions
diff --git a/sys/arch/i386/stand/boot/conf.c b/sys/arch/i386/stand/boot/conf.c index 7b8a7ce5564..3e234eb0245 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.31 2005/05/03 13:02:44 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.32 2005/05/03 13:18:05 tom Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "2.09"; +const char version[] = "2.10"; int debug = 1; diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c index 204ae6d5081..d35d3bb7e1a 100644 --- a/sys/arch/i386/stand/cdboot/conf.c +++ b/sys/arch/i386/stand/cdboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.4 2005/05/03 13:02:45 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.5 2005/05/03 13:18:05 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -43,7 +43,7 @@ #include <dev/cons.h> #include "debug.h" -const char version[] = "1.03"; +const char version[] = "1.04"; int debug = 1; #undef _TEST diff --git a/sys/arch/i386/stand/libsa/memprobe.c b/sys/arch/i386/stand/libsa/memprobe.c index 156dd22cf95..e3c7a39b2bb 100644 --- a/sys/arch/i386/stand/libsa/memprobe.c +++ b/sys/arch/i386/stand/libsa/memprobe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: memprobe.c,v 1.43 2005/05/03 13:02:44 tom Exp $ */ +/* $OpenBSD: memprobe.c,v 1.44 2005/05/03 13:18:04 tom Exp $ */ /* * Copyright (c) 1997-1999 Michael Shalayeff @@ -67,9 +67,7 @@ checkA20(void) static __inline bios_memmap_t * bios_E820(bios_memmap_t *mp) { - void *info; int rc, off = 0, sig, gotcha = 0; - info = getEBDAaddr(); do { BIOS_regs.biosr_es = ((u_int)(mp) >> 4); diff --git a/sys/arch/i386/stand/pxeboot/conf.c b/sys/arch/i386/stand/pxeboot/conf.c index 009c908a81f..da5d7d63ef4 100644 --- a/sys/arch/i386/stand/pxeboot/conf.c +++ b/sys/arch/i386/stand/pxeboot/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.6 2005/05/03 13:02:45 tom Exp $ */ +/* $OpenBSD: conf.c,v 1.7 2005/05/03 13:18:05 tom Exp $ */ /* * Copyright (c) 2004 Tom Cosgrove @@ -46,7 +46,7 @@ #include "pxeboot.h" #include "pxe_net.h" -const char version[] = "1.05"; +const char version[] = "1.06"; int debug = 1; #undef _TEST |