Unexport xf86ChkConflict
Also remove the unused internal ChkConflict()
This commit is contained in:
parent
d7c0ba2e9e
commit
949ef6b79a
|
@ -134,7 +134,6 @@ Bool xf86IsEntityPrimary(int entityIndex);
|
|||
resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes);
|
||||
resPtr xf86SetOperatingState(resList list, int entityIndex, int mask);
|
||||
void xf86EnterServerState(xf86State state);
|
||||
memType xf86ChkConflict(resRange *rgp, int entityIndex);
|
||||
ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
|
||||
Bool xf86NoSharedResources(int screenIndex, resType res);
|
||||
resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2);
|
||||
|
|
|
@ -1099,24 +1099,15 @@ checkConflict(resRange *rgp, resPtr pRes, int entityIndex,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* ChkConflict() -- used within xxxBus ; find conflict with any location.
|
||||
*/
|
||||
memType
|
||||
ChkConflict(resRange *rgp, resPtr res, xf86State state)
|
||||
{
|
||||
return checkConflict(rgp, res, -2, state,FALSE);
|
||||
}
|
||||
|
||||
/*
|
||||
* xf86ChkConflict() - This function is the low level interface to
|
||||
* the resource broker that gets exported. Tests all resources ie.
|
||||
* performs test with SETUP flag.
|
||||
*/
|
||||
_X_EXPORT memType
|
||||
static memType
|
||||
xf86ChkConflict(resRange *rgp, int entityIndex)
|
||||
{
|
||||
return checkConflict(rgp, Acc, entityIndex, SETUP,FALSE);
|
||||
return checkConflict(rgp, Acc, entityIndex, SETUP, FALSE);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -129,7 +129,6 @@ extern BusAccPtr xf86BusAccInfo;
|
|||
|
||||
int xf86AllocateEntity(void);
|
||||
BusType StringToBusType(const char* busID, const char **retID);
|
||||
memType ChkConflict(resRange *rgp, resPtr res, xf86State state);
|
||||
Bool xf86IsSubsetOf(resRange range, resPtr list);
|
||||
resPtr xf86ExtractTypeFromList(resPtr list, unsigned long type);
|
||||
resPtr xf86FindIntersect(resRange Range, resPtr list);
|
||||
|
|
|
@ -322,7 +322,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
|
|||
SYMFUNC(xf86CheckPciMemBase)
|
||||
SYMFUNC(xf86IsEntityPrimary)
|
||||
SYMFUNC(xf86SetOperatingState)
|
||||
SYMFUNC(xf86ChkConflict)
|
||||
SYMFUNC(xf86FindScreenForEntity)
|
||||
SYMFUNC(xf86NoSharedResources)
|
||||
/* Shared Accel Accessor Functions */
|
||||
|
|
Loading…
Reference in New Issue
Block a user