diff options
| -rw-r--r-- | src/geode_driver.c | 72 | ||||
| -rw-r--r-- | src/gx_driver.c | 17 | ||||
| -rw-r--r-- | src/lx_driver.c | 13 |
3 files changed, 0 insertions, 102 deletions
diff --git a/src/geode_driver.c b/src/geode_driver.c index e374a40..e56e7c4 100644 --- a/src/geode_driver.c +++ b/src/geode_driver.c @@ -229,69 +229,6 @@ OptionInfoRec no_GeodeOptions[] = { {-1, NULL, OPTV_NONE, {0}, FALSE} }; -/* List of symbols from other modules that this module references.The purpose -* is that to avoid unresolved symbol warnings -*/ -const char *amdVgahwSymbols[] = { - "vgaHWGetHWRec", - "vgaHWUnlock", - "vgaHWInit", - "vgaHWSave", - "vgaHWRestore", - "vgaHWProtect", - "vgaHWGetIOBase", - "vgaHWMapMem", - "vgaHWLock", - "vgaHWFreeHWRec", - "vgaHWSaveScreen", - NULL -}; - -const char *amdVbeSymbols[] = { - "VBEInit", - "vbeDoEDID", - "vbeFree", - NULL -}; - -const char *amdInt10Symbols[] = { - "xf86ExecX86int10", - "xf86InitInt10", - "xf86Int10AllocPages", - "xf86Int10Addr", - NULL -}; - -const char *amdFbSymbols[] = { - "fbScreenInit", - "fbPictureInit", - NULL -}; - -const char *amdXaaSymbols[] = { - "XAADestroyInfoRec", - "XAACreateInfoRec", - "XAAInit", - "XAAScreenIndex", - NULL -}; - -const char *amdExaSymbols[] = { - "exaGetVersion", - "exaDriverInit", - "exaDriverFini", - "exaOffscreenAlloc", - "exaOffscreenFree", - NULL -}; - -const char *amdRamdacSymbols[] = { - "xf86InitCursor", - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - NULL -}; - #ifdef XFree86LOADER /* Module loader interface */ @@ -341,9 +278,6 @@ GeodeSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) init = TRUE; xf86AddDriver(&GEODE, Module, flag); - LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols, - amdFbSymbols, amdXaaSymbols, amdInt10Symbols, amdRamdacSymbols, NULL); - return (pointer) TRUE; } @@ -362,12 +296,6 @@ AmdSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) #endif ); - /* Tell the loader about symbols from other modules that this - * module might refer to. - */ - LoaderRefSymLists(amdVgahwSymbols, amdVbeSymbols, - amdFbSymbols, amdXaaSymbols, - amdInt10Symbols, amdRamdacSymbols, NULL); return (pointer) TRUE; } diff --git a/src/gx_driver.c b/src/gx_driver.c index f842712..b713897 100644 --- a/src/gx_driver.c +++ b/src/gx_driver.c @@ -73,14 +73,6 @@ extern OptionInfoRec GX_GeodeOptions[]; -extern const char *amdVgahwSymbols[]; -extern const char *amdVbeSymbols[]; -extern const char *amdInt10Symbols[]; -extern const char *amdFbSymbols[]; -extern const char *amdXaaSymbols[]; -extern const char *amdExaSymbols[]; -extern const char *amdRamdacSymbols[]; - unsigned char *XpressROMPtr; static inline void @@ -622,7 +614,6 @@ GXPreInit(ScrnInfoPtr pScrni, int flags) if (!xf86LoadSubModule(pScrni, "int10")) return FALSE; - xf86LoaderReqSymLists(amdInt10Symbols, NULL); pVesa = pGeode->vesa; @@ -699,26 +690,18 @@ GXPreInit(ScrnInfoPtr pScrni, int flags) return FALSE; } - xf86LoaderReqSymLists(amdFbSymbols, NULL); - if (pGeode->NoAccel == FALSE) { const char *module = (pGeode->useEXA) ? "exa" : "xaa"; - const char **symbols = (pGeode->useEXA) ? - &amdExaSymbols[0] : &amdXaaSymbols[0]; if (!xf86LoadSubModule(pScrni, module)) { return FALSE; } - - xf86LoaderReqSymLists(symbols, NULL); } if (pGeode->tryHWCursor == TRUE) { if (!xf86LoadSubModule(pScrni, "ramdac")) { return FALSE; } - - xf86LoaderReqSymLists(amdRamdacSymbols, NULL); } if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) { diff --git a/src/lx_driver.c b/src/lx_driver.c index 19e923e..107b354 100644 --- a/src/lx_driver.c +++ b/src/lx_driver.c @@ -69,11 +69,6 @@ extern OptionInfoRec LX_GeodeOptions[]; -extern const char *amdVgahwSymbols[]; -extern const char *amdInt10Symbols[]; -extern const char *amdFbSymbols[]; -extern const char *amdExaSymbols[]; - unsigned char *XpressROMPtr; static Bool @@ -482,15 +477,11 @@ LXPreInit(ScrnInfoPtr pScrni, int flags) /* Set up VGA */ if (pGeode->useVGA) { - xf86LoaderReqSymLists(amdVgahwSymbols, NULL); - VESARec *pVesa; if (!xf86LoadSubModule(pScrni, "int10")) return FALSE; - xf86LoaderReqSymLists(amdInt10Symbols, NULL); - pVesa = pGeode->vesa; if ((pVesa->pInt = xf86InitInt10(pGeode->pEnt->index)) == NULL) { @@ -575,13 +566,9 @@ LXPreInit(ScrnInfoPtr pScrni, int flags) return FALSE; } - xf86LoaderReqSymLists(amdFbSymbols, NULL); - if (!pGeode->NoAccel) { if (!xf86LoadSubModule(pScrni, "exa")) return FALSE; - - xf86LoaderReqSymLists(&amdExaSymbols[0], NULL); } if (xf86RegisterResources(pGeode->pEnt->index, NULL, ResExclusive)) { |