diff options
| author | Adam Jackson <ajax@redhat.com> | 2008-10-09 00:33:28 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2008-11-24 23:40:03 -0500 |
| commit | 41be6b3f0dc0baa1c6ae8d2b41a6be73ca0e7268 (patch) | |
| tree | 67c57ada469babd744ef8119d8d5f5a6563becd1 | |
| parent | 095ba1435501776c8c8a34e767b89f89e5dc949a (diff) | |
Bus: Remove the notion of estimated resources.
| -rw-r--r-- | hw/xfree86/common/xf86Bus.c | 12 | ||||
| -rw-r--r-- | hw/xfree86/os-support/shared/stdResource.c | 3 |
2 files changed, 1 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c index 27626a0be..8d3d9bbe3 100644 --- a/hw/xfree86/common/xf86Bus.c +++ b/hw/xfree86/common/xf86Bus.c @@ -1009,10 +1009,6 @@ needCheck(resPtr pRes, unsigned long type, int entityIndex, xf86State state) if (pRes->res_type & type & ResBios) return FALSE; - /*If requested, skip over estimated resources */ - if (pRes->res_type & type & ResEstimated) - return FALSE; - if (type & pRes->res_type & ResUnused) return FALSE; @@ -1284,8 +1280,6 @@ xf86PrintResList(int verb, resPtr list) s = "[?]"; } xf86ErrorFVerb(verb, "%s", s); - if (list->res_type & ResEstimated) - xf86ErrorFVerb(verb, "E"); if (list->res_type & ResOverlap) xf86ErrorFVerb(verb, "O"); if (list->res_type & ResInit) @@ -1360,8 +1354,7 @@ RemoveOverlaps(resPtr target, resPtr list, Bool pow2Alignment, Bool useEstimated if (!target) return; - if (!(target->res_type & ResEstimated) /* Don't touch sure resources */ - && !(target->res_type & ResOverlap)) /* Unless they may overlap */ + if (!(target->res_type & ResOverlap)) /* only touch overlaps */ return; for (pRes = list; pRes; pRes = pRes->next) { @@ -1373,9 +1366,6 @@ RemoveOverlaps(resPtr target, resPtr list, Bool pow2Alignment, Bool useEstimated continue; if (pRes->block_begin <= target->block_begin) { - /* Possibly ignore estimated resources */ - if (!useEstimated && (pRes->res_type & ResEstimated)) - continue; /* Special cases */ if (pRes->block_end >= target->block_end) { diff --git a/hw/xfree86/os-support/shared/stdResource.c b/hw/xfree86/os-support/shared/stdResource.c index c144211f0..8cb101488 100644 --- a/hw/xfree86/os-support/shared/stdResource.c +++ b/hw/xfree86/os-support/shared/stdResource.c @@ -77,9 +77,6 @@ xf86StdAccResFromOS(resPtr ret) ret = xf86AddResToList(ret, &range, -1); RANGE(range, 0x000f0000, 0x000fffff, ResExcMemBlock); ret = xf86AddResToList(ret, &range, -1); - RANGE(range, 0x00100000, 0x3fffffff, - ResExcMemBlock | ResBios | ResEstimated); - ret = xf86AddResToList(ret, &range, -1); #if 0 RANGE(range, 0xfec00000, 0xfecfffff, ResExcMemBlock | ResBios); ret = xf86AddResToList(ret, &range, -1); |