diff options
author | 2015-06-30 09:02:11 -0500 | |
---|---|---|
committer | 2015-07-08 23:37:59 -0500 | |
commit | 8db46d73a25701178d8acc93510a6e81a86b3c4b (patch) | |
tree | 9248dd9388fb86f64be05e7d9c06b20f1bb3950c /src/emu/machine | |
parent | 1a32c4b76007999073b353532f74e7acee4b0491 (diff) |
more pedantic fixes (NW)
Diffstat (limited to 'src/emu/machine')
-rw-r--r-- | src/emu/machine/53c7xx.h | 8 | ||||
-rw-r--r-- | src/emu/machine/6850acia.c | 2 | ||||
-rw-r--r-- | src/emu/machine/68561mpcc.h | 2 | ||||
-rw-r--r-- | src/emu/machine/8530scc.h | 2 | ||||
-rw-r--r-- | src/emu/machine/eeprompar.c | 2 | ||||
-rw-r--r-- | src/emu/machine/eepromser.c | 2 | ||||
-rw-r--r-- | src/emu/machine/hd64610.c | 2 | ||||
-rw-r--r-- | src/emu/machine/i8255.c | 2 | ||||
-rw-r--r-- | src/emu/machine/i8257.c | 2 | ||||
-rw-r--r-- | src/emu/machine/idehd.h | 2 | ||||
-rw-r--r-- | src/emu/machine/ins8250.h | 2 | ||||
-rw-r--r-- | src/emu/machine/mc146818.h | 2 | ||||
-rw-r--r-- | src/emu/machine/mc68681.c | 14 | ||||
-rw-r--r-- | src/emu/machine/mcf5206e.c | 112 | ||||
-rw-r--r-- | src/emu/machine/microtch.c | 2 | ||||
-rw-r--r-- | src/emu/machine/mm58274c.c | 2 | ||||
-rw-r--r-- | src/emu/machine/ncr5380n.h | 8 | ||||
-rw-r--r-- | src/emu/machine/ncr5390.h | 8 | ||||
-rw-r--r-- | src/emu/machine/nmc9306.c | 2 | ||||
-rw-r--r-- | src/emu/machine/nscsi_bus.h | 20 | ||||
-rw-r--r-- | src/emu/machine/pit8253.c | 4 | ||||
-rw-r--r-- | src/emu/machine/rtc9701.h | 2 | ||||
-rw-r--r-- | src/emu/machine/t10mmc.h | 2 | ||||
-rw-r--r-- | src/emu/machine/tms9902.c | 2 | ||||
-rw-r--r-- | src/emu/machine/x76f041.h | 2 |
25 files changed, 104 insertions, 106 deletions
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 |