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

Unexport xf86ChkConflict 

Also remove the unused internal ChkConflict()
This commit is contained in:
Adam Jackson 2008-10-03 15:10:26 -04:00
parent d7c0ba2e9e
commit 949ef6b79a
4 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/xfree86/common/xf86.h
View File

@ -134,7 +134,6 @@ Bool xf86IsEntityPrimary(int entityIndex);
resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes); resPtr xf86ReallocatePciResources(int entityIndex, resPtr pRes);
resPtr xf86SetOperatingState(resList list, int entityIndex, int mask); resPtr xf86SetOperatingState(resList list, int entityIndex, int mask);
void xf86EnterServerState(xf86State state); void xf86EnterServerState(xf86State state);
memType xf86ChkConflict(resRange *rgp, int entityIndex);
ScrnInfoPtr xf86FindScreenForEntity(int entityIndex); ScrnInfoPtr xf86FindScreenForEntity(int entityIndex);
Bool xf86NoSharedResources(int screenIndex, resType res); Bool xf86NoSharedResources(int screenIndex, resType res);
resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2); resPtr xf86FindIntersectOfLists(resPtr l1, resPtr l2);

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

@ -1099,21 +1099,12 @@ checkConflict(resRange *rgp, resPtr pRes, int entityIndex,
return 0; 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 * xf86ChkConflict() - This function is the low level interface to
* the resource broker that gets exported. Tests all resources ie. * the resource broker that gets exported. Tests all resources ie.
* performs test with SETUP flag. * performs test with SETUP flag.
*/ */
_X_EXPORT memType static memType
xf86ChkConflict(resRange *rgp, int entityIndex) xf86ChkConflict(resRange *rgp, int entityIndex)
{ {
return checkConflict(rgp, Acc, entityIndex, SETUP, FALSE); return checkConflict(rgp, Acc, entityIndex, SETUP, FALSE);

1
hw/xfree86/common/xf86Bus.h
View File

@ -129,7 +129,6 @@ extern BusAccPtr xf86BusAccInfo;
int xf86AllocateEntity(void); int xf86AllocateEntity(void);
BusType StringToBusType(const char* busID, const char **retID); BusType StringToBusType(const char* busID, const char **retID);
memType ChkConflict(resRange *rgp, resPtr res, xf86State state);
Bool xf86IsSubsetOf(resRange range, resPtr list); Bool xf86IsSubsetOf(resRange range, resPtr list);
resPtr xf86ExtractTypeFromList(resPtr list, unsigned long type); resPtr xf86ExtractTypeFromList(resPtr list, unsigned long type);
resPtr xf86FindIntersect(resRange Range, resPtr list); resPtr xf86FindIntersect(resRange Range, resPtr list);

1
hw/xfree86/loader/xf86sym.c
View File

@ -322,7 +322,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86CheckPciMemBase) SYMFUNC(xf86CheckPciMemBase)
SYMFUNC(xf86IsEntityPrimary) SYMFUNC(xf86IsEntityPrimary)
SYMFUNC(xf86SetOperatingState) SYMFUNC(xf86SetOperatingState)
SYMFUNC(xf86ChkConflict)
SYMFUNC(xf86FindScreenForEntity) SYMFUNC(xf86FindScreenForEntity)
SYMFUNC(xf86NoSharedResources) SYMFUNC(xf86NoSharedResources)
/* Shared Accel Accessor Functions */ /* Shared Accel Accessor Functions */