diff --git a/glide3x/h3/minihwc/dxdrvr.c b/glide3x/h3/minihwc/dxdrvr.c index ed540a5..1f1f4c2 100644 --- a/glide3x/h3/minihwc/dxdrvr.c +++ b/glide3x/h3/minihwc/dxdrvr.c @@ -751,7 +751,7 @@ dxControl(FxU32 code, hwcBufferDesc *pBufDesc, int *width, int *height) } /* dxControl */ FxBool -dxClose() +dxClose(void) { GDBG_INFO(80, "dxClose:\n"); /* diff --git a/glide3x/h5/minihwc/dxdrvr.c b/glide3x/h5/minihwc/dxdrvr.c index 6457d49..a86eb5e 100644 --- a/glide3x/h5/minihwc/dxdrvr.c +++ b/glide3x/h5/minihwc/dxdrvr.c @@ -772,7 +772,7 @@ dxControl(FxU32 code, hwcBufferDesc *pBufDesc, int *width, int *height) } /* dxControl */ FxBool -dxClose() +dxClose(void) { GDBG_INFO(80, "dxClose:\n"); /* diff --git a/glide3x/sst1/init/init96/dxdrvr.c b/glide3x/sst1/init/init96/dxdrvr.c index 678a319..d184816 100644 --- a/glide3x/sst1/init/init96/dxdrvr.c +++ b/glide3x/sst1/init/init96/dxdrvr.c @@ -746,7 +746,7 @@ dxControl(FxU32 code, InitBufDesc_t *pBufDesc, int *width, int *height) } /* dxControl */ FxBool -dxClose() +dxClose(void) { GDBG_INFO((80, "dxClose:\n")); @@ -1002,7 +1002,7 @@ dxControl(FxU32 code, InitBufDesc_t *pBufDesc, int *width, int *height) return FXTRUE; } /* dxControl */ FxBool -dxClose() +dxClose(void) { #define FN_NAME "dxClose" GDBG_INFO((80, "%s: Setting up VESA mode 640*480*\n", FN_NAME)); diff --git a/glide3x/sst1/init/init96/fxinit96.h b/glide3x/sst1/init/init96/fxinit96.h index d06bd2a..40fbecd 100644 --- a/glide3x/sst1/init/init96/fxinit96.h +++ b/glide3x/sst1/init/init96/fxinit96.h @@ -19,7 +19,6 @@ ** */ - #ifndef _FXINIT96_H_ #define _FXINIT96_H_ @@ -41,11 +40,11 @@ FxBool dxOpen( int nAux, InitBufDesc_t *pBufDesc, int *width, - int *height, + int *height, InitSwapType_t *swapType ); FxBool dxControl(FxU32 control, InitBufDesc_t *pDesc, int *w, int *h); -FxBool dxClose(); +FxBool dxClose(void); void dxSwap(FxU32 code); #else @@ -60,11 +59,11 @@ FxBool linOpen( int nAux, InitBufDesc_t *pBufDesc, int *width, - int *height, + int *height, InitSwapType_t *swapType ); FxBool linControl(FxU32 control, InitBufDesc_t *pDesc, int *w, int *h); -FxBool linClose(); +FxBool linClose(void); void linSwap(FxU32 code); void linFlip(FxU32 buffer); @@ -125,7 +124,6 @@ GDBG_INFO((80, "SET: Register: %s (0x%x) = 0x%x\n",\ #define GET(s) *(GETREADADDR(s)) #endif - #ifdef __cplusplus } #endif diff --git a/glide3x/sst1/init/init96/lindrvr.c b/glide3x/sst1/init/init96/lindrvr.c index 15d9bbb..78826d6 100644 --- a/glide3x/sst1/init/init96/lindrvr.c +++ b/glide3x/sst1/init/init96/lindrvr.c @@ -123,15 +123,16 @@ linFlip(FxU32 buffer) void linExit(void); static FxBool -ErrorMessage(Window win, char *err) +ErrorMessage(Window win, const char *err) { fprintf(stderr, "Error %s \n", err); return FXFALSE; } /* ErrorMessage */ -FxBool linSetup() { +FxBool linSetup(void) { int eventbase, errorbase; - int banksize, baseaddr; + int banksize; + unsigned int baseaddr; if (dpy!=0) return FXTRUE; dpy=XOpenDisplay(""); @@ -220,7 +221,7 @@ cvtXToGlideDesc(InitBufDesc_t *pDesc) { dFifo->bufType = INIT_BUFFER_FIFOBUFFER; dFifo->bufOffset = (int)addrFifo-dScreen->bufOffset; dFifo->bufStride = FIFOSIZE; - + GDBG_INFO((80, "cvtXToGlideDesc: dFront->bufOffset = 0x%x\n", dFront->bufOffset)); GDBG_INFO((80, "cvtXToGlideDesc: dBack->bufOffset = 0x%x\n", dBack->bufOffset)); GDBG_INFO((80, "cvtXToGlideDesc: dAux->bufOffset = 0x%x\n", dAux->bufOffset)); @@ -466,7 +467,7 @@ FxBool linControl(FxU32 code, InitBufDesc_t *pBufDesc, int *width, int *height) { unsigned int i, w = 0, h = 0; - + GDBG_INFO((80, "linControl: code = %d\n", code)); if (IsFullScreen) return FXTRUE; @@ -520,7 +521,7 @@ linControl(FxU32 code, InitBufDesc_t *pBufDesc, int *width, int *height) } /* linControl */ FxBool -linClose() +linClose(void) { GDBG_INFO((80, "linClose:\n")); if (!dpy) return FXTRUE; @@ -581,5 +582,3 @@ linFlip(FxU32 buffer) } /* linFlip */ #endif - -