From 95b246f166bb6504eadc4987ece1edc6f5090341 Mon Sep 17 00:00:00 2001 From: Jonathan Lemon Date: Mon, 28 Sep 1998 03:41:12 +0000 Subject: Use defines APM_BIOS and SYSTEM_BIOS instead of hardcoding 0x53 and 0x15. --- sys/i386/apm/apm.c | 10 +++++----- sys/i386/bios/apm.c | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys/i386/apm/apm.c b/sys/i386/apm/apm.c index 7018f1dccd74..c871151c7ae0 100644 --- a/sys/i386/apm/apm.c +++ b/sys/i386/apm/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.72 1998/06/07 17:09:55 dfr Exp $ + * $Id: apm.c,v 1.73 1998/07/06 06:29:03 imp Exp $ */ #include "opt_devfs.h" @@ -651,18 +651,18 @@ apmprobe(struct isa_device *dvp) #ifdef VM86 bzero(&vmf, sizeof(struct vm86frame)); /* safety */ - vmf.vmf_ax = 0x5300; + vmf.vmf_ax = (APM_BIOS << 8) | APM_INSTCHECK; vmf.vmf_bx = 0; - if (((i = vm86_intcall(0x15, &vmf)) == 0) && + if (((i = vm86_intcall(SYSTEM_BIOS, &vmf)) == 0) && !(vmf.vmf_eflags & PSL_C) && (vmf.vmf_bx == 0x504d)) { apm_version = vmf.vmf_ax; apm_flags = vmf.vmf_cx; - vmf.vmf_ax = 0x5303; + vmf.vmf_ax = (APM_BIOS << 8) | APM_PROT32CONNECT; vmf.vmf_bx = 0; - if (((i = vm86_intcall(0x15, &vmf)) == 0) && + if (((i = vm86_intcall(SYSTEM_BIOS, &vmf)) == 0) && !(vmf.vmf_eflags & PSL_C)) { apm_cs32_base = vmf.vmf_ax; diff --git a/sys/i386/bios/apm.c b/sys/i386/bios/apm.c index 7018f1dccd74..c871151c7ae0 100644 --- a/sys/i386/bios/apm.c +++ b/sys/i386/bios/apm.c @@ -15,7 +15,7 @@ * * Sep, 1994 Implemented on FreeBSD 1.1.5.1R (Toshiba AVS001WD) * - * $Id: apm.c,v 1.72 1998/06/07 17:09:55 dfr Exp $ + * $Id: apm.c,v 1.73 1998/07/06 06:29:03 imp Exp $ */ #include "opt_devfs.h" @@ -651,18 +651,18 @@ apmprobe(struct isa_device *dvp) #ifdef VM86 bzero(&vmf, sizeof(struct vm86frame)); /* safety */ - vmf.vmf_ax = 0x5300; + vmf.vmf_ax = (APM_BIOS << 8) | APM_INSTCHECK; vmf.vmf_bx = 0; - if (((i = vm86_intcall(0x15, &vmf)) == 0) && + if (((i = vm86_intcall(SYSTEM_BIOS, &vmf)) == 0) && !(vmf.vmf_eflags & PSL_C) && (vmf.vmf_bx == 0x504d)) { apm_version = vmf.vmf_ax; apm_flags = vmf.vmf_cx; - vmf.vmf_ax = 0x5303; + vmf.vmf_ax = (APM_BIOS << 8) | APM_PROT32CONNECT; vmf.vmf_bx = 0; - if (((i = vm86_intcall(0x15, &vmf)) == 0) && + if (((i = vm86_intcall(SYSTEM_BIOS, &vmf)) == 0) && !(vmf.vmf_eflags & PSL_C)) { apm_cs32_base = vmf.vmf_ax; -- cgit v1.3