Skip to content

GitLab

Commit 16ea2bb4 authored by Adam Jackson's avatar Adam Jackson
Browse files

Remove useless loader symbol lists.

parent c3434c86
Hide whitespace changes
Inline Side-by-side
src/fbdev.c
View file @ 16ea2bb4
...@@ -141,67 +141,6 @@ static const OptionInfoRec FBDevOptions[] = { ...@@ -141,67 +141,6 @@ static const OptionInfoRec FBDevOptions[] = {
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
static const char *afbSymbols[] = {
"afbScreenInit",
"afbCreateDefColormap",
NULL
};
static const char *fbSymbols[] = {
"fbScreenInit",
"fbPictureInit",
NULL
};
static const char *shadowSymbols[] = {
"shadowAdd",
"shadowInit",
"shadowSetup",
"shadowUpdatePacked",
"shadowUpdatePackedWeak",
"shadowUpdateRotatePacked",
"shadowUpdateRotatePackedWeak",
NULL
};
static const char *fbdevHWSymbols[] = {
"fbdevHWInit",
"fbdevHWProbe",
"fbdevHWSetVideoModes",
"fbdevHWUseBuildinMode",
"fbdevHWGetDepth",
"fbdevHWGetLineLength",
"fbdevHWGetName",
"fbdevHWGetType",
"fbdevHWGetVidmem",
"fbdevHWLinearOffset",
"fbdevHWLoadPalette",
"fbdevHWMapVidmem",
"fbdevHWUnmapVidmem",
/* colormap */
"fbdevHWLoadPalette",
"fbdevHWLoadPaletteWeak",
/* ScrnInfo hooks */
"fbdevHWAdjustFrameWeak",
"fbdevHWEnterVTWeak",
"fbdevHWLeaveVTWeak",
"fbdevHWModeInit",
"fbdevHWRestore",
"fbdevHWSave",
"fbdevHWSaveScreen",
"fbdevHWSaveScreenWeak",
"fbdevHWSwitchModeWeak",
"fbdevHWValidModeWeak",
"fbdevHWDPMSSet",
"fbdevHWDPMSSetWeak",
NULL
};
#ifdef XFree86LOADER #ifdef XFree86LOADER
MODULESETUPPROTO(FBDevSetup); MODULESETUPPROTO(FBDevSetup);
...@@ -230,8 +169,6 @@ FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin) ...@@ -230,8 +169,6 @@ FBDevSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) { if (!setupDone) {
setupDone = TRUE; setupDone = TRUE;
xf86AddDriver(&FBDEV, module, HaveDriverFuncs); xf86AddDriver(&FBDEV, module, HaveDriverFuncs);
LoaderRefSymLists(afbSymbols, fbSymbols,
shadowSymbols, fbdevHWSymbols, NULL);
return (pointer)1; return (pointer)1;
} else { } else {
if (errmaj) *errmaj = LDR_ONCEONLY; if (errmaj) *errmaj = LDR_ONCEONLY;
...@@ -307,8 +244,6 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num, ...@@ -307,8 +244,6 @@ static Bool FBDevPciProbe(DriverPtr drv, int entity_num,
if (!xf86LoadDrvSubModule(drv, "fbdevhw")) if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
return FALSE; return FALSE;
xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL, pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, NULL,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
if (pScrn) { if (pScrn) {
...@@ -369,8 +304,6 @@ FBDevProbe(DriverPtr drv, int flags) ...@@ -369,8 +304,6 @@ FBDevProbe(DriverPtr drv, int flags)
if (!xf86LoadDrvSubModule(drv, "fbdevhw")) if (!xf86LoadDrvSubModule(drv, "fbdevhw"))
return FALSE; return FALSE;
xf86LoaderReqSymLists(fbdevHWSymbols, NULL);
for (i = 0; i < numDevSections; i++) { for (i = 0; i < numDevSections; i++) {
Bool isIsa = FALSE; Bool isIsa = FALSE;
Bool isPci = FALSE; Bool isPci = FALSE;
...@@ -463,7 +396,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -463,7 +396,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
FBDevPtr fPtr; FBDevPtr fPtr;
int default_depth, fbbpp; int default_depth, fbbpp;
const char *mod = NULL, *s; const char *mod = NULL, *s;
const char **syms = NULL;
int type; int type;
if (flags & PROBE_DETECT) return FALSE; if (flags & PROBE_DETECT) return FALSE;
...@@ -620,7 +552,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -620,7 +552,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
{ {
case FBDEVHW_PLANES: case FBDEVHW_PLANES:
mod = "afb"; mod = "afb";
syms = afbSymbols;
break; break;
case FBDEVHW_PACKED_PIXELS: case FBDEVHW_PACKED_PIXELS:
switch (pScrn->bitsPerPixel) switch (pScrn->bitsPerPixel)
...@@ -630,7 +561,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -630,7 +561,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
case 24: case 24:
case 32: case 32:
mod = "fb"; mod = "fb";
syms = fbSymbols;
break; break;
default: default:
xf86DrvMsg(pScrn->scrnIndex, X_ERROR, xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
...@@ -666,9 +596,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -666,9 +596,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
FBDevFreeRec(pScrn); FBDevFreeRec(pScrn);
return FALSE; return FALSE;
} }
if (mod && syms) {
xf86LoaderReqSymLists(syms, NULL);
}
/* Load shadow if needed */ /* Load shadow if needed */
if (fPtr->shadowFB) { if (fPtr->shadowFB) {
...@@ -678,7 +605,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags) ...@@ -678,7 +605,6 @@ FBDevPreInit(ScrnInfoPtr pScrn, int flags)
FBDevFreeRec(pScrn); FBDevFreeRec(pScrn);
return FALSE; return FALSE;
} }
xf86LoaderReqSymLists(shadowSymbols, NULL);
} }
TRACE_EXIT("PreInit"); TRACE_EXIT("PreInit");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment