andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bus: Remove yet more unused overlap processing.

Browse Source
This commit is contained in:
Adam Jackson 2008-10-11 22:14:23 -04:00
parent 994b7c034f
commit a8bcab2d3b
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -978,10 +978,6 @@ needCheck(resPtr pRes, unsigned long type, int entityIndex, xf86State state)
BusType loc = BUS_NONE; BusType loc = BUS_NONE;
BusType r_loc = BUS_NONE; BusType r_loc = BUS_NONE;
/* Ignore overlapped ranges that have been nullified */
if ((pRes->res_type & ResOverlap) && (pRes->block_begin > pRes->block_end))
return FALSE;
if ((pRes->res_type & ResTypeMask) != (type & ResTypeMask)) if ((pRes->res_type & ResTypeMask) != (type & ResTypeMask))
return FALSE; return FALSE;
@ -1263,8 +1259,6 @@ xf86PrintResList(int verb, resPtr list)
s = "[?]"; s = "[?]";
} }
xf86ErrorFVerb(verb, "%s", s); xf86ErrorFVerb(verb, "%s", s);
if (list->res_type & ResOverlap)
xf86ErrorFVerb(verb, "O");
if (list->res_type & ResInit) if (list->res_type & ResInit)
xf86ErrorFVerb(verb, "t"); xf86ErrorFVerb(verb, "t");
if (list->res_type & ResBios) if (list->res_type & ResBios)

2
hw/xfree86/common/xf86str.h
View File

@ -645,7 +645,6 @@ typedef struct _CurrAccRec {
#define ResMiscMask 0x00F000 #define ResMiscMask 0x00F000
#define ResBus 0x010000 #define ResBus 0x010000
#define ResOverlap 0x020000
#if defined(__alpha__) && defined(linux) #if defined(__alpha__) && defined(linux)
# define ResDomain 0x1ff000000ul # define ResDomain 0x1ff000000ul
@ -684,7 +683,6 @@ typedef struct _CurrAccRec {
#define ResIsBlock(r) (((r)->type & ResExtMask) == ResBlock) #define ResIsBlock(r) (((r)->type & ResExtMask) == ResBlock)
#define ResIsSparse(r) (((r)->type & ResExtMask) == ResSparse) #define ResIsSparse(r) (((r)->type & ResExtMask) == ResSparse)
#define ResIsEstimated(r) (((r)->type & ResMiscMask) == ResEstimated) #define ResIsEstimated(r) (((r)->type & ResMiscMask) == ResEstimated)
#define ResCanOverlap(r) (ResIsEstimated(r) || ((r)->type & ResOverlap))
typedef struct { typedef struct {
unsigned long type; /* shared, exclusive, unused etc. */ unsigned long type; /* shared, exclusive, unused etc. */