summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2009-05-28 15:16:22 -0400
committerAdam Jackson <ajax@redhat.com>2009-05-28 15:16:34 -0400
commita75f0eaba6cb907a6ca9e506858d41f9c6f66b8b (patch)
tree03308be70f16adc5dc4f7e539a90a22a9bec3d77
parentf2742755352d49a1ff4cbf9a1a5050a0a50e9e6b (diff)
Remove useless loader symbol lists.
-rw-r--r--src/savage_driver.c196
1 files changed, 0 insertions, 196 deletions
diff --git a/src/savage_driver.c b/src/savage_driver.c
index 4115fb0..ec2083c 100644
--- a/src/savage_driver.c
+++ b/src/savage_driver.c
@@ -339,178 +339,6 @@ _X_EXPORT DriverRec SAVAGE =
#endif
};
-
-
-static const char *vgaHWSymbols[] = {
- "vgaHWBlankScreen",
- "vgaHWCopyReg",
- "vgaHWGetHWRec",
- "vgaHWGetIOBase",
- "vgaHWGetIndex",
- "vgaHWInit",
- "vgaHWLock",
- "vgaHWProtect",
- "vgaHWRestore",
- "vgaHWSave",
- "vgaHWSaveScreen",
- "vgaHWSetMmioFuncs",
- "vgaHWSetStdFuncs",
- "vgaHWUnmapMem",
- "vgaHWddc1SetSpeedWeak",
-#if 0
- "vgaHWFreeHWRec",
- "vgaHWMapMem",
- "vgaHWUnlock",
-#endif
- NULL
-};
-
-#ifdef XF86DRI
-static const char *drmSymbols[] = {
- "drmAvailable",
- "drmAddBufs",
- "drmAddMap",
- "drmCtlInstHandler",
- "drmGetInterruptFromBusID",
- "drmFreeVersion",
- "drmGetVersion",
- "drmMap",
- "drmUnmap",
- "drmMapBufs",
- "drmUnmapBufs",
- "drmAgpAcquire",
- "drmAgpRelease",
- "drmAgpEnable",
- "drmAgpAlloc",
- "drmAgpFree",
- "drmAgpBind",
- "drmAgpUnbind",
- "drmAgpGetMode",
- "drmAgpBase",
- "drmAgpSize",
- "drmAgpVendorId",
- "drmAgpDeviceId",
- "drmMGAInitDMA",
- "drmMGACleanupDMA",
- "drmMGAFlushDMA",
- "drmMGAEngineReset",
- NULL
-};
-
-static const char *driSymbols[] = {
- "DRIGetDrawableIndex",
- "DRIFinishScreenInit",
- "DRIDestroyInfoRec",
- "DRICloseScreen",
- "DRIDestroyInfoRec",
- "DRIScreenInit",
- "DRIDestroyInfoRec",
- "DRICreateInfoRec",
- "DRILock",
- "DRIUnlock",
- "DRIGetSAREAPrivate",
- "DRIGetContext",
- "DRIQueryVersion",
- "DRIAdjustFrame",
- "DRIOpenFullScreen",
- "DRICloseFullScreen",
- "GlxSetVisualConfigs",
- NULL
-};
-#endif
-
-
-static const char *ramdacSymbols[] = {
- "xf86CreateCursorInfoRec",
-#if 0
- "xf86DestroyCursorInfoRec",
-#endif
- "xf86InitCursor",
- NULL
-};
-
-static const char *int10Symbols[] = {
- "xf86ExecX86int10",
- "xf86Int10AllocPages",
- "xf86int10Addr",
- "xf86Int10FreePages"
-};
-
-static const char *vbeSymbols[] = {
- "VBEInit",
- "vbeDoEDID",
-#if 0
- "vbeFree",
-#endif
- NULL
-};
-
-static const char *vbeOptSymbols[] = {
- "vbeModeInit",
- "VBESetVBEMode",
- "VBEGetVBEInfo",
- "VBEFreeVBEInfo",
- NULL
-};
-
-static const char *ddcSymbols[] = {
- "xf86DoEDID_DDC1",
- "xf86DoEDID_DDC2",
- "xf86PrintEDID",
- "xf86SetDDCproperties",
- NULL
-};
-
-static const char *i2cSymbols[] = {
- "xf86CreateI2CBusRec",
- "xf86I2CBusInit",
- "xf86CreateI2CDevRec",
- "xf86I2CDevInit",
- "xf86I2CWriteByte",
- "xf86I2CWriteBytes",
- "xf86I2CReadByte",
- "xf86I2CReadBytes",
- "xf86I2CWriteRead",
- "xf86DestroyI2CDevRec",
- NULL
-};
-
-static const char *xaaSymbols[] = {
- "XAAGetCopyROP",
- "XAAGetCopyROP_PM",
- "XAACreateInfoRec",
- "XAADestroyInfoRec",
- "XAAFillSolidRects",
- "XAAHelpPatternROP",
- "XAAHelpSolidROP",
- "XAAInit",
- "XAAScreenIndex",
- NULL
-};
-
-static const char *exaSymbols[] = {
- "exaDriverAlloc",
- "exaDriverInit",
- "exaDriverFini",
- "exaOffscreenAlloc",
- "exaOffscreenFree",
- "exaGetPixmapOffset",
- "exaGetPixmapPitch",
- "exaGetPixmapSize",
- NULL
-};
-
-static const char *shadowSymbols[] = {
- "ShadowFBInit",
- NULL
-};
-
-static const char *fbSymbols[] = {
- "fbPictureInit",
- "fbScreenInit",
- NULL
-};
-
#ifdef XFree86LOADER
static MODULESETUPPROTO(SavageSetup);
@@ -542,14 +370,6 @@ static pointer SavageSetup(pointer module, pointer opts, int *errmaj,
if (!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SAVAGE, module, 1);
- LoaderRefSymLists(vgaHWSymbols, fbSymbols, ramdacSymbols,
- xaaSymbols,
- exaSymbols,
- shadowSymbols, vbeSymbols, vbeOptSymbols,
-#ifdef XF86DRI
- drmSymbols, driSymbols,
-#endif
- int10Symbols, i2cSymbols, ddcSymbols, NULL);
return (pointer) 1;
} else {
if (errmaj)
@@ -1052,7 +872,6 @@ static void SavageDoDDC(ScrnInfoPtr pScrn)
/* Do the DDC dance. */ /* S3/VIA's DDC code */
ddc = xf86LoadSubModule(pScrn, "ddc");
if (ddc) {
- xf86LoaderReqSymLists(ddcSymbols, NULL);
switch( psav->Chipset ) {
case S3_SAVAGE3D:
case S3_SAVAGE_MX:
@@ -1074,7 +893,6 @@ static void SavageDoDDC(ScrnInfoPtr pScrn)
if (!SavageDDC1(pScrn->scrnIndex)) {
/* DDC1 failed,switch to DDC2 */
if (xf86LoadSubModule(pScrn, "i2c")) {
- xf86LoaderReqSymLists(i2cSymbols,NULL);
if (SavageI2CInit(pScrn)) {
unsigned char tmp;
xf86MonPtr pMon;
@@ -1276,7 +1094,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
- xf86LoaderReqSymLists(vgaHWSymbols, NULL);
if (!vgaHWGetHWRec(pScrn))
return FALSE;
@@ -1579,7 +1396,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
psav->EntityIndex = pEnt->index;
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
psav->pVbe = VBEInit(NULL, pEnt->index);
}
@@ -2313,16 +2129,11 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
- xf86LoaderReqSymLists(fbSymbols, NULL);
-
if( !psav->NoAccel ) {
-
char *modName = NULL;
- const char **symNames = NULL;
if (psav->useEXA) {
modName = "exa";
- symNames = exaSymbols;
XF86ModReqInfo req;
int errmaj, errmin;
memset(&req, 0, sizeof(req));
@@ -2339,7 +2150,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
}
} else {
modName = "xaa";
- symNames = xaaSymbols;
if( !xf86LoadSubModule(pScrn, modName) ) {
SavageFreeRec(pScrn);
vbeFree(psav->pVbe);
@@ -2347,9 +2157,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
return FALSE;
}
}
-
- xf86LoaderReqSymLists(symNames, NULL );
-
}
if (psav->hwcursor) {
@@ -2359,7 +2166,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
psav->pVbe = NULL;
return FALSE;
}
- xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (psav->shadowFB) {
@@ -2369,7 +2175,6 @@ static Bool SavagePreInit(ScrnInfoPtr pScrn, int flags)
psav->pVbe = NULL;
return FALSE;
}
- xf86LoaderReqSymLists(shadowSymbols, NULL);
}
vbeFree(psav->pVbe);
@@ -4740,7 +4545,6 @@ SavageProbeDDC(ScrnInfoPtr pScrn, int index)
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
- xf86LoaderReqSymLists(vbeSymbols, NULL);
pVbe = VBEInit(NULL, index);
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);