From aafb0bd9d4c8b6373170ff04fb811dddcb21e484 Mon Sep 17 00:00:00 2001 From: Paulo Cesar Pereira de Andrade Date: Sat, 15 Mar 2008 21:06:42 -0300 Subject: [PATCH] Compile warning fixes. Add prototypes to ffh.h. If 0 static unused functions. Protect definition of FFBSync() around ifdef, as there are also macro versions (one for debug and one that is a noop), and the function definition does nothing. --- src/ffb.h | 20 ++++++++++++++++++++ src/ffb_ddc.c | 2 ++ src/ffb_dga.c | 8 -------- src/ffb_driver.c | 6 ++++-- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/ffb.h b/src/ffb.h index ea1b7fc..5127958 100644 --- a/src/ffb.h +++ b/src/ffb.h @@ -237,6 +237,26 @@ extern void FFBWidChangeBuffer(FFBPtr, unsigned int, int); /* Accelerated double-buffering. */ extern Bool FFBDbePreInit(ScreenPtr); +/* VISmoveImage.s */ +extern void VISmoveImageLR(unsigned char *, unsigned char *, + long, long, long, long); +extern void VISmoveImageRL(unsigned char *, unsigned char *, + long, long, long, long); + +/* ffb_accel.c */ +extern void FFB_SetupForSolidFill(ScrnInfoPtr, int, int, unsigned int); +extern void FFB_SubsequentSolidFillRect(ScrnInfoPtr, int, int, int, int); +extern void FFB_SetupForScreenToScreenCopy(ScrnInfoPtr, int, int, int, + unsigned int, int); +extern void FFB_SubsequentScreenToScreenCopy(ScrnInfoPtr, int, int, int, int, + int, int); + +/* ffb_ddc.c */ +extern Bool FFBi2cInit(ScrnInfoPtr); + +/* ffb_dga.c */ +void FFB_InitDGA(ScreenPtr pScreen); + /* The fastfill and pagefill buffer sizes change based upon * the resolution. */ diff --git a/src/ffb_ddc.c b/src/ffb_ddc.c index b665105..f7b2ad8 100644 --- a/src/ffb_ddc.c +++ b/src/ffb_ddc.c @@ -41,6 +41,7 @@ * XXX several details and I must figure them out by trial and error. */ +#if 0 /* Wait for the next VSYNC. */ static void WaitForVSYNC(ffb_dacPtr dac) @@ -103,6 +104,7 @@ FFBDacDdc1Read(ScrnInfoPtr pScrn) /* Return the result and we're done. */ return val; } +#endif static void FFBI2CGetBits(I2CBusPtr b, int *clock, int *data) diff --git a/src/ffb_dga.c b/src/ffb_dga.c index 0b40b06..218b105 100644 --- a/src/ffb_dga.c +++ b/src/ffb_dga.c @@ -180,9 +180,6 @@ static void FFB_Flush(ScrnInfoPtr pScrn) FFBWait(pFfb, ffb); } -extern void FFB_SetupForSolidFill(ScrnInfoPtr, int, int, unsigned int); -extern void FFB_SubsequentSolidFillRect(ScrnInfoPtr, int, int, int, int); - static void FFB_FillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned long color) { FFBPtr pFfb = GET_FFB_FROM_SCRN(pScrn); @@ -192,11 +189,6 @@ static void FFB_FillRect(ScrnInfoPtr pScrn, int x, int y, int w, int h, unsigned SET_SYNC_FLAG(pFfb->pXAAInfo); } -extern void FFB_SetupForScreenToScreenCopy(ScrnInfoPtr, int, int, int, - unsigned int, int); -extern void FFB_SubsequentScreenToScreenCopy(ScrnInfoPtr, int, int, - int, int, int, int); - static void FFB_BlitRect(ScrnInfoPtr pScrn, int srcx, int srcy, int w, int h, int dstx, int dsty) { diff --git a/src/ffb_driver.c b/src/ffb_driver.c index 5e329e8..eac81ad 100644 --- a/src/ffb_driver.c +++ b/src/ffb_driver.c @@ -62,10 +62,10 @@ static void FFBFreeScreen(int scrnIndex, int flags); static ModeStatus FFBValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags); static void FFBDPMSMode(ScrnInfoPtr pScrn, int DPMSMode, int flags); -/* ffb_dga.c */ -extern void FFB_InitDGA(ScreenPtr pScreen); +#ifndef FFBSync void FFBSync(ScrnInfoPtr pScrn); +#endif #define FFB_VERSION 4000 #define FFB_NAME "SUNFFB" @@ -972,6 +972,7 @@ FFBDPMSSet(ScrnInfoPtr pScrn, int mode, int flags) FFBDacDPMSMode(pFfb, mode, 0); } +#ifndef FFBSync /* * This is the implementation of the Sync() function. */ @@ -980,6 +981,7 @@ FFBSync(ScrnInfoPtr pScrn) { return; } +#endif /* Hook for DPMS Mode. -- 1.5.3.2