Date: Tue, 25 Apr 2006 19:07:50 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 96085 for review Message-ID: <200604251907.k3PJ7oo8003099@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=96085 Change 96085 by jhb@jhb_slimer on 2006/04/25 19:07:45 IFC @96083. Affected files ... .. //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#10 integrate Differences ... ==== //depot/projects/smpng/sys/boot/i386/libi386/biosacpi.c#10 (text+ko) ==== @@ -25,11 +25,13 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.10 2005/04/16 17:38:24 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.11 2006/04/25 18:42:22 jhb Exp $"); #include <stand.h> #include <machine/stdarg.h> #include <bootstrap.h> +#include <btxv86.h> +#include "libi386.h" #include "acfreebsd.h" #include "acconfig.h" @@ -93,7 +95,7 @@ uint16_t *addr; /* EBDA is the 1 KB addressed by the 16 bit pointer at 0x40E. */ - addr = (uint16_t *)0x40E; + addr = (uint16_t *)PTOV(0x40E); if ((rsdp = biosacpi_search_rsdp((char *)(*addr << 4), 0x400)) != NULL) return (rsdp); @@ -113,7 +115,7 @@ /* search on 16-byte boundaries */ for (ofs = 0; ofs < length; ofs += 16) { - rsdp = (RSDP_DESCRIPTOR *)(base + ofs); + rsdp = (RSDP_DESCRIPTOR *)PTOV(base + ofs); /* compare signature, validate checksum */ if (!strncmp(rsdp->Signature, RSDP_SIG, strlen(RSDP_SIG))) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604251907.k3PJ7oo8003099>