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

MFi386: revision 1.599 (Preserve dcons(4) buffer passed by loader(8).)

Browse Source
This commit is contained in:
Yoshihiro Takahashi 2004-10-30 12:41:20 +00:00
parent 56f0c46a3b
commit 9bb402796d
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1557,6 +1557,7 @@ getmemsize(int first)
char *cp;
struct bios_smap *smap;
#endif
quad_t dcons_addr, dcons_size;
#ifdef PC98
/* XXX - some of EPSON machines can't use PG_N */
@ -1871,6 +1872,13 @@ next_run: ;
phys_avail[pa_indx] = physmap[0];
pte = CMAP1;
/*
* Get dcons buffer address
*/
if (getenv_quad("dcons.addr", &dcons_addr) == 0 ||
getenv_quad("dcons.size", &dcons_size) == 0)
dcons_addr = 0;
/*
* physmap is in bytes, so when converting to page boundaries,
* round up the start address and round down the end address.
@ -1890,7 +1898,15 @@ next_run: ;
*/
if (pa >= KERNLOAD && pa < first)
continue;
/*
* block out dcons buffer
*/
if (dcons_addr > 0
&& pa >= trunc_page(dcons_addr)
&& pa < dcons_addr + dcons_size)
continue;
page_bad = FALSE;
/*

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

@ -1557,6 +1557,7 @@ getmemsize(int first)
char *cp;
struct bios_smap *smap;
#endif
quad_t dcons_addr, dcons_size;
#ifdef PC98
/* XXX - some of EPSON machines can't use PG_N */
@ -1871,6 +1872,13 @@ next_run: ;
phys_avail[pa_indx] = physmap[0];
pte = CMAP1;
/*
* Get dcons buffer address
*/
if (getenv_quad("dcons.addr", &dcons_addr) == 0 ||
getenv_quad("dcons.size", &dcons_size) == 0)
dcons_addr = 0;
/*
* physmap is in bytes, so when converting to page boundaries,
* round up the start address and round down the end address.
@ -1890,7 +1898,15 @@ next_run: ;
*/
if (pa >= KERNLOAD && pa < first)
continue;
/*
* block out dcons buffer
*/
if (dcons_addr > 0
&& pa >= trunc_page(dcons_addr)
&& pa < dcons_addr + dcons_size)
continue;
page_bad = FALSE;
/*