diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-10-19 06:34:24 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 1997-10-19 06:34:24 +0000 |
| commit | 4fb24ed917f8f7b33b510287972a2640a0b2baf6 (patch) | |
| tree | b5f375f2b550e6309ff0be4db619c2d7f78fdfe8 /sys/arch | |
| parent | ece0612d23299fe0350f3f565b16c6ee7d30e919 (diff) | |
no, not good. will be fixed soon
xyu te6e B poT, teo
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/bios.c | 3 | ||||
| -rw-r--r-- | sys/arch/i386/i386/genassym.cf | 10 | ||||
| -rw-r--r-- | sys/arch/i386/i386/locore.s | 14 |
3 files changed, 3 insertions, 24 deletions
diff --git a/sys/arch/i386/i386/bios.c b/sys/arch/i386/i386/bios.c index 178bef8d194..c54f332a49d 100644 --- a/sys/arch/i386/i386/bios.c +++ b/sys/arch/i386/i386/bios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bios.c,v 1.9 1997/10/18 00:33:11 weingart Exp $ */ +/* $OpenBSD: bios.c,v 1.10 1997/10/19 06:34:21 mickey Exp $ */ /* * Copyright (c) 1997 Michael Shalayeff @@ -91,7 +91,6 @@ struct { u_int16_t cs; } bios_kentry; struct BIOS_vars BIOS_vars; -bios_diskinfo_t bios_diskinfo[16]; /* XXX - For now */ static __inline int bios_call(cmd, arg) diff --git a/sys/arch/i386/i386/genassym.cf b/sys/arch/i386/i386/genassym.cf index 6f3bfd6ad76..c7d96c90eff 100644 --- a/sys/arch/i386/i386/genassym.cf +++ b/sys/arch/i386/i386/genassym.cf @@ -1,4 +1,4 @@ -# $OpenBSD: genassym.cf,v 1.4 1997/10/18 00:33:12 weingart Exp $ +# $OpenBSD: genassym.cf,v 1.5 1997/10/19 06:34:23 mickey Exp $ # # Copyright (c) 1982, 1990 The Regents of the University of California. # All rights reserved. @@ -156,11 +156,3 @@ define IH_ARG offsetof(struct intrhand, ih_arg) define IH_COUNT offsetof(struct intrhand, ih_count) define IH_NEXT offsetof(struct intrhand, ih_next) endif - -include "bios.h" -ifdef NBIOS -include <machine/biosvar.h> -define BOOT_DATA offsetof(struct BIOS_vars, boot_data) -define BOOT_SIZE sizeof(bios_diskinfo_t) -endif - diff --git a/sys/arch/i386/i386/locore.s b/sys/arch/i386/i386/locore.s index ec5c405bc3d..46e2a9e2fb4 100644 --- a/sys/arch/i386/i386/locore.s +++ b/sys/arch/i386/i386/locore.s @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.s,v 1.34 1997/10/18 00:33:13 weingart Exp $ */ +/* $OpenBSD: locore.s,v 1.35 1997/10/19 06:34:22 mickey Exp $ */ /* $NetBSD: locore.s,v 1.145 1996/05/03 19:41:19 christos Exp $ */ /*- @@ -157,7 +157,6 @@ .globl _bootapiver,_proc0paddr,_curpcb,_PTDpaddr,_dynamic_gdt #if NBIOS > 0 .globl _BIOS_vars - .globl _bios_diskinfo #endif _cpu: .long 0 # are we 386, 386sx, 486, 586 or 686 _cpu_vendor: .space 16 # vendor string returned by `cpuid' instruction @@ -212,16 +211,6 @@ start: movw $0x1234,0x472 # warm boot movl 32(%esp), %ecx cld rep; movsb - - /* Copy bios_diskinfo as well */ - clc - movl 28(%esp), %eax /* Get boot_data */ - addl $BOOT_DATA, %eax - movl (%eax), %esi - movl $RELOC(_bios_diskinfo), %edi - movl $BOOT_SIZE*16, %ecx - cld - rep; movsb 1: #endif /* NBIOS */ @@ -1575,7 +1564,6 @@ ENTRY(idle) sti #if NAPM > 0 call _apm_cpu_idle - hlt cmpl $0,_apm_dobusy je 1f call _apm_cpu_busy |