diff options
Diffstat (limited to 'src/emu')
| -rw-r--r-- | src/emu/cpu/i8008/i8008.c | 2 | ||||
| -rw-r--r-- | src/emu/cpu/i8008/i8008.h | 16 | ||||
| -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 | ||||
| -rw-r--r-- | src/emu/mconfig.c | 2 | ||||
| -rw-r--r-- | src/emu/sound/pokey.c | 74 | ||||
| -rw-r--r-- | src/emu/sound/pokey.h | 4 | ||||
| -rw-r--r-- | src/emu/uimain.c | 4 |
14 files changed, 99 insertions, 99 deletions
diff --git a/src/emu/cpu/i8008/i8008.c b/src/emu/cpu/i8008/i8008.c index 935e34f1660..5acc80b864d 100644 --- a/src/emu/cpu/i8008/i8008.c +++ b/src/emu/cpu/i8008/i8008.c @@ -95,7 +95,7 @@ void i8008_device::device_start() astring tempstr; for (int addrnum = 0; addrnum < 8; addrnum++) state_add(I8008_ADDR1 + addrnum, tempstr.format("ADDR%d", addrnum + 1), m_ADDR[addrnum].w.l).mask(0xfff); - + init_tables(); } diff --git a/src/emu/cpu/i8008/i8008.h b/src/emu/cpu/i8008/i8008.h index 4367a47fa1a..eb662d69f83 100644 --- a/src/emu/cpu/i8008/i8008.h +++ b/src/emu/cpu/i8008/i8008.h @@ -39,10 +39,10 @@ protected: virtual UINT32 execute_max_cycles() const; virtual void execute_run(); virtual void execute_set_input(int inputnum, int state); - + // device_memory_interface overrides virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; - + // device_state_interface overrides virtual void state_import(const device_state_entry &entry); virtual void state_export(const device_state_entry &entry); @@ -53,7 +53,7 @@ protected: virtual UINT32 disasm_min_opcode_bytes() const; virtual UINT32 disasm_max_opcode_bytes() const; virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - + virtual void execute_one(int opcode); void push_stack(); @@ -68,10 +68,10 @@ protected: void illegal(UINT8 opcode); void take_interrupt(); void init_tables(void); - + int m_pc_pos; // PC possition in ADDR int m_icount; - + // configuration const address_space_config m_program_config; const address_space_config m_io_config; @@ -85,11 +85,11 @@ protected: UINT8 m_PF; // Parity flag UINT8 m_HALT; UINT8 m_flags; // temporary I/O only - + UINT8 m_irq_state; - + UINT8 m_PARITY[256]; - + address_space *m_program; address_space *m_io; direct_read_data *m_direct; 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); } } diff --git a/src/emu/mconfig.c b/src/emu/mconfig.c index 226031d031e..342d8f2c4b0 100644 --- a/src/emu/mconfig.c +++ b/src/emu/mconfig.c @@ -96,7 +96,7 @@ machine_config::machine_config(const game_driver &gamedrv, emu_options &options) device_t *new_dev = device_add(&owner, intf[i].name, intf[i].devtype, is_default ? slot->default_clock() : 0); found = true; if (is_default) { - device_t::static_set_input_default(*new_dev, slot->input_ports_defaults()); + device_t::static_set_input_default(*new_dev, slot->input_ports_defaults()); if (slot->default_config()) { device_t::static_set_static_config(*new_dev, slot->default_config()); } diff --git a/src/emu/sound/pokey.c b/src/emu/sound/pokey.c index b4007dc91cc..7b7cbbf62b8 100644 --- a/src/emu/sound/pokey.c +++ b/src/emu/sound/pokey.c @@ -259,8 +259,8 @@ void pokey_device::device_start() vol_init(); /* The pokey does not have a reset line. These should be initialized - * with random values. - */ + * with random values. + */ m_KBCODE = 0x09; /* Atari 800 'no key' */ m_SKCTL = SK_RESET; /* let the RNG run after reset */ @@ -454,7 +454,7 @@ void pokey_device::execute_run() do { // debugging - //m_ppc = m_pc; // copy PC to previous PC + //m_ppc = m_pc; // copy PC to previous PC if (check_debugger) debugger_instruction_hook(this, 0); //m_pc); @@ -728,8 +728,8 @@ void pokey_device::sound_stream_update(sound_stream &stream, stream_sample_t **i out = (out > 0x7fff) ? 0x7fff : out; while( samples > 0 ) { - *buffer++ = out; - samples--; + *buffer++ = out; + samples--; } } else if (m_output_type == RC_LOWPASS) @@ -741,51 +741,51 @@ void pokey_device::sound_stream_update(sound_stream &stream, stream_sample_t **i while( samples > 0 ) { - /* store sum of output signals into the buffer */ - m_out_filter += (V0 - m_out_filter) * mult; - *buffer++ = m_out_filter; - samples--; + /* store sum of output signals into the buffer */ + m_out_filter += (V0 - m_out_filter) * mult; + *buffer++ = m_out_filter; + samples--; } } else if (m_output_type == OPAMP_C_TO_GROUND) { double rTot = m_voltab[m_output]; - /* In this configuration there is a capacitor in parallel to the pokey output to ground. - * With a LM324 in LTSpice this causes the opamp circuit to oscillate at around 100 kHz. - * We are ignoring the capacitor here, since this oscillation would not be audible. - */ + /* In this configuration there is a capacitor in parallel to the pokey output to ground. + * With a LM324 in LTSpice this causes the opamp circuit to oscillate at around 100 kHz. + * We are ignoring the capacitor here, since this oscillation would not be audible. + */ - /* This post-pokey stage usually has a high-pass filter behind it - * It is approximated by eliminating m_v_ref ( -1.0 term) - */ + /* This post-pokey stage usually has a high-pass filter behind it + * It is approximated by eliminating m_v_ref ( -1.0 term) + */ double V0 = ((rTot+m_r_pullup) / rTot - 1.0) * m_v_ref / 5.0 * 32767.0; while( samples > 0 ) { - /* store sum of output signals into the buffer */ - *buffer++ = V0; - samples--; + /* store sum of output signals into the buffer */ + *buffer++ = V0; + samples--; } } else if (m_output_type == OPAMP_LOW_PASS) { double rTot = m_voltab[m_output]; - /* This post-pokey stage usually has a low-pass filter behind it - * It is approximated by not adding in VRef below. - */ + /* This post-pokey stage usually has a low-pass filter behind it + * It is approximated by not adding in VRef below. + */ double V0 = (m_r_pullup / rTot) * m_v_ref / 5.0 * 32767.0; double mult = (m_cap == 0.0) ? 1.0 : 1.0 - exp(-1.0 / (m_cap * m_r_pullup) * m_clock_period.as_double()); while( samples > 0 ) { - /* store sum of output signals into the buffer */ - m_out_filter += (V0 - m_out_filter) * mult; - *buffer++ = m_out_filter /* + m_v_ref */; // see above - samples--; + /* store sum of output signals into the buffer */ + m_out_filter += (V0 - m_out_filter) * mult; + *buffer++ = m_out_filter /* + m_v_ref */; // see above + samples--; } } else if (m_output_type == DISCRETE_VAR_R) @@ -793,8 +793,8 @@ void pokey_device::sound_stream_update(sound_stream &stream, stream_sample_t **i INT32 out = m_voltab[m_output]; while( samples > 0 ) { - *buffer++ = out; - samples--; + *buffer++ = out; + samples--; } } } @@ -1112,8 +1112,8 @@ void pokey_device::pokey_potgo(void) if (r == 0) { /* immediately set the ready - bit of m_ALLPOT - * In this case, most likely no capacitor is connected - */ + * In this case, most likely no capacitor is connected + */ m_ALLPOT |= (1<<pot); } @@ -1128,8 +1128,8 @@ void pokey_device::vol_init() double resistors[4] = {90000, 26500, 8050, 3400}; double pull_up = 10000; /* just a guess, there has to be a resistance since the doc specifies that - * Vout is at least 4.2V if all channels turned off. - */ + * Vout is at least 4.2V if all channels turned off. + */ double r_off = 8e6; double r_chan[16]; double rTot; @@ -1276,12 +1276,12 @@ char *pokey_device::audctl2str(int val) pokey_device::pokey_channel::pokey_channel() : m_AUDF(0), - m_AUDC(0), + m_AUDC(0), m_borrow_cnt(0), - m_counter(0), - m_output(0), - m_filter_sample(0), - m_div2(0) + m_counter(0), + m_output(0), + m_filter_sample(0), + m_div2(0) { } diff --git a/src/emu/sound/pokey.h b/src/emu/sound/pokey.h index 276dd083576..0203ce18c27 100644 --- a/src/emu/sound/pokey.h +++ b/src/emu/sound/pokey.h @@ -180,8 +180,8 @@ public: enum /* sync-operations */ { - SYNC_NOOP = 11, - SYNC_SET_IRQST = 12, + SYNC_NOOP = 11, + SYNC_SET_IRQST = 12, SYNC_POT = 13, SYNC_WRITE = 14 }; diff --git a/src/emu/uimain.c b/src/emu/uimain.c index dbc98edcd22..bb46fa777aa 100644 --- a/src/emu/uimain.c +++ b/src/emu/uimain.c @@ -412,7 +412,7 @@ const char *ui_menu_slot_devices::slot_get_prev(device_slot_interface *slot) if (idx==-2) idx = slot_get_length(slot) -1; if (idx==-1) return ""; if (slot->get_slot_interfaces()[idx].internal) idx--; - } while (slot->get_slot_interfaces()[idx].internal); + } while (slot->get_slot_interfaces()[idx].internal); return slot->get_slot_interfaces()[idx].name; } @@ -479,7 +479,7 @@ void ui_menu_slot_devices::handle() if (menu_event != NULL && menu_event->itemref != NULL) { if (menu_event->iptkey == IPT_UI_LEFT || menu_event->iptkey == IPT_UI_RIGHT) { - device_slot_interface *slot = (device_slot_interface *)menu_event->itemref; + device_slot_interface *slot = (device_slot_interface *)menu_event->itemref; const char *val = (menu_event->iptkey == IPT_UI_LEFT) ? slot_get_prev(slot) : slot_get_next(slot); set_slot_device(slot,val); reset(UI_MENU_RESET_REMEMBER_REF); |
