Internalise some resource list API.

This commit is contained in:
Adam Jackson 2008-10-03 14:32:32 -04:00
parent 0ca4f3cee7
commit 8fbf1185f5
3 changed files with 4 additions and 11 deletions

View File

@ -100,7 +100,6 @@ Bool xf86ParsePciBusString(const char *busID, int *bus, int *device,
int *func); int *func);
Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func); Bool xf86ComparePciBusString(const char *busID, int bus, int device, int func);
void xf86FormatPciBusNumber(int busnum, char *buffer); void xf86FormatPciBusNumber(int busnum, char *buffer);
void xf86PrintResList(int verb, resPtr list);
resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex); resPtr xf86AddRangesToList(resPtr list, resRange *pRange, int entityIndex);
int xf86ClaimIsaSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active); int xf86ClaimIsaSlot(DriverPtr drvp, int chipset, GDevPtr dev, Bool active);
int xf86GetIsaInfoForScreen(int scrnIndex); int xf86GetIsaInfoForScreen(int scrnIndex);
@ -114,8 +113,6 @@ Bool xf86IsPrimaryPci(struct pci_device * pPci);
Bool xf86IsPrimaryIsa(void); Bool xf86IsPrimaryIsa(void);
/* new RAC */ /* new RAC */
resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex); resPtr xf86AddResToList(resPtr rlist, resRange *Range, int entityIndex);
resPtr xf86JoinResLists(resPtr rlist1, resPtr rlist2);
resPtr xf86DupResList(const resPtr rlist);
void xf86FreeResList(resPtr rlist); void xf86FreeResList(resPtr rlist);
void xf86ClaimFixedResources(resList list, int entityIndex); void xf86ClaimFixedResources(resList list, int entityIndex);
Bool xf86DriverHasEntities(DriverPtr drvp); Bool xf86DriverHasEntities(DriverPtr drvp);

View File

@ -1129,7 +1129,7 @@ xf86ChkConflict(resRange *rgp, int entityIndex)
* Resources List handling * Resources List handling
*/ */
_X_EXPORT resPtr static resPtr
xf86JoinResLists(resPtr rlist1, resPtr rlist2) xf86JoinResLists(resPtr rlist1, resPtr rlist2)
{ {
resPtr pRes; resPtr pRes;
@ -1146,7 +1146,7 @@ xf86JoinResLists(resPtr rlist1, resPtr rlist2)
return rlist1; return rlist1;
} }
_X_EXPORT resPtr resPtr
xf86AddResToList(resPtr rlist, resRange *range, int entityIndex) xf86AddResToList(resPtr rlist, resRange *range, int entityIndex)
{ {
resPtr new; resPtr new;
@ -1196,7 +1196,7 @@ xf86FreeResList(resPtr rlist)
xfree(rlist); xfree(rlist);
} }
_X_EXPORT resPtr static resPtr
xf86DupResList(const resPtr rlist) xf86DupResList(const resPtr rlist)
{ {
resPtr pRes, ret, prev, new; resPtr pRes, ret, prev, new;
@ -1216,7 +1216,7 @@ xf86DupResList(const resPtr rlist)
return ret; return ret;
} }
_X_EXPORT void static void
xf86PrintResList(int verb, resPtr list) xf86PrintResList(int verb, resPtr list)
{ {
int i = 0; int i = 0;

View File

@ -307,10 +307,6 @@ _X_HIDDEN void *xfree86LookupTab[] = {
SYMFUNC(xf86SetCurrentAccess) SYMFUNC(xf86SetCurrentAccess)
SYMFUNC(xf86IsPrimaryPci) SYMFUNC(xf86IsPrimaryPci)
SYMFUNC(xf86IsPrimaryIsa) SYMFUNC(xf86IsPrimaryIsa)
SYMFUNC(xf86PrintResList)
SYMFUNC(xf86AddResToList)
SYMFUNC(xf86JoinResLists)
SYMFUNC(xf86DupResList)
SYMFUNC(xf86FreeResList) SYMFUNC(xf86FreeResList)
SYMFUNC(xf86ClaimFixedResources) SYMFUNC(xf86ClaimFixedResources)
SYMFUNC(xf86AddEntityToScreen) SYMFUNC(xf86AddEntityToScreen)