summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/imagedev/floppy.h2
-rw-r--r--src/emu/sound/c352.h2
-rw-r--r--src/emu/sound/qs1000.h2
-rw-r--r--src/emu/sound/rf5c400.c4
-rw-r--r--src/emu/video/voodoo.c2
-rw-r--r--src/mame/audio/depthch.c2
-rw-r--r--src/mame/audio/m79amb.c2
-rw-r--r--src/mame/drivers/3x3puzzl.c2
-rw-r--r--src/mame/drivers/cobra.c8
-rw-r--r--src/mame/drivers/cps2.c4
-rw-r--r--src/mame/drivers/firebeat.c3
-rw-r--r--src/mame/drivers/gei.c2
-rw-r--r--src/mame/drivers/ghosteo.c2
-rw-r--r--src/mame/drivers/guab.c2
-rw-r--r--src/mame/drivers/jpmsys5.c2
-rw-r--r--src/mame/drivers/maygayv1.c4
-rw-r--r--src/mame/drivers/meritm.c46
-rw-r--r--src/mame/drivers/model2.c2
-rw-r--r--src/mame/drivers/multigam.c22
-rw-r--r--src/mame/drivers/pong.c6
-rw-r--r--src/mame/drivers/psikyosh.c2
-rw-r--r--src/mame/drivers/rastersp.c4
-rw-r--r--src/mame/drivers/smsmcorp.c2
-rw-r--r--src/mame/drivers/taitotz.c2
-rw-r--r--src/mame/drivers/tmaster.c2
-rw-r--r--src/mame/drivers/ttchamp.c2
-rw-r--r--src/mame/drivers/vlc.c6
-rw-r--r--src/mame/machine/inder_sb.c8
-rw-r--r--src/mame/machine/micro3d.c4
-rw-r--r--src/mame/machine/namcoio.h2
-rw-r--r--src/mame/machine/playch10.c2
-rw-r--r--src/mame/video/k001005.h2
-rw-r--r--src/mame/video/kaneko_tmap.c4
-rw-r--r--src/mame/video/micro3d.c2
-rw-r--r--src/mame/video/rltennis.c4
-rw-r--r--src/mame/video/segas24.c2
-rw-r--r--src/mess/drivers/esq5505.c2
-rw-r--r--src/mess/includes/hec2hrp.h2
-rw-r--r--src/mess/includes/next.h2
-rw-r--r--src/mess/includes/z80ne.h2
40 files changed, 89 insertions, 90 deletions
diff --git a/src/emu/imagedev/floppy.h b/src/emu/imagedev/floppy.h
index 1130260cb81..5b230ae9e49 100644
--- a/src/emu/imagedev/floppy.h
+++ b/src/emu/imagedev/floppy.h
@@ -27,7 +27,7 @@
static_cast<floppy_connector *>(device)->set_formats(_formats);
#define DECLARE_FLOPPY_FORMATS(_name) \
- static const floppy_format_type _name [];
+ static const floppy_format_type _name []
#define FLOPPY_FORMATS_MEMBER(_member) \
const floppy_format_type _member [] = {
diff --git a/src/emu/sound/c352.h b/src/emu/sound/c352.h
index 75a00bbab71..31eceffb366 100644
--- a/src/emu/sound/c352.h
+++ b/src/emu/sound/c352.h
@@ -80,7 +80,7 @@ private:
C352_FLG_FILTER = 0x0004, // don't apply filter
C352_FLG_REVLOOP = 0x0003, // loop backwards
C352_FLG_LOOP = 0x0002, // loop forward
- C352_FLG_REVERSE = 0x0001, // play sample backwards
+ C352_FLG_REVERSE = 0x0001 // play sample backwards
};
struct c352_ch_t
diff --git a/src/emu/sound/qs1000.h b/src/emu/sound/qs1000.h
index b3610dda400..24b843184b4 100644
--- a/src/emu/sound/qs1000.h
+++ b/src/emu/sound/qs1000.h
@@ -108,7 +108,7 @@ public:
{
QS1000_KEYON = 1,
QS1000_PLAYING = 2,
- QS1000_ADPCM = 4,
+ QS1000_ADPCM = 4
};
void start_voice(int ch);
diff --git a/src/emu/sound/rf5c400.c b/src/emu/sound/rf5c400.c
index 34d3fd3f362..91f9cf0d761 100644
--- a/src/emu/sound/rf5c400.c
+++ b/src/emu/sound/rf5c400.c
@@ -40,7 +40,7 @@ enum
TYPE_MASK = 0x00C0,
TYPE_16 = 0x0000,
TYPE_8LOW = 0x0040,
- TYPE_8HIGH = 0x0080,
+ TYPE_8HIGH = 0x0080
};
/* envelope phase */
@@ -49,7 +49,7 @@ enum
PHASE_NONE = 0,
PHASE_ATTACK,
PHASE_DECAY,
- PHASE_RELEASE,
+ PHASE_RELEASE
};
diff --git a/src/emu/video/voodoo.c b/src/emu/video/voodoo.c
index 777747d22c5..25ea57de6ba 100644
--- a/src/emu/video/voodoo.c
+++ b/src/emu/video/voodoo.c
@@ -5717,7 +5717,7 @@ static raster_info *add_rasterizer(voodoo_state *v, const raster_info *cinfo)
if (LOG_RASTERIZERS)
printf("Adding rasterizer @ %p : cp=%08X am=%08X %08X fbzM=%08X tm0=%08X tm1=%08X (hash=%d)\n",
- info->callback,
+ (void *)info->callback,
info->eff_color_path, info->eff_alpha_mode, info->eff_fog_mode, info->eff_fbz_mode,
info->eff_tex_mode_0, info->eff_tex_mode_1, hash);
diff --git a/src/mame/audio/depthch.c b/src/mame/audio/depthch.c
index 55623b38d0c..07e55d48e98 100644
--- a/src/mame/audio/depthch.c
+++ b/src/mame/audio/depthch.c
@@ -45,7 +45,7 @@ enum
SND_LONGEXPL = 0,
SND_SHRTEXPL,
SND_SPRAY,
- SND_SONAR,
+ SND_SONAR
};
diff --git a/src/mame/audio/m79amb.c b/src/mame/audio/m79amb.c
index eba68d316dd..3d9df21221f 100644
--- a/src/mame/audio/m79amb.c
+++ b/src/mame/audio/m79amb.c
@@ -330,7 +330,7 @@ WRITE8_MEMBER(m79amb_state::m79amb_8000_w)
m_discrete->write(space, M79AMB_SHOT_EN, data & 0x01);
m_discrete->write(space, M79AMB_BOOM_EN, data & 0x02);
m_discrete->write(space, M79AMB_THUD_EN, data & 0x04);
-};
+}
WRITE8_MEMBER(m79amb_state::m79amb_8003_w)
{
diff --git a/src/mame/drivers/3x3puzzl.c b/src/mame/drivers/3x3puzzl.c
index c0753cec6b7..833d3ead2ca 100644
--- a/src/mame/drivers/3x3puzzl.c
+++ b/src/mame/drivers/3x3puzzl.c
@@ -162,7 +162,7 @@ WRITE16_MEMBER(_3x3puzzle_state::gfx_ctrl_w)
WRITE16_MEMBER(_3x3puzzle_state::tilemap1_scrollx_w)
{
m_tilemap1->set_scrollx(data);
-};
+}
WRITE16_MEMBER(_3x3puzzle_state::tilemap1_scrolly_w)
{
diff --git a/src/mame/drivers/cobra.c b/src/mame/drivers/cobra.c
index 2552f56300b..7850cc721fa 100644
--- a/src/mame/drivers/cobra.c
+++ b/src/mame/drivers/cobra.c
@@ -419,7 +419,7 @@ private:
enum
{
RE_STATUS_IDLE = 0,
- RE_STATUS_COMMAND = 1,
+ RE_STATUS_COMMAND = 1
};
enum
@@ -431,7 +431,7 @@ private:
POLY_A = 4,
POLY_U = 5,
POLY_V = 6,
- POLY_W = 7,
+ POLY_W = 7
};
};
@@ -444,7 +444,7 @@ public:
{
EVENT_EMPTY,
EVENT_HALF_FULL,
- EVENT_FULL,
+ EVENT_FULL
};
typedef delegate<void (EventType)> event_delegate;
@@ -687,7 +687,7 @@ public:
enum
{
MAIN_INT_M2S = 0x01,
- MAIN_INT_S2M = 0x02,
+ MAIN_INT_S2M = 0x02
};
UINT8 m_m2s_int_enable;
diff --git a/src/mame/drivers/cps2.c b/src/mame/drivers/cps2.c
index 11eafc7374a..4693b1f97ef 100644
--- a/src/mame/drivers/cps2.c
+++ b/src/mame/drivers/cps2.c
@@ -9180,12 +9180,12 @@ DRIVER_INIT_MEMBER(cps_state,singbrd)
READ16_MEMBER( cps_state::gigaman2_dummyqsound_r )
{
return m_gigaman2_dummyqsound_ram[offset];
-};
+}
WRITE16_MEMBER( cps_state::gigaman2_dummyqsound_w )
{
m_gigaman2_dummyqsound_ram[offset] = data;
-};
+}
/* rearrange the graphics data into the normal order */
void cps_state::gigaman2_gfx_reorder()
diff --git a/src/mame/drivers/firebeat.c b/src/mame/drivers/firebeat.c
index e58068c25f1..efb1719ab4a 100644
--- a/src/mame/drivers/firebeat.c
+++ b/src/mame/drivers/firebeat.c
@@ -1985,12 +1985,11 @@ MACHINE_CONFIG_END
enum
{
DS1991_STATE_NORMAL,
- DS1991_STATE_READ_SUBKEY,
+ DS1991_STATE_READ_SUBKEY
};
-
void firebeat_state::set_ibutton(UINT8 *data)
{
int i, j;
diff --git a/src/mame/drivers/gei.c b/src/mame/drivers/gei.c
index 4bbf06b1bc6..25c3137d872 100644
--- a/src/mame/drivers/gei.c
+++ b/src/mame/drivers/gei.c
@@ -386,7 +386,7 @@ READ8_MEMBER(gei_state::banksel_1_r)
{
membank("bank1")->set_base(memregion("maincpu")->base() + 0x10000);
return 0x03;
-};
+}
READ8_MEMBER(gei_state::banksel_2_r)
{
diff --git a/src/mame/drivers/ghosteo.c b/src/mame/drivers/ghosteo.c
index 91c1fd09a47..298d90784ba 100644
--- a/src/mame/drivers/ghosteo.c
+++ b/src/mame/drivers/ghosteo.c
@@ -69,7 +69,7 @@ ToDo: verify QS1000 hook-up
enum nand_mode_t
{
NAND_M_INIT, // initial state
- NAND_M_READ, // read page data
+ NAND_M_READ // read page data
};
struct nand_t
diff --git a/src/mame/drivers/guab.c b/src/mame/drivers/guab.c
index 1a284d57c9a..789fe6cf960 100644
--- a/src/mame/drivers/guab.c
+++ b/src/mame/drivers/guab.c
@@ -50,7 +50,7 @@ enum int_levels
INT_6850ACIA = 4,
INT_TMS34061 = 5,
INT_FLOPPYCTRL = 6,
- INT_WATCHDOG_INT = 7,
+ INT_WATCHDOG_INT = 7
};
diff --git a/src/mame/drivers/jpmsys5.c b/src/mame/drivers/jpmsys5.c
index d664f7014c0..85b23a65d63 100644
--- a/src/mame/drivers/jpmsys5.c
+++ b/src/mame/drivers/jpmsys5.c
@@ -53,7 +53,7 @@ enum int_levels
INT_6850ACIA = 4,
INT_WATCHDOG = 5,
INT_FLOPPYCTRL = 6,
- INT_POWERFAIL = 7,
+ INT_POWERFAIL = 7
};
diff --git a/src/mame/drivers/maygayv1.c b/src/mame/drivers/maygayv1.c
index 9cc4980f307..05ab9377c14 100644
--- a/src/mame/drivers/maygayv1.c
+++ b/src/mame/drivers/maygayv1.c
@@ -804,14 +804,14 @@ WRITE_LINE_MEMBER(maygayv1_state::duart_irq_handler)
{
m_maincpu->set_input_line_and_vector(5, state, m_duart68681->get_irq_vector());
// m_maincpu->set_input_line(5, state ? ASSERT_LINE : CLEAR_LINE);
-};
+}
WRITE_LINE_MEMBER(maygayv1_state::duart_txa)
{
m_d68681_val = state;
m_soundcpu->set_input_line(MCS51_RX_LINE, ASSERT_LINE); // ?
-};
+}
READ8_MEMBER(maygayv1_state::data_to_i8031)
{
diff --git a/src/mame/drivers/meritm.c b/src/mame/drivers/meritm.c
index 0556f147df7..0e0ac92dba2 100644
--- a/src/mame/drivers/meritm.c
+++ b/src/mame/drivers/meritm.c
@@ -372,12 +372,12 @@ void meritm_state::meritm_crt250_switch_banks( )
//logerror( "CRT250: Switching banks: rom = %0x (bank = %x)\n", rombank, m_bank );
membank("bank1")->set_entry(rombank );
-};
+}
WRITE8_MEMBER(meritm_state::meritm_crt250_bank_w)
{
meritm_crt250_switch_banks();
-};
+}
void meritm_state::meritm_switch_banks( )
{
@@ -391,19 +391,19 @@ void meritm_state::meritm_switch_banks( )
membank("bank1")->set_entry(rombank );
membank("bank2")->set_entry(rombank | 0x01);
membank("bank3")->set_entry(rambank);
-};
+}
WRITE8_MEMBER(meritm_state::meritm_psd_a15_w)
{
m_psd_a15 = data;
//logerror( "Writing PSD_A15 with %02x at PC=%04X\n", data, space.device().safe_pc() );
meritm_switch_banks();
-};
+}
WRITE8_MEMBER(meritm_state::meritm_bank_w)
{
meritm_switch_banks();
-};
+}
/*************************************
*
@@ -416,13 +416,13 @@ WRITE8_MEMBER(meritm_state::meritm_crt250_questions_lo_w)
{
m_questions_loword_address &= 0xff00;
m_questions_loword_address |= data;
-};
+}
WRITE8_MEMBER(meritm_state::meritm_crt250_questions_hi_w)
{
m_questions_loword_address &= 0x00ff;
m_questions_loword_address |= (data << 8);
-};
+}
WRITE8_MEMBER(meritm_state::meritm_crt250_questions_bank_w)
{
@@ -466,7 +466,7 @@ WRITE8_MEMBER(meritm_state::meritm_crt250_questions_bank_w)
logerror( "Reading question byte at %06X\n", questions_address | m_questions_loword_address);
*dst = memregion("extra")->base()[questions_address | m_questions_loword_address];
}
-};
+}
/*************************************
@@ -490,7 +490,7 @@ WRITE8_MEMBER(meritm_state::meritm_ds1644_w)
}
//logerror( "Writing RTC, reg = %d, data = %x\n", offset, data);
}
-};
+}
UINT8 meritm_state::binary_to_BCD(UINT8 data)
{
@@ -517,7 +517,7 @@ READ8_MEMBER(meritm_state::meritm_ds1644_r)
m_ram[0x7fff] = binary_to_BCD(systime.local_time.year % 100);
}
return m_ram[rambank*0x2000 + 0x1ff8 + offset];
-};
+}
/*************************************
*
@@ -863,7 +863,7 @@ READ8_MEMBER(meritm_state::meritm_8255_port_c_r)
{
//logerror( "8255 port C read\n" );
return 0xff;
-};
+}
WRITE8_MEMBER(meritm_state::meritm_crt250_port_b_w)
{
@@ -891,7 +891,7 @@ WRITE8_MEMBER(meritm_state::meritm_crt250_port_b_w)
WRITE8_MEMBER(meritm_state::meritm_ay8930_port_b_w)
{
// lamps
-};
+}
/*************************************
*
@@ -917,7 +917,7 @@ READ8_MEMBER(meritm_state::meritm_audio_pio_port_a_r)
*/
return m_vint;
-};
+}
READ8_MEMBER(meritm_state::meritm_audio_pio_port_b_r)
{
@@ -937,7 +937,7 @@ READ8_MEMBER(meritm_state::meritm_audio_pio_port_b_r)
*/
return m_ds1204->read_dq();
-};
+}
WRITE8_MEMBER(meritm_state::meritm_audio_pio_port_a_w)
{
@@ -958,7 +958,7 @@ WRITE8_MEMBER(meritm_state::meritm_audio_pio_port_a_w)
m_bank = (data & 7) | ((data >> 2) & 0x18);
//logerror("Writing BANK with %x (raw = %x)\n", m_bank, data);
-};
+}
WRITE8_MEMBER(meritm_state::meritm_audio_pio_port_b_w)
{
@@ -980,7 +980,7 @@ WRITE8_MEMBER(meritm_state::meritm_audio_pio_port_b_w)
m_ds1204->write_rst((data >> 2) & 1);
m_ds1204->write_clk((data >> 1) & 1);
m_ds1204->write_dq(data & 0x01);
-};
+}
WRITE8_MEMBER(meritm_state::meritm_io_pio_port_a_w)
{
@@ -998,7 +998,7 @@ WRITE8_MEMBER(meritm_state::meritm_io_pio_port_a_w)
7 J3 PE7
*/
-};
+}
WRITE8_MEMBER(meritm_state::meritm_io_pio_port_b_w)
{
@@ -1016,7 +1016,7 @@ WRITE8_MEMBER(meritm_state::meritm_io_pio_port_b_w)
7 J3 PF7
*/
-};
+}
static const z80_daisy_config meritm_daisy_chain[] =
{
@@ -1031,7 +1031,7 @@ MACHINE_START_MEMBER(meritm_state,merit_common)
m_z80pio_0->strobe_b(1);
m_z80pio_1->strobe_a(1);
m_z80pio_1->strobe_b(1);
-};
+}
void meritm_state::machine_start()
{
@@ -1041,13 +1041,13 @@ void meritm_state::machine_start()
MACHINE_START_CALL_MEMBER(merit_common);
save_item(NAME(m_bank));
-};
+}
MACHINE_START_MEMBER(meritm_state,meritm_crt250_questions)
{
meritm_state::machine_start();
save_item(NAME(m_questions_loword_address));
-};
+}
MACHINE_START_MEMBER(meritm_state,meritm_crt250_crt252_crt258)
{
@@ -1069,7 +1069,7 @@ MACHINE_START_MEMBER(meritm_state,meritm_crt260)
save_item(NAME(m_bank));
save_item(NAME(m_psd_a15));
save_pointer(NAME(m_ram), 0x8000);
-};
+}
// from MSX2 driver, may be not accurate for merit games
#define MSX2_XBORDER_PIXELS 16
@@ -2277,7 +2277,7 @@ ROM_END
DRIVER_INIT_MEMBER(meritm_state,megat3te)
{
m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xfff8, 0xffff, read8_delegate(FUNC(meritm_state::meritm_ds1644_r), this), write8_delegate(FUNC(meritm_state::meritm_ds1644_w), this));
-};
+}
/* CRT-250 */
GAME( 1987, americna, 0, meritm_crt250, americna, driver_device, 0, ROT0, "Merit", "Americana (9131-00)", GAME_IMPERFECT_GRAPHICS )
diff --git a/src/mame/drivers/model2.c b/src/mame/drivers/model2.c
index 641c454ad4d..6b66fc9f2fd 100644
--- a/src/mame/drivers/model2.c
+++ b/src/mame/drivers/model2.c
@@ -129,7 +129,7 @@
enum {
DSP_TYPE_TGP = 1,
DSP_TYPE_SHARC = 2,
- DSP_TYPE_TGPX4 = 3,
+ DSP_TYPE_TGPX4 = 3
};
diff --git a/src/mame/drivers/multigam.c b/src/mame/drivers/multigam.c
index 9419839b329..3030c258208 100644
--- a/src/mame/drivers/multigam.c
+++ b/src/mame/drivers/multigam.c
@@ -379,14 +379,14 @@ WRITE8_MEMBER(multigam_state::multigam_switch_prg_rom)
memcpy(&dst[0x8000], &src[data*0x4000], 0x4000);
memcpy(&dst[0xc000], &src[data*0x4000], 0x4000);
}
-};
+}
WRITE8_MEMBER(multigam_state::multigam_switch_gfx_rom)
{
membank("bank1")->set_base(memregion("gfx1")->base() + (0x2000 * (data & 0x3f)));
set_mirroring(data & 0x40 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
m_game_gfx_bank = data;
-};
+}
WRITE8_MEMBER(multigam_state::multigam_mapper2_w)
@@ -631,7 +631,7 @@ void multigam_state::multigam_init_mmc3(UINT8 *prg_base, int prg_size, int chr_b
m_multigam3_mmc3_prg_base = prg_base;
m_multigam3_mmc3_chr_bank_base = chr_bank_base;
m_multigam3_mmc3_prg_size = prg_size;
-};
+}
WRITE8_MEMBER(multigam_state::multigm3_mapper2_w)
{
@@ -643,14 +643,14 @@ WRITE8_MEMBER(multigam_state::multigm3_mapper2_w)
{
logerror("Unmapped multigam_mapper2_w: offset = %04X, data = %02X\n", offset, data);
}
-};
+}
WRITE8_MEMBER(multigam_state::multigm3_switch_gfx_rom)
{
set_videorom_bank(0, 8, data & 0x3f, 8);
set_mirroring(data & 0x40 ? PPU_MIRROR_HORZ : PPU_MIRROR_VERT);
m_game_gfx_bank = data;
-};
+}
WRITE8_MEMBER(multigam_state::multigm3_switch_prg_rom)
{
@@ -682,7 +682,7 @@ WRITE8_MEMBER(multigam_state::multigm3_switch_prg_rom)
memcpy(&dst[0x8000], &src[data*0x4000], 0x4000);
memcpy(&dst[0xc000], &src[data*0x4000], 0x4000);
}
-};
+}
/******************************************************
@@ -889,7 +889,7 @@ void multigam_state::multigam_init_mmc1(UINT8 *prg_base, int prg_size, int chr_b
m_mmc1_chr_bank_base = chr_bank_base;
m_ppu->set_scanline_callback(ppu2c0x_scanline_delegate());
-};
+}
/******************************************************
@@ -1182,7 +1182,7 @@ MACHINE_RESET_MEMBER(multigam_state,multigm3)
address_space &space = m_maincpu->space(AS_PROGRAM);
/* reset the ppu */
multigm3_switch_prg_rom(space, 0, 0x01 );
-};
+}
void multigam_state::machine_start()
{
@@ -1217,7 +1217,7 @@ MACHINE_START_MEMBER(multigam_state,multigm3)
m_ppu->space(AS_PROGRAM).install_read_bank(0x1c00, 0x1fff, "bank9");
set_videorom_bank(0, 8, 0, 8);
-};
+}
MACHINE_START_MEMBER(multigam_state,supergm3)
{
@@ -1430,7 +1430,7 @@ void multigam_state::multigm3_decrypt(UINT8* mem, int memsize, const UINT8* deco
{
mem[i] = decode_nibble[mem[i] & 0x0f] | (decode_nibble[mem[i] >> 4] << 4);
}
-};
+}
DRIVER_INIT_MEMBER(multigam_state,multigm3)
{
@@ -1483,7 +1483,7 @@ DRIVER_INIT_MEMBER(multigam_state,multigmt)
}
multigam_switch_prg_rom(space, 0x0, 0x01);
-};
+}
GAME( 1992, multigam, 0, multigam, multigam, multigam_state, multigam, ROT0, "<unknown>", "Multi Game (set 1)", 0 )
GAME( 1992, multigmb, multigam, multigam, multigam, multigam_state, multigam, ROT0, "<unknown>", "Multi Game (set 2)", 0 )
diff --git a/src/mame/drivers/pong.c b/src/mame/drivers/pong.c
index 6a495760c60..4e29ead9ada 100644
--- a/src/mame/drivers/pong.c
+++ b/src/mame/drivers/pong.c
@@ -86,9 +86,9 @@ enum input_changed_enum
IC_VR2
};
-NETLIST_EXTERNAL(pongdoubles);
-NETLIST_EXTERNAL(pong_fast);
-NETLIST_EXTERNAL(breakout);
+NETLIST_EXTERNAL(pongdoubles)
+NETLIST_EXTERNAL(pong_fast)
+NETLIST_EXTERNAL(breakout)
class ttl_mono_state : public driver_device
{
diff --git a/src/mame/drivers/psikyosh.c b/src/mame/drivers/psikyosh.c
index 19eb3b07d4f..083a653e68d 100644
--- a/src/mame/drivers/psikyosh.c
+++ b/src/mame/drivers/psikyosh.c
@@ -434,7 +434,7 @@ P1KEY11 29|30 P2KEY11
KEY8 = 0x1000, // JAMMA P1 Left
KEY9 = 0x2000, // JAMMA P1 Right
KEY10 = 0x0020, // JAMMA P2 Right
- KEY11 = 0x0800, // JAMMA P1 Button 1
+ KEY11 = 0x0800 // JAMMA P1 Button 1
}; // Mahjong->JAMMA mapping specific to this game pcb
UINT16 key_codes[] = { // treated as IP_ACTIVE_LOW, game inverts them upon reading
diff --git a/src/mame/drivers/rastersp.c b/src/mame/drivers/rastersp.c
index 3b01e34fd03..a7397db632c 100644
--- a/src/mame/drivers/rastersp.c
+++ b/src/mame/drivers/rastersp.c
@@ -84,7 +84,7 @@ public:
SPORT_TIMER_COUNTER = 0x45,
SPORT_TIMER_PERIOD = 0x46,
SPORT_DATA_TX = 0x48,
- SPORT_DATA_RX = 0x4c,
+ SPORT_DATA_RX = 0x4c
};
enum irq_status
@@ -93,7 +93,7 @@ public:
IRQ_UART = 2,
IRQ_DSP = 4,
IRQ_VBLANK = 5,
- IRQ_SCSI = 7,
+ IRQ_SCSI = 7
};
required_device<cpu_device> m_maincpu;
diff --git a/src/mame/drivers/smsmcorp.c b/src/mame/drivers/smsmcorp.c
index 9797e7514e6..a99d68b16a2 100644
--- a/src/mame/drivers/smsmcorp.c
+++ b/src/mame/drivers/smsmcorp.c
@@ -286,7 +286,7 @@ READ8_MEMBER(smsmfg_state::link_r)
return m_communication_port_status;
}
return 0;
-};
+}
WRITE8_MEMBER(smsmfg_state::link_w)
{
diff --git a/src/mame/drivers/taitotz.c b/src/mame/drivers/taitotz.c
index 5c3c9865404..0ef77c8a859 100644
--- a/src/mame/drivers/taitotz.c
+++ b/src/mame/drivers/taitotz.c
@@ -652,7 +652,7 @@ private:
POLY_V = 2,
POLY_NX = 3,
POLY_NY = 4,
- POLY_NZ = 5,
+ POLY_NZ = 5
};
//static const float ZBUFFER_MAX = 10000000000.0f;
diff --git a/src/mame/drivers/tmaster.c b/src/mame/drivers/tmaster.c
index bf8a1312cc5..162e2c49ecc 100644
--- a/src/mame/drivers/tmaster.c
+++ b/src/mame/drivers/tmaster.c
@@ -227,7 +227,7 @@ WRITE_LINE_MEMBER(tmaster_state::write_oki_bank1)
WRITE_LINE_MEMBER(tmaster_state::duart_irq_handler)
{
m_maincpu->set_input_line_and_vector(4, state, m_duart->get_irq_vector());
-};
+}
/***************************************************************************
diff --git a/src/mame/drivers/ttchamp.c b/src/mame/drivers/ttchamp.c
index 48981ebf535..cf85d0a47e8 100644
--- a/src/mame/drivers/ttchamp.c
+++ b/src/mame/drivers/ttchamp.c
@@ -116,7 +116,7 @@ public:
PIC_SET_READADDRESS = 1,
PIC_SET_WRITEADDRESS = 2,
PIC_SET_WRITELATCH = 3,
- PIC_SET_READLATCH = 4,
+ PIC_SET_READLATCH = 4
} picmodex;
diff --git a/src/mame/drivers/vlc.c b/src/mame/drivers/vlc.c
index 6ad4eb24a36..10fbb98d550 100644
--- a/src/mame/drivers/vlc.c
+++ b/src/mame/drivers/vlc.c
@@ -329,7 +329,7 @@ void nevada_state::nvram_init(nvram_device &nvram, void *data, size_t size)
WRITE_LINE_MEMBER(nevada_state::duart18_irq_handler)
{
m_maincpu->set_input_line_and_vector(4, state, m_duart18_68681->get_irq_vector());
-};
+}
/***************************************************************************/
/***************************************************************************/
@@ -344,7 +344,7 @@ WRITE_LINE_MEMBER(nevada_state::duart18_irq_handler)
WRITE_LINE_MEMBER(nevada_state::duart39_irq_handler)
{
m_maincpu->set_input_line_and_vector(3, state, m_duart39_68681->get_irq_vector());
-};
+}
/***************************************************************************/
/***************************************************************************/
@@ -360,7 +360,7 @@ WRITE_LINE_MEMBER(nevada_state::duart39_irq_handler)
WRITE_LINE_MEMBER(nevada_state::duart40_irq_handler)
{
m_maincpu->set_input_line_and_vector(5, state, m_duart40_68681->get_irq_vector());
-};
+}
/***************************************************************************/
/********************* RTC SECTION ********************************/
diff --git a/src/mame/machine/inder_sb.c b/src/mame/machine/inder_sb.c
index 99b45e98568..5b62cabb5c8 100644
--- a/src/mame/machine/inder_sb.c
+++ b/src/mame/machine/inder_sb.c
@@ -26,10 +26,10 @@ inder_sb_device::inder_sb_device(const machine_config &mconfig, const char *tag,
// hacks for test purposes, these are installed over the program rom so we know when irqs are actually taken
-READ8_MEMBER(inder_sb_device::megaphx_02cc_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02cc\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[0] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02cc]; };
-READ8_MEMBER(inder_sb_device::megaphx_02e6_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02e6\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[1] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02e6]; };
-READ8_MEMBER(inder_sb_device::megaphx_0309_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0309\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[2] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0309]; };
-READ8_MEMBER(inder_sb_device::megaphx_0323_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0323\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[3] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0323]; };
+READ8_MEMBER(inder_sb_device::megaphx_02cc_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02cc\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[0] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02cc]; }
+READ8_MEMBER(inder_sb_device::megaphx_02e6_hack_r) { /*logerror("%04x audicpu IRQ hack 0x02e6\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[1] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x02e6]; }
+READ8_MEMBER(inder_sb_device::megaphx_0309_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0309\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[2] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0309]; }
+READ8_MEMBER(inder_sb_device::megaphx_0323_hack_r) { /*logerror("%04x audicpu IRQ hack 0x0323\n", machine().device("audiocpu")->safe_pc());*/ int bank = m_soundbank[3] & 7; membank("snddata")->set_entry(bank); return memregion("audiocpu")->base()[0x0323]; }
diff --git a/src/mame/machine/micro3d.c b/src/mame/machine/micro3d.c
index 9d825ff427d..9d9eb6c7f99 100644
--- a/src/mame/machine/micro3d.c
+++ b/src/mame/machine/micro3d.c
@@ -33,7 +33,7 @@
WRITE_LINE_MEMBER(micro3d_state::duart_irq_handler)
{
m_maincpu->set_input_line_and_vector(3, state, m_duart68681->get_irq_vector());
-};
+}
WRITE_LINE_MEMBER(micro3d_state::duart_txb)
{
@@ -41,7 +41,7 @@ WRITE_LINE_MEMBER(micro3d_state::duart_txb)
m_audiocpu->set_input_line(MCS51_RX_LINE, ASSERT_LINE);
// TODO: next line should be behind a timer callback which lasts one audiocpu clock cycle
m_audiocpu->set_input_line(MCS51_RX_LINE, CLEAR_LINE);
-};
+}
READ8_MEMBER(micro3d_state::data_to_i8031)
{
diff --git a/src/mame/machine/namcoio.h b/src/mame/machine/namcoio.h
index f8f7d9d6f15..70b9240db33 100644
--- a/src/mame/machine/namcoio.h
+++ b/src/mame/machine/namcoio.h
@@ -37,7 +37,7 @@ protected:
enum {
TYPE_NAMCO56XX,
TYPE_NAMCO58XX,
- TYPE_NAMCO59XX,
+ TYPE_NAMCO59XX
};
// internal state
diff --git a/src/mame/machine/playch10.c b/src/mame/machine/playch10.c
index 85792eefe67..44d35252341 100644
--- a/src/mame/machine/playch10.c
+++ b/src/mame/machine/playch10.c
@@ -1076,7 +1076,7 @@ WRITE8_MEMBER(playch10_state::hboard_rom_switch_w)
}
};
gboard_rom_switch_w(space,offset,data);
-};
+}
DRIVER_INIT_MEMBER(playch10_state,pchboard)
diff --git a/src/mame/video/k001005.h b/src/mame/video/k001005.h
index cd4418fadd2..779baa3cbd9 100644
--- a/src/mame/video/k001005.h
+++ b/src/mame/video/k001005.h
@@ -36,7 +36,7 @@ enum k001005_param
K001005_FOG_R,
K001005_FOG_G,
K001005_FOG_B,
- K001005_FAR_Z,
+ K001005_FAR_Z
};
diff --git a/src/mame/video/kaneko_tmap.c b/src/mame/video/kaneko_tmap.c
index fc181d924cc..d74b87f52d5 100644
--- a/src/mame/video/kaneko_tmap.c
+++ b/src/mame/video/kaneko_tmap.c
@@ -197,8 +197,8 @@ void kaneko_view2_tilemap_device::kaneko16_vram_w(offs_t offset, UINT16 data, UI
m_tmap[_N_]->mark_tile_dirty(offset/2);
}
-void kaneko_view2_tilemap_device::kaneko16_prepare(bitmap_ind16 &bitmap, const rectangle &cliprect) { kaneko16_prepare_common(bitmap, cliprect); };
-void kaneko_view2_tilemap_device::kaneko16_prepare(bitmap_rgb32 &bitmap, const rectangle &cliprect) { kaneko16_prepare_common(bitmap, cliprect); };
+void kaneko_view2_tilemap_device::kaneko16_prepare(bitmap_ind16 &bitmap, const rectangle &cliprect) { kaneko16_prepare_common(bitmap, cliprect); }
+void kaneko_view2_tilemap_device::kaneko16_prepare(bitmap_rgb32 &bitmap, const rectangle &cliprect) { kaneko16_prepare_common(bitmap, cliprect); }
template<class _BitmapClass>
void kaneko_view2_tilemap_device::kaneko16_prepare_common(_BitmapClass &bitmap, const rectangle &cliprect)
diff --git a/src/mame/video/micro3d.c b/src/mame/video/micro3d.c
index b1e41470df5..256624092b9 100644
--- a/src/mame/video/micro3d.c
+++ b/src/mame/video/micro3d.c
@@ -27,7 +27,7 @@ enum
{
STATE_DRAW_CMD,
STATE_DRAW_CMD_DATA,
- STATE_DRAW_VTX_DATA,
+ STATE_DRAW_VTX_DATA
};
diff --git a/src/mame/video/rltennis.c b/src/mame/video/rltennis.c
index 84b0c6514b0..0600a31899f 100644
--- a/src/mame/video/rltennis.c
+++ b/src/mame/video/rltennis.c
@@ -83,7 +83,7 @@ enum
BLT_FLAGS,
BLT_UNK,
BLT_START,
- BLT_UNK2,
+ BLT_UNK2
};
enum
@@ -91,7 +91,7 @@ enum
BITMAP_BG=0,
BITMAP_FG_1,
BITMAP_FG_2,
- BITMAP_FG_DISPLAY,
+ BITMAP_FG_DISPLAY
};
#define BLTFLAG_DST_X_DIR (1<<0)
diff --git a/src/mame/video/segas24.c b/src/mame/video/segas24.c
index 3a9c0f24a6a..f8e19e7aeb5 100644
--- a/src/mame/video/segas24.c
+++ b/src/mame/video/segas24.c
@@ -28,7 +28,7 @@ namespace {
segas24_mixer *mixer;
};
-};
+}
UINT32 segas24_state::screen_update_system24(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect)
{
diff --git a/src/mess/drivers/esq5505.c b/src/mess/drivers/esq5505.c
index f4ec6522e24..69f3c380971 100644
--- a/src/mess/drivers/esq5505.c
+++ b/src/mess/drivers/esq5505.c
@@ -448,7 +448,7 @@ WRITE_LINE_MEMBER(esq5505_state::duart_irq_handler)
duart_irq_state = 0;
}
update_irq_to_maincpu();
-};
+}
WRITE8_MEMBER(esq5505_state::duart_output)
{
diff --git a/src/mess/includes/hec2hrp.h b/src/mess/includes/hec2hrp.h
index 12f793231b7..c30b7bfccd3 100644
--- a/src/mess/includes/hec2hrp.h
+++ b/src/mess/includes/hec2hrp.h
@@ -88,7 +88,7 @@ public:
m_floppy0(*this, "wd179x:0")
{}
- DECLARE_FLOPPY_FORMATS(minidisc_formats)
+ DECLARE_FLOPPY_FORMATS(minidisc_formats);
required_device<cpu_device> m_maincpu;
optional_device<cpu_device> m_disc2cpu;
diff --git a/src/mess/includes/next.h b/src/mess/includes/next.h
index 44b2f2e1de0..25bc09cdaa5 100644
--- a/src/mess/includes/next.h
+++ b/src/mess/includes/next.h
@@ -141,7 +141,7 @@ protected:
DMA_SUPDATE = 0x02,
DMA_READ = 0x04,
DMA_COMPLETE = 0x08,
- DMA_BUSEXC = 0x10,
+ DMA_BUSEXC = 0x10
};
static const char *dma_targets[0x20];
diff --git a/src/mess/includes/z80ne.h b/src/mess/includes/z80ne.h
index b7dbfc9f8c5..b6d77971981 100644
--- a/src/mess/includes/z80ne.h
+++ b/src/mess/includes/z80ne.h
@@ -103,7 +103,7 @@ public:
m_io_modifiers(*this, "MODIFIERS"),
m_io_config(*this, "CONFIG") { }
- DECLARE_FLOPPY_FORMATS(floppy_formats)
+ DECLARE_FLOPPY_FORMATS(floppy_formats);
optional_device<mc6847_base_device> m_vdg;
optional_shared_ptr<UINT8> m_videoram;