summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nv_driver.c12
-rw-r--r--src/riva_driver.c11
2 files changed, 11 insertions, 12 deletions
diff --git a/src/nv_driver.c b/src/nv_driver.c
index f793669..8d477d9 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.2 2004/04/23 19:42:10 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.3 2004/07/30 20:30:53 ajax Exp $ */
/* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */
/*
* Copyright 1996-1997 David J. McKay
@@ -1053,11 +1053,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(pNv->pInt);
return FALSE;
}
- pScrn->SwitchMode = LoaderSymbol("fbdevHWSwitchMode");
- pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame");
+ pScrn->SwitchMode = fbdevHWSwitchModeWeak();
+ pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
pScrn->EnterVT = NVEnterVTFBDev;
- pScrn->LeaveVT = LoaderSymbol("fbdevHWLeaveVT");
- pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode");
+ pScrn->LeaveVT = fbdevHWLeaveVTWeak();
+ pScrn->ValidMode = fbdevHWValidModeWeak();
}
pNv->Rotate = 0;
if ((s = xf86GetOptValString(pNv->Options, OPTION_ROTATE))) {
@@ -1765,7 +1765,7 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Initialize colormap layer.
Must follow initialization of the default colormap */
if(!xf86HandleColormaps(pScreen, 256, 8,
- (pNv->FBDev ? LoaderSymbol("fbdevHWLoadPalette") : NVDACLoadPalette),
+ (pNv->FBDev ? fbdevHWLoadPaletteWeak() : NVDACLoadPalette),
NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
return FALSE;
diff --git a/src/riva_driver.c b/src/riva_driver.c
index c812bb7..efe1eb4 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -688,11 +688,11 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(pRiva->pInt);
return FALSE;
}
- pScrn->SwitchMode = LoaderSymbol("fbdevHWSwitchMode");
- pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame");
+ pScrn->SwitchMode = fbdevHWSwitchModeWeak();
+ pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
pScrn->EnterVT = RivaEnterVTFBDev;
- pScrn->LeaveVT = LoaderSymbol("fbdevHWLeaveVT");
- pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode");
+ pScrn->LeaveVT = fbdevHWLeaveVTWeak();
+ pScrn->ValidMode = fbdevHWValidModeWeak();
}
pRiva->Rotate = 0;
if ((s = xf86GetOptValString(pRiva->Options, OPTION_ROTATE))) {
@@ -1317,8 +1317,7 @@ RivaScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Initialize colormap layer.
Must follow initialization of the default colormap */
if(!xf86HandleColormaps(pScreen, 256, 8,
- (pRiva->FBDev ? LoaderSymbol("fbdevHWLoadPalette")
- : Rivadac->LoadPalette),
+ (pRiva->FBDev ? fbdevHWLoadPaletteWeak() : Rivadac->LoadPalette),
NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
return FALSE;