diff options
Diffstat (limited to 'src/emu/machine')
| -rw-r--r-- | src/emu/machine/68681.c | 8 | ||||
| -rw-r--r-- | src/emu/machine/am9517a.c | 56 | ||||
| -rw-r--r-- | src/emu/machine/am9517a.h | 4 | ||||
| -rw-r--r-- | src/emu/machine/im6402.c | 12 | ||||
| -rw-r--r-- | src/emu/machine/im6402.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/mc2661.c | 10 | ||||
| -rw-r--r-- | src/emu/machine/mc2661.h | 2 | ||||
| -rw-r--r-- | src/emu/machine/ram.c | 2 |
8 files changed, 48 insertions, 48 deletions
diff --git a/src/emu/machine/68681.c b/src/emu/machine/68681.c index 4e69fcab776..7b0c721a193 100644 --- a/src/emu/machine/68681.c +++ b/src/emu/machine/68681.c @@ -289,13 +289,13 @@ double duart68681_get_ct_rate(duart68681_state *duart68681) UINT16 duart68681_get_ct_count(duart68681_state *duart68681) { - double clock = duart68681_get_ct_rate(duart68681); + double clock = duart68681_get_ct_rate(duart68681); return (duart68681->duart_timer->remaining() * clock).as_double(); } void duart68681_start_ct(duart68681_state *duart68681, int count) { - double clock = duart68681_get_ct_rate(duart68681); + double clock = duart68681_get_ct_rate(duart68681); duart68681->duart_timer->adjust(attotime::from_hz(clock) * count, 0); } @@ -600,7 +600,7 @@ READ8_DEVICE_HANDLER( duart68681_r ) case 0x05: /* ISR */ r = duart68681->ISR; break; - + case 0x06: /* CUR */ r = duart68681_get_ct_count(duart68681) >> 8; break; @@ -608,7 +608,7 @@ READ8_DEVICE_HANDLER( duart68681_r ) case 0x07: /* CLR */ r = duart68681_get_ct_count(duart68681) & 0xff; break; - + case 0x08: /* MR1B/MR2B */ if ( duart68681->channel[1].MR_ptr == 0 ) { diff --git a/src/emu/machine/am9517a.c b/src/emu/machine/am9517a.c index 4eaf6e00911..8af58c19e6e 100644 --- a/src/emu/machine/am9517a.c +++ b/src/emu/machine/am9517a.c @@ -9,10 +9,10 @@ /* - TODO: + TODO: - - memory-to-memory transfer - - external EOP + - memory-to-memory transfer + - external EOP */ @@ -271,7 +271,7 @@ inline void am9517a_device::dma_advance() if (MODE_ADDRESS_DECREMENT) { m_channel[m_current_channel].m_address--; - + if ((m_channel[m_current_channel].m_address & 0xff) == 0xff) { msb_changed = true; @@ -280,7 +280,7 @@ inline void am9517a_device::dma_advance() else { m_channel[m_current_channel].m_address++; - + if ((m_channel[m_current_channel].m_address & 0xff) == 0x00) { msb_changed = true; @@ -314,11 +314,11 @@ inline void am9517a_device::dma_advance() set_dack(); m_state = STATE_SI; break; - + case MODE_BLOCK: m_state = get_state1(msb_changed); break; - + case MODE_CASCADE: break; } @@ -514,7 +514,7 @@ void am9517a_device::execute_run() { m_current_channel = -1; m_state = STATE_SI; - } + } set_dack(); break; @@ -527,13 +527,13 @@ void am9517a_device::execute_run() set_dack(); m_state = COMMAND_COMPRESSED_TIMING ? STATE_S4 : STATE_S3; break; - + case STATE_S3: dma_read(); if (COMMAND_EXTENDED_WRITE) { - dma_write(); + dma_write(); } m_state = m_ready ? STATE_S4 : STATE_SW; @@ -542,7 +542,7 @@ void am9517a_device::execute_run() case STATE_SW: m_state = m_ready ? STATE_S4 : STATE_SW; break; - + case STATE_S4: if (COMMAND_COMPRESSED_TIMING) { @@ -556,7 +556,7 @@ void am9517a_device::execute_run() dma_advance(); break; - + case STATE_S11: m_current_channel = 0; @@ -570,27 +570,27 @@ void am9517a_device::execute_run() case STATE_S13: m_state = STATE_S14; break; - + case STATE_S14: dma_read(); m_state = STATE_S21; break; - + case STATE_S21: m_current_channel = 1; m_state = STATE_S22; break; - + case STATE_S22: m_state = STATE_S23; break; - + case STATE_S23: m_state = STATE_S24; break; - + case STATE_S24: dma_write(); dma_advance(); @@ -603,7 +603,7 @@ void am9517a_device::execute_run() //------------------------------------------------- -// read - +// read - //------------------------------------------------- READ8_MEMBER( am9517a_device::read ) @@ -655,7 +655,7 @@ READ8_MEMBER( am9517a_device::read ) case REGISTER_TEMPORARY: data = m_temp; break; - + case REGISTER_MASK: data = m_mask; break; @@ -667,7 +667,7 @@ READ8_MEMBER( am9517a_device::read ) //------------------------------------------------- -// write - +// write - //------------------------------------------------- WRITE8_MEMBER( am9517a_device::write ) @@ -675,7 +675,7 @@ WRITE8_MEMBER( am9517a_device::write ) if (!BIT(offset, 3)) { int channel = (offset >> 1) & 0x03; - + switch (offset & 0x01) { case REGISTER_ADDRESS: @@ -737,7 +737,7 @@ WRITE8_MEMBER( am9517a_device::write ) if (LOG) logerror("AM9517A '%s' Request Register: %01x\n", tag(), m_request); } break; - + case REGISTER_SINGLE_MASK: { int channel = data & 0x03; @@ -754,7 +754,7 @@ WRITE8_MEMBER( am9517a_device::write ) if (LOG) logerror("AM9517A '%s' Mask Register: %01x\n", tag(), m_mask); } break; - + case REGISTER_MODE: { int channel = data & 0x03; @@ -767,25 +767,25 @@ WRITE8_MEMBER( am9517a_device::write ) if (LOG) logerror("AM9517A '%s' Channel %u Mode: %02x\n", tag(), channel, data & 0xfc); } break; - + case REGISTER_BYTE_POINTER: if (LOG) logerror("AM9517A '%s' Clear Byte Pointer Flip-Flop\n", tag()); m_msb = 0; break; - + case REGISTER_MASTER_CLEAR: if (LOG) logerror("AM9517A '%s' Master Clear\n", tag()); - + device_reset(); break; - + case REGISTER_CLEAR_MASK: if (LOG) logerror("AM9517A '%s' Clear Mask Register\n", tag()); m_mask = 0; break; - + case REGISTER_MASK: m_mask = data & 0x0f; diff --git a/src/emu/machine/am9517a.h b/src/emu/machine/am9517a.h index 83f4dbce7cf..a0f60c542b5 100644 --- a/src/emu/machine/am9517a.h +++ b/src/emu/machine/am9517a.h @@ -128,7 +128,7 @@ private: devcb_resolved_write_line m_out_eop_func; devcb_resolved_read8 m_in_memr_func; devcb_resolved_write8 m_out_memw_func; - + struct { devcb_resolved_read8 m_in_ior_func; @@ -161,6 +161,6 @@ private: // device type definition extern const device_type AM9517A; - + #endif diff --git a/src/emu/machine/im6402.c b/src/emu/machine/im6402.c index 87a2a0da72c..c91f6bf9da9 100644 --- a/src/emu/machine/im6402.c +++ b/src/emu/machine/im6402.c @@ -74,14 +74,14 @@ inline void im6402_device::set_tre(int state) inline void im6402_device::receive_bit(int state) { if (LOG) logerror("IM6402 '%s' Receive Bit %u\n", tag(), state); - + receive_register_update_bit(state); if (is_receive_register_full()) { receive_register_extract(); m_rbr = get_received_char(); - + if (LOG) logerror("IM6402 '%s' Receive Data %02x\n", tag(), m_rbr); if (m_dr) @@ -90,7 +90,7 @@ inline void im6402_device::receive_bit(int state) } set_dr(ASSERT_LINE); - } + } } @@ -283,7 +283,7 @@ void im6402_device::device_timer(emu_timer &timer, device_timer_id id, int param void im6402_device::input_callback(UINT8 state) { int bit = (state & SERIAL_STATE_RX_DATA) ? 1 : 0; - + receive_bit(bit); } @@ -496,7 +496,7 @@ WRITE_LINE_MEMBER( im6402_device::pi_w ) WRITE_LINE_MEMBER( im6402_device::sbs_w ) { if (LOG) logerror("IM6402 '%s' Stop Bit Select %u\n", tag(), state); - + m_sbs = state; } @@ -520,7 +520,7 @@ WRITE_LINE_MEMBER( im6402_device::cls1_w ) WRITE_LINE_MEMBER( im6402_device::cls2_w ) { if (LOG) logerror("IM6402 '%s' Character Length Select 2 %u\n", tag(), state); - + m_cls2 = state; } diff --git a/src/emu/machine/im6402.h b/src/emu/machine/im6402.h index 33f54143f83..5409c65d926 100644 --- a/src/emu/machine/im6402.h +++ b/src/emu/machine/im6402.h @@ -130,7 +130,7 @@ private: inline void receive(); inline void transmit(); - enum + enum { TIMER_RX, TIMER_TX diff --git a/src/emu/machine/mc2661.c b/src/emu/machine/mc2661.c index 249b8edf9a3..80ec243781e 100644 --- a/src/emu/machine/mc2661.c +++ b/src/emu/machine/mc2661.c @@ -309,7 +309,7 @@ WRITE8_MEMBER( mc2661_device::write ) case REGISTER_SYNC: if (LOG) logerror("MC2661 '%s' Sync Register %u: %02x\n", tag(), m_sync_index + 1, data); - + m_sync[m_sync_index] = data; m_sync_index++; @@ -329,16 +329,16 @@ WRITE8_MEMBER( mc2661_device::write ) switch (MODE_STOP_BITS) { - case STOP_BITS_1: stop_bits = 1; break; - case STOP_BITS_1_5: stop_bits = 1.5; break; - case STOP_BITS_2: stop_bits = 2; break; + case STOP_BITS_1: stop_bits = 1; break; + case STOP_BITS_1_5: stop_bits = 1.5; break; + case STOP_BITS_2: stop_bits = 2; break; } if (!MODE_PARITY) parity_code = SERIAL_PARITY_NONE; else if (MODE_PARITY_EVEN) parity_code = SERIAL_PARITY_EVEN; else parity_code = SERIAL_PARITY_ODD; - set_data_frame(word_length, stop_bits, parity_code); + set_data_frame(word_length, stop_bits, parity_code); } m_mode_index++; diff --git a/src/emu/machine/mc2661.h b/src/emu/machine/mc2661.h index 3ab5ab609dd..f4e282b9c51 100644 --- a/src/emu/machine/mc2661.h +++ b/src/emu/machine/mc2661.h @@ -108,7 +108,7 @@ private: inline void receive(); inline void transmit(); - enum + enum { TIMER_RX, TIMER_TX diff --git a/src/emu/machine/ram.c b/src/emu/machine/ram.c index f329d57bf32..8767b7e031b 100644 --- a/src/emu/machine/ram.c +++ b/src/emu/machine/ram.c @@ -168,7 +168,7 @@ void ram_device::device_validity_check(validity_checker &valid) const mame_printf_warning("Setting value to default %s\n",m_default_size); astring error; mconfig().options().set_value(OPTION_RAMSIZE, m_default_size, OPTION_PRIORITY_CMDLINE, error); - assert(!error); + assert(!error); } } |
