Fix compiler warnings

This commit is contained in:
Barry Harris 2015-03-06 16:31:54 +00:00
parent cafe5e12c0
commit a066c641fc
29 changed files with 52 additions and 52 deletions

View File

@ -56,7 +56,7 @@ static void GunTargetUpdate(INT32 player)
static UINT8 GunTargetShouldDraw(INT32 player) static UINT8 GunTargetShouldDraw(INT32 player)
{ {
return (nCurrentFrame < GunTargetTimer[player] + GunTargetHideTime); return ((INT32)nCurrentFrame < GunTargetTimer[player] + GunTargetHideTime);
} }
#undef GunTargetHideTime #undef GunTargetHideTime

View File

@ -336,7 +336,7 @@ static UINT8 __fastcall battlnts_sound_read(UINT16 address)
return 0; return 0;
} }
static void battlnts_tile_callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *flags) static void battlnts_tile_callback(INT32 /*layer*/, INT32 /*bank*/, INT32 *code, INT32 *color, INT32 */*flags*/)
{ {
*code |= ((*color & 0x0f) << 9) | ((*color & 0x40) << 2); *code |= ((*color & 0x0f) << 9) | ((*color & 0x40) << 2);
*color = 0; *color = 0;

View File

@ -204,7 +204,7 @@ static void bladestl_main_write(UINT16 address, UINT8 data)
} }
} }
static UINT8 trackball_read(INT32 offset) static UINT8 trackball_read(INT32 /*offset*/)
{ {
/* /*
int curr = m_trackball[offset]->read(); int curr = m_trackball[offset]->read();
@ -287,7 +287,7 @@ static UINT8 bladestl_sound_read(UINT16 address)
return 0; return 0;
} }
static void bladestl_tile_callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *flags) static void bladestl_tile_callback(INT32 layer, INT32 /*bank*/, INT32 *code, INT32 *color, INT32 */*flags*/)
{ {
*code |= ((*color & 0x0f) << 8) | ((*color & 0x40) << 6); *code |= ((*color & 0x0f) << 8) | ((*color & 0x40) << 6);
*color = 0x10 + layer; *color = 0x10 + layer;

View File

@ -342,7 +342,7 @@ static void filter_write(INT32 num, UINT8 d)
filter_rc_set_RC(num, FLT_RC_LOWPASS, 1000, 5100, 0, CAP_P(C)); filter_rc_set_RC(num, FLT_RC_LOWPASS, 1000, 5100, 0, CAP_P(C));
} }
void AY8910_0_portBwrite(UINT32 port, UINT32 data) void AY8910_0_portBwrite(UINT32 /*port*/, UINT32 data)
{ {
if (ZetGetActive() == -1) return; if (ZetGetActive() == -1) return;
@ -356,7 +356,7 @@ void AY8910_0_portBwrite(UINT32 port, UINT32 data)
} }
} }
void AY8910_1_portBwrite(UINT32 port, UINT32 data) void AY8910_1_portBwrite(UINT32 /*port*/, UINT32 data)
{ {
if (ZetGetActive() == -1) return; if (ZetGetActive() == -1) return;

View File

@ -585,7 +585,7 @@ static void draw_layer(INT32 layer)
} }
} }
static void k007121_sprites_draw(UINT8 *gfx, UINT32 *palette, UINT8 *source, int base_color, int global_x_offset, int bank_base, UINT32 pri_mask ) static void k007121_sprites_draw(UINT8 *gfx, UINT32 */*palette*/, UINT8 *source, int base_color, int global_x_offset, int bank_base, UINT32 /*pri_mask*/)
{ {
INT32 flipscreen = K007121CtrlRAM[7] & 0x08; INT32 flipscreen = K007121CtrlRAM[7] & 0x08;

View File

@ -1227,7 +1227,7 @@ static UINT8 konamigt_read_wheel()
return Temp2; return Temp2;
} }
static UINT16 konamigt_read_analog(int Offset) static UINT16 konamigt_read_analog(int /*Offset*/)
{ {
UINT16 nRet = 0; UINT16 nRet = 0;

View File

@ -244,7 +244,7 @@ static UINT32 DrvVLM5030Sync(INT32 samples_rate)
return (samples_rate * M6809TotalCycles()) / 25000; return (samples_rate * M6809TotalCycles()) / 25000;
} }
static void rockrage_tile_callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 *flags) static void rockrage_tile_callback(INT32 layer, INT32 bank, INT32 *code, INT32 *color, INT32 */*flags*/)
{ {
if (layer == 1) { if (layer == 1) {
*code |= ((*color & 0x40) << 2) | ((bank & 0x01) << 9); *code |= ((*color & 0x40) << 2) | ((bank & 0x01) << 9);

View File

@ -44,7 +44,7 @@ INT32 K007342_irq_enabled()
return (K007342Regs[0][0] & 0x02); return (K007342Regs[0][0] & 0x02);
} }
void K007342DrawLayer(INT32 layer, INT32 baseflags, INT32 priority) void K007342DrawLayer(INT32 layer, INT32 baseflags, INT32 /*priority*/)
{ {
// INT32 flipscreen = K007342Regs[0][0] & 0x10; // INT32 flipscreen = K007342Regs[0][0] & 0x10;

View File

@ -21,7 +21,7 @@ static void filter_write(INT32 num, UINT8 d)
static void __fastcall timeplt_sound_write(UINT16 address, UINT8 data) static void __fastcall timeplt_sound_write(UINT16 address, UINT8 data)
{ {
if (address >= 0x8000 && address <= 0xffff) { if (address >= 0x8000 /*&& address <= 0xffff*/) {
INT32 Offset = address & 0xfff; INT32 Offset = address & 0xfff;
filter_write(3, (Offset >> 0) & 3); filter_write(3, (Offset >> 0) & 3);
filter_write(4, (Offset >> 2) & 3); filter_write(4, (Offset >> 2) & 3);

View File

@ -313,22 +313,22 @@ static void NeoTextBlendInit(INT32 nSlot)
if (strncmp ("Name", szLine, 4) == 0) continue; // don't care if (strncmp ("Name", szLine, 4) == 0) continue; // don't care
if (szLine[0] == ';') continue; // comment (also don't care) if (szLine[0] == ';') continue; // comment (also don't care)
int type; INT32 type;
unsigned int min,max,k, single_entry = -1; UINT32 min,max,k, single_entry = (UINT32)-1;
for (k = 0; k < strlen(szLine); k++) { for (k = 0; k < strlen(szLine); k++) {
if (szLine[k] == '-') { single_entry = k+1; break; } if (szLine[k] == '-') { single_entry = k+1; break; }
} }
if (single_entry < 0) { /* if (single_entry < 0) {
sscanf(szLine,"%x %d",&max,&type); sscanf(szLine,"%x %d",&max,&type);
min = max; min = max;
} else { } else {*/
sscanf(szLine,"%x",&min); sscanf(szLine,"%x",&min);
sscanf(szLine+single_entry,"%x %d",&max,&type); sscanf(szLine+single_entry,"%x %d",&max,&type);
} // }
for (k = min; k <= max && k < (nNeoTextROMSize[nSlot]/0x20); k++) { for (k = min; k <= max && k < ((UINT32)nNeoTextROMSize[nSlot]/0x20); k++) {
if (NeoTextTileAttrib[nSlot][k] != 1) // ? if (NeoTextTileAttrib[nSlot][k] != 1) // ?
NeoTextTileAttrib[nSlot][k] = table[type&3]; NeoTextTileAttrib[nSlot][k] = table[type&3];
} }

View File

@ -32,7 +32,7 @@ static void svg_set_ram_bank(INT32 data)
SekMapMemory(svg_ram[svg_ram_sel^1], 0x500000, 0x50ffff, MAP_RAM); SekMapMemory(svg_ram[svg_ram_sel^1], 0x500000, 0x50ffff, MAP_RAM);
} }
static void __fastcall svg_write_byte(UINT32 address, UINT8 data) static void __fastcall svg_write_byte(UINT32 address, UINT8 /*data*/)
{ {
pgm_cpu_sync(); pgm_cpu_sync();

View File

@ -1170,7 +1170,7 @@ static UINT8 dkong3_sound0_read(UINT16 a)
return 0; return 0;
} }
static void dkong3_sound1_write(UINT16 a, UINT8 d) static void dkong3_sound1_write(UINT16 a, UINT8 /*d*/)
{ {
//bprintf (0, _T("s1: %4.4x, %2.2x, %d\n"), a, d, M6502GetActive()); //bprintf (0, _T("s1: %4.4x, %2.2x, %d\n"), a, d, M6502GetActive());
if ((a & 0xffe0) == 0x4000) { if ((a & 0xffe0) == 0x4000) {

View File

@ -430,7 +430,7 @@ static struct BurnSampleInfo MarioSampleDesc[] = {
{ "run.wav", SAMPLE_NOLOOP }, { "run.wav", SAMPLE_NOLOOP },
{ "luigirun.wav", SAMPLE_NOLOOP }, { "luigirun.wav", SAMPLE_NOLOOP },
#endif #endif
{ 0, 0 } { "", 0 }
}; };
STD_SAMPLE_PICK(Mario) STD_SAMPLE_PICK(Mario)

View File

@ -1417,7 +1417,7 @@ static UINT8 __fastcall mcu_prot_read_byte(UINT32 address)
static UINT16 __fastcall mcu_prot_read_word(UINT32 address) static UINT16 __fastcall mcu_prot_read_word(UINT32 address)
{ {
if (mcu_hs && ((mcu_ram[4] << 6) & 0x3ffc0) == (address & 0x3ffc0)) if ((UINT32)mcu_hs && (((UINT32)mcu_ram[4] << 6) & 0x3ffc0) == (address & 0x3ffc0))
{ {
return mcu_config[2]; return mcu_config[2];
} }

View File

@ -206,7 +206,7 @@ static void mrdo_palette_init()
} }
else pot[i] = 0; else pot[i] = 0;
weight[i] = 0xff * pot[i] / pot[0x0f]; weight[i] = (INT32)(0xff * pot[i] / pot[0x0f]);
if (weight[i] < 0) weight[i] = 0; if (weight[i] < 0) weight[i] = 0;
} }

View File

@ -51,7 +51,7 @@ static INT32 watchdog_enable = 0;
static INT32 watchdog; static INT32 watchdog;
static INT32 sample_start = -1; static INT32 sample_start = -1;
static INT32 sample_offset; static INT32 sample_offset = 0;
static UINT8 sample_number = 0; static UINT8 sample_number = 0;
static UINT8 m_gfxbank = 0; static UINT8 m_gfxbank = 0;
@ -481,7 +481,7 @@ static void sample_render(INT16 *buffer, INT32 nLen)
while (pos < nLen) while (pos < nLen)
{ {
INT32 sample = rom[(sample_offset >> 16)] * 0.2; INT32 sample = (INT32)(rom[(sample_offset >> 16)] * 0.2);
buffer[0] = BURN_SND_CLIP((INT32)(buffer[0] + sample)); buffer[0] = BURN_SND_CLIP((INT32)(buffer[0] + sample));
buffer[1] = BURN_SND_CLIP((INT32)(buffer[1] + sample)); buffer[1] = BURN_SND_CLIP((INT32)(buffer[1] + sample));
@ -1283,7 +1283,7 @@ static void CommonDoReset(INT32 clear_ram)
watchdog = 0; watchdog = 0;
sample_start = -1; sample_start = -1;
sample_offset; sample_offset = 0;
sample_number = 0; sample_number = 0;
m_gfxbank = 0; m_gfxbank = 0;

View File

@ -1693,4 +1693,4 @@ struct BurnDriver BurnDrvGeminib = {
NULL, geminibRomInfo, geminibRomName, NULL, NULL, GeminiInputInfo, GeminiDIPInfo, NULL, geminibRomInfo, geminibRomName, NULL, NULL, GeminiInputInfo, GeminiDIPInfo,
GeminiInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400, GeminiInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x400,
224, 256, 3, 4 224, 256, 3, 4
}; };

View File

@ -1331,4 +1331,4 @@ struct BurnDriverD BurnDrvXsleenab2 = {
NULL, xsleenab2RomInfo, xsleenab2RomName, NULL, NULL, DrvInputInfo, DrvDIPInfo, NULL, xsleenab2RomInfo, xsleenab2RomName, NULL, NULL, DrvInputInfo, DrvDIPInfo,
DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200, DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x200,
256, 240, 4, 3 256, 240, 4, 3
}; };

View File

@ -2337,7 +2337,7 @@ static INT32 Drv68KExit()
return 0; return 0;
} }
static void DrawLayer(UINT8 *rom, UINT8 *scroll, UINT8 *gfxbase, INT32 gfxlenmask, INT32 colorbase, UINT8 *transtab, INT32 transp, INT32 depth, INT32 pri) static void DrawLayer(UINT8 *rom, UINT8 *scroll, UINT8 *gfxbase, INT32 gfxlenmask, INT32 colorbase, UINT8 *transtab, INT32 transp, INT32 depth, INT32 /*pri*/)
{ {
if (scroll[6] & 0x10) return; if (scroll[6] & 0x10) return;
@ -2420,7 +2420,7 @@ static void DrawLayer(UINT8 *rom, UINT8 *scroll, UINT8 *gfxbase, INT32 gfxlenmas
} }
} }
static void draw_layer_rshark(UINT8 *tmaprom0, UINT8 *tmaprom1, UINT8 *scroll, UINT8 *gfxbase, INT32 gfxlenmask, INT32 colorbase, UINT8 *transtab, INT32 transp, INT32 pri) static void draw_layer_rshark(UINT8 *tmaprom0, UINT8 *tmaprom1, UINT8 *scroll, UINT8 *gfxbase, INT32 gfxlenmask, INT32 colorbase, UINT8 *transtab, INT32 transp, INT32 /*pri*/)
{ {
INT32 scrollx = scroll[0] + 64; INT32 scrollx = scroll[0] + 64;
INT32 scrolly = (scroll[3] + (scroll[4] * 256) + global_y) & 0x1ff; INT32 scrolly = (scroll[3] + (scroll[4] * 256) + global_y) & 0x1ff;
@ -2477,7 +2477,7 @@ static void draw_layer_rshark(UINT8 *tmaprom0, UINT8 *tmaprom1, UINT8 *scroll, U
} }
} }
static void DrawTextLayer(INT32 mode, INT32 pri, INT32 scroll_adj) static void DrawTextLayer(INT32 mode, INT32 /*pri*/, INT32 scroll_adj)
{ {
for (INT32 offs = 0; offs < 64 * 32; offs++) for (INT32 offs = 0; offs < 64 * 32; offs++)
{ {

View File

@ -1484,4 +1484,4 @@ struct BurnDriver BurnDrvAsurabusa = {
NULL, asurabusaRomInfo, asurabusaRomName, NULL, NULL, AsurabusaInputInfo, AsurabusDIPInfo, NULL, asurabusaRomInfo, asurabusaRomName, NULL, NULL, AsurabusaInputInfo, AsurabusDIPInfo,
DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x2000, DrvInit, DrvExit, DrvFrame, DrvDraw, DrvScan, &DrvRecalc, 0x2000,
320, 240, 4, 3 320, 240, 4, 3
}; };

View File

@ -1887,4 +1887,4 @@ struct BurnDriver BurnDrvToutrunj1 = {
NULL, Toutrunj1RomInfo, Toutrunj1RomName, NULL, NULL, ToutrunInputInfo, ToutrunctDIPInfo, NULL, Toutrunj1RomInfo, Toutrunj1RomName, NULL, NULL, ToutrunInputInfo, ToutrunctDIPInfo,
ToutrunInit, System16Exit, OutrunFrame, NULL, System16Scan, ToutrunInit, System16Exit, OutrunFrame, NULL, System16Scan,
NULL, 0x3000, 320, 224, 4, 3 NULL, 0x3000, 320, 224, 4, 3
}; };

View File

@ -162,12 +162,12 @@ static int MemIndex()
return 0; return 0;
} }
static void __fastcall sg1000_write(UINT16 address, UINT8 data) static void __fastcall sg1000_write(UINT16 /*address*/, UINT8 /*data*/)
{ {
//bprintf(0, _T("a[%X] d[%X],"), address, data); //bprintf(0, _T("a[%X] d[%X],"), address, data);
} }
static UINT8 __fastcall sg1000_read(UINT16 address) static UINT8 __fastcall sg1000_read(UINT16 /*address*/)
{ {
//bprintf(0, _T("a[%X],"), address); //bprintf(0, _T("a[%X],"), address);
return 0; return 0;

View File

@ -172,7 +172,7 @@ INT32 SMSFrame()
return 0; return 0;
} }
void system_manage_sram(uint8 *sram, int slot, int mode) void system_manage_sram(uint8 */*sram*/, int /*slot*/, int /*mode*/)
{ {
} }
@ -423,7 +423,7 @@ static void system_load_state()
for(INT32 i = 0; i < 0x200; i++) for(INT32 i = 0; i < 0x200; i++)
{ {
bg_name_list[i] = i; bg_name_list[i] = i;
bg_name_dirty[i] = -1; bg_name_dirty[i] = (UINT8)-1;
} }
/* Restore palette */ /* Restore palette */

View File

@ -341,7 +341,7 @@ UINT8 _fastcall sms_port_r(UINT16 port)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }
@ -420,7 +420,7 @@ UINT8 _fastcall smsj_port_r(UINT16 port)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }
@ -492,7 +492,7 @@ UINT8 _fastcall gg_port_r(UINT16 port)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@ -553,7 +553,7 @@ UINT8 _fastcall ggms_port_r(UINT16 port)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
@ -611,6 +611,6 @@ UINT8 _fastcall md_port_r(UINT16 port)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }

