warning fixes and minor cleanup.

This commit is contained in:
sezero
2018-08-07 11:58:55 +03:00
parent 19efdba7e0
commit af4ebfce0c
5 changed files with 15 additions and 18 deletions

View File

@@ -751,7 +751,7 @@ dxControl(FxU32 code, hwcBufferDesc *pBufDesc, int *width, int *height)
} /* dxControl */
FxBool
dxClose()
dxClose(void)
{
GDBG_INFO(80, "dxClose:\n");
/*

View File

@@ -772,7 +772,7 @@ dxControl(FxU32 code, hwcBufferDesc *pBufDesc, int *width, int *height)
} /* dxControl */
FxBool
dxClose()
dxClose(void)
{
GDBG_INFO(80, "dxClose:\n");
/*

View File

@@ -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));

View File

@@ -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

View File

@@ -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