d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged from sys/i386/i386/machdep.c rev. 1.404 just for keeping

Browse Source 
similarity.  No PC-98 may have ACPI feature, but I'm not 100%
sure.
This commit is contained in:
KATO Takenori 2000-09-03 14:11:03 +00:00
parent ddf47c26f3
commit 5340942440
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65408
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/pc98/i386/machdep.c
View File

@ -38,6 +38,7 @@
* $FreeBSD$
*/
#include "acpi.h"
#include "apm.h"
#include "npx.h"
#include "opt_atalk.h"
@ -121,6 +122,10 @@
#include <sys/ptrace.h>
#include <machine/sigframe.h>
#if NACPI > 0
#include <sys/acpi.h>
#endif
extern void init386 __P((int first));
extern void dblfault_handler __P((void));
@ -1777,6 +1782,9 @@ getmemsize(int first)
smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT));
vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di);
#if NACPI > 0
acpi_init_addr_range();
#endif
physmap_idx = 0;
vmf.vmf_ebx = 0;
do {
@ -1793,7 +1801,13 @@ getmemsize(int first)
(u_int32_t)smap->base,
*(u_int32_t *)((char *)&smap->length + 4),
(u_int32_t)smap->length);
#if NACPI > 0
/* Save ACPI related memory Info */
if (smap->type == 0x03 || smap->type == 0x04) {
acpi_register_addr_range(smap->base,
smap->length, smap->type);
}
#endif
if (smap->type != 0x01)
goto next_run;

16
sys/pc98/pc98/machdep.c
View File

@ -38,6 +38,7 @@
* $FreeBSD$
*/
#include "acpi.h"
#include "apm.h"
#include "npx.h"
#include "opt_atalk.h"
@ -121,6 +122,10 @@
#include <sys/ptrace.h>
#include <machine/sigframe.h>
#if NACPI > 0
#include <sys/acpi.h>
#endif
extern void init386 __P((int first));
extern void dblfault_handler __P((void));
@ -1777,6 +1782,9 @@ getmemsize(int first)
smap = (void *)vm86_addpage(&vmc, 1, KERNBASE + (1 << PAGE_SHIFT));
vm86_getptr(&vmc, (vm_offset_t)smap, &vmf.vmf_es, &vmf.vmf_di);
#if NACPI > 0
acpi_init_addr_range();
#endif
physmap_idx = 0;
vmf.vmf_ebx = 0;
do {
@ -1793,7 +1801,13 @@ getmemsize(int first)
(u_int32_t)smap->base,
*(u_int32_t *)((char *)&smap->length + 4),
(u_int32_t)smap->length);
#if NACPI > 0
/* Save ACPI related memory Info */
if (smap->type == 0x03 || smap->type == 0x04) {
acpi_register_addr_range(smap->base,
smap->length, smap->type);
}
#endif
if (smap->type != 0x01)
goto next_run;