From 23ca1b0d4324ae65a0c2a39cc877d318063988b1 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 28 May 2009 15:11:20 -0400 Subject: Remove useless loader symbol lists. --- src/g80_driver.c | 59 +--------------------- src/nv_driver.c | 143 ------------------------------------------------------ src/riva_driver.c | 108 ----------------------------------------- 3 files changed, 1 insertion(+), 309 deletions(-) (limited to 'src') diff --git a/src/g80_driver.c b/src/g80_driver.c index ad8a424..5ecf895 100644 --- a/src/g80_driver.c +++ b/src/g80_driver.c @@ -51,56 +51,6 @@ #define G80_REG_SIZE (1024 * 1024 * 16) #define G80_RESERVED_VIDMEM 0xd000 -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACopyROP", - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAFallbackOps", - "XAAInit", - "XAAPatternROP", - NULL -}; - -static const char *exaSymbols[] = { - "exaDriverAlloc", - "exaDriverInit", - "exaDriverFini", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86DoEDID_DDC2", - "xf86SetDDCproperties", - NULL -}; - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - "xf86ExecX86int10", - NULL -}; - typedef enum { OPTION_HW_CURSOR, OPTION_NOACCEL, @@ -243,7 +193,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) pNv->int10 = NULL; pNv->int10Mode = 0; if(xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n"); pNv->int10 = xf86InitInt10(pEnt->index); } @@ -434,7 +383,6 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) if(!xf86LoadSubModule(pScrn, "i2c")) goto fail; if(!xf86LoadSubModule(pScrn, "ddc")) goto fail; - xf86LoaderReqSymLists(i2cSymbols, ddcSymbols, NULL); if(!G80DispPreInit(pScrn)) goto fail; /* Read the DDC routing table and create outputs */ @@ -465,17 +413,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) /* Load fb */ if(!xf86LoadSubModule(pScrn, "fb")) goto fail; - xf86LoaderReqSymLists(fbSymbols, NULL); if(!pNv->NoAccel) { switch(pNv->AccelMethod) { case XAA: if(!xf86LoadSubModule(pScrn, "xaa")) goto fail; - xf86LoaderReqSymLists(xaaSymbols, NULL); break; case EXA: if(!xf86LoadSubModule(pScrn, "exa")) goto fail; - xf86LoaderReqSymLists(exaSymbols, NULL); break; } } @@ -486,9 +431,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags) xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Failed to load ramdac. " "Falling back to software cursor.\n"); pNv->HWCursor = FALSE; - } else { - xf86LoaderReqSymLists(ramdacSymbols, NULL); - } + } } return TRUE; diff --git a/src/nv_driver.c b/src/nv_driver.c index 5f0a5b4..41840dd 100644 --- a/src/nv_driver.c +++ b/src/nv_driver.c @@ -487,123 +487,6 @@ static SymTabRec NVKnownChipsets[] = {-1, NULL} }; - -/* - * 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[] = { - "vgaHWUnmapMem", - "vgaHWDPMSSet", - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - NULL -}; - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *xaaSymbols[] = { - "XAACopyROP", - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAFallbackOps", - "XAAInit", - "XAAPatternROP", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86DoEDID_DDC2", - "xf86SetDDCproperties", - NULL -}; - -#ifdef XFree86LOADER -static const char *vbeSymbols[] = { - "VBEInit", - "vbeFree", - "vbeDoEDID", - NULL -}; - -static const char *vbeModeSymbols[] = { - "VBEExtendedInit", - "VBEGetVBEInfo", - "VBEGetModePool", - "VBEValidateModes", - "VBESetModeParameters", - "VBEGetVBEMode", - "VBESetVBEMode", - NULL -}; -#endif - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -static const char *fbdevHWSymbols[] = { - "fbdevHWInit", - "fbdevHWUseBuildinMode", - - "fbdevHWGetVidmem", - - /* colormap */ - "fbdevHWLoadPaletteWeak", - - /* ScrnInfo hooks */ - "fbdevHWAdjustFrameWeak", - "fbdevHWEnterVT", - "fbdevHWLeaveVTWeak", - "fbdevHWModeInit", - "fbdevHWSave", - "fbdevHWSwitchModeWeak", - "fbdevHWValidModeWeak", - - "fbdevHWMapMMIO", - "fbdevHWMapVidmem", - - NULL -}; - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - - #ifdef XFree86LOADER static MODULESETUPPROTO(nvSetup); @@ -713,20 +596,6 @@ nvSetup(pointer module, pointer opts, int *errmaj, int *errmin) #endif ); - /* - * Modules that this driver always requires may be loaded here - * by calling LoadSubModule(). - */ - - /* - * Tell the loader about symbols from other modules that this module - * might refer to. - */ - LoaderRefSymLists(vgahwSymbols, xaaSymbols, fbSymbols, - ramdacSymbols, shadowSymbols, - i2cSymbols, ddcSymbols, vbeSymbols, - fbdevHWSymbols, int10Symbols, NULL); - /* * The return value must be non-NULL on success even though there * is no TearDownProc. @@ -1285,11 +1154,9 @@ Bool NVI2CInit(ScrnInfoPtr pScrn) char *mod = "i2c"; if (xf86LoadSubModule(pScrn, mod)) { - xf86LoaderReqSymLists(i2cSymbols,NULL); mod = "ddc"; if(xf86LoadSubModule(pScrn, mod)) { - xf86LoaderReqSymLists(ddcSymbols, NULL); return NVDACi2cInit(pScrn); } } @@ -1388,7 +1255,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) /* Initialize the card through int10 interface if needed */ if (xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); #if !defined(__alpha__) && !defined(__powerpc__) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n"); pNv->pInt = xf86InitInt10(pNv->pEnt->index); @@ -1524,8 +1390,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* * Allocate a vgaHWRec */ @@ -1594,7 +1458,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (!fbdevHWInit(pScrn, pNv->PciInfo, NULL)) { xf86FreeInt10(pNv->pInt); return FALSE; @@ -1702,7 +1565,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) "enabled.\n"); return FALSE; } - xf86LoaderReqSymLists(vbeModeSymbols, NULL); pNv->pVbe = VBEExtendedInit(NULL, pNv->pEnt->index, SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH); if (!pNv->pVbe) return FALSE; @@ -2034,8 +1896,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbSymbols, NULL); - /* Load XAA if needed */ if (!pNv->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { @@ -2043,7 +1903,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) NVFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } /* Load ramdac if needed */ @@ -2053,7 +1912,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) NVFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* Load shadowfb if needed */ @@ -2063,7 +1921,6 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) NVFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } pNv->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel; diff --git a/src/riva_driver.c b/src/riva_driver.c index b021749..3540fe9 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -60,103 +60,6 @@ static void RivaRestore(ScrnInfoPtr pScrn); static Bool RivaModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode); -/* - * 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[] = { - "vgaHWUnmapMem", - "vgaHWDPMSSet", - "vgaHWFreeHWRec", - "vgaHWGetHWRec", - "vgaHWGetIndex", - "vgaHWInit", - "vgaHWMapMem", - "vgaHWProtect", - "vgaHWRestore", - "vgaHWSave", - "vgaHWSaveScreen", - NULL -}; - -static const char *fbSymbols[] = { - "fbPictureInit", - "fbScreenInit", - NULL -}; - -static const char *xaaSymbols[] = { - "XAAGetCopyROP", - "XAACreateInfoRec", - "XAADestroyInfoRec", - "XAAGetFallbackOps", - "XAAInit", - "XAAGetPatternROP", - NULL -}; - -static const char *ramdacSymbols[] = { - "xf86CreateCursorInfoRec", - "xf86DestroyCursorInfoRec", - "xf86InitCursor", - NULL -}; - -static const char *ddcSymbols[] = { - "xf86PrintEDID", - "xf86DoEDID_DDC2", - "xf86SetDDCproperties", - NULL -}; - -static const char *i2cSymbols[] = { - "xf86CreateI2CBusRec", - "xf86I2CBusInit", - NULL -}; - -static const char *shadowSymbols[] = { - "ShadowFBInit", - NULL -}; - -static const char *fbdevHWSymbols[] = { - "fbdevHWInit", - "fbdevHWUseBuildinMode", - - "fbdevHWGetVidmem", - - /* colormap */ - "fbdevHWLoadPaletteWeak", - - /* ScrnInfo hooks */ - "fbdevHWAdjustFrameWeak", - "fbdevHWEnterVT", - "fbdevHWLeaveVTWeak", - "fbdevHWModeInit", - "fbdevHWSave", - "fbdevHWSwitchModeWeak", - "fbdevHWValidModeWeak", - - "fbdevHWMapMMIO", - "fbdevHWMapVidmem", - - NULL -}; - -static const char *int10Symbols[] = { - "xf86FreeInt10", - "xf86InitInt10", - NULL -}; - - - typedef enum { OPTION_SW_CURSOR, OPTION_HW_CURSOR, @@ -412,11 +315,9 @@ Bool RivaI2CInit(ScrnInfoPtr pScrn) char *mod = "i2c"; if (xf86LoadSubModule(pScrn, mod)) { - xf86LoaderReqSymLists(i2cSymbols,NULL); mod = "ddc"; if(xf86LoadSubModule(pScrn, mod)) { - xf86LoaderReqSymLists(ddcSymbols, NULL); return RivaDACi2cInit(pScrn); } } @@ -489,7 +390,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) /* Initialize the card through int10 interface if needed */ if (xf86LoadSubModule(pScrn, "int10")) { - xf86LoaderReqSymLists(int10Symbols, NULL); #if !defined(__alpha__) xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Initializing int10\n"); pRiva->pInt = xf86InitInt10(pRiva->pEnt->index); @@ -575,8 +475,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(vgahwSymbols, NULL); - /* * Allocate a vgaHWRec */ @@ -643,7 +541,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (!fbdevHWInit(pScrn, pRiva->PciInfo, NULL)) { xf86FreeInt10(pRiva->pInt); return FALSE; @@ -866,8 +763,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) return FALSE; } - xf86LoaderReqSymLists(fbSymbols, NULL); - /* Load XAA if needed */ if (!pRiva->NoAccel) { if (!xf86LoadSubModule(pScrn, "xaa")) { @@ -875,7 +770,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) RivaFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(xaaSymbols, NULL); } /* Load ramdac if needed */ @@ -885,7 +779,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) RivaFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(ramdacSymbols, NULL); } /* Load shadowfb if needed */ @@ -895,7 +788,6 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) RivaFreeRec(pScrn); return FALSE; } - xf86LoaderReqSymLists(shadowSymbols, NULL); } pRiva->CurrentLayout.bitsPerPixel = pScrn->bitsPerPixel; -- cgit v1.2.3