View File

@ -64,7 +64,7 @@ void FM_Reset(void)
} }
void FM_Update(int16 **buffer, int length) void FM_Update(int16 **/*buffer*/, int /*length*/)
{ {
/* switch(snd.fm_which) /* switch(snd.fm_which)
{ {
@ -78,13 +78,13 @@ void FM_Update(int16 **buffer, int length)
}*/ }*/
} }
void FM_WriteReg(int reg, int data) void FM_WriteReg(int /*reg*/, int /*data*/)
{ {
/* FM_Write(0, reg); /* FM_Write(0, reg);
FM_Write(1, data);*/ FM_Write(1, data);*/
} }
void FM_Write(int offset, int data) void FM_Write(int /*offset*/, int /*data*/)
{ {
/* if(offset & 1) /* if(offset & 1)
fm_context.reg[ fm_context.latch ] = data; fm_context.reg[ fm_context.latch ] = data;
@ -104,12 +104,12 @@ void FM_Write(int offset, int data)
} }
void FM_GetContext(uint8 *data) void FM_GetContext(uint8 */*data*/)
{ {
// memcpy(data, &fm_context, sizeof(FM_Context)); // memcpy(data, &fm_context, sizeof(FM_Context));
} }
void FM_SetContext(uint8 *data) void FM_SetContext(uint8 */*data*/)
{ {
/* /*
int i; int i;

View File

@ -220,7 +220,7 @@ uint8 sio_r(int offset)
} }
/* Just to please compiler */ /* Just to please compiler */
return -1; return 0;
} }
void sio_w(int offset, int data) void sio_w(int offset, int data)

View File

@ -102,7 +102,7 @@ parse_end:
vdp.status = (vdp.status & 0xE0) | (i & 0x1F); vdp.status = (vdp.status & 0xE0) | (i & 0x1F);
} }
void render_obj_tms(int line) void render_obj_tms(int /*line*/)
{ {
int i, x = 0; int i, x = 0;
int size, start, end, mode; int size, start, end, mode;
@ -442,7 +442,7 @@ void render_bg_m1x(int line)
} }
/* Invalid (2+3/1+2+3) */ /* Invalid (2+3/1+2+3) */
void render_bg_inv(int line) void render_bg_inv(int /*line*/)
{ {
int column; int column;
uint8 *clut; uint8 *clut;

View File

@ -325,7 +325,7 @@ uint8 vdp_read(int offset)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }
uint8 vdp_counter_r(int offset) uint8 vdp_counter_r(int offset)
@ -343,7 +343,7 @@ uint8 vdp_counter_r(int offset)
} }
/* Just to please the compiler */ /* Just to please the compiler */
return -1; return 0;
} }

View File

@ -68,7 +68,7 @@ void SN76496Update(INT32 Num, INT16* pSoundBuf, INT32 Length)
while (Length > 0) while (Length > 0)
{ {
INT32 Vol[4]; INT32 Vol[4];
UINT32 Out, Out2; UINT32 Out, Out2 = 0;
INT32 Left; INT32 Left;