XLibre/xf86-video-sis
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-sis.git synced 2026-03-24 01:25:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless loader symbol lists.

Browse Source
This commit is contained in:
Adam Jackson
2009-05-28 15:19:25 -04:00
parent 933dd8f860
commit 74553b5ee4
1 changed files with 2 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/sis_driver.c
View File

@@ -191,127 +191,6 @@ static PciChipsets XGIPciChipsets[] = {
{ -1, -1, RES_UNDEFINED }
};
#ifdef SIS_USE_XAA
static const char *xaaSymbols[] = {
"XAACreateInfoRec",
"XAADestroyInfoRec",
"XAAHelpPatternROP",
"XAAInit",
NULL
};
#endif
#ifdef SIS_USE_EXA
static const char *exaSymbols[] = {
"exaDriverAccel",
"exaDriverInit",
"exaDriverFini",
"exaOffscreenAlloc",
"exaOffscreenFree",
NULL
};
#endif
static const char *fbSymbols[] = {
"fbPictureInit",
"fbScreenInit",
NULL
};
static const char *shadowSymbols[] = {
"ShadowFBInit",
NULL
};
static const char *ramdacSymbols[] = {
"xf86CreateCursorInfoRec",
"xf86DestroyCursorInfoRec",
"xf86InitCursor",
NULL
};
static const char *ddcSymbols[] = {
"xf86PrintEDID",
"xf86SetDDCproperties",
"xf86InterpretEDID",
NULL
};
static const char *int10Symbols[] = {
"xf86FreeInt10",
"xf86InitInt10",
NULL
};
static const char *vbeSymbols[] = {
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
"VBEInit",
#else
"VBEExtendedInit",
#endif
"vbeDoEDID",
"vbeFree",
"VBEGetVBEInfo",
"VBEFreeVBEInfo",
"VBEGetModeInfo",
"VBEFreeModeInfo",
"VBESaveRestore",
"VBESetVBEMode",
"VBEGetVBEMode",
"VBESetDisplayStart",
"VBESetGetLogicalScanlineLength",
NULL
};
#ifdef XF86DRI
static const char *drmSymbols[] = {
"drmAddMap",
"drmAgpAcquire",
"drmAgpRelease",
"drmAgpAlloc",
"drmAgpFree",
"drmAgpBase",
"drmAgpBind",
"drmAgpUnbind",
"drmAgpEnable",
"drmAgpGetMode",
"drmCtlInstHandler",
"drmCtlUninstHandler",
"drmGetInterruptFromBusID",
#ifndef SISHAVEDRMWRITE
"drmSiSAgpInit",
#else
"drmCommandWrite",
#endif
#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0)
"drmGetVersion",
"drmFreeVersion",
#endif
NULL
};
static const char *driSymbols[] = {
"DRICreateInfoRec",
"DRIScreenInit",
"DRIFinishScreenInit",
"DRIDestroyInfoRec",
"DRICloseScreen",
"DRIGetSAREAPrivate",
"DRILock",
"DRIUnlock",
"DRIQueryVersion",
"GlxSetVisualConfigs",
NULL
};
#ifdef XFree86LOADER
static const char *driRefSymbols[] = {
"DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */
NULL
};
#endif
#endif /* XF86DRI */
#ifdef XFree86LOADER
static MODULESETUPPROTO(sisSetup);
@@ -347,19 +226,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if(!setupDone) {
setupDone = TRUE;
xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs);
LoaderRefSymLists(fbSymbols,
#ifdef SIS_USE_XAA
xaaSymbols,
#endif
#ifdef SIS_USE_EXA
exaSymbols,
#endif
shadowSymbols, ramdacSymbols,
vbeSymbols, int10Symbols,
#ifdef XF86DRI
drmSymbols, driSymbols, driRefSymbols,
#endif
NULL);
return (pointer)TRUE;
}
@@ -2949,7 +2815,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn)
if(pSiS->pVbe) return;
if(xf86LoadSubModule(pScrn, "vbe")) {
xf86LoaderReqSymLists(vbeSymbols, NULL);
#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0)
pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index);
#else
@@ -3628,7 +3493,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Initializing adapter through int10\n");
if(xf86LoadSubModule(pScrn, "int10")) {
xf86LoaderReqSymLists(int10Symbols, NULL);
pSiS->pInt = xf86InitInt10(pSiS->pEnt->index);
} else {
SISErrorLog(pScrn, "Failed to load int10 module\n");
@@ -3718,8 +3582,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
goto my_error_1;
}
xf86LoaderReqSymLists(ramdacSymbols, NULL);
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -6086,7 +5948,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) {
if(xf86LoadSubModule(pScrn, "ddc")) {
int crtnum = 0;
xf86LoaderReqSymLists(ddcSymbols, NULL);
if((pMonitor = SiSDoPrivateDDC(pScrn, &crtnum))) {
didddc2 = TRUE;
xf86DrvMsg(pScrn->scrnIndex, X_PROBED, ddcsstr, crtnum);
@@ -6119,8 +5980,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if(xf86LoadSubModule(pScrn, "ddc")) {
xf86LoaderReqSymLists(ddcSymbols, NULL);
/* Now load and initialize VBE module. */
SiS_LoadInitVBE(pScrn);
@@ -6957,18 +6816,15 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel);
goto my_error_1;
}
xf86LoaderReqSymLists(fbSymbols, NULL);
/* Load XAA/EXA (if needed) */
if(!pSiS->NoAccel) {
const char **symNames = NULL;
#ifdef SIS_USE_XAA
if(!pSiS->useEXA) {
if (!xf86LoadSubModule(pScrn, "xaa")) {
SISErrorLog(pScrn, "Could not load xaa module\n");
goto my_error_1;
}
symNames = xaaSymbols;
}
#endif
#ifdef SIS_USE_EXA
@@ -6984,13 +6840,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
LoaderErrorMsg(NULL, "exa", errmaj, errmin);
goto my_error_1;
}
symNames = exaSymbols;
}
#endif
if(symNames) {
xf86LoaderReqSymLists(symNames, NULL);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
}
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled\n");
}
/* Load shadowfb (if needed) */
@@ -6999,7 +6851,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
SISErrorLog(pScrn, "Could not load shadowfb module\n");
goto my_error_1;
}
xf86LoaderReqSymLists(shadowSymbols, NULL);
}
/* Load the dri and glx modules if requested. */
@@ -7008,9 +6859,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags)
if(!xf86LoaderCheckSymbol("DRIScreenInit")) {
if(xf86LoadSubModule(pScrn, "dri")) {
if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) {
if(xf86LoadSubModule(pScrn, "glx")) {
xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL);
} else {
if(!xf86LoadSubModule(pScrn, "glx")) {
SISErrorLog(pScrn, "Failed to load glx module\n");
}
}