diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-07-31 01:21:18 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-07-31 01:21:18 +0000 |
| commit | 4db80992d38311deaefdbe5da1c41b2c14102e1a (patch) | |
| tree | fd25c6a2cd1aaa9e2fc2d3bc4e8e0122c05b1645 /src/mga_driver.c | |
| parent | dd173d29d2c2bd73bea8eef018b1c6dd6b7a967c (diff) | |
Change several LoaderSymbol calls introduced by the bug #400 patch to
*Weak() resolver functions.
Diffstat (limited to 'src/mga_driver.c')
| -rw-r--r-- | src/mga_driver.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mga_driver.c b/src/mga_driver.c index d0bc9b2..12656d8 100644 --- a/src/mga_driver.c +++ b/src/mga_driver.c @@ -1029,7 +1029,7 @@ MGAdoDDC(ScrnInfoPtr pScrn) return NULL; } else { /* XXX Need to write an MGA mode ddc1SetSpeed */ - if (pMga->DDC1SetSpeed == LoaderSymbol("vgaHWddc1SetSpeed")) { + if (pMga->DDC1SetSpeed == vgaHWddc1SetSpeedWeak()) { pMga->DDC1SetSpeed = NULL; xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 2, "DDC1 disabled - chip not in VGA mode\n"); @@ -1692,11 +1692,11 @@ MGAPreInit(ScrnInfoPtr pScrn, int flags) xf86LoaderReqSymLists(fbdevHWSymbols, NULL); if (!fbdevHWInit(pScrn, pMga->PciInfo, NULL)) return FALSE; - pScrn->SwitchMode = LoaderSymbol("fbdevHWSwitchMode"); - pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame"); + pScrn->SwitchMode = fbdevHWSwitchModeWeak(); + pScrn->AdjustFrame = fbdevHWAdjustFrameWeak(); pScrn->EnterVT = MGAEnterVTFBDev; - pScrn->LeaveVT = LoaderSymbol("fbdevHWLeaveVT"); - pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode"); + pScrn->LeaveVT = fbdevHWLeaveVTWeak(); + pScrn->ValidMode = fbdevHWValidModeWeak(); } pMga->Rotate = 0; if ((s = xf86GetOptValString(pMga->Options, OPTION_ROTATE))) { @@ -3428,7 +3428,7 @@ MGAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) else f = CMAP_RELOAD_ON_MODE_SWITCH; if(!xf86HandleColormaps(pScreen, 256, 8, - pMga->FBDev ? LoaderSymbol("fbdevHWLoadPalette") : MGAdac->LoadPalette, + pMga->FBDev ? fbdevHWLoadPaletteWeak() : MGAdac->LoadPalette, NULL, f)) return FALSE; |