Change several LoaderSymbol calls introduced by the bug #400 patch to

*Weak() resolver functions.

6 files changed, 45 insertions, 13 deletions

diff --git a/hw/xfree86/ddc/xf86DDC.c b/hw/xfree86/ddc/xf86DDC.c
index cac425c27..2cdeacab5 100644
--- a/hw/xfree86/ddc/xf86DDC.c
+++ b/hw/xfree86/ddc/xf86DDC.c
@@ -83,7 +83,7 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
 
 static unsigned char *EDIDRead_DDC1(
     ScrnInfoPtr pScrn,
-    void (*)(ScrnInfoPtr,xf86ddcSpeed), 
+    DDC1SetSpeedProc,
     unsigned int (*)(ScrnInfoPtr)
 );
 
@@ -139,7 +139,7 @@ DDCAvailableOptions(void *unused)
 
 xf86MonPtr 
 xf86DoEDID_DDC1(
-    int scrnIndex, void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed), 
+    int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed, 
     unsigned int (*DDC1Read)(ScrnInfoPtr)
 )
 {
@@ -227,7 +227,7 @@ xf86DoEDID_DDC2(int scrnIndex, I2CBusPtr pBus)
  * function; it will also decide if we need to reread it 
  */
 static unsigned char *
-EDIDRead_DDC1(ScrnInfoPtr pScrn, void (*DDCSpeed)(ScrnInfoPtr,xf86ddcSpeed), 
+EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed, 
               unsigned int (*read_DDC)(ScrnInfoPtr))
 {
     unsigned char *EDID_block = NULL;
diff --git a/hw/xfree86/ddc/xf86DDC.h b/hw/xfree86/ddc/xf86DDC.h
index ae2e26641..ca866c69f 100644
--- a/hw/xfree86/ddc/xf86DDC.h
+++ b/hw/xfree86/ddc/xf86DDC.h
@@ -24,9 +24,11 @@ typedef enum {
   DDC_FAST
 } xf86ddcSpeed;
 
+typedef void * DDC1SetSpeedProc (ScrnInfoPtr, xf86ddcSpeed);
+
 extern xf86MonPtr xf86DoEDID_DDC1(
     int scrnIndex, 
-    void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed),
+    DDC1SetSpeedProc DDC1SetSpeed,
     unsigned int (*DDC1Read)(ScrnInfoPtr)
 );
 
diff --git a/hw/xfree86/fbdevhw/fbdevhw.c b/hw/xfree86/fbdevhw/fbdevhw.c
index 19fb05954..6d578d5fb 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.c
+++ b/hw/xfree86/fbdevhw/fbdevhw.c
@@ -881,11 +881,26 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
 	return TRUE;
 }
 
-void
-fbdevHWFillInScreenInfo(ScrnInfoPtr pScrn) {
-	pScrn->SwitchMode	= fbdevHWSwitchMode;
-	pScrn->AdjustFrame	= fbdevHWAdjustFrame;
-	pScrn->EnterVT		= fbdevHWEnterVT;
-	pScrn->LeaveVT		= fbdevHWLeaveVT;
-	pScrn->ValidMode	= fbdevHWValidMode;
-}
+xf86SwitchModeProc *
+fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
+
+xf86AdjustFrameProc *
+fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
+
+xf86EnterVTProc *
+fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
+
+xf86LeaveVTProc *
+fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
+
+xf86ValidModeProc *
+fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
+
+xf86DPMSSetProc *
+fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
+
+xf86LoadPaletteProc *
+fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
+
+SaveScreenProcPtr
+fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
diff --git a/hw/xfree86/fbdevhw/fbdevhw.h b/hw/xfree86/fbdevhw/fbdevhw.h
index 3d881220f..cfc3fcdb6 100644
--- a/hw/xfree86/fbdevhw/fbdevhw.h
+++ b/hw/xfree86/fbdevhw/fbdevhw.h
@@ -49,6 +49,13 @@ void  fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags);
 
 Bool  fbdevHWSaveScreen(ScreenPtr pScreen, int mode);
 
-void  fbdevHWFillInScreenInfo(ScrnInfoPtr pScrn);
+xf86SwitchModeProc	*fbdevHWSwitchModeWeak(void);
+xf86AdjustFrameProc	*fbdevHWAdjustFrameWeak(void);
+xf86EnterVTProc		*fbdevHWEnterVTWeak(void);
+xf86LeaveVTProc		*fbdevHWLeaveVTWeak(void);
+xf86ValidModeProc	*fbdevHWValidModeWeak(void);
+xf86DPMSSetProc		*fbdevHWDPMSSetWeak(void);
+xf86LoadPaletteProc	*fbdevHWLoadPaletteWeak(void);
+SaveScreenProcPtr	fbdevHWSaveScreenWeak(void);
 
 #endif
diff --git a/hw/xfree86/vgahw/vgaHW.c b/hw/xfree86/vgahw/vgaHW.c
index b8bcbdba9..5365a4ae7 100644
--- a/hw/xfree86/vgahw/vgaHW.c
+++ b/hw/xfree86/vgahw/vgaHW.c
@@ -1988,3 +1988,7 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
 	break;
     }
 }
+
+DDC1SetSpeedProc *vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; }
+
+SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; }
diff --git a/hw/xfree86/vgahw/vgaHW.h b/hw/xfree86/vgahw/vgaHW.h
index 9a51f1046..ea8fb2861 100644
--- a/hw/xfree86/vgahw/vgaHW.h
+++ b/hw/xfree86/vgahw/vgaHW.h
@@ -225,4 +225,8 @@ CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
 CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, 
 	       unsigned int Flags);
 Bool vgaHWAllocDefaultRegs(vgaRegPtr regp);
+
+DDC1SetSpeedProc *vgaHWddc1SetSpeedWeak(void);
+SaveScreenProcPtr vgaHWSaveScreenWeak(void);
+
 #endif /* _VGAHW_H */