diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-10-12 21:14:24 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-10-12 21:14:24 +0000 |
| commit | cdc35d8a869029ed9e6ed3cc4c8a253579b1a570 (patch) | |
| tree | df239b0e01460281421bec21f62de009228d011c /sys/arch/i386/stand | |
| parent | 81da727bd14731e4d3df1ccd4f39fcae73994ae7 (diff) | |
BOOT_APM bye, bye
Diffstat (limited to 'sys/arch/i386/stand')
| -rw-r--r-- | sys/arch/i386/stand/Makefile.inc | 3 | ||||
| -rw-r--r-- | sys/arch/i386/stand/libsa/machdep.c | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/sys/arch/i386/stand/Makefile.inc b/sys/arch/i386/stand/Makefile.inc index 78c3a4934a9..69763110210 100644 --- a/sys/arch/i386/stand/Makefile.inc +++ b/sys/arch/i386/stand/Makefile.inc @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile.inc,v 1.15 1997/09/21 04:28:00 mickey Exp $ +# $OpenBSD: Makefile.inc,v 1.16 1997/10/12 21:14:22 mickey Exp $ CFLAGS=-O2 -Wall -Werror CPPFLAGS=-I${S} -I${SADIR}/libsa -I. -I${.CURDIR} SACFLAGS=-nostdinc -fpack-struct -fno-builtin -fomit-frame-pointer SACFLAGS+=-D_STANDALONE -SACFLAGS+=-DBOOT_APM # CPPFLAGS+=-DSAVE_MEMORY # DEBUGFLAGS=-DDEBUG # DEBUGFLAGS+=-DGIDT_DEBUG diff --git a/sys/arch/i386/stand/libsa/machdep.c b/sys/arch/i386/stand/libsa/machdep.c index 4f1a249dd77..c5b5bed28be 100644 --- a/sys/arch/i386/stand/libsa/machdep.c +++ b/sys/arch/i386/stand/libsa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.16 1997/10/06 17:36:43 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.17 1997/10/12 21:14:23 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -71,7 +71,6 @@ int bootdev; #define CKPT(c) /* c */ #endif -#ifdef BOOT_APM static __inline u_int apm_check() { @@ -96,7 +95,8 @@ apm_check() } static __inline int -apm_disconnect() { +apm_disconnect() +{ register u_int16_t rv; __asm __volatile(DOINT(0x15) "\n\t" "setc %b0" @@ -132,7 +132,6 @@ apm_connect() #endif return (f & 0xff)? f >> 8 : 0; } -#endif void machdep() @@ -146,7 +145,6 @@ machdep() memprobe(); CKPT('4'); #endif -#ifdef BOOT_APM if ((BIOS_vars.bios_apm_detail = apm_check())) { printf("apm0"); @@ -167,6 +165,6 @@ machdep() #endif putchar('\n'); } -#endif + CKPT('9'); } |