frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

*Weak() resolver functions.
This commit is contained in:
Adam Jackson 2004-07-31 01:21:19 +00:00
parent 9e13805b02
commit 706b2a7e02
6 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xfree86/ddc/xf86DDC.c
View File

@ -83,7 +83,7 @@ ddcSetup(pointer module, pointer opts, int *errmaj, int *errmin)
static unsigned char *EDIDRead_DDC1( static unsigned char *EDIDRead_DDC1(
ScrnInfoPtr pScrn, ScrnInfoPtr pScrn,
void (*)(ScrnInfoPtr,xf86ddcSpeed), DDC1SetSpeedProc,
unsigned int (*)(ScrnInfoPtr) unsigned int (*)(ScrnInfoPtr)
); );
@ -139,7 +139,7 @@ DDCAvailableOptions(void *unused)
xf86MonPtr xf86MonPtr
xf86DoEDID_DDC1( xf86DoEDID_DDC1(
int scrnIndex, void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed), int scrnIndex, DDC1SetSpeedProc DDC1SetSpeed,
unsigned int (*DDC1Read)(ScrnInfoPtr) 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 * function; it will also decide if we need to reread it
*/ */
static unsigned char * static unsigned char *
EDIDRead_DDC1(ScrnInfoPtr pScrn, void (*DDCSpeed)(ScrnInfoPtr,xf86ddcSpeed), EDIDRead_DDC1(ScrnInfoPtr pScrn, DDC1SetSpeedProc DDCSpeed,
unsigned int (*read_DDC)(ScrnInfoPtr)) unsigned int (*read_DDC)(ScrnInfoPtr))
{ {
unsigned char *EDID_block = NULL; unsigned char *EDID_block = NULL;

4
hw/xfree86/ddc/xf86DDC.h
View File

@ -24,9 +24,11 @@ typedef enum {
DDC_FAST DDC_FAST
} xf86ddcSpeed; } xf86ddcSpeed;
typedef void * DDC1SetSpeedProc (ScrnInfoPtr, xf86ddcSpeed);
extern xf86MonPtr xf86DoEDID_DDC1( extern xf86MonPtr xf86DoEDID_DDC1(
int scrnIndex, int scrnIndex,
void (*DDC1SetSpeed)(ScrnInfoPtr, xf86ddcSpeed), DDC1SetSpeedProc DDC1SetSpeed,
unsigned int (*DDC1Read)(ScrnInfoPtr) unsigned int (*DDC1Read)(ScrnInfoPtr)
); );

31
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -881,11 +881,26 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
return TRUE; return TRUE;
} }
void xf86SwitchModeProc *
fbdevHWFillInScreenInfo(ScrnInfoPtr pScrn) { fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
pScrn->SwitchMode = fbdevHWSwitchMode;
pScrn->AdjustFrame = fbdevHWAdjustFrame; xf86AdjustFrameProc *
pScrn->EnterVT = fbdevHWEnterVT; fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
pScrn->LeaveVT = fbdevHWLeaveVT;
pScrn->ValidMode = fbdevHWValidMode; 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; }

9
hw/xfree86/fbdevhw/fbdevhw.h
View File

@ -49,6 +49,13 @@ void fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mode, int flags);
Bool fbdevHWSaveScreen(ScreenPtr pScreen, int mode); 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 #endif

4
hw/xfree86/vgahw/vgaHW.c
View File

@ -1988,3 +1988,7 @@ vgaHWddc1SetSpeed(ScrnInfoPtr pScrn, xf86ddcSpeed speed)
break; break;
} }
} }
DDC1SetSpeedProc *vgaHWddc1SetSpeedWeak(void) { return vgaHWddc1SetSpeed; }
SaveScreenProcPtr vgaHWSaveScreenWeak(void) { return vgaHWSaveScreen; }

4
hw/xfree86/vgahw/vgaHW.h
View File

@ -225,4 +225,8 @@ CARD32 vgaHWHBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits, CARD32 vgaHWVBlankKGA(DisplayModePtr mode, vgaRegPtr regp, int nBits,
unsigned int Flags); unsigned int Flags);
Bool vgaHWAllocDefaultRegs(vgaRegPtr regp); Bool vgaHWAllocDefaultRegs(vgaRegPtr regp);
DDC1SetSpeedProc *vgaHWddc1SetSpeedWeak(void);
SaveScreenProcPtr vgaHWSaveScreenWeak(void);
#endif /* _VGAHW_H */ #endif /* _VGAHW_H */