frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bus: Remove the notion of estimated resources.

This commit is contained in:
Adam Jackson 2008-10-09 00:33:28 -04:00
parent 095ba14355
commit 41be6b3f0d
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/xfree86/common/xf86Bus.c
View File

@ -1009,10 +1009,6 @@ needCheck(resPtr pRes, unsigned long type, int entityIndex, xf86State state)
if (pRes->res_type & type & ResBios) if (pRes->res_type & type & ResBios)
return FALSE; return FALSE;
/*If requested, skip over estimated resources */
if (pRes->res_type & type & ResEstimated)
return FALSE;
if (type & pRes->res_type & ResUnused) if (type & pRes->res_type & ResUnused)
return FALSE; return FALSE;
@ -1284,8 +1280,6 @@ xf86PrintResList(int verb, resPtr list)
s = "[?]"; s = "[?]";
} }
xf86ErrorFVerb(verb, "%s", s); xf86ErrorFVerb(verb, "%s", s);
if (list->res_type & ResEstimated)
xf86ErrorFVerb(verb, "E");
if (list->res_type & ResOverlap) if (list->res_type & ResOverlap)
xf86ErrorFVerb(verb, "O"); xf86ErrorFVerb(verb, "O");
if (list->res_type & ResInit) if (list->res_type & ResInit)
@ -1360,8 +1354,7 @@ RemoveOverlaps(resPtr target, resPtr list, Bool pow2Alignment, Bool useEstimated
if (!target) if (!target)
return; return;
if (!(target->res_type & ResEstimated) /* Don't touch sure resources */ if (!(target->res_type & ResOverlap)) /* only touch overlaps */
&& !(target->res_type & ResOverlap)) /* Unless they may overlap */
return; return;
for (pRes = list; pRes; pRes = pRes->next) { for (pRes = list; pRes; pRes = pRes->next) {
@ -1373,9 +1366,6 @@ RemoveOverlaps(resPtr target, resPtr list, Bool pow2Alignment, Bool useEstimated
continue; continue;
if (pRes->block_begin <= target->block_begin) { if (pRes->block_begin <= target->block_begin) {
/* Possibly ignore estimated resources */
if (!useEstimated && (pRes->res_type & ResEstimated))
continue;
/* Special cases */ /* Special cases */
if (pRes->block_end >= target->block_end) { if (pRes->block_end >= target->block_end) {

3
hw/xfree86/os-support/shared/stdResource.c
View File

@ -77,9 +77,6 @@ xf86StdAccResFromOS(resPtr ret)
ret = xf86AddResToList(ret, &range, -1); ret = xf86AddResToList(ret, &range, -1);
RANGE(range, 0x000f0000, 0x000fffff, ResExcMemBlock); RANGE(range, 0x000f0000, 0x000fffff, ResExcMemBlock);
ret = xf86AddResToList(ret, &range, -1); ret = xf86AddResToList(ret, &range, -1);
RANGE(range, 0x00100000, 0x3fffffff,
ResExcMemBlock | ResBios | ResEstimated);
ret = xf86AddResToList(ret, &range, -1);
#if 0 #if 0
RANGE(range, 0xfec00000, 0xfecfffff, ResExcMemBlock | ResBios); RANGE(range, 0xfec00000, 0xfecfffff, ResExcMemBlock | ResBios);
ret = xf86AddResToList(ret, &range, -1); ret = xf86AddResToList(ret, &range, -1);