From fa071d0a9342f34c626b8612c5edb289b010dac5 Mon Sep 17 00:00:00 2001 From: sezero Date: Mon, 20 Aug 2018 16:40:57 +0300 Subject: [PATCH] glide2x, sst1: fixed incompatible assignment warning for swapBuffers(). kept the original case in commented out form. --- glide2x/sst1/init/vg96drvr.c | 4 ++-- glide2x/sst1/init/vgdrvr.c | 4 ++-- glide3x/sst1/init/vg96drvr.c | 3 ++- glide3x/sst1/init/vgdrvr.c | 3 ++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/glide2x/sst1/init/vg96drvr.c b/glide2x/sst1/init/vg96drvr.c index f95e37c..29c1b5d 100644 --- a/glide2x/sst1/init/vg96drvr.c +++ b/glide2x/sst1/init/vg96drvr.c @@ -62,10 +62,10 @@ static void disableTransport( void ) { init96DisableTransport(); } -static InitSwapType_t swapBuffers( FxU32 code ) { +static /*InitSwapType_t*/ void swapBuffers( FxU32 code ) { if ( context && context->writeMethod ) init96Swap( code, &context->info.regs, context->writeMethod ); - return INIT_SWAP_FLIP; +/* return INIT_SWAP_FLIP;*/ } static FxU32 status( void ) { diff --git a/glide2x/sst1/init/vgdrvr.c b/glide2x/sst1/init/vgdrvr.c index 5e187e0..f7e90a4 100644 --- a/glide2x/sst1/init/vgdrvr.c +++ b/glide2x/sst1/init/vgdrvr.c @@ -96,8 +96,8 @@ static FxBool enableTransport( InitFIFOData *info ) { static void disableTransport( void ) { } -static InitSwapType_t swapBuffers( FxU32 code ) { - return INIT_SWAP_FLIP; +static /*InitSwapType_t*/ void swapBuffers( FxU32 code ) { +/* return INIT_SWAP_FLIP;*/ } static FxU32 status( void ) { diff --git a/glide3x/sst1/init/vg96drvr.c b/glide3x/sst1/init/vg96drvr.c index 5035b88..29c1b5d 100644 --- a/glide3x/sst1/init/vg96drvr.c +++ b/glide3x/sst1/init/vg96drvr.c @@ -62,9 +62,10 @@ static void disableTransport( void ) { init96DisableTransport(); } -static void swapBuffers( FxU32 code ) { +static /*InitSwapType_t*/ void swapBuffers( FxU32 code ) { if ( context && context->writeMethod ) init96Swap( code, &context->info.regs, context->writeMethod ); +/* return INIT_SWAP_FLIP;*/ } static FxU32 status( void ) { diff --git a/glide3x/sst1/init/vgdrvr.c b/glide3x/sst1/init/vgdrvr.c index 8cc8d49..f7e90a4 100644 --- a/glide3x/sst1/init/vgdrvr.c +++ b/glide3x/sst1/init/vgdrvr.c @@ -96,7 +96,8 @@ static FxBool enableTransport( InitFIFOData *info ) { static void disableTransport( void ) { } -static void swapBuffers( FxU32 code ) { +static /*InitSwapType_t*/ void swapBuffers( FxU32 code ) { +/* return INIT_SWAP_FLIP;*/ } static FxU32 status( void ) {