summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Cowering <cowering@users.noreply.github.com>2015-06-30 09:02:11 -0500
committer Cowering <cowering@users.noreply.github.com>2015-07-08 23:37:59 -0500
commit8db46d73a25701178d8acc93510a6e81a86b3c4b (patch)
tree9248dd9388fb86f64be05e7d9c06b20f1bb3950c
parent1a32c4b76007999073b353532f74e7acee4b0491 (diff)
more pedantic fixes (NW)
-rw-r--r--src/emu/bus/a2bus/corvfdc02.c2
-rw-r--r--src/emu/bus/centronics/epson_lx810l.h2
-rw-r--r--src/emu/bus/ecbbus/grip.c2
-rw-r--r--src/emu/bus/gameboy/mbc.h2
-rw-r--r--src/emu/bus/isa/ibm_mfc.c4
-rw-r--r--src/emu/bus/isa/omti8621.c4
-rw-r--r--src/emu/bus/isa/sc499.c2
-rw-r--r--src/emu/bus/nubus/nubus_image.c2
-rw-r--r--src/emu/bus/nubus/nubus_radiustpd.c2
-rw-r--r--src/emu/bus/nubus/nubus_wsportrait.c2
-rw-r--r--src/emu/bus/psx/ctlrport.h2
-rw-r--r--src/emu/bus/ti99_peb/peribox.c8
-rw-r--r--src/emu/bus/wangpc/wdc.c16
-rw-r--r--src/emu/cpu/arcompact/arcompactdasm.c2
-rw-r--r--src/emu/cpu/hd61700/hd61700d.c2
-rw-r--r--src/emu/cpu/lh5801/5801dasm.c2
-rw-r--r--src/emu/cpu/mc68hc11/hc11dasm.c2
-rw-r--r--src/emu/cpu/mcs51/mcs51dasm.c2
-rw-r--r--src/emu/cpu/powerpc/ppc_dasm.c2
-rw-r--r--src/emu/cpu/sm8500/sm8500d.c4
-rw-r--r--src/emu/cpu/tlcs900/dasm900.c2
-rw-r--r--src/emu/machine/53c7xx.h8
-rw-r--r--src/emu/machine/6850acia.c2
-rw-r--r--src/emu/machine/68561mpcc.h2
-rw-r--r--src/emu/machine/8530scc.h2
-rw-r--r--src/emu/machine/eeprompar.c2
-rw-r--r--src/emu/machine/eepromser.c2
-rw-r--r--src/emu/machine/hd64610.c2
-rw-r--r--src/emu/machine/i8255.c2
-rw-r--r--src/emu/machine/i8257.c2
-rw-r--r--src/emu/machine/idehd.h2
-rw-r--r--src/emu/machine/ins8250.h2
-rw-r--r--src/emu/machine/mc146818.h2
-rw-r--r--src/emu/machine/mc68681.c14
-rw-r--r--src/emu/machine/mcf5206e.c112
-rw-r--r--src/emu/machine/microtch.c2
-rw-r--r--src/emu/machine/mm58274c.c2
-rw-r--r--src/emu/machine/ncr5380n.h8
-rw-r--r--src/emu/machine/ncr5390.h8
-rw-r--r--src/emu/machine/nmc9306.c2
-rw-r--r--src/emu/machine/nscsi_bus.h20
-rw-r--r--src/emu/machine/pit8253.c4
-rw-r--r--src/emu/machine/rtc9701.h2
-rw-r--r--src/emu/machine/t10mmc.h2
-rw-r--r--src/emu/machine/tms9902.c2
-rw-r--r--src/emu/machine/x76f041.h2
-rw-r--r--src/emu/sound/pokey.c2
-rw-r--r--src/emu/video/crt9007.c2
-rw-r--r--src/emu/video/hd44780.h5
-rw-r--r--src/emu/video/mc6845.c2
-rw-r--r--src/emu/video/mc6847.h4
-rw-r--r--src/mame/machine/315-5838_317-0229_comp.h2
-rw-r--r--src/mame/machine/atarigen.h2
-rw-r--r--src/mame/machine/cdicdic.c28
-rw-r--r--src/mame/machine/cdislave.c4
-rw-r--r--src/mame/video/atarimo.h2
-rw-r--r--src/mame/video/mcd212.c6
-rw-r--r--src/mame/video/vectrex.c2
-rw-r--r--src/mess/audio/mea8000.h2
-rw-r--r--src/mess/drivers/abc80.c6
-rw-r--r--src/mess/drivers/ace.c4
-rw-r--r--src/mess/drivers/alphatro.c2
-rw-r--r--src/mess/drivers/chessmst.c2
-rw-r--r--src/mess/drivers/dectalk.c2
-rw-r--r--src/mess/drivers/esq1.c2
-rw-r--r--src/mess/drivers/esqkt.c2
-rw-r--r--src/mess/drivers/fidelz80.c4
-rw-r--r--src/mess/drivers/nascom1.c2
-rw-r--r--src/mess/drivers/ngp.c2
-rw-r--r--src/mess/drivers/px8.c2
-rw-r--r--src/mess/drivers/sc2.c2
-rw-r--r--src/mess/drivers/sgi_ip2.c4
-rw-r--r--src/mess/drivers/vii.c2
-rw-r--r--src/mess/drivers/xerox820.c4
-rw-r--r--src/mess/includes/coco.h2
-rw-r--r--src/mess/includes/hp48.h2
-rw-r--r--src/mess/machine/mac.c2
-rw-r--r--src/mess/machine/mbc55x.c3
-rw-r--r--src/mess/machine/mbee.c2
-rw-r--r--src/mess/machine/rmnimbus.c3
-rw-r--r--src/mess/machine/ti99/gromport.c8
-rw-r--r--src/mess/machine/upd65031.c2
-rw-r--r--src/mess/machine/zx8302.h6
-rw-r--r--src/mess/video/apollo.c2
-rw-r--r--src/mess/video/cgc7900.c2
-rw-r--r--src/mess/video/mbc55x.c3
-rw-r--r--src/mess/video/pc1512.c2
-rw-r--r--src/mess/video/rmnimbus.c3
88 files changed, 213 insertions, 212 deletions
diff --git a/src/emu/bus/a2bus/corvfdc02.c b/src/emu/bus/a2bus/corvfdc02.c
index 38669039137..eaad8725d1f 100644
--- a/src/emu/bus/a2bus/corvfdc02.c
+++ b/src/emu/bus/a2bus/corvfdc02.c
@@ -221,7 +221,7 @@ void a2bus_corvfdc02_device::write_c0nx(address_space &space, UINT8 offset, UINT
break;
}
- logerror("corvfdc02: selecting drive %d: %p\n", data & 3, floppy);
+ logerror("corvfdc02: selecting drive %d: %p\n", data & 3, (void *) floppy);
if (floppy != m_curfloppy)
{
diff --git a/src/emu/bus/centronics/epson_lx810l.h b/src/emu/bus/centronics/epson_lx810l.h
index 972805438bc..71bcc68db6a 100644
--- a/src/emu/bus/centronics/epson_lx810l.h
+++ b/src/emu/bus/centronics/epson_lx810l.h
@@ -116,7 +116,7 @@ private:
UINT8 m_fakemem;
enum {
- TIMER_CR,
+ TIMER_CR
};
};
diff --git a/src/emu/bus/ecbbus/grip.c b/src/emu/bus/ecbbus/grip.c
index 4bf0bdefca4..f2db25938d8 100644
--- a/src/emu/bus/ecbbus/grip.c
+++ b/src/emu/bus/ecbbus/grip.c
@@ -879,7 +879,7 @@ UINT8 grip_device::ecbbus_io_r(offs_t offset)
}
return data;
-};
+}
//-------------------------------------------------
diff --git a/src/emu/bus/gameboy/mbc.h b/src/emu/bus/gameboy/mbc.h
index 199501f5261..3ad27d2cdee 100644
--- a/src/emu/bus/gameboy/mbc.h
+++ b/src/emu/bus/gameboy/mbc.h
@@ -38,7 +38,7 @@ public:
enum {
MODE_16M_64k = 0, /// 16Mbit ROM, 64kBit RAM
- MODE_4M_256k = 1, /// 4Mbit ROM, 256kBit RAM
+ MODE_4M_256k = 1 /// 4Mbit ROM, 256kBit RAM
};
// construction/destruction
diff --git a/src/emu/bus/isa/ibm_mfc.c b/src/emu/bus/isa/ibm_mfc.c
index bfe265f9e10..293162aa70a 100644
--- a/src/emu/bus/isa/ibm_mfc.c
+++ b/src/emu/bus/isa/ibm_mfc.c
@@ -44,7 +44,7 @@ enum
PC_IRQ_TIMERA,
PC_IRQ_TIMERB,
PC_IRQ_RXRDY,
- PC_IRQ_TXRDY,
+ PC_IRQ_TXRDY
};
enum
@@ -53,7 +53,7 @@ enum
Z80_IRQ_RXRDY,
Z80_IRQ_TXRDY,
Z80_IRQ_MIDI_RXRDY,
- Z80_IRQ_MIDI_TXRDY,
+ Z80_IRQ_MIDI_TXRDY
};
diff --git a/src/emu/bus/isa/omti8621.c b/src/emu/bus/isa/omti8621.c
index 5478737a38d..96b1214ff85 100644
--- a/src/emu/bus/isa/omti8621.c
+++ b/src/emu/bus/isa/omti8621.c
@@ -140,7 +140,7 @@ enum {
OMTI_STATE_SELECTION,
OMTI_STATE_COMMAND,
OMTI_STATE_DATA,
- OMTI_STATE_STATUS,
+ OMTI_STATE_STATUS
};
// OMTI commands
@@ -1285,7 +1285,7 @@ omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, co
void omti_disk_image_device::device_config_complete()
{
update_names(OMTI_DISK, "disk", "disk");
-};
+}
/***************************************************************************
diff --git a/src/emu/bus/isa/sc499.c b/src/emu/bus/isa/sc499.c
index 6289044e261..ea6969afe1a 100644
--- a/src/emu/bus/isa/sc499.c
+++ b/src/emu/bus/isa/sc499.c
@@ -1287,7 +1287,7 @@ sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig
void sc499_ctape_image_device::device_config_complete()
{
update_names(SC499_CTAPE, "ctape", "ct");
-};
+}
UINT8 *sc499_ctape_image_device::read_block(int block_num)
diff --git a/src/emu/bus/nubus/nubus_image.c b/src/emu/bus/nubus/nubus_image.c
index d002a3badca..6b929c98270 100644
--- a/src/emu/bus/nubus/nubus_image.c
+++ b/src/emu/bus/nubus/nubus_image.c
@@ -77,7 +77,7 @@ messimg_disk_image_device::messimg_disk_image_device(const machine_config &mconf
void messimg_disk_image_device::device_config_complete()
{
update_names(MESSIMG_DISK, "disk", "disk");
-};
+}
/*-------------------------------------------------
diff --git a/src/emu/bus/nubus/nubus_radiustpd.c b/src/emu/bus/nubus/nubus_radiustpd.c
index 1ace166e020..3b30fc4a384 100644
--- a/src/emu/bus/nubus/nubus_radiustpd.c
+++ b/src/emu/bus/nubus/nubus_radiustpd.c
@@ -97,7 +97,7 @@ void nubus_radiustpd_device::device_start()
slotspace = get_slotspace();
- printf("[radiustpd %p] slotspace = %x\n", this, slotspace);
+ printf("[radiustpd %p] slotspace = %x\n", (void *)this, slotspace);
m_vram.resize(VRAM_SIZE);
m_vram32 = (UINT32 *)&m_vram[0];
diff --git a/src/emu/bus/nubus/nubus_wsportrait.c b/src/emu/bus/nubus/nubus_wsportrait.c
index 5dfaf45f6a2..3f00160ba40 100644
--- a/src/emu/bus/nubus/nubus_wsportrait.c
+++ b/src/emu/bus/nubus/nubus_wsportrait.c
@@ -100,7 +100,7 @@ void nubus_wsportrait_device::device_start()
slotspace = get_slotspace();
- printf("[wsportrait %p] slotspace = %x\n", this, slotspace);
+ printf("[wsportrait %p] slotspace = %x\n", (void *)this, slotspace);
m_vram.resize(VRAM_SIZE);
m_vram32 = (UINT32 *)&m_vram[0];
diff --git a/src/emu/bus/psx/ctlrport.h b/src/emu/bus/psx/ctlrport.h
index 2d02cf31c14..2e7a35d2d9d 100644
--- a/src/emu/bus/psx/ctlrport.h
+++ b/src/emu/bus/psx/ctlrport.h
@@ -39,7 +39,7 @@ protected:
enum
{
QUERY_PAD_STATE = 0x42,
- CONFIG_MODE = 0x43,
+ CONFIG_MODE = 0x43
};
private:
diff --git a/src/emu/bus/ti99_peb/peribox.c b/src/emu/bus/ti99_peb/peribox.c
index bac6597967c..9d5024e7fa6 100644
--- a/src/emu/bus/ti99_peb/peribox.c
+++ b/src/emu/bus/ti99_peb/peribox.c
@@ -450,7 +450,7 @@ peribox_gen_device::peribox_gen_device(const machine_config &mconfig, const char
// a maximum address space of 512 KiB in the box. With the Genmod
// modification, the full 2 MiB space is available.
m_address_prefix = 0x00000;
-};
+}
// The BwG controller will not run with the Geneve due to its wait state
// logic; it assumes that before reading 5FF6 (data register), address 5FF7
@@ -501,7 +501,7 @@ peribox_998_device::peribox_998_device(const machine_config &mconfig, const char
: peribox_device(mconfig, PERIBOX_998, "Peripheral expansion box 99/8", tag, owner, clock, "peribox_998", __FILE__)
{
m_address_prefix = 0x70000;
-};
+}
// The BwG controller will not run with the TI-99/8 for the same reason why
// it won't work with the Geneve.
@@ -540,7 +540,7 @@ peribox_sg_device::peribox_sg_device(const machine_config &mconfig, const char *
: peribox_device(mconfig, PERIBOX_SG, "Peripheral expansion box SGCPU", tag, owner, clock, "peribox_sg", __FILE__)
{
m_address_prefix = 0x70000;
-};
+}
SLOT_INTERFACE_START( peribox_slotp )
SLOT_INTERFACE("pcode", TI99_P_CODE)
@@ -581,7 +581,7 @@ peribox_ev_device::peribox_ev_device(const machine_config &mconfig, const char *
: peribox_device(mconfig, PERIBOX_EV, "Peripheral expansion box EVPC", tag, owner, clock, "peribox_ev", __FILE__)
{
m_address_prefix = 0x70000;
-};
+}
MACHINE_CONFIG_FRAGMENT( peribox_ev_device )
MCFG_PERIBOX_SLOT_ADD_DEF( PEBSLOT2, peribox_ev_slot, "evpc" )
diff --git a/src/emu/bus/wangpc/wdc.c b/src/emu/bus/wangpc/wdc.c
index cfb0307473d..4e4e8fb92bc 100644
--- a/src/emu/bus/wangpc/wdc.c
+++ b/src/emu/bus/wangpc/wdc.c
@@ -332,11 +332,11 @@ WRITE8_MEMBER( wangpc_wdc_device::status_w )
}
-READ8_MEMBER( wangpc_wdc_device::ctc_ch0_r ) { return m_ctc->read(space, 0); };
-WRITE8_MEMBER( wangpc_wdc_device::ctc_ch0_w ) { m_ctc->write(space, 0, data); };
-READ8_MEMBER( wangpc_wdc_device::ctc_ch1_r ) { return m_ctc->read(space, 1); };
-WRITE8_MEMBER( wangpc_wdc_device::ctc_ch1_w ) { m_ctc->write(space, 1, data); };
-READ8_MEMBER( wangpc_wdc_device::ctc_ch2_r ) { return m_ctc->read(space, 2); };
-WRITE8_MEMBER( wangpc_wdc_device::ctc_ch2_w ) { m_ctc->write(space, 2, data); };
-READ8_MEMBER( wangpc_wdc_device::ctc_ch3_r ) { return m_ctc->read(space, 3); };
-WRITE8_MEMBER( wangpc_wdc_device::ctc_ch3_w ) { m_ctc->write(space, 3, data); };
+READ8_MEMBER( wangpc_wdc_device::ctc_ch0_r ) { return m_ctc->read(space, 0); }
+WRITE8_MEMBER( wangpc_wdc_device::ctc_ch0_w ) { m_ctc->write(space, 0, data); }
+READ8_MEMBER( wangpc_wdc_device::ctc_ch1_r ) { return m_ctc->read(space, 1); }
+WRITE8_MEMBER( wangpc_wdc_device::ctc_ch1_w ) { m_ctc->write(space, 1, data); }
+READ8_MEMBER( wangpc_wdc_device::ctc_ch2_r ) { return m_ctc->read(space, 2); }
+WRITE8_MEMBER( wangpc_wdc_device::ctc_ch2_w ) { m_ctc->write(space, 2, data); }
+READ8_MEMBER( wangpc_wdc_device::ctc_ch3_r ) { return m_ctc->read(space, 3); }
+WRITE8_MEMBER( wangpc_wdc_device::ctc_ch3_w ) { m_ctc->write(space, 3, data); }
diff --git a/src/emu/cpu/arcompact/arcompactdasm.c b/src/emu/cpu/arcompact/arcompactdasm.c
index aeb0c8747ac..0b917a05d56 100644
--- a/src/emu/cpu/arcompact/arcompactdasm.c
+++ b/src/emu/cpu/arcompact/arcompactdasm.c
@@ -22,7 +22,7 @@
#define ARCOMPACT_OPERATION ((op & 0xf800) >> 11)
-extern char *output;;
+extern char *output;
CPU_DISASSEMBLE(arcompact)
{
diff --git a/src/emu/cpu/hd61700/hd61700d.c b/src/emu/cpu/hd61700/hd61700d.c
index 6f1e29cd90f..719fade4f49 100644
--- a/src/emu/cpu/hd61700/hd61700d.c
+++ b/src/emu/cpu/hd61700/hd61700d.c
@@ -38,7 +38,7 @@ enum
OP_REG8_,
OP_REGIM8,
OP_RMSIM3,
- OP_RSIR,
+ OP_RSIR
};
struct hd61700_dasm
diff --git a/src/emu/cpu/lh5801/5801dasm.c b/src/emu/cpu/lh5801/5801dasm.c
index ef812756d4e..b622bda9de6 100644
--- a/src/emu/cpu/lh5801/5801dasm.c
+++ b/src/emu/cpu/lh5801/5801dasm.c
@@ -85,7 +85,7 @@ enum Ins
OFF, // clears bf flip flop
RDP, SDP,// reset display flip flop
RPU, SPU,// flip flop pu off
- RPV, SPV,// flip flop pv off
+ RPV, SPV // flip flop pv off
};
static const char *const InsNames[]={
diff --git a/src/emu/cpu/mc68hc11/hc11dasm.c b/src/emu/cpu/mc68hc11/hc11dasm.c
index bab28c654bc..eed3df13c5e 100644
--- a/src/emu/cpu/mc68hc11/hc11dasm.c
+++ b/src/emu/cpu/mc68hc11/hc11dasm.c
@@ -25,7 +25,7 @@ enum
EA_IND_Y_IMM8_REL,
PAGE2,
PAGE3,
- PAGE4,
+ PAGE4
};
struct M68HC11_OPCODE {
diff --git a/src/emu/cpu/mcs51/mcs51dasm.c b/src/emu/cpu/mcs51/mcs51dasm.c
index 0d16048855f..9c0758c4e35 100644
--- a/src/emu/cpu/mcs51/mcs51dasm.c
+++ b/src/emu/cpu/mcs51/mcs51dasm.c
@@ -34,7 +34,7 @@ enum
FEATURE_CMOS = 0x02,
FEATURE_I80C52 = 0x04,
FEATURE_DS5002FP = 0x08,
- FEATURE_I83C751 = 0x08,
+ FEATURE_I83C751 = 0x08
};
diff --git a/src/emu/cpu/powerpc/ppc_dasm.c b/src/emu/cpu/powerpc/ppc_dasm.c
index e1ccb28591c..d80f800c89b 100644
--- a/src/emu/cpu/powerpc/ppc_dasm.c
+++ b/src/emu/cpu/powerpc/ppc_dasm.c
@@ -80,7 +80,7 @@ enum
F_FRT_FRA_FRC, // frT, frA, frC
F_RA_RT_SH_MB_ME, // rA, rT, SH, MB, ME
F_RLWNMx, // rT, rA, rB, MB, ME only used by RLWNMx
- F_RT_RB, // rT, rB
+ F_RT_RB // rT, rB
};
/*
diff --git a/src/emu/cpu/sm8500/sm8500d.c b/src/emu/cpu/sm8500/sm8500d.c
index be8fc0f0549..06b37795d54 100644
--- a/src/emu/cpu/sm8500/sm8500d.c
+++ b/src/emu/cpu/sm8500/sm8500d.c
@@ -27,7 +27,7 @@ enum e_mnemonics
z5A, z5B,
/* more complicated instructions */
-z1A, z1B, z4F,
+z1A, z1B, z4F
};
/* instructions not found:
@@ -86,7 +86,7 @@ enum e_addrmodes {
AM_R=1, AM_rr, AM_r1, AM_S, AM_rmb, AM_mbr, AM_Ri, AM_rmw, AM_mwr, AM_smw, AM_mws,
AM_Sw, AM_iR, AM_rbr, AM_riw, AM_cjp, AM_rib, AM_pi, AM_cbr, AM_i, AM_ii,
AM_ss, AM_RR, AM_2, AM_SS, AM_bR, AM_Rbr, AM_Rb, AM_rR, AM_Rr, AM_Rii, AM_RiR,
- AM_riB, AM_iS, AM_CALS, AM_bid, AM_1A, AM_1B, AM_4F,
+ AM_riB, AM_iS, AM_CALS, AM_bid, AM_1A, AM_1B, AM_4F
};
static const sm8500dasm mnemonic[256] = {
diff --git a/src/emu/cpu/tlcs900/dasm900.c b/src/emu/cpu/tlcs900/dasm900.c
index 4d13d6cd322..7231a2f4759 100644
--- a/src/emu/cpu/tlcs900/dasm900.c
+++ b/src/emu/cpu/tlcs900/dasm900.c
@@ -86,7 +86,7 @@ enum e_operand
O_M8, /* (8) */
O_M16, /* (i16) */
O_R, /* register */
- O_SR, /* status register */
+ O_SR /* status register */
};
diff --git a/src/emu/machine/53c7xx.h b/src/emu/machine/53c7xx.h
index 877a0d5293c..937bd9d16a0 100644
--- a/src/emu/machine/53c7xx.h
+++ b/src/emu/machine/53c7xx.h
@@ -98,14 +98,14 @@ private:
{
STATE_MASK = 0x00ff,
SUB_SHIFT = 8,
- SUB_MASK = 0xff00,
+ SUB_MASK = 0xff00
};
enum
{
MODE_I,
MODE_T,
- MODE_D,
+ MODE_D
};
enum scsi_state
@@ -131,7 +131,7 @@ private:
SEND_WAIT_SETTLE,
RECV_WAIT_SETTLE,
RECV_WAIT_REQ_0,
- RECV_WAIT_REQ_1,
+ RECV_WAIT_REQ_1
};
void update_irqs();
@@ -148,7 +148,7 @@ private:
SCRIPTS_IDLE,
SCRIPTS_WAIT_MANUAL_START,
SCRIPTS_FETCH,
- SCRIPTS_EXECUTE,
+ SCRIPTS_EXECUTE
};
void set_scripts_state(scripts_state state);
diff --git a/src/emu/machine/6850acia.c b/src/emu/machine/6850acia.c
index 6058588a54d..7c1fcc85178 100644
--- a/src/emu/machine/6850acia.c
+++ b/src/emu/machine/6850acia.c
@@ -258,7 +258,7 @@ WRITE8_MEMBER( acia6850_device::data_w )
/// TODO: find out if data stored during master reset is sent after divider is set
if (m_divide == 0)
{
- logerror("%s:ACIA %p: Data write while in reset!\n", machine().describe_context(), this);
+ logerror("%s:ACIA %p: Data write while in reset!\n", machine().describe_context(), (void *)this);
}
/// TODO: find out what happens if TDRE is already clear when you write
diff --git a/src/emu/machine/68561mpcc.h b/src/emu/machine/68561mpcc.h
index 8a7d8783c58..df036282f1c 100644
--- a/src/emu/machine/68561mpcc.h
+++ b/src/emu/machine/68561mpcc.h
@@ -28,7 +28,7 @@ public:
IRQ_A_TX,
IRQ_B_TX,
IRQ_A_EXT,
- IRQ_B_EXT,
+ IRQ_B_EXT
};
mpcc68561_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/emu/machine/8530scc.h b/src/emu/machine/8530scc.h
index 0a42bfd3405..af4cef88e1e 100644
--- a/src/emu/machine/8530scc.h
+++ b/src/emu/machine/8530scc.h
@@ -26,7 +26,7 @@ public:
IRQ_A_TX,
IRQ_B_TX,
IRQ_A_EXT,
- IRQ_B_EXT,
+ IRQ_B_EXT
};
scc8530_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
diff --git a/src/emu/machine/eeprompar.c b/src/emu/machine/eeprompar.c
index 1e70085a6e6..af575ec1419 100644
--- a/src/emu/machine/eeprompar.c
+++ b/src/emu/machine/eeprompar.c
@@ -120,7 +120,7 @@ eeprom_parallel_##_lowercase##_device::eeprom_parallel_##_lowercase##_device(con
: eeprom_parallel_##_baseclass##_device(mconfig, EEPROM_PARALLEL_##_uppercase, "Parallel EEPROM " #_uppercase " (" #_cells "x" #_bits ")", tag, owner, #_lowercase, __FILE__) \
{ \
static_set_size(*this, _cells, _bits); \
-}; \
+} \
const device_type EEPROM_PARALLEL_##_uppercase = &device_creator<eeprom_parallel_##_lowercase##_device>;
// standard 28XX class of 8-bit EEPROMs
DEFINE_PARALLEL_EEPROM_DEVICE(28xx, 2804, 2804, 8, 512)
diff --git a/src/emu/machine/eepromser.c b/src/emu/machine/eepromser.c
index 3b1f05bdc94..347accae06f 100644
--- a/src/emu/machine/eepromser.c
+++ b/src/emu/machine/eepromser.c
@@ -1132,7 +1132,7 @@ eeprom_serial_##_lowercase##_##_bits##bit_device::eeprom_serial_##_lowercase##_#
{ \
static_set_size(*this, _cells, _bits); \
static_set_address_bits(*this, _addrbits); \
-}; \
+} \
const device_type EEPROM_SERIAL_##_uppercase##_##_bits##BIT = &device_creator<eeprom_serial_##_lowercase##_##_bits##bit_device>;
// standard 93CX6 class of 16-bit EEPROMs
DEFINE_SERIAL_EEPROM_DEVICE(93cxx, 93c06, 93C06, 16, 16, 6)
diff --git a/src/emu/machine/hd64610.c b/src/emu/machine/hd64610.c
index c56775e486f..d4639892e17 100644
--- a/src/emu/machine/hd64610.c
+++ b/src/emu/machine/hd64610.c
@@ -46,7 +46,7 @@ enum
REG_DAY_OF_THE_WEEK_ALARM,
REG_DAY_ALARM,
REG_CRA,
- REG_CRB,
+ REG_CRB
};
diff --git a/src/emu/machine/i8255.c b/src/emu/machine/i8255.c
index acaef0f372a..7725565cde2 100644
--- a/src/emu/machine/i8255.c
+++ b/src/emu/machine/i8255.c
@@ -44,7 +44,7 @@ enum
enum
{
MODE_OUTPUT = 0,
- MODE_INPUT,
+ MODE_INPUT
};
diff --git a/src/emu/machine/i8257.c b/src/emu/machine/i8257.c
index f6616de3a61..23abcc3915c 100644
--- a/src/emu/machine/i8257.c
+++ b/src/emu/machine/i8257.c
@@ -53,7 +53,7 @@ enum
STATE_S2,
STATE_S3,
STATE_SW,
- STATE_S4,
+ STATE_S4
};
diff --git a/src/emu/machine/idehd.h b/src/emu/machine/idehd.h
index 0c999a76fd2..beacb0a25c4 100644
--- a/src/emu/machine/idehd.h
+++ b/src/emu/machine/idehd.h
@@ -107,7 +107,7 @@ protected:
enum
{
- TID_NULL = TID_BUSY + 1,
+ TID_NULL = TID_BUSY + 1
};
private:
diff --git a/src/emu/machine/ins8250.h b/src/emu/machine/ins8250.h
index a369f05c9b4..9415c2b70ce 100644
--- a/src/emu/machine/ins8250.h
+++ b/src/emu/machine/ins8250.h
@@ -56,7 +56,7 @@ protected:
TYPE_INS8250A,
TYPE_NS16450,
TYPE_NS16550,
- TYPE_NS16550A,
+ TYPE_NS16550A
};
int m_device_type;
struct {
diff --git a/src/emu/machine/mc146818.h b/src/emu/machine/mc146818.h
index d07b78eea4a..3db19ec533e 100644
--- a/src/emu/machine/mc146818.h
+++ b/src/emu/machine/mc146818.h
@@ -113,7 +113,7 @@ private:
REG_B_UIE = 16,
REG_B_AIE = 32,
REG_B_PIE = 64,
- REG_B_SET = 128,
+ REG_B_SET = 128
};
enum
diff --git a/src/emu/machine/mc68681.c b/src/emu/machine/mc68681.c
index be9d65c3546..8b40488de24 100644
--- a/src/emu/machine/mc68681.c
+++ b/src/emu/machine/mc68681.c
@@ -174,7 +174,7 @@ void mc68681_device::update_interrupts()
write_irq(CLEAR_LINE);
m_read_vector = false; // clear IACK too
}
-};
+}
double mc68681_device::duart68681_get_ct_rate()
{
@@ -286,7 +286,7 @@ TIMER_CALLBACK_MEMBER( mc68681_device::duart_timer_callback )
duart68681_start_ct(0xffff);
}
-};
+}
READ8_MEMBER( mc68681_device::read )
{
@@ -630,7 +630,7 @@ int mc68681_device::calc_baud(int ch, UINT8 data)
}
return baud_rate;
-};
+}
void mc68681_device::clear_ISR_bits(int mask)
{
@@ -901,7 +901,7 @@ UINT8 mc68681_channel::read_rx_fifo()
// printf("Rx read %02x\n", rv);
return rv;
-};
+}
UINT8 mc68681_channel::read_chan_reg(int reg)
{
@@ -976,7 +976,7 @@ void mc68681_channel::write_MR(UINT8 data)
}
recalc_framing();
update_interrupts();
-};
+}
void mc68681_channel::recalc_framing()
{
@@ -1114,7 +1114,7 @@ void mc68681_channel::write_CR(UINT8 data)
}
update_interrupts();
-};
+}
void mc68681_channel::write_TX(UINT8 data)
{
@@ -1139,7 +1139,7 @@ void mc68681_channel::write_TX(UINT8 data)
transmit_register_setup(tx_data);
update_interrupts();
-};
+}
void mc68681_channel::ACR_updated()
{
diff --git a/src/emu/machine/mcf5206e.c b/src/emu/machine/mcf5206e.c
index d63937b621c..d993c7235e4 100644
--- a/src/emu/machine/mcf5206e.c
+++ b/src/emu/machine/mcf5206e.c
@@ -275,63 +275,61 @@ inline void mcf5206e_peripheral_device::CSCR_w(int which, int offset, UINT16 dat
-
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR0_r) { return CSAR_r(0, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR0_w) { CSAR_w(0, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR0_r) { return CSMR_r(0, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR0_w) { CSMR_w(0, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR0_r) { return CSCR_r(0, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR0_w) { CSCR_w(0, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR1_r) { return CSAR_r(1, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR1_w) { CSAR_w(1, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR1_r) { return CSMR_r(1, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR1_w) { CSMR_w(1, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR1_r) { return CSCR_r(1, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR1_w) { CSCR_w(1, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR2_r) { return CSAR_r(2, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR2_w) { CSAR_w(2, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR2_r) { return CSMR_r(2, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR2_w) { CSMR_w(2, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR2_r) { return CSCR_r(2, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR2_w) { CSCR_w(2, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR3_r) { return CSAR_r(3, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR3_w) { CSAR_w(3, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR3_r) { return CSMR_r(3, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR3_w) { CSMR_w(3, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR3_r) { return CSCR_r(3, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR3_w) { CSCR_w(3, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR4_r) { return CSAR_r(4, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR4_w) { CSAR_w(4, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR4_r) { return CSMR_r(4, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR4_w) { CSMR_w(4, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR4_r) { return CSCR_r(4, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR4_w) { CSCR_w(4, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR5_r) { return CSAR_r(5, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR5_w) { CSAR_w(5, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR5_r) { return CSMR_r(5, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR5_w) { CSMR_w(5, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR5_r) { return CSCR_r(5, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR5_w) { CSCR_w(5, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR6_r) { return CSAR_r(6, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR6_w) { CSAR_w(6, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR6_r) { return CSMR_r(6, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR6_w) { CSMR_w(6, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR6_r) { return CSCR_r(6, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR6_w) { CSCR_w(6, offset, data, mem_mask); };
-
-READ16_MEMBER( mcf5206e_peripheral_device::CSAR7_r) { return CSAR_r(7, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR7_w) { CSAR_w(7, offset, data, mem_mask); };
-READ32_MEMBER( mcf5206e_peripheral_device::CSMR7_r) { return CSMR_r(7, mem_mask); };
-WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR7_w) { CSMR_w(7, data, mem_mask); };
-READ16_MEMBER( mcf5206e_peripheral_device::CSCR7_r) { return CSCR_r(7, offset, mem_mask); };
-WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR7_w) { CSCR_w(7, offset, data, mem_mask); };
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR0_r) { return CSAR_r(0, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR0_w) { CSAR_w(0, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR0_r) { return CSMR_r(0, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR0_w) { CSMR_w(0, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR0_r) { return CSCR_r(0, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR0_w) { CSCR_w(0, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR1_r) { return CSAR_r(1, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR1_w) { CSAR_w(1, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR1_r) { return CSMR_r(1, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR1_w) { CSMR_w(1, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR1_r) { return CSCR_r(1, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR1_w) { CSCR_w(1, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR2_r) { return CSAR_r(2, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR2_w) { CSAR_w(2, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR2_r) { return CSMR_r(2, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR2_w) { CSMR_w(2, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR2_r) { return CSCR_r(2, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR2_w) { CSCR_w(2, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR3_r) { return CSAR_r(3, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR3_w) { CSAR_w(3, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR3_r) { return CSMR_r(3, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR3_w) { CSMR_w(3, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR3_r) { return CSCR_r(3, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR3_w) { CSCR_w(3, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR4_r) { return CSAR_r(4, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR4_w) { CSAR_w(4, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR4_r) { return CSMR_r(4, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR4_w) { CSMR_w(4, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR4_r) { return CSCR_r(4, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR4_w) { CSCR_w(4, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR5_r) { return CSAR_r(5, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR5_w) { CSAR_w(5, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR5_r) { return CSMR_r(5, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR5_w) { CSMR_w(5, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR5_r) { return CSCR_r(5, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR5_w) { CSCR_w(5, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR6_r) { return CSAR_r(6, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR6_w) { CSAR_w(6, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR6_r) { return CSMR_r(6, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR6_w) { CSMR_w(6, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR6_r) { return CSCR_r(6, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR6_w) { CSCR_w(6, offset, data, mem_mask); }
+
+READ16_MEMBER( mcf5206e_peripheral_device::CSAR7_r) { return CSAR_r(7, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSAR7_w) { CSAR_w(7, offset, data, mem_mask); }
+READ32_MEMBER( mcf5206e_peripheral_device::CSMR7_r) { return CSMR_r(7, mem_mask); }
+WRITE32_MEMBER( mcf5206e_peripheral_device::CSMR7_w) { CSMR_w(7, data, mem_mask); }
+READ16_MEMBER( mcf5206e_peripheral_device::CSCR7_r) { return CSCR_r(7, offset, mem_mask); }
+WRITE16_MEMBER( mcf5206e_peripheral_device::CSCR7_w) { CSCR_w(7, offset, data, mem_mask); }
READ16_MEMBER( mcf5206e_peripheral_device::DMCR_r)
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index ae85e59217b..eee87447495 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -268,7 +268,7 @@ void microtouch_device::rcv_complete()
m_tx_buffer[m_tx_buffer_num++] = 0x0d;
m_rx_buffer_ptr = 0;
}
-};
+}
INPUT_CHANGED_MEMBER( microtouch_device::touch )
{
diff --git a/src/emu/machine/mm58274c.c b/src/emu/machine/mm58274c.c
index db2d1d07dcf..0690f775b5d 100644
--- a/src/emu/machine/mm58274c.c
+++ b/src/emu/machine/mm58274c.c
@@ -147,7 +147,7 @@ attotime mm58274c_device::interrupt_period_table(int val)
case 7: return attotime::from_seconds(60);
default: fatalerror("out of range\n");
}
-};
+}
READ8_MEMBER( mm58274c_device::read )
{
diff --git a/src/emu/machine/ncr5380n.h b/src/emu/machine/ncr5380n.h
index f7e007d7641..e9a142d78e5 100644
--- a/src/emu/machine/ncr5380n.h
+++ b/src/emu/machine/ncr5380n.h
@@ -115,7 +115,7 @@ private:
INIT_XFR_WAIT_REQ,
INIT_CPT_RECV_BYTE_ACK,
INIT_CPT_RECV_WAIT_REQ,
- INIT_CPT_RECV_BYTE_NACK,
+ INIT_CPT_RECV_BYTE_NACK
};
enum {
@@ -134,13 +134,13 @@ private:
SEND_WAIT_REQ_0,
RECV_WAIT_REQ_1,
RECV_WAIT_SETTLE,
- RECV_WAIT_REQ_0,
+ RECV_WAIT_REQ_0
};
enum {
STATE_MASK = 0x00ff,
SUB_SHIFT = 8,
- SUB_MASK = 0xff00,
+ SUB_MASK = 0xff00
};
enum { BUS_BUSY, BUS_FREE_WAIT, BUS_FREE };
@@ -182,7 +182,7 @@ private:
MODE_EOPIRQ = 0x08,
MODE_BSYIRQ = 0x04,
MODE_DMA = 0x02,
- MODE_ARBITRATE = 0x01,
+ MODE_ARBITRATE = 0x01
};
enum { DMA_NONE, DMA_IN, DMA_OUT };
diff --git a/src/emu/machine/ncr5390.h b/src/emu/machine/ncr5390.h
index b51db080048..93cf76a5486 100644
--- a/src/emu/machine/ncr5390.h
+++ b/src/emu/machine/ncr5390.h
@@ -107,7 +107,7 @@ private:
INIT_XFR_WAIT_REQ,
INIT_CPT_RECV_BYTE_ACK,
INIT_CPT_RECV_WAIT_REQ,
- INIT_CPT_RECV_BYTE_NACK,
+ INIT_CPT_RECV_BYTE_NACK
};
enum {
@@ -126,13 +126,13 @@ private:
SEND_WAIT_REQ_0,
RECV_WAIT_REQ_1,
RECV_WAIT_SETTLE,
- RECV_WAIT_REQ_0,
+ RECV_WAIT_REQ_0
};
enum {
STATE_MASK = 0x00ff,
SUB_SHIFT = 8,
- SUB_MASK = 0xff00,
+ SUB_MASK = 0xff00
};
enum { BUS_BUSY, BUS_FREE_WAIT, BUS_FREE };
@@ -177,7 +177,7 @@ private:
CI_COMPLETE = 0x11,
CI_MSG_ACCEPT = 0x12,
CI_PAD = 0x18,
- CI_SET_ATN = 0x1a,
+ CI_SET_ATN = 0x1a
};
enum { DMA_NONE, DMA_IN, DMA_OUT };
diff --git a/src/emu/machine/nmc9306.c b/src/emu/machine/nmc9306.c
index d32c88bea01..0b23eda21d7 100644
--- a/src/emu/machine/nmc9306.c
+++ b/src/emu/machine/nmc9306.c
@@ -35,7 +35,7 @@ enum
EWDS = 0, // erase/write disable
WRAL, // write all registers
ERAL, // erase all registers
- EWEN, // erase/write enable
+ EWEN // erase/write enable
};
// states
diff --git a/src/emu/machine/nscsi_bus.h b/src/emu/machine/nscsi_bus.h
index 51bf11ec74c..2aa4a57db7e 100644
--- a/src/emu/machine/nscsi_bus.h
+++ b/src/emu/machine/nscsi_bus.h
@@ -83,7 +83,7 @@ public:
S_PHASE_STATUS = S_CTL|S_INP,
S_PHASE_MSG_OUT = S_MSG|S_CTL,
S_PHASE_MSG_IN = S_MSG|S_CTL|S_INP,
- S_PHASE_MASK = S_MSG|S_CTL|S_INP,
+ S_PHASE_MASK = S_MSG|S_CTL|S_INP
};
nscsi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source);
@@ -117,7 +117,7 @@ protected:
SS_INT_CONDITION_MET = 0x14,
SS_RESV_CONFLICT = 0x18,
SS_TERMINATED = 0x22,
- SS_QUEUE_FULL = 0x28,
+ SS_QUEUE_FULL = 0x28
};
// SCSI commands
@@ -238,7 +238,7 @@ protected:
SC_PLAY_CD = 0xbc,
SC_MECHANISM_STATUS = 0xbd,
SC_READ_CD = 0xbe,
- SC_SEND_DVD_STRUCTURE = 0xbf,
+ SC_SEND_DVD_STRUCTURE = 0xbf
};
// SCSI Messages
@@ -264,12 +264,12 @@ protected:
SM_SIMPLE_QUEUE = 0x20,
SM_HEAD_QUEUE = 0x21,
SM_ORDERED_QUEUE = 0x22,
- SM_IGNORE_WIDE_RES = 0x23,
+ SM_IGNORE_WIDE_RES = 0x23
};
enum {
SBUF_MAIN,
- SBUF_SENSE,
+ SBUF_SENSE
};
UINT8 scsi_cmdbuf[4096], scsi_sense_buffer[8];
@@ -359,7 +359,7 @@ protected:
private:
enum {
- IDLE,
+ IDLE
};
enum {
@@ -370,20 +370,20 @@ private:
TARGET_WAIT_MSG_BYTE,
TARGET_WAIT_CMD_BYTE,
TARGET_WAIT_DATA_IN_BYTE,
- TARGET_WAIT_DATA_OUT_BYTE,
+ TARGET_WAIT_DATA_OUT_BYTE
};
enum {
RECV_BYTE_T_WAIT_ACK_0 = 1,
RECV_BYTE_T_WAIT_ACK_1,
SEND_BYTE_T_WAIT_ACK_0,
- SEND_BYTE_T_WAIT_ACK_1,
+ SEND_BYTE_T_WAIT_ACK_1
};
enum {
STATE_MASK = 0x00ff,
SUB_SHIFT = 8,
- SUB_MASK = 0xff00,
+ SUB_MASK = 0xff00
};
enum {
@@ -393,7 +393,7 @@ private:
BC_MESSAGE_2,
BC_DATA_IN,
BC_DATA_OUT,
- BC_BUS_FREE,
+ BC_BUS_FREE
};
struct control {
diff --git a/src/emu/machine/pit8253.c b/src/emu/machine/pit8253.c
index fe160d6d25a..afeefdb31ee 100644
--- a/src/emu/machine/pit8253.c
+++ b/src/emu/machine/pit8253.c
@@ -724,7 +724,7 @@ void pit8253_device::update(pit8253_timer *timer)
attotime elapsed_time = now - timer->last_updated;
INT64 elapsed_cycles = elapsed_time.as_double() * timer->clockin;
- LOG1(("pit8253: update(): timer %d, %" I64FMT "d elapsed_cycles\n", timer->index, elapsed_cycles));
+ LOG1(("pit8253: update(): timer %d, %s elapsed_cycles\n", timer->index, I64_to_base10(elapsed_cycles)));
if (timer->clockin)
timer->last_updated += elapsed_cycles * attotime::from_hz(timer->clockin);
@@ -1091,7 +1091,7 @@ void pit8253_device::set_clockin(int timerno, double new_clockin)
pit8253_timer *timer = get_timer(timerno);
assert(timer != NULL);
- LOG2(("pit8253_set_clockin(): PIT timer=%d, clockin = %lf\n", timerno, new_clockin));
+ LOG2(("pit8253_set_clockin(): PIT timer=%d, clockin = %f\n", timerno, new_clockin));
update(timer);
timer->clockin = new_clockin;
diff --git a/src/emu/machine/rtc9701.h b/src/emu/machine/rtc9701.h
index 88f6bee0e96..eaad28ad0b5 100644
--- a/src/emu/machine/rtc9701.h
+++ b/src/emu/machine/rtc9701.h
@@ -34,7 +34,7 @@ enum rtc9701_state_t
RTC9701_RTC_WRITE,
RTC9701_EEPROM_READ,
RTC9701_EEPROM_WRITE,
- RTC9701_AFTER_WRITE_ENABLE,
+ RTC9701_AFTER_WRITE_ENABLE
};
diff --git a/src/emu/machine/t10mmc.h b/src/emu/machine/t10mmc.h
index 9e112fe279f..cfebfc1694c 100644
--- a/src/emu/machine/t10mmc.h
+++ b/src/emu/machine/t10mmc.h
@@ -35,7 +35,7 @@ protected:
T10MMC_CMD_PAUSE_RESUME = 0x4b,
T10MMC_CMD_STOP_PLAY_SCAN = 0x4e,
T10MMC_CMD_PLAY_AUDIO_12 = 0xa5,
- T10MMC_CMD_SET_CD_SPEED = 0xbb,
+ T10MMC_CMD_SET_CD_SPEED = 0xbb
};
enum toc_format_t
diff --git a/src/emu/machine/tms9902.c b/src/emu/machine/tms9902.c
index 6bd10ac85a4..557da504f96 100644
--- a/src/emu/machine/tms9902.c
+++ b/src/emu/machine/tms9902.c
@@ -335,7 +335,7 @@ void tms9902_device::set_receive_data_rate()
// Thus the callback function should add up this value on each poll
// and deliver a data input not before it sums up to 1.
m_baudpoll = (double)(baud / (10*POLLING_FREQ));
- if (VERBOSE>3) LOG ("TMS9902: baudpoll = %lf\n", m_baudpoll);
+ if (VERBOSE>3) LOG ("TMS9902: baudpoll = %f\n", m_baudpoll);
m_last_config_value = value;
m_ctrl_cb((offs_t)CONFIG, RATERECV);
diff --git a/src/emu/machine/x76f041.h b/src/emu/machine/x76f041.h
index 02178a22f3b..d1f8a8e9e46 100644
--- a/src/emu/machine/x76f041.h
+++ b/src/emu/machine/x76f041.h
@@ -52,7 +52,7 @@ private:
CONFIG_BCR2 = 1,
CONFIG_CR = 2,
CONFIG_RR = 3,
- CONFIG_RC = 4,
+ CONFIG_RC = 4
};
enum bcr_t
diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c
index 33aec56ae80..89279c16184 100644
--- a/src/emu/sound/pokey.c
+++ b/src/emu/sound/pokey.c
@@ -1100,7 +1100,7 @@ void pokey_device::pokey_potgo(void)
{
int pot;
- LOG(("POKEY #%p pokey_potgo\n", this));
+ LOG(("POKEY #%p pokey_potgo\n", (void *) this));
m_ALLPOT = 0x00;
m_pot_counter = 0;
diff --git a/src/emu/video/crt9007.c b/src/emu/video/crt9007.c
index 7a7a3f78f87..a5722fbd3bf 100644
--- a/src/emu/video/crt9007.c
+++ b/src/emu/video/crt9007.c
@@ -176,7 +176,7 @@ enum
{
NON_INTERLACED = 0,
ENHANCED_VIDEO_INTERFACE,
- NORMAL_VIDEO_INTERFACE,
+ NORMAL_VIDEO_INTERFACE
};
diff --git a/src/emu/video/hd44780.h b/src/emu/video/hd44780.h
index 466af6f8a7d..f98bc01806b 100644
--- a/src/emu/video/hd44780.h
+++ b/src/emu/video/hd44780.h
@@ -69,15 +69,14 @@ protected:
enum
{
CHARSET_HD44780_A00,
- CHARSET_KS0066_F05,
- /*
+ CHARSET_KS0066_F05 /*,
CHARSET_HD44780_A01,
CHARSET_HD44780_A02,
CHARSET_KS0066_F00,
CHARSET_KS0066_F03,
CHARSET_KS0066_F04,
CHARSET_KS0066_F06,
- CHARSET_KS0066_F59,
+ CHARSET_KS0066_F59
*/
};
diff --git a/src/emu/video/mc6845.c b/src/emu/video/mc6845.c
index 60f98535aa0..4c1d811369c 100644
--- a/src/emu/video/mc6845.c
+++ b/src/emu/video/mc6845.c
@@ -1479,7 +1479,7 @@ PALETTE_INIT_MEMBER(mos8563_device, mos8563)
palette.set_pen_color(13, rgb_t(0xff, 0xff, 0x55));
palette.set_pen_color(14, rgb_t(0xaa, 0xaa, 0xaa));
palette.set_pen_color(15, rgb_t::white);
-};
+}
void mos8563_device::update_cursor_state()
diff --git a/src/emu/video/mc6847.h b/src/emu/video/mc6847.h
index b81422cdc37..d3420a7fcba 100644
--- a/src/emu/video/mc6847.h
+++ b/src/emu/video/mc6847.h
@@ -172,7 +172,7 @@ protected:
}
}
}
- };
+ }
private:
struct entry
@@ -370,7 +370,7 @@ protected:
result = true;
}
return result;
- };
+ }
// template function for emitting graphics bytes
template<int bits_per_pixel, int xscale>
diff --git a/src/mame/machine/315-5838_317-0229_comp.h b/src/mame/machine/315-5838_317-0229_comp.h
index 74cf265ebbe..4584cd96203 100644
--- a/src/mame/machine/315-5838_317-0229_comp.h
+++ b/src/mame/machine/315-5838_317-0229_comp.h
@@ -39,7 +39,7 @@ public:
}
DECLARE_READ32_MEMBER(decathlt_prot1_r);
- DECLARE_READ32_MEMBER(decathlt_prot2_r);;
+ DECLARE_READ32_MEMBER(decathlt_prot2_r);
UINT32 genericdecathlt_prot_r(UINT32 mem_mask, int channel);
void write_prot_data(UINT32 data, UINT32 mem_mask, int channel, int rev_words);
diff --git a/src/mame/machine/atarigen.h b/src/mame/machine/atarigen.h
index 69ca704078b..208e103fd19 100644
--- a/src/mame/machine/atarigen.h
+++ b/src/mame/machine/atarigen.h
@@ -218,7 +218,7 @@ private:
{
TID_SCANLINE_INT,
TID_TILEROW_UPDATE,
- TID_EOF,
+ TID_EOF
};
// internal helpers
diff --git a/src/mame/machine/cdicdic.c b/src/mame/machine/cdicdic.c
index 332f962b6fd..f3099930d1b 100644
--- a/src/mame/machine/cdicdic.c
+++ b/src/mame/machine/cdicdic.c
@@ -542,7 +542,7 @@ void cdicdic_device::sample_trigger()
if(m_decode_addr == 0xffff)
{
- verboselog(machine(), 0, "Decode stop requested, stopping playback\n" );
+ verboselog(machine(), 0, "%s", "Decode stop requested, stopping playback\n" );
m_audio_sample_timer->adjust(attotime::never);
return;
}
@@ -550,11 +550,11 @@ void cdicdic_device::sample_trigger()
if(!m_decode_delay)
{
// Indicate that data has been decoded
- verboselog(machine(), 0, "Flagging that audio data has been decoded\n" );
+ verboselog(machine(), 0, "%s", "Flagging that audio data has been decoded\n" );
m_audio_buffer |= 0x8000;
// Set the CDIC interrupt line
- verboselog(machine(), 0, "Setting CDIC interrupt line for soundmap decode\n" );
+ verboselog(machine(), 0, "%s", "Setting CDIC interrupt line for soundmap decode\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_4, 128);
state->m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE);
}
@@ -576,7 +576,7 @@ void cdicdic_device::sample_trigger()
verboselog(machine(), 0, "Updated m_decode_addr, new value is %04x\n", m_decode_addr );
//// Delay for Frequency * (18*28*2*size in bytes) before requesting more data
- verboselog(machine(), 0, "Data is valid, setting up a new callback\n" );
+ verboselog(machine(), 0, "%s", "Data is valid, setting up a new callback\n" );
m_decode_period = attotime::from_hz(CDIC_SAMPLE_BUF_FREQ(m_ram, m_decode_addr & 0x3ffe)) * (18*28*2*CDIC_SAMPLE_BUF_SIZE(m_ram, m_decode_addr & 0x3ffe));
m_audio_sample_timer->adjust(m_decode_period);
//dmadac_enable(&dmadac[0], 2, 0);
@@ -586,7 +586,7 @@ void cdicdic_device::sample_trigger()
// Swap buffer positions to indicate our new buffer position at the next read
m_decode_addr ^= 0x1a00;
- verboselog(machine(), 0, "Data is not valid, indicating to shut down on the next audio sample\n" );
+ verboselog(machine(), 0, "%s", "Data is not valid, indicating to shut down on the next audio sample\n" );
m_decode_addr = 0xffff;
m_audio_sample_timer->adjust(m_decode_period);
}
@@ -695,7 +695,7 @@ void cdicdic_device::process_delayed_command()
if(((buffer[CDIC_SECTOR_SUBMODE2] & (CDIC_SUBMODE_FORM | CDIC_SUBMODE_DATA | CDIC_SUBMODE_AUDIO | CDIC_SUBMODE_VIDEO)) == (CDIC_SUBMODE_FORM | CDIC_SUBMODE_AUDIO)) &&
(m_channel & m_audio_channel & (1 << buffer[CDIC_SECTOR_CHAN2])))
{
- verboselog(machine(), 0, "Audio sector\n" );
+ verboselog(machine(), 0, "%s", "Audio sector\n" );
m_x_buffer |= 0x8000;
//m_data_buffer |= 0x4000;
@@ -709,7 +709,7 @@ void cdicdic_device::process_delayed_command()
decode_audio_sector(((UINT8*)m_ram) + ((m_data_buffer & 5) * 0xa00 + 4), 0);
//printf( "Setting CDIC interrupt line\n" );
- verboselog(machine(), 0, "Setting CDIC interrupt line for audio sector\n" );
+ verboselog(machine(), 0, "%s", "Setting CDIC interrupt line for audio sector\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_4, 128);
state->m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE);
}
@@ -728,13 +728,13 @@ void cdicdic_device::process_delayed_command()
(buffer[CDIC_SECTOR_SUBMODE2] & CDIC_SUBMODE_EOF) == CDIC_SUBMODE_EOF)
{
//printf( "Setting CDIC interrupt line\n" );
- verboselog(machine(), 0, "Setting CDIC interrupt line for message sector\n" );
+ verboselog(machine(), 0, "%s", "Setting CDIC interrupt line for message sector\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_4, 128);
state->m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE);
}
else
{
- verboselog(machine(), 0, "Message sector, ignored\n" );
+ verboselog(machine(), 0, "%s", "Message sector, ignored\n" );
}
}
else
@@ -748,7 +748,7 @@ void cdicdic_device::process_delayed_command()
}
//printf( "Setting CDIC interrupt line\n" );
- verboselog(machine(), 0, "Setting CDIC interrupt line for data sector\n" );
+ verboselog(machine(), 0, "%s", "Setting CDIC interrupt line for data sector\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_4, 128);
state->m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE);
}
@@ -843,7 +843,7 @@ void cdicdic_device::process_delayed_command()
m_ram[(m_data_buffer & 5) * (0xa00/2) + (index - 6)] = (buffer[index*2] << 8) | buffer[index*2 + 1];
}
- verboselog(machine(), 0, "Setting CDIC interrupt line for CDDA sector\n" );
+ verboselog(machine(), 0, "%s", "Setting CDIC interrupt line for CDDA sector\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_4, 128);
state->m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE);
break;
@@ -894,7 +894,7 @@ void cdicdic_device::process_delayed_command()
m_time = next_msf << 8;
- verboselog(machine(), 0, "Setting CDIC interrupt line for Seek sector\n" );
+ verboselog(machine(), 0, "%s", "Setting CDIC interrupt line for Seek sector\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_4, 128);
state->m_maincpu->set_input_line(M68K_IRQ_4, ASSERT_LINE);
break;
@@ -944,7 +944,7 @@ READ16_MEMBER( cdicdic_device::regs_r )
if(!((m_audio_buffer | m_x_buffer) & 0x8000))
{
state->m_maincpu->set_input_line(M68K_IRQ_4, CLEAR_LINE);
- verboselog(machine(), 0, "Clearing CDIC interrupt line\n" );
+ verboselog(machine(), 0, "%s", "Clearing CDIC interrupt line\n" );
////printf("Clearing CDIC interrupt line\n" );
}
verboselog(machine(), 0, "cdic_r: Audio Buffer Register = %04x & %04x\n", temp, mem_mask);
@@ -958,7 +958,7 @@ READ16_MEMBER( cdicdic_device::regs_r )
if(!((m_audio_buffer | m_x_buffer) & 0x8000))
{
state->m_maincpu->set_input_line(M68K_IRQ_4, CLEAR_LINE);
- verboselog(machine(), 0, "Clearing CDIC interrupt line\n" );
+ verboselog(machine(), 0, "%s", "Clearing CDIC interrupt line\n" );
////printf("Clearing CDIC interrupt line\n" );
}
verboselog(machine(), 0, "cdic_r: X-Buffer Register = %04x & %04x\n", temp, mem_mask);
diff --git a/src/mame/machine/cdislave.c b/src/mame/machine/cdislave.c
index 4bfa5952115..99f9b73e753 100644
--- a/src/mame/machine/cdislave.c
+++ b/src/mame/machine/cdislave.c
@@ -56,7 +56,7 @@ TIMER_CALLBACK_MEMBER( cdislave_device::trigger_readback_int )
{
cdi_state *state = machine().driver_data<cdi_state>();
- verboselog(machine(), 0, "Asserting IRQ2\n" );
+ verboselog(machine(), 0, "%s", "Asserting IRQ2\n" );
state->m_maincpu->set_input_line_vector(M68K_IRQ_2, 26);
state->m_maincpu->set_input_line(M68K_IRQ_2, ASSERT_LINE);
m_interrupt_timer->adjust(attotime::never);
@@ -140,7 +140,7 @@ READ16_MEMBER( cdislave_device::slave_r )
case 0xf3:
case 0xf4:
case 0xf7:
- verboselog(machine(), 0, "slave_r: De-asserting IRQ2\n" );
+ verboselog(machine(), 0, "%s", "slave_r: De-asserting IRQ2\n" );
state->m_maincpu->set_input_line(M68K_IRQ_2, CLEAR_LINE);
break;
}
diff --git a/src/mame/video/atarimo.h b/src/mame/video/atarimo.h
index 7804ab3b57c..de8ad2adbb6 100644
--- a/src/mame/video/atarimo.h
+++ b/src/mame/video/atarimo.h
@@ -126,7 +126,7 @@ private:
// timer IDs
enum
{
- TID_FORCE_UPDATE,
+ TID_FORCE_UPDATE
};
// internal helpers
diff --git a/src/mame/video/mcd212.c b/src/mame/video/mcd212.c
index 5baa84b59e4..7ae7051916e 100644
--- a/src/mame/video/mcd212.c
+++ b/src/mame/video/mcd212.c
@@ -819,7 +819,7 @@ void mcd212_device::process_vsr(int channel, UINT8 *pixels_r, UINT8 *pixels_g, U
if(m_channel[channel].dcr & MCD212_DCR_CM)
{
// 4-bit Bitmap
- verboselog(machine, 0, "Unsupported display mode: 4-bit Bitmap\n" );
+ verboselog(machine, 0, "%s", "Unsupported display mode: 4-bit Bitmap\n" );
}
else
{
@@ -1000,7 +1000,7 @@ void mcd212_device::process_vsr(int channel, UINT8 *pixels_r, UINT8 *pixels_g, U
case MCD212_DDR_FT_RLE:
if(m_channel[channel].dcr & MCD212_DCR_CM)
{
- verboselog(machine, 0, "Unsupported display mode: 4-bit RLE\n" );
+ verboselog(machine, 0, "%s", "Unsupported display mode: 4-bit RLE\n" );
done = 1;
}
else
@@ -1427,7 +1427,7 @@ TIMER_CALLBACK_MEMBER( mcd212_device::perform_scan )
if(scanline == 0)
{
// Process ICA
- verboselog(machine, 6, "Frame Start\n" );
+ verboselog(machine, 6, "%s", "Frame Start\n" );
m_channel[0].csrr &= 0x7f;
for(int index = 0; index < 2; index++)
{
diff --git a/src/mame/video/vectrex.c b/src/mame/video/vectrex.c
index fd857fe8993..b78c096e343 100644
--- a/src/mame/video/vectrex.c
+++ b/src/mame/video/vectrex.c
@@ -30,7 +30,7 @@ enum {
A_ZR,
A_Z,
A_AUDIO,
- A_Y,
+ A_Y
};
/*********************************************************************
diff --git a/src/mess/audio/mea8000.h b/src/mess/audio/mea8000.h
index 7510ff2617c..5d09ee938c9 100644
--- a/src/mess/audio/mea8000.h
+++ b/src/mess/audio/mea8000.h
@@ -35,7 +35,7 @@ enum mea8000_state
MEA8000_STOPPED, /* nothing to do, timer disabled */
MEA8000_WAIT_FIRST, /* received pitch, wait for first full trame, timer disabled */
MEA8000_STARTED, /* playing a frame, timer on */
- MEA8000_SLOWING, /* repating last frame with decreasing amplitude, timer on */
+ MEA8000_SLOWING /* repeating last frame with decreasing amplitude, timer on */
};
ALLOW_SAVE_TYPE( mea8000_state );
diff --git a/src/mess/drivers/abc80.c b/src/mess/drivers/abc80.c
index b64cb786b44..101f4e8865e 100644
--- a/src/mess/drivers/abc80.c
+++ b/src/mess/drivers/abc80.c
@@ -269,7 +269,7 @@ READ8_MEMBER( abc80_state::pio_pa_r )
data |= (m_key_strobe << 7);
return data;
-};
+}
READ8_MEMBER( abc80_state::pio_pb_r )
{
@@ -305,7 +305,7 @@ READ8_MEMBER( abc80_state::pio_pb_r )
if (LOG) logerror("%s %s read tape latch %u\n", machine().time().as_string(), machine().describe_context(), m_tape_in_latch);
return data;
-};
+}
WRITE8_MEMBER( abc80_state::pio_pb_w )
{
@@ -356,7 +356,7 @@ WRITE8_MEMBER( abc80_state::pio_pb_w )
m_pio->pb7_w(m_tape_in_latch);
}
-};
+}
//-------------------------------------------------
diff --git a/src/mess/drivers/ace.c b/src/mess/drivers/ace.c
index b1416ff675b..06cbec86d42 100644
--- a/src/mess/drivers/ace.c
+++ b/src/mess/drivers/ace.c
@@ -599,7 +599,7 @@ READ8_MEMBER( ace_state::pio_pa_r )
*/
return 0;
-};
+}
WRITE8_MEMBER( ace_state::pio_pa_w )
{
@@ -620,7 +620,7 @@ WRITE8_MEMBER( ace_state::pio_pa_w )
// centronics strobe
m_centronics->write_strobe(!BIT(data, 6));
-};
+}
//**************************************************************************
// MACHINE INITIALIZATION
diff --git a/src/mess/drivers/alphatro.c b/src/mess/drivers/alphatro.c
index 6c9c00c3757..355ad41a8d8 100644
--- a/src/mess/drivers/alphatro.c
+++ b/src/mess/drivers/alphatro.c
@@ -54,7 +54,7 @@ class alphatro_state : public driver_device
public:
enum
{
- TIMER_SYSTEM,
+ TIMER_SYSTEM
};
alphatro_state(const machine_config &mconfig, device_type type, const char *tag)
diff --git a/src/mess/drivers/chessmst.c b/src/mess/drivers/chessmst.c
index b4b7f8fe041..4e0e3a00574 100644
--- a/src/mess/drivers/chessmst.c
+++ b/src/mess/drivers/chessmst.c
@@ -200,7 +200,7 @@ WRITE8_MEMBER( chessmst_state::pio1_port_b_w )
m_led_sel = (m_led_sel & 0xff) | ((data & 0x03)<<8);
m_speaker->level_w(BIT(data, 6));
-};
+}
READ8_MEMBER( chessmst_state::pio2_port_a_r )
{
diff --git a/src/mess/drivers/dectalk.c b/src/mess/drivers/dectalk.c
index 18951addb19..1935e4133e4 100644
--- a/src/mess/drivers/dectalk.c
+++ b/src/mess/drivers/dectalk.c
@@ -349,7 +349,7 @@ WRITE_LINE_MEMBER(dectalk_state::dectalk_duart_irq_handler)
m_maincpu->set_input_line_and_vector(M68K_IRQ_6, state, M68K_INT_ACK_AUTOVECTOR);
//drvstate->m_maincpu->set_input_line_and_vector(M68K_IRQ_6, CLEAR_LINE, M68K_INT_ACK_AUTOVECTOR);
//drvstate->m_maincpu->set_input_line_and_vector(M68K_IRQ_6, HOLD_LINE, vector);
-};
+}
READ8_MEMBER(dectalk_state::dectalk_duart_input)
{
diff --git a/src/mess/drivers/esq1.c b/src/mess/drivers/esq1.c
index 3dc7b9535ec..3dcf511f95a 100644
--- a/src/mess/drivers/esq1.c
+++ b/src/mess/drivers/esq1.c
@@ -537,7 +537,7 @@ ADDRESS_MAP_END
WRITE_LINE_MEMBER(esq1_state::duart_irq_handler)
{
m_maincpu->set_input_line(M6809_IRQ_LINE, state);
-};
+}
WRITE8_MEMBER(esq1_state::duart_output)
{
diff --git a/src/mess/drivers/esqkt.c b/src/mess/drivers/esqkt.c
index 086909c8783..ff97daaf644 100644
--- a/src/mess/drivers/esqkt.c
+++ b/src/mess/drivers/esqkt.c
@@ -181,7 +181,7 @@ READ16_MEMBER(esqkt_state::esq5506_read_adc)
WRITE_LINE_MEMBER(esqkt_state::duart_irq_handler)
{
m_maincpu->set_input_line(M68K_IRQ_3, state);
-};
+}
WRITE8_MEMBER(esqkt_state::duart_output)
{
diff --git a/src/mess/drivers/fidelz80.c b/src/mess/drivers/fidelz80.c
index 32acdd01919..2d64b061189 100644
--- a/src/mess/drivers/fidelz80.c
+++ b/src/mess/drivers/fidelz80.c
@@ -665,12 +665,12 @@ WRITE8_MEMBER( fidelz80_state::fidelz80_portb_w )
}
// ignoring the language switch enable for now, is bit 0x40
-};
+}
WRITE8_MEMBER( fidelz80_state::fidelz80_portc_w )
{
m_kp_matrix = data;
-};
+}
WRITE8_MEMBER( fidelz80_state::cc10_porta_w )
{
diff --git a/src/mess/drivers/nascom1.c b/src/mess/drivers/nascom1.c
index 948919fdab6..135a5d6b083 100644
--- a/src/mess/drivers/nascom1.c
+++ b/src/mess/drivers/nascom1.c
@@ -234,7 +234,7 @@ SNAPSHOT_LOAD_MEMBER( nascom_state, nascom1 )
while (image.fread( &line, sizeof(line)) == sizeof(line))
{
- int addr, b0, b1, b2, b3, b4, b5, b6, b7, dummy;
+ unsigned int addr, b0, b1, b2, b3, b4, b5, b6, b7, dummy;
if (sscanf((char *)line, "%x %x %x %x %x %x %x %x %x %x\010\010\n",
&addr, &b0, &b1, &b2, &b3, &b4, &b5, &b6, &b7, &dummy) == 10)
diff --git a/src/mess/drivers/ngp.c b/src/mess/drivers/ngp.c
index 21b8d1d7812..4110dcd2c6c 100644
--- a/src/mess/drivers/ngp.c
+++ b/src/mess/drivers/ngp.c
@@ -118,7 +118,7 @@ enum flash_state
F_AUTO_PROGRAM, /* 5555 AA 2AAA 55 5555 A0 address data */
F_AUTO_CHIP_ERASE, /* 5555 AA 2AAA 55 5555 80 5555 AA 2AAA 55 5555 10 */
F_AUTO_BLOCK_ERASE, /* 5555 AA 2AAA 55 5555 80 5555 AA 2AAA 55 block_address 30 */
- F_BLOCK_PROTECT, /* 5555 AA 2AAA 55 5555 9A 5555 AA 2AAA 55 5555 9A */
+ F_BLOCK_PROTECT /* 5555 AA 2AAA 55 5555 9A 5555 AA 2AAA 55 5555 9A */
};
diff --git a/src/mess/drivers/px8.c b/src/mess/drivers/px8.c
index c9b1bff8c65..2e797174b5b 100644
--- a/src/mess/drivers/px8.c
+++ b/src/mess/drivers/px8.c
@@ -52,7 +52,7 @@ enum
GAH40M_CTLR1 = 0,
GAH40M_CMDR,
GAH40M_CTLR2,
- GAH40M_IER = 4,
+ GAH40M_IER = 4
};
enum
diff --git a/src/mess/drivers/sc2.c b/src/mess/drivers/sc2.c
index 74d610ebea5..88b538f6a17 100644
--- a/src/mess/drivers/sc2.c
+++ b/src/mess/drivers/sc2.c
@@ -193,7 +193,7 @@ WRITE8_MEMBER( sc2_state::pio_port_b_w )
}
else
m_kp_matrix = data;
-};
+}
static MACHINE_CONFIG_START( sc2, sc2_state )
/* basic machine hardware */
diff --git a/src/mess/drivers/sgi_ip2.c b/src/mess/drivers/sgi_ip2.c
index 7e44e712b9f..ac6ade7de97 100644
--- a/src/mess/drivers/sgi_ip2.c
+++ b/src/mess/drivers/sgi_ip2.c
@@ -403,12 +403,12 @@ ADDRESS_MAP_END
WRITE_LINE_MEMBER(sgi_ip2_state::duarta_irq_handler)
{
m_maincpu->set_input_line_and_vector(M68K_IRQ_6, state, M68K_INT_ACK_AUTOVECTOR);
-};
+}
WRITE_LINE_MEMBER(sgi_ip2_state::duartb_irq_handler)
{
m_maincpu->set_input_line_and_vector(M68K_IRQ_6, state, M68K_INT_ACK_AUTOVECTOR);
-};
+}
static DEVICE_INPUT_DEFAULTS_START( ip2_terminal )
DEVICE_INPUT_DEFAULTS( "RS232_TXBAUD", 0xff, RS232_BAUD_19200 )
diff --git a/src/mess/drivers/vii.c b/src/mess/drivers/vii.c
index 5958e8c24b4..127e4a7a72b 100644
--- a/src/mess/drivers/vii.c
+++ b/src/mess/drivers/vii.c
@@ -181,7 +181,7 @@ enum
SPG243_BATMAN,
SPG243_VSMILE,
- SPG243_MODEL_COUNT,
+ SPG243_MODEL_COUNT
};
diff --git a/src/mess/drivers/xerox820.c b/src/mess/drivers/xerox820.c
index 68bad92a04c..6e9d4307fe3 100644
--- a/src/mess/drivers/xerox820.c
+++ b/src/mess/drivers/xerox820.c
@@ -244,7 +244,7 @@ READ8_MEMBER( xerox820_state::kbpio_pa_r )
data |= m_400_460 << 5;
return data;
-};
+}
WRITE8_MEMBER( xerox820_state::kbpio_pa_w )
{
@@ -327,7 +327,7 @@ READ8_MEMBER( xerox820_state::kbpio_pb_r )
*/
return m_kb->read() ^ 0xff;
-};
+}
WRITE8_MEMBER( xerox820ii_state::rdpio_pb_w )
{
diff --git a/src/mess/includes/coco.h b/src/mess/includes/coco.h
index b9d90b3dad5..a43af0d40f0 100644
--- a/src/mess/includes/coco.h
+++ b/src/mess/includes/coco.h
@@ -188,7 +188,7 @@ private:
HIRES_RIGHT = 0x01,
HIRES_RIGHT_COCOMAX3 = 0x02,
HIRES_LEFT = 0x03,
- HIRES_LEFT_COCOMAX3 = 0x04,
+ HIRES_LEFT_COCOMAX3 = 0x04
};
struct analog_input_t
diff --git a/src/mess/includes/hp48.h b/src/mess/includes/hp48.h
index 3577d404d26..70780f2817d 100644
--- a/src/mess/includes/hp48.h
+++ b/src/mess/includes/hp48.h
@@ -16,7 +16,7 @@ typedef enum {
HP48_G,
HP48_GX,
HP48_GP,
- HP49_G,
+ HP49_G
} hp48_models;
/* memory module configuration */
diff --git a/src/mess/machine/mac.c b/src/mess/machine/mac.c
index 7ce5a0ab2c4..098bcede238 100644
--- a/src/mess/machine/mac.c
+++ b/src/mess/machine/mac.c
@@ -2162,7 +2162,7 @@ MAC_DRIVER_INIT(macpd210, MODEL_MAC_PBDUO_210)
MAC_DRIVER_INIT(macquadra700, MODEL_MAC_QUADRA_700)
MAC_DRIVER_INIT(maciicx, MODEL_MAC_IICX)
MAC_DRIVER_INIT(maciifdhd, MODEL_MAC_II_FDHD)
-MAC_DRIVER_INIT(maciix, MODEL_MAC_IIX);
+MAC_DRIVER_INIT(maciix, MODEL_MAC_IIX)
MAC_DRIVER_INIT(maclc520, MODEL_MAC_LC_520)
void mac_state::nubus_slot_interrupt(UINT8 slot, UINT32 state)
diff --git a/src/mess/machine/mbc55x.c b/src/mess/machine/mbc55x.c
index abfff2ca144..18704e33f0a 100644
--- a/src/mess/machine/mbc55x.c
+++ b/src/mess/machine/mbc55x.c
@@ -352,7 +352,8 @@ static void mbc55x_debug(running_machine &machine, int ref, int params, const ch
mbc55x_state *state = machine.driver_data<mbc55x_state>();
if(params>0)
{
- sscanf(param[0],"%d",&state->m_debug_machine);
+ int temp;
+ sscanf(param[0],"%d",&temp); state->m_debug_machine = temp;
}
else
{
diff --git a/src/mess/machine/mbee.c b/src/mess/machine/mbee.c
index 43ac9942129..904849a1c78 100644
--- a/src/mess/machine/mbee.c
+++ b/src/mess/machine/mbee.c
@@ -53,7 +53,7 @@ WRITE8_MEMBER( mbee_state::pio_port_b_w )
m_cassette->output(BIT(data, 1) ? -1.0 : +1.0);
m_speaker->level_w(BIT(data, 6));
-};
+}
READ8_MEMBER( mbee_state::pio_port_b_r )
{
diff --git a/src/mess/machine/rmnimbus.c b/src/mess/machine/rmnimbus.c
index a256bcea123..2670e1968c9 100644
--- a/src/mess/machine/rmnimbus.c
+++ b/src/mess/machine/rmnimbus.c
@@ -244,7 +244,8 @@ static void nimbus_debug(running_machine &machine, int ref, int params, const ch
rmnimbus_state *state = machine.driver_data<rmnimbus_state>();
if(params>0)
{
- sscanf(param[0],"%d",&state->m_debug_machine);
+ int temp;
+ sscanf(param[0],"%d",&temp); state->m_debug_machine = temp;
}
else
{
diff --git a/src/mess/machine/ti99/gromport.c b/src/mess/machine/ti99/gromport.c
index 9747deadff7..427dc929b8a 100644
--- a/src/mess/machine/ti99/gromport.c
+++ b/src/mess/machine/ti99/gromport.c
@@ -2066,7 +2066,7 @@ rpk::rpk(emu_options& options, const char* sysname)
//,m_system_name(sysname)
{
m_sockets.reset();
-};
+}
rpk::~rpk()
{
@@ -2126,12 +2126,12 @@ void rpk::close()
rpk_socket::rpk_socket(const char* id, int length, UINT8* contents, const char *pathname)
: m_id(id), m_length(length), m_next(NULL), m_contents(contents), m_pathname(pathname)
{
-};
+}
rpk_socket::rpk_socket(const char* id, int length, UINT8* contents)
: m_id(id), m_length(length), m_next(NULL), m_contents(contents), m_pathname(NULL)
{
-};
+}
/*
Locate a file in the ZIP container
@@ -2234,7 +2234,7 @@ rpk_socket* rpk_reader::load_ram_resource(emu_options &options, xml_data_node* r
const char* ram_type;
const char* ram_filename;
const char* ram_pname;
- int length;
+ unsigned int length;
UINT8* contents;
// find the length attribute
diff --git a/src/mess/machine/upd65031.c b/src/mess/machine/upd65031.c
index e0377d7d20d..86d9ff5e093 100644
--- a/src/mess/machine/upd65031.c
+++ b/src/mess/machine/upd65031.c
@@ -79,7 +79,7 @@ enum
REG_RXD = 0xe0, // UART receive data register
REG_RXE = 0xe1, // UART extended receiver data
- REG_UIT = 0xe5, // UART interrupt status
+ REG_UIT = 0xe5 // UART interrupt status
};
//mode
diff --git a/src/mess/machine/zx8302.h b/src/mess/machine/zx8302.h
index f05ebe2b702..2cfb4efbe49 100644
--- a/src/mess/machine/zx8302.h
+++ b/src/mess/machine/zx8302.h
@@ -183,7 +183,7 @@ private:
MODE_SER2 = 0x08,
MODE_MDV = 0x10,
MODE_NET = 0x18,
- MODE_MASK = 0x18,
+ MODE_MASK = 0x18
};
enum
@@ -192,7 +192,7 @@ private:
INT_INTERFACE = 0x02,
INT_TRANSMIT = 0x04,
INT_FRAME = 0x08,
- INT_EXTERNAL = 0x10,
+ INT_EXTERNAL = 0x10
};
enum
@@ -200,7 +200,7 @@ private:
STATUS_NETWORK_PORT = 0x01,
STATUS_TX_BUFFER_FULL = 0x02,
STATUS_RX_BUFFER_FULL = 0x04,
- STATUS_MICRODRIVE_GAP = 0x08,
+ STATUS_MICRODRIVE_GAP = 0x08
};
int m_rtc_clock; // the RTC clock (pin 30) of the chip
diff --git a/src/mess/video/apollo.c b/src/mess/video/apollo.c
index b35e6550d4e..c79464355c3 100644
--- a/src/mess/video/apollo.c
+++ b/src/mess/video/apollo.c
@@ -1875,7 +1875,7 @@ void apollo_graphics_15i::device_reset()
= auto_alloc_array(machine(), UINT16, m_image_memory_size);
assert(m_image_memory != NULL);
- MLOG1(("device reset apollo graphics: buffer=%p size=%0x", m_image_memory, m_image_memory_size));
+ MLOG1(("device reset apollo graphics: buffer=%p size=%0x", (void *) m_image_memory, m_image_memory_size));
}
memset(m_color_lookup_table, 0, sizeof(m_color_lookup_table));
diff --git a/src/mess/video/cgc7900.c b/src/mess/video/cgc7900.c
index d9ad9e40692..0eb1cda1dd6 100644
--- a/src/mess/video/cgc7900.c
+++ b/src/mess/video/cgc7900.c
@@ -34,7 +34,7 @@ PALETTE_INIT_MEMBER(cgc7900_state, cgc7900)
palette.set_pen_color(5, rgb_t(0xff, 0x00, 0xff));
palette.set_pen_color(6, rgb_t(0xff, 0xff, 0x00));
palette.set_pen_color(7, rgb_t::white);
-};
+}
/***************************************************************************
READ/WRITE HANDLERS
diff --git a/src/mess/video/mbc55x.c b/src/mess/video/mbc55x.c
index 165c0979903..d7fdc80d41c 100644
--- a/src/mess/video/mbc55x.c
+++ b/src/mess/video/mbc55x.c
@@ -80,7 +80,8 @@ static void video_debug(running_machine &machine, int ref, int params, const cha
mbc55x_state *mstate = machine.driver_data<mbc55x_state>();
if(params>0)
{
- sscanf(param[0],"%d",&mstate->m_debug_video);
+ int temp;
+ sscanf(param[0],"%d",&temp); mstate->m_debug_video = temp;;
}
else
{
diff --git a/src/mess/video/pc1512.c b/src/mess/video/pc1512.c
index fe13b003d63..cecfe291d96 100644
--- a/src/mess/video/pc1512.c
+++ b/src/mess/video/pc1512.c
@@ -461,7 +461,7 @@ int pc1512_state::get_color(UINT8 data)
}
return color;
-};
+}
MC6845_UPDATE_ROW( pc1512_state::draw_graphics_1 )
{
diff --git a/src/mess/video/rmnimbus.c b/src/mess/video/rmnimbus.c
index 91bcc364c60..4ef72cac7c0 100644
--- a/src/mess/video/rmnimbus.c
+++ b/src/mess/video/rmnimbus.c
@@ -475,7 +475,8 @@ static void video_debug(running_machine &machine, int ref, int params, const cha
rmnimbus_state *state = machine.driver_data<rmnimbus_state>();
if(params>0)
{
- sscanf(param[0],"%d",&state->m_debug_video);
+ int temp;
+ sscanf(param[0],"%d",&temp); state->m_debug_video = temp;
}
else
{