XLibre/xf86-video-cirrus
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-cirrus.git synced 2026-03-24 01:24:45 +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 14:53:06 -04:00
parent 15b1632d41
commit f07b4a3c5d
3 changed files with 0 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/alp_driver.c
View File

@@ -152,86 +152,6 @@ static int gd5446_MaxClocks[] = { 135100, 135100, 85500, 85500, 0 };
static int gd5480_MaxClocks[] = { 135100, 200000, 200000, 135100, 135100 };
static int gd7548_MaxClocks[] = { 80100, 80100, 80100, 80100, 80100 };
/*
* List of symbols from other modules that this module references. This
* list is used to tell the loader that it is OK for symbols here to be
* unresolved providing that it hasn't been told that they haven't been
* told that they are essential via a call to xf86LoaderReqSymbols() or
* xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
* unresolved symbols that are not required.
*/
static const char *vgahwSymbols[] = {
"vgaHWFreeHWRec",
"vgaHWGetHWRec",
"vgaHWGetIOBase",
"vgaHWGetIndex",
"vgaHWHandleColormaps",
"vgaHWInit",
"vgaHWLock",
"vgaHWMapMem",
"vgaHWProtect",
"vgaHWRestore",
"vgaHWSave",
"vgaHWSaveScreen",
"vgaHWSetMmioFuncs",
"vgaHWSetStdFuncs",
"vgaHWUnlock",
NULL
};
#ifdef XFree86LOADER
static const char *miscfbSymbols[] = {
"xf1bppScreenInit",
"xf4bppScreenInit",
NULL
};
#endif
static const char *fbSymbols[] = {
"fbScreenInit",
"fbPictureInit",
NULL
};
static const char *xaaSymbols[] = {
"XAACreateInfoRec",
"XAADestroyInfoRec",
"XAAInit",
NULL
};
static const char *ramdacSymbols[] = {
"xf86CreateCursorInfoRec",
"xf86DestroyCursorInfoRec",
"xf86InitCursor",
NULL
};
static const char *int10Symbols[] = {
"xf86FreeInt10",
"xf86InitInt10",
NULL
};
static const char *shadowSymbols[] = {
"ShadowFBInit",
NULL
};
static const char *ddcSymbols[] = {
"xf86PrintEDID",
"xf86DoEDID_DDC2",
"xf86SetDDCproperties",
NULL
};
static const char *i2cSymbols[] = {
"xf86CreateI2CBusRec",
"xf86I2CBusInit",
NULL
};
#ifdef XFree86LOADER
#define ALP_MAJOR_VERSION 1
@@ -270,9 +190,6 @@ alpSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static Bool setupDone = FALSE;
if (!setupDone) {
setupDone = TRUE;
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
miscfbSymbols, ramdacSymbols,int10Symbols,
ddcSymbols, i2cSymbols, shadowSymbols, NULL);
}
return (pointer)1;
}
@@ -549,8 +466,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
xf86LoaderReqSymLists(vgahwSymbols, NULL);
/*
* Allocate a vgaHWRec
*/
@@ -582,7 +497,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_FUNC(pCir->PciInfo));
if (xf86LoadSubModule(pScrn, "int10")) {
xf86LoaderReqSymLists(int10Symbols,NULL);
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
pInt = xf86InitInt10(pCir->pEnt->index);
xf86FreeInt10(pInt);
@@ -803,13 +717,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(i2cSymbols,NULL);
if (!xf86LoadSubModule(pScrn, "ddc")) {
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(ddcSymbols, NULL);
if(!AlpI2CInit(pScrn)) {
xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
@@ -1102,7 +1014,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymbols("xf1bppScreenInit",NULL);
break;
#endif
#ifdef HAVE_XF4BPP
@@ -1111,7 +1022,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymbols("xf4bppScreenInit",NULL);
break;
#endif
case 8:
@@ -1122,7 +1032,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -1132,7 +1041,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -1141,7 +1049,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (pCir->shadowFB) {
@@ -1149,7 +1056,6 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
AlpFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;

33
src/cir_driver.c
View File

@@ -109,33 +109,6 @@ _X_EXPORT PciChipsets CIRPciChipsets[] = {
{ -1, -1, RES_UNDEFINED}
};
/*
* List of symbols from other modules that this module references. This
* list is used to tell the loader that it is OK for symbols here to be
* unresolved providing that it hasn't been told that they haven't been
* told that they are essential via a call to xf86LoaderReqSymbols() or
* xf86LoaderReqSymLists(). The purpose of this is to avoid warnings about
* unresolved symbols that are not required.
*/
static const char *alpSymbols[] = {
"AlpAvailableOptions",
"AlpProbe",
NULL
};
static const char *lgSymbols[] = {
"LgAvailableOptions",
"LgProbe",
NULL
};
static const char *vbeSymbols[] = {
"VBEInit",
"vbeDoEDID",
"vbeFree",
NULL
};
#ifdef XFree86LOADER
static MODULESETUPPROTO(cirSetup);
@@ -171,7 +144,6 @@ cirSetup(pointer module, pointer opts, int *errmaj, int *errmin)
setupDone = TRUE;
xf86AddDriver(&CIRRUS, module, 0);
LoaderRefSymLists(alpSymbols, lgSymbols, vbeSymbols, NULL);
return (pointer)1;
}
if (errmaj) *errmaj = LDR_ONCEONLY;
@@ -236,13 +208,11 @@ CIRProbe(DriverPtr drv, int flags)
if (flags & PROBE_DETECT) {
if (!lg_loaded) {
if (xf86LoadDrvSubModule(drv, "cirrus_laguna")) {
xf86LoaderReqSymLists(lgSymbols, NULL);
lg_loaded = TRUE;
}
}
if (!alp_loaded) {
if (xf86LoadDrvSubModule(drv, "cirrus_alpine")) {
xf86LoaderReqSymLists(alpSymbols, NULL);
alp_loaded = TRUE;
}
}
@@ -288,7 +258,6 @@ CIRProbe(DriverPtr drv, int flags)
if (!lg_loaded) {
if (!xf86LoadDrvSubModule(drv, "cirrus_laguna"))
continue;
xf86LoaderReqSymLists(lgSymbols, NULL);
lg_loaded = TRUE;
}
pScrn = LgProbe(usedChips[i]);
@@ -296,7 +265,6 @@ CIRProbe(DriverPtr drv, int flags)
if (!alp_loaded) {
if (!xf86LoadDrvSubModule(drv, "cirrus_alpine"))
continue;
xf86LoaderReqSymLists(alpSymbols, NULL);
alp_loaded = TRUE;
}
pScrn = AlpProbe(usedChips[i]);
@@ -444,7 +412,6 @@ cirProbeDDC(ScrnInfoPtr pScrn, int index)
vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) {
xf86LoaderReqSymLists(vbeSymbols,NULL);
pVbe = VBEInit(NULL,index);
ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe);

86
src/lg_driver.c
View File

@@ -161,80 +161,6 @@ static int LgLinePitches[4][11] = {
/* 32 */ { 160, 256, 320, 416, 512, 640, 832, 1024, 1280, 1664, 0 }
};
/*
* List of symbols from other modules that this module references. This
* list is used to tell the loader that it is OK for symbols here to be
* unresolved providing that it hasn't been told that they haven't been
* told that they are essential via a call to xf86LoaderReqSymbols() or
* xf86LoaderReqSymLists(). The purpose is this is to avoid warnings about
* unresolved symbols that are not required.
*/
static const char *vgahwSymbols[] = {
"vgaHWFreeHWRec",
"vgaHWGetHWRec",
"vgaHWGetIOBase",
"vgaHWGetIndex",
"vgaHWHandleColormaps",
"vgaHWInit",
"vgaHWLock",
"vgaHWMapMem",
"vgaHWProtect",
"vgaHWRestore",
"vgaHWSave",
"vgaHWSaveScreen",
"vgaHWUnlock",
NULL
};
static const char *fbSymbols[] = {
"fbScreenInit",
"fbPictureInit",
NULL
};
static const char *xaaSymbols[] = {
"XAACreateInfoRec",
"XAADestroyInfoRec",
"XAAInit",
NULL
};
static const char *ramdacSymbols[] = {
"xf86CreateCursorInfoRec",
"xf86DestroyCursorInfoRec",
"xf86InitCursor",
NULL
};
#define LGuseI2C 1
static const char *ddcSymbols[] = {
"xf86PrintEDID",
#if LGuseI2C
"xf86DoEDID_DDC2",
#endif
"xf86SetDDCproperties",
NULL
};
static const char *i2cSymbols[] = {
"xf86CreateI2CBusRec",
"xf86I2CBusInit",
NULL
};
static const char *int10Symbols[] = {
"xf86FreeInt10",
"xf86InitInt10",
NULL
};
static const char *shadowSymbols[] = {
"ShadowFBInit",
NULL
};
#ifdef XFree86LOADER
#define LG_MAJOR_VERSION 1
@@ -274,9 +200,6 @@ lgSetup(pointer module, pointer opts, int *errmaj, int *errmin)
if (!setupDone) {
setupDone = TRUE;
LoaderRefSymLists(vgahwSymbols, fbSymbols, xaaSymbols,
ramdacSymbols, ddcSymbols, i2cSymbols,
int10Symbols, NULL);
}
return (pointer)1;
}
@@ -430,8 +353,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
if (!xf86LoadSubModule(pScrn, "vgahw"))
return FALSE;
xf86LoaderReqSymLists(vgahwSymbols, NULL);
/*
* Allocate a vgaHWRec
*/
@@ -463,7 +384,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr;
xf86LoaderReqSymLists(int10Symbols, NULL);
int10InfoPtr = xf86InitInt10(pCir->pEnt->index);
@@ -666,14 +586,12 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(ddcSymbols, NULL);
#if LGuseI2C
if (!xf86LoadSubModule(pScrn, "i2c")) {
LgFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(i2cSymbols, NULL);
#endif
/* Read and print the monitor DDC information */
@@ -866,7 +784,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(fbSymbols, NULL);
break;
}
@@ -876,7 +793,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(xaaSymbols, NULL);
}
/* Load ramdac if needed */
@@ -885,7 +801,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(ramdacSymbols, NULL);
}
if (pCir->shadowFB) {
@@ -893,7 +808,6 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
LgFreeRec(pScrn);
return FALSE;
}
xf86LoaderReqSymLists(shadowSymbols, NULL);
}
return TRUE;