summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>1997-07-28 23:05:00 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>1997-07-28 23:05:00 +0000
commit57ecfd692c2ea481e5992beb34158dc94d0b4cbf (patch)
treef412f8212843766626aaabca35ba474db0ff54be /sys/arch/i386/stand
parent6735a93538919738534562dc6189aeb3f7f9cc1a (diff)
adopt for assym.h
Diffstat (limited to 'sys/arch/i386/stand')
-rw-r--r--sys/arch/i386/stand/libsa/machdep.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/i386/stand/libsa/machdep.c b/sys/arch/i386/stand/libsa/machdep.c
index c53b47a371c..863bc6e2459 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.3 1997/07/21 15:41:55 mickey Exp $ */
+/* $OpenBSD: machdep.c,v 1.4 1997/07/28 23:04:59 mickey Exp $ */
/*
* Copyright (c) 1997 Michael Shalayeff
@@ -54,7 +54,7 @@ machdep()
#ifdef DEBUG
*(u_int16_t*)0xb8148 = 0x4f31;
#endif
-#if 0
+#ifdef BOOT_APM
printf("apm_init: ");
switch(apminfo.apm_detail = apm_init()) {
case APMINI_CANTFIND:
@@ -75,17 +75,17 @@ machdep()
default:
/* valid: detail, dx, bx */
- apminfo.apm_code32_seg_base = (BIOS_regs.br_ax & 0xffff) << 4;
- apminfo.apm_code16_seg_base = (BIOS_regs.br_cx & 0xffff) << 4;
- apminfo.apm_data_seg_base = (BIOS_regs.br_dx & 0xffff) << 4;
+ apminfo.apm_code32_seg_base = (BIOS_regs.biosr_ax & 0xffff)<< 4;
+ apminfo.apm_code16_seg_base = (BIOS_regs.biosr_cx & 0xffff)<< 4;
+ apminfo.apm_data_seg_base = (BIOS_regs.biosr_dx & 0xffff)<< 4;
#if 0
- apminfo.apm_code32_seg_len = BIOS_regs.br_si & 0xffff;
- apminfo.apm_data_seg_len = BIOS_regs.br_di & 0xffff;
+ apminfo.apm_code32_seg_len = BIOS_regs.biosr_si & 0xffff;
+ apminfo.apm_data_seg_len = BIOS_regs.biosr_di & 0xffff;
#else
apminfo.apm_code32_seg_len = 0x10000;
apminfo.apm_data_seg_len = 0x10000;
#endif
- apminfo.apm_entrypt = BIOS_regs.br_bx;
+ apminfo.apm_entrypt = BIOS_regs.biosr_bx;
#ifdef DEBUG
printf("%x text=%x/%x[%x] data=%x[%x] @ %x",
apminfo.apm_detail,