Delete internal usage of the symbol ref/req lists.

This commit is contained in:
Adam Jackson 2006-07-21 18:47:18 -04:00
parent bca9364f3f
commit 63dfaa1d5b
4 changed files with 1 additions and 70 deletions

View File

@ -15,15 +15,6 @@
static const OptionInfoRec *DDCAvailableOptions(void *unused);
const char *i2cSymbols[] = {
"xf86CreateI2CDevRec",
"xf86I2CDevInit",
"xf86I2CWriteRead",
"xf86I2CFindDev",
"xf86DestroyI2CDevRec",
NULL
};
static MODULESETUPPROTO(ddcSetup);
static XF86ModuleVersionInfo ddcVersRec =
@ -58,12 +49,6 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
xf86AddModuleInfo(&DDC, module);
/*
* Tell the loader about symbols from other modules that this module
* might refer to.
*/
LoaderRefSymLists(i2cSymbols, NULL);
}
/*
* The return value must be non-NULL on success even though there
@ -348,8 +333,6 @@ DDCRead_DDC2(int scrnIndex, I2CBusPtr pBus, int start, int len)
unsigned char *R_Buffer;
int i;
xf86LoaderReqSymLists(i2cSymbols, NULL);
if (!(dev = xf86I2CFindDev(pBus, 0x00A0))) {
dev = xf86CreateI2CDevRec();
dev->DevName = "ddc2";

View File

@ -68,32 +68,6 @@ static ExtensionModule XF86DRIExt =
NULL
};
static const char *drmSymbols[] = {
"drmAddContextTag",
"drmAddMap",
"drmAuthMagic",
"drmAvailable",
"drmClose",
"drmCreateContext",
"drmCreateDrawable",
"drmDelContextTag",
"drmDestroyContext",
"drmDestroyDrawable",
"drmFreeReservedContextList",
"drmGetContextTag",
"drmGetLock",
"drmGetReservedContextList",
"drmInstallSIGIOHandler",
"drmMap",
"drmOpen",
"drmRemoveSIGIOHandler",
"drmSetBusid",
"drmSetContextFlags",
"drmUnlock",
"drmUnmap",
NULL
};
_X_EXPORT XF86ModuleData driModuleData = { &VersRec, driSetup, NULL };
static pointer
@ -110,10 +84,7 @@ driSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!drm) {
if (errmaj) *errmaj = LDR_NOSUBENT;
}
else {
LoaderReqSymLists(drmSymbols, NULL);
LoaderRefSymbols("noPanoramiXExtension", NULL);
} else {
LoadExtension(&XF86DRIExt, FALSE);
}
} else {

View File

@ -39,11 +39,6 @@
static unsigned char * vbeReadEDID(vbeInfoPtr pVbe);
static Bool vbeProbeDDC(vbeInfoPtr pVbe);
const char *vbe_ddcSymbols[] = {
"xf86InterpretEDID",
NULL
};
static const char vbeVersionString[] = "VBE2";
vbeInfoPtr
@ -327,8 +322,6 @@ vbeDoEDID(vbeInfoPtr pVbe, pointer pDDCModule)
xf86LoadSubModule(xf86Screens[pVbe->pInt10->scrnIndex], "ddc");
if (!pModule)
return NULL;
xf86LoaderReqSymLists(vbe_ddcSymbols, NULL);
}
DDC_data = vbeReadEDID(pVbe);

View File

@ -6,8 +6,6 @@
#include "xf86str.h"
#include "vbe.h"
extern const char *vbe_ddcSymbols[];
static MODULESETUPPROTO(vbeSetup);
static XF86ModuleVersionInfo vbeVersRec =
@ -29,19 +27,5 @@ _X_EXPORT XF86ModuleData vbeModuleData = { &vbeVersRec, vbeSetup, NULL };
static pointer
vbeSetup(pointer module, pointer opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;
if (!setupDone) {
setupDone = TRUE;
LoaderRefSymLists(vbe_ddcSymbols,NULL);
/*
* Tell the loader about symbols from other modules that this module
* might refer to.
*/
}
/*
* The return value must be non-NULL on success even though there
* is no TearDownProc.
*/
return (pointer)1;
}