diff options
| author | 2015-02-25 08:09:13 +0100 | |
|---|---|---|
| committer | 2015-02-25 08:09:13 +0100 | |
| commit | 6ae44e46f91aa2bd74d9895e6bfd345baebd3d22 (patch) | |
| tree | 70be3ad6f499bb138c0335e8d2d16790f6f971b3 /src/emu | |
| parent | 33c8d18d612786130c2baafd644604137f6f4ef8 (diff) | |
Cleanups and version bumpmame0159
Diffstat (limited to 'src/emu')
40 files changed, 174 insertions, 179 deletions
diff --git a/src/emu/bus/a2bus/a2bus.h b/src/emu/bus/a2bus/a2bus.h index f14b1d40354..90ab602607d 100644 --- a/src/emu/bus/a2bus/a2bus.h +++ b/src/emu/bus/a2bus/a2bus.h @@ -176,7 +176,7 @@ public: void recalc_slot_inh() { m_a2bus->recalc_inh(m_slot); } void set_maincpu_halt(int state) { m_a2bus->set_maincpu_halt(state); } - // pass through the original address space if any for debugger protection + // pass through the original address space if any for debugger protection // when debugging e.g. coprocessor cards (Z80 SoftCard etc). UINT8 slot_dma_read(address_space &space, UINT16 offset) { return m_a2bus->dma_r(space, offset); } void slot_dma_write(address_space &space, UINT16 offset, UINT8 data) { m_a2bus->dma_w(space, offset, data); } diff --git a/src/emu/bus/cpc/smartwatch.c b/src/emu/bus/cpc/smartwatch.c index cb82fba853d..85a559bc0d0 100644 --- a/src/emu/bus/cpc/smartwatch.c +++ b/src/emu/bus/cpc/smartwatch.c @@ -1,10 +1,10 @@ /* - Dobbertin Smartwatch - - Created: 23/2/2015 - - TODO: setting the time (requires the DS1315 core to be able to do this, - at the moment it just reads the current time) + Dobbertin Smartwatch + + Created: 23/2/2015 + + TODO: setting the time (requires the DS1315 core to be able to do this, + at the moment it just reads the current time) */ #include "emu.h" diff --git a/src/emu/bus/cpc/smartwatch.h b/src/emu/bus/cpc/smartwatch.h index aacdd085981..8e2007f8a28 100644 --- a/src/emu/bus/cpc/smartwatch.h +++ b/src/emu/bus/cpc/smartwatch.h @@ -1,10 +1,10 @@ /* - Dobbertin Smartwatch - - Dallas DS1216 Smartwatch + DS1315 Phantom Time chip - - Further info at: http://www.cpcwiki.eu/index.php/Dobbertin_Smart_Watch - + Dobbertin Smartwatch + + Dallas DS1216 Smartwatch + DS1315 Phantom Time chip + + Further info at: http://www.cpcwiki.eu/index.php/Dobbertin_Smart_Watch + */ #ifndef SMARTWATCH_H_ diff --git a/src/emu/bus/nes_ctrl/bcbattle.c b/src/emu/bus/nes_ctrl/bcbattle.c index 81331440767..aa75aeddd39 100644 --- a/src/emu/bus/nes_ctrl/bcbattle.c +++ b/src/emu/bus/nes_ctrl/bcbattle.c @@ -35,7 +35,7 @@ machine_config_constructor nes_bcbattle_device::device_mconfig_additions() const //------------------------------------------------- // This part is the hacky replacement for the real Barcode unit [shared with SNES implementation]: -// code periodically checks whether a new code has been scanned and it moves it to the +// code periodically checks whether a new code has been scanned and it moves it to the // m_current_barcode array void nes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { diff --git a/src/emu/bus/nes_ctrl/miracle.c b/src/emu/bus/nes_ctrl/miracle.c index bcf596b8d72..ff122d09dfb 100644 --- a/src/emu/bus/nes_ctrl/miracle.c +++ b/src/emu/bus/nes_ctrl/miracle.c @@ -12,8 +12,8 @@ #include "miracle.h" #define MIRACLE_MIDI_WAITING 0 -#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano -#define MIRACLE_MIDI_SEND 2 // send byte to piano +#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano +#define MIRACLE_MIDI_SEND 2 // send byte to piano //************************************************************************** // DEVICE DEFINITIONS @@ -141,7 +141,7 @@ UINT8 nes_miracle_device::read_bit0() void nes_miracle_device::write(UINT8 data) { -// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode); +// printf("write: %d (%d %02x %d)\n", data & 1, m_sent_bits, m_data_sent, m_midi_mode); if (m_midi_mode == MIRACLE_MIDI_SEND) { @@ -154,7 +154,7 @@ void nes_miracle_device::write(UINT8 data) // then we go back to waiting if (m_sent_bits == 8) { -// printf("xmit MIDI byte %02x\n", m_data_sent); +// printf("xmit MIDI byte %02x\n", m_data_sent); xmit_char(m_data_sent); m_midi_mode = MIRACLE_MIDI_WAITING; m_sent_bits = 0; @@ -175,7 +175,7 @@ void nes_miracle_device::write(UINT8 data) // was timer running? if (m_strobe_clock > 0) { -// printf("got strobe at %d clocks\n", m_strobe_clock); +// printf("got strobe at %d clocks\n", m_strobe_clock); if (m_strobe_clock < 66 && data == 0) { @@ -188,7 +188,7 @@ void nes_miracle_device::write(UINT8 data) m_status_bit = true; if (m_recv_read != m_recv_write) { -// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read); +// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read); m_data_sent = m_recvring[m_recv_read++]; if (m_recv_read >= RECV_RING_SIZE) { @@ -199,7 +199,7 @@ void nes_miracle_device::write(UINT8 data) else { m_read_status = false; -// printf("Miracle has no data\n"); +// printf("Miracle has no data\n"); } return; } @@ -230,7 +230,7 @@ void nes_miracle_device::rcv_complete() // Rx completed receiving byte receive_register_extract(); UINT8 rcv = get_received_char(); -// printf("Got %02x -> [%d]\n", rcv, m_recv_write); +// printf("Got %02x -> [%d]\n", rcv, m_recv_write); m_recvring[m_recv_write++] = rcv; if (m_recv_write >= RECV_RING_SIZE) { @@ -282,4 +282,3 @@ void nes_miracle_device::xmit_char(UINT8 data) } } } - diff --git a/src/emu/bus/snes_ctrl/bcbattle.c b/src/emu/bus/snes_ctrl/bcbattle.c index 83682589c71..27d7dd1c71c 100644 --- a/src/emu/bus/snes_ctrl/bcbattle.c +++ b/src/emu/bus/snes_ctrl/bcbattle.c @@ -35,7 +35,7 @@ machine_config_constructor snes_bcbattle_device::device_mconfig_additions() cons //------------------------------------------------- // This part is the hacky replacement for the real Barcode unit [shared with NES implementation]: -// code periodically checks whether a new code has been scanned and it moves it to the +// code periodically checks whether a new code has been scanned and it moves it to the // m_current_barcode array void snes_bcbattle_device::device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) { @@ -140,7 +140,7 @@ int snes_bcbattle_device::read_current_bit() m_cur_bit++; return bit; } - if (m_cur_bit == 4) // only the low nibble is transmitted (this is the main action of the BBII interface for SNES) + if (m_cur_bit == 4) // only the low nibble is transmitted (this is the main action of the BBII interface for SNES) { m_cur_bit = 0; //printf("%X ", m_current_barcode[m_cur_byte]); @@ -175,26 +175,26 @@ void snes_bcbattle_device::port_poll() UINT8 snes_bcbattle_device::read_pin4() { UINT8 ret = 0; - + if (m_idx >= 80) ret |= 0x00; - else if (m_idx >= 28) // scan actual barcode + else if (m_idx >= 28) // scan actual barcode { - ret |= read_current_bit(); // if no code is pending transmission, the function returns 0 + ret |= read_current_bit(); // if no code is pending transmission, the function returns 0 m_idx++; } - else if (m_idx >= 25) // unknown flags? + else if (m_idx >= 25) // unknown flags? m_idx++; - else if (m_idx == 24) // barcode present + else if (m_idx == 24) // barcode present { ret |= m_pending_code; m_idx++; } - else if (m_idx >= 12) // controller ID + else if (m_idx >= 12) // controller ID ret |= BIT(0x7000, m_idx++); - else // first 12 bytes are unknown and probably always 0 + else // first 12 bytes are unknown and probably always 0 m_idx++; - + return ret; } @@ -207,7 +207,7 @@ void snes_bcbattle_device::write_strobe(UINT8 data) { int old = m_strobe; m_strobe = data & 0x01; - - if (m_strobe < old) // 1 -> 0 transition + + if (m_strobe < old) // 1 -> 0 transition port_poll(); } diff --git a/src/emu/bus/snes_ctrl/bcbattle.h b/src/emu/bus/snes_ctrl/bcbattle.h index 00d653c5e29..e960b8ac134 100644 --- a/src/emu/bus/snes_ctrl/bcbattle.h +++ b/src/emu/bus/snes_ctrl/bcbattle.h @@ -45,7 +45,7 @@ protected: int read_current_bit(); private: - + static const device_timer_id TIMER_BATTLER = 1; required_device<barcode_reader_device> m_reader; UINT8 m_current_barcode[20]; diff --git a/src/emu/bus/snes_ctrl/ctrl.h b/src/emu/bus/snes_ctrl/ctrl.h index d7f87ef5c42..2d6850806d7 100644 --- a/src/emu/bus/snes_ctrl/ctrl.h +++ b/src/emu/bus/snes_ctrl/ctrl.h @@ -29,13 +29,13 @@ public: // construction/destruction device_snes_control_port_interface(const machine_config &mconfig, device_t &device); virtual ~device_snes_control_port_interface(); - + virtual UINT8 read_pin4() { return 0; }; virtual UINT8 read_pin5() { return 0; }; virtual void write_pin6(UINT8 data) { }; virtual void write_strobe(UINT8 data) { }; virtual void port_poll() { }; - + protected: snes_control_port_device *m_port; }; diff --git a/src/emu/bus/snes_ctrl/joypad.c b/src/emu/bus/snes_ctrl/joypad.c index a8291c2dfdb..4b26d35b887 100644 --- a/src/emu/bus/snes_ctrl/joypad.c +++ b/src/emu/bus/snes_ctrl/joypad.c @@ -97,7 +97,7 @@ void snes_joypad_device::port_poll() // if up, no down if (temp & 0x10) temp &= ~0x20; - + m_latch = temp | 0xffff0000; } @@ -121,7 +121,6 @@ void snes_joypad_device::write_strobe(UINT8 data) int old = m_strobe; m_strobe = data & 0x01; - if (m_strobe < old) // 1 -> 0 transition + if (m_strobe < old) // 1 -> 0 transition port_poll(); } - diff --git a/src/emu/bus/snes_ctrl/joypad.h b/src/emu/bus/snes_ctrl/joypad.h index 9c6920e7a18..bb0b36b6a4f 100644 --- a/src/emu/bus/snes_ctrl/joypad.h +++ b/src/emu/bus/snes_ctrl/joypad.h @@ -41,7 +41,7 @@ protected: virtual UINT8 read_pin4(); virtual void write_strobe(UINT8 data); virtual void port_poll(); - + private: required_ioport m_joypad; int m_strobe; diff --git a/src/emu/bus/snes_ctrl/miracle.c b/src/emu/bus/snes_ctrl/miracle.c index c7a25a630dd..081a2c5f030 100644 --- a/src/emu/bus/snes_ctrl/miracle.c +++ b/src/emu/bus/snes_ctrl/miracle.c @@ -4,17 +4,17 @@ Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. - + recv at PC = 008a4a xmit at PC = 008adb - + **********************************************************************/ #include "miracle.h" #define MIRACLE_MIDI_WAITING 0 -#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano -#define MIRACLE_MIDI_SEND 2 // send byte to piano +#define MIRACLE_MIDI_RECEIVE 1 // receive byte from piano +#define MIRACLE_MIDI_SEND 2 // send byte to piano //************************************************************************** // DEVICE DEFINITIONS @@ -130,12 +130,12 @@ UINT8 snes_miracle_device::read_pin4() void snes_miracle_device::write_pin6(UINT8 data) { -// printf("%02x to pin6\n", data); +// printf("%02x to pin6\n", data); } void snes_miracle_device::write_strobe(UINT8 data) { -// printf("%02x to strobe\n", data); +// printf("%02x to strobe\n", data); if (m_midi_mode == MIRACLE_MIDI_SEND) { @@ -148,7 +148,7 @@ void snes_miracle_device::write_strobe(UINT8 data) // then we go back to waiting if (m_sent_bits == 8) { -// printf("xmit MIDI byte %02x\n", m_data_sent); +// printf("xmit MIDI byte %02x\n", m_data_sent); xmit_char(m_data_sent); m_midi_mode = MIRACLE_MIDI_WAITING; m_sent_bits = 0; @@ -169,7 +169,7 @@ void snes_miracle_device::write_strobe(UINT8 data) // was timer running? if (m_strobe_clock > 0) { -// printf("got strobe at %d clocks\n", m_strobe_clock); +// printf("got strobe at %d clocks\n", m_strobe_clock); if (m_strobe_clock < 500 && data == 0) { @@ -182,7 +182,7 @@ void snes_miracle_device::write_strobe(UINT8 data) m_status_bit = true; if (m_recv_read != m_recv_write) { -// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read); +// printf("Getting %02x from Miracle[%d]\n", m_recvring[m_recv_read], m_recv_read); m_data_sent = m_recvring[m_recv_read++]; if (m_recv_read >= RECV_RING_SIZE) { @@ -193,7 +193,7 @@ void snes_miracle_device::write_strobe(UINT8 data) else { m_read_status = false; -// printf("Miracle has no data\n"); +// printf("Miracle has no data\n"); } return; } @@ -225,7 +225,7 @@ void snes_miracle_device::rcv_complete() // Rx completed receiving byte receive_register_extract(); UINT8 rcv = get_received_char(); -// printf("Got %02x -> [%d]\n", rcv, m_recv_write); +// printf("Got %02x -> [%d]\n", rcv, m_recv_write); m_recvring[m_recv_write++] = rcv; if (m_recv_write >= RECV_RING_SIZE) { @@ -277,4 +277,3 @@ void snes_miracle_device::xmit_char(UINT8 data) } } } - diff --git a/src/emu/bus/snes_ctrl/mouse.c b/src/emu/bus/snes_ctrl/mouse.c index 1d6cb5b52f6..8337af09859 100644 --- a/src/emu/bus/snes_ctrl/mouse.c +++ b/src/emu/bus/snes_ctrl/mouse.c @@ -1,7 +1,7 @@ /********************************************************************** Nintendo Super Famicom & SNES Mouse - + Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -32,11 +32,11 @@ static INPUT_PORTS_START( snes_mouse ) // detect a sudden jump in the wrong direction, making the usage unfriendly... PORT_START("MOUSE_X") PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_X ) PORT_NAME("Superscope X Axis") PORT_SENSITIVITY(30) PORT_KEYDELTA(5) -// PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(30) PORT_KEYDELTA(5) +// PORT_BIT( 0xff, 0x00, IPT_MOUSE_X) PORT_SENSITIVITY(30) PORT_KEYDELTA(5) PORT_START("MOUSE_Y") PORT_BIT( 0x1ff, 0x100, IPT_LIGHTGUN_Y) PORT_NAME("Superscope Y Axis") PORT_SENSITIVITY(30) PORT_KEYDELTA(5) -// PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(30) PORT_KEYDELTA(5) +// PORT_BIT( 0xff, 0x00, IPT_MOUSE_Y) PORT_SENSITIVITY(30) PORT_KEYDELTA(5) INPUT_PORTS_END @@ -155,7 +155,7 @@ void snes_mouse_device::port_poll() m_deltax = var; m_oldx = m_x; } - + var = m_y - m_oldy; if (var) { @@ -163,7 +163,7 @@ void snes_mouse_device::port_poll() if (m_diry != new_dir) m_diry = new_dir; } - + if (var < -127) { m_deltay = 0x7f; @@ -196,14 +196,14 @@ void snes_mouse_device::port_poll() UINT8 snes_mouse_device::read_pin4() { UINT8 res = 0; - + if (m_strobe == 1) { // reading with strobe 1, changes mouse speed m_speed = (m_speed + 1) % 3; return res; } - + if (m_idx >= 32) res |= 0x01; else if (m_idx >= 24) @@ -222,7 +222,7 @@ UINT8 snes_mouse_device::read_pin4() } else res |= BIT(m_latch, m_idx++); - + return res; } @@ -235,7 +235,6 @@ void snes_mouse_device::write_strobe(UINT8 data) int old = m_strobe; m_strobe = data & 0x01; - if (m_strobe < old) // 1 -> 0 transition + if (m_strobe < old) // 1 -> 0 transition port_poll(); } - diff --git a/src/emu/bus/snes_ctrl/mouse.h b/src/emu/bus/snes_ctrl/mouse.h index fbce1ba6c41..c795b93579a 100644 --- a/src/emu/bus/snes_ctrl/mouse.h +++ b/src/emu/bus/snes_ctrl/mouse.h @@ -41,7 +41,7 @@ protected: virtual UINT8 read_pin4(); virtual void write_strobe(UINT8 data); virtual void port_poll(); - + private: required_ioport m_buttons; required_ioport m_xaxis; diff --git a/src/emu/bus/snes_ctrl/multitap.c b/src/emu/bus/snes_ctrl/multitap.c index bf1d04cada9..8a18422c19f 100644 --- a/src/emu/bus/snes_ctrl/multitap.c +++ b/src/emu/bus/snes_ctrl/multitap.c @@ -121,14 +121,14 @@ UINT8 snes_multitap_device::read_pin4() ret |= m_select ? m_port1->read_pin4() : m_port3->read_pin4(); else // 1P ret |= m_select ? m_port1->read_pin4() : 0; - + return ret; } UINT8 snes_multitap_device::read_pin5() { UINT8 ret = 0; - + if (m_cfg->read() == 0) // 4P ret |= m_select ? m_port2->read_pin4() : m_port4->read_pin4(); return ret; diff --git a/src/emu/bus/snes_ctrl/pachinko.c b/src/emu/bus/snes_ctrl/pachinko.c index 099e4e00f57..e69050a9a78 100644 --- a/src/emu/bus/snes_ctrl/pachinko.c +++ b/src/emu/bus/snes_ctrl/pachinko.c @@ -83,7 +83,7 @@ void snes_pachinko_device::device_reset() void snes_pachinko_device::port_poll() { UINT8 dial = BITSWAP8(m_dial->read() ^ 0xff,7,6,5,4,3,2,1,0); - m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID + m_latch = m_button->read() | (dial << 25) | 0xee7000; // add ID } //------------------------------------------------- @@ -105,7 +105,7 @@ void snes_pachinko_device::write_strobe(UINT8 data) { int old = m_strobe; m_strobe = data & 0x01; - - if (m_strobe < old) // 1 -> 0 transition + + if (m_strobe < old) // 1 -> 0 transition port_poll(); } diff --git a/src/emu/bus/snes_ctrl/sscope.c b/src/emu/bus/snes_ctrl/sscope.c index 93e46879a16..178ab25bddd 100644 --- a/src/emu/bus/snes_ctrl/sscope.c +++ b/src/emu/bus/snes_ctrl/sscope.c @@ -112,11 +112,11 @@ void snes_sscope_device::port_poll() // then start elaborating input bits // 1. only keep old turbo value m_latch &= 0x04; - + // 2. set onscreen/offscreen if (!m_port->m_onscreen_cb.isnull()) m_latch |= (m_port->m_onscreen_cb(m_x, m_y) ? 0x00 : 0x40); - + // 3. pause is a button that is always edge sensitive if (BIT(input, 3) && !m_pause_lock) { @@ -134,11 +134,11 @@ void snes_sscope_device::port_poll() } else if (!BIT(input, 2)) m_turbo_lock = 0; - + // 5. cursor is a button that is always level sensitive m_latch |= BIT(input, 1); - - // 6. fire is a button with two behaviors: if turbo is active, trigger is level sensitive; + + // 6. fire is a button with two behaviors: if turbo is active, trigger is level sensitive; // otherwise it is edge sensitive if (BIT(input, 0) && (BIT(m_latch, 2) || !m_fire_lock)) { @@ -147,7 +147,7 @@ void snes_sscope_device::port_poll() } else if (!BIT(input, 0)) m_fire_lock = 0; - + // If we have pressed fire or cursor and we are on-screen and SuperScope is in Port2, then latch video signal. // Notice that this only works in Port2 because its IOBit pin is connected to bit7 of the IO Port, while Port1 // has IOBit pin connected to bit6 of the IO Port, and the latter is not detected by the H/V Counters. In other @@ -163,12 +163,12 @@ void snes_sscope_device::port_poll() UINT8 snes_sscope_device::read_pin4() { UINT8 res = 0; - - if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s + + if (m_idx >= 8) // bits 8-15 = ID = all 1s; bits >= 16 all 1s res |= 0x01; else res |= BIT(m_latch, m_idx++); - + return res; } @@ -181,7 +181,6 @@ void snes_sscope_device::write_strobe(UINT8 data) int old = m_strobe; m_strobe = data & 0x01; - if (m_strobe < old) // 1 -> 0 transition + if (m_strobe < old) // 1 -> 0 transition port_poll(); } - diff --git a/src/emu/bus/snes_ctrl/sscope.h b/src/emu/bus/snes_ctrl/sscope.h index e6a806038fc..7b9379336dc 100644 --- a/src/emu/bus/snes_ctrl/sscope.h +++ b/src/emu/bus/snes_ctrl/sscope.h @@ -41,7 +41,7 @@ protected: virtual UINT8 read_pin4(); virtual void write_strobe(UINT8 data); virtual void port_poll(); - + private: required_ioport m_buttons; required_ioport m_xaxis; diff --git a/src/emu/bus/snes_ctrl/twintap.c b/src/emu/bus/snes_ctrl/twintap.c index 6ddcb32b158..d5d38d55ac4 100644 --- a/src/emu/bus/snes_ctrl/twintap.c +++ b/src/emu/bus/snes_ctrl/twintap.c @@ -3,12 +3,12 @@ Nintendo Super Famicom - Yonezawa / PartyRoom 21 Twin Tap Controller This controller consists of two 1-button small units attached to a - single 7pin connector. You plug the connector to Port2 and two + single 7pin connector. You plug the connector to Port2 and two players can compete on the quiz game (Port1 should have a joypad plugged in, to start the game and browse the menus). By plugging a multitap adapter to Port2, up to 4 Twin Tap controllers can be attached at the same time, allowing for 8 players quiz sessions. - + Copyright MESS Team. Visit http://mamedev.org for licensing and usage restrictions. @@ -28,7 +28,7 @@ static INPUT_PORTS_START( snes_twintap ) PORT_BIT( 0x0001, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Button 2") PORT_BIT( 0x0002, IP_ACTIVE_HIGH, IPT_OTHER ) PORT_NAME("Button 1") PORT_BIT( 0x8ffc, IP_ACTIVE_HIGH, IPT_UNUSED ) - PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED ) // controller ID unknown + PORT_BIT( 0x7000, IP_ACTIVE_LOW, IPT_UNUSED ) // controller ID unknown INPUT_PORTS_END @@ -108,7 +108,7 @@ void snes_twintap_device::write_strobe(UINT8 data) { int old = m_strobe; m_strobe = data & 0x01; - - if (m_strobe < old) // 1 -> 0 transition + + if (m_strobe < old) // 1 -> 0 transition port_poll(); } diff --git a/src/emu/cpu/amis2000/amis2000.c b/src/emu/cpu/amis2000/amis2000.c index ac680096275..d23e2dbdec4 100644 --- a/src/emu/cpu/amis2000/amis2000.c +++ b/src/emu/cpu/amis2000/amis2000.c @@ -184,7 +184,7 @@ void amis2152_cpu_device::device_start() amis2000_base_device::device_start(); m_d2f_timer = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(amis2152_cpu_device::d2f_timer_cb), this)); - + // zerofill m_d2f_latch = 0; m_fout_state = 0; @@ -205,7 +205,7 @@ void amis2000_base_device::device_reset() m_pc = 0; m_op = 0; m_skip = false; - + // clear i/o m_a = 0x1fff; m_write_a(0, m_a, 0xffff); @@ -235,14 +235,14 @@ void amis2000_base_device::execute_run() while (m_icount > 0) { m_icount--; - + // remember previous opcode m_prev_op = m_op; debugger_instruction_hook(this, m_pc); m_op = m_program->read_byte(m_pc); m_pc = (m_pc + 1) & 0x1fff; - + if (m_skip) { // always skip over PP prefix @@ -299,7 +299,7 @@ void amis2000_base_device::execute_run() case 0x2d: op_sf2(); break; case 0x2e: op_tf1(); break; case 0x2f: op_tf2(); break; - + default: switch (m_op & 0xfc) { diff --git a/src/emu/cpu/amis2000/amis2000.h b/src/emu/cpu/amis2000/amis2000.h index 8adcb4e2f7c..cf7c67c63a3 100644 --- a/src/emu/cpu/amis2000/amis2000.h +++ b/src/emu/cpu/amis2000/amis2000.h @@ -95,7 +95,7 @@ protected: address_space_config m_data_config; address_space *m_program; address_space *m_data; - + UINT8 m_bu_bits; UINT16 m_bu_mask; UINT8 m_callstack_bits; // number of program counter bits held in callstack @@ -129,14 +129,14 @@ protected: devcb_write8 m_write_d; devcb_write16 m_write_a; devcb_write_line m_write_f; - + // misc internal helpers UINT8 ram_r(); void ram_w(UINT8 data); void pop_callstack(); void push_callstack(); void d_latch_out(bool active); - + // opcode handlers virtual void op_lai(); virtual void op_lab(); @@ -221,7 +221,7 @@ protected: // device-level overrides virtual void device_start(); virtual void device_reset(); - + // digital-to-frequency converter UINT8 m_d2f_latch; emu_timer *m_d2f_timer; @@ -229,7 +229,7 @@ protected: void d2f_timer_clock(); TIMER_CALLBACK_MEMBER(d2f_timer_cb); - + // opcode handlers virtual void op_szk(); }; diff --git a/src/emu/cpu/amis2000/amis2000d.c b/src/emu/cpu/amis2000/amis2000d.c index 971a1a61571..27077170402 100644 --- a/src/emu/cpu/amis2000/amis2000d.c +++ b/src/emu/cpu/amis2000/amis2000d.c @@ -108,21 +108,21 @@ CPU_DISASSEMBLE( amis2000 ) char *dst = buffer; dst += sprintf(dst, "%-5s ", s_mnemonics[instr]); - + // opcode parameter int mask = s_bits[instr]; bool complement = (mask < 0); if (mask < 0) mask = -mask; mask = (1 << mask) - 1; - + if (mask != 0) { UINT8 param = op; if (complement) param = ~param; param &= mask; - + if (mask < 0x10) dst += sprintf(dst, "%d", param); else diff --git a/src/emu/cpu/amis2000/amis2000op.inc b/src/emu/cpu/amis2000/amis2000op.inc index 85f285e66bc..1b647b071bf 100644 --- a/src/emu/cpu/amis2000/amis2000op.inc +++ b/src/emu/cpu/amis2000/amis2000op.inc @@ -307,7 +307,7 @@ void amis2000_base_device::op_jmp() // JMP X: jump to X(+PP) UINT16 mask = 0x3f; UINT16 param = m_op & mask; - + // if previous opcode was PP, change PC high bits too if ((m_prev_op & 0xf0) == 0x60) { @@ -507,7 +507,7 @@ TIMER_CALLBACK_MEMBER(amis2152_cpu_device::d2f_timer_cb) { m_write_f(m_fout_state); m_fout_state ^= 1; - + d2f_timer_clock(); } diff --git a/src/emu/cpu/i386/i386ops.h b/src/emu/cpu/i386/i386ops.h index 9edaee19683..66e7782687a 100644 --- a/src/emu/cpu/i386/i386ops.h +++ b/src/emu/cpu/i386/i386ops.h @@ -329,7 +329,7 @@ const i386_device::X86_OPCODE i386_device::s_x86_opcode_table[] = { 0x32, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_rdmsr, &i386_device::pentium_rdmsr, false}, { 0x38, OP_2BYTE|OP_PENTIUM, &i386_device::i386_decode_three_byte38, &i386_device::i386_decode_three_byte38,false}, { 0x3A, OP_2BYTE|OP_PENTIUM, &i386_device::i386_decode_three_byte3a, &i386_device::i386_decode_three_byte3a,false}, - { 0x40, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovo_r16_rm16, &i386_device::pentium_cmovo_r32_rm32, false}, + { 0x40, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovo_r16_rm16, &i386_device::pentium_cmovo_r32_rm32, false}, { 0x41, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovno_r16_rm16, &i386_device::pentium_cmovno_r32_rm32, false}, { 0x42, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovb_r16_rm16, &i386_device::pentium_cmovb_r32_rm32, false}, { 0x43, OP_2BYTE|OP_PENTIUM, &i386_device::pentium_cmovae_r16_rm16, &i386_device::pentium_cmovae_r32_rm32, false}, diff --git a/src/emu/cpu/m6502/m4510.c b/src/emu/cpu/m6502/m4510.c index a435ae7aa4e..04756fc52ed 100644 --- a/src/emu/cpu/m6502/m4510.c +++ b/src/emu/cpu/m6502/m4510.c @@ -86,7 +86,7 @@ bool m4510_device::memory_translate(address_spacenum spacenum, int intention, of { address = map(address); } - + return true; } diff --git a/src/emu/cpu/m68000/m68000.h b/src/emu/cpu/m68000/m68000.h index d9b9200cee6..a7da4266061 100644 --- a/src/emu/cpu/m68000/m68000.h +++ b/src/emu/cpu/m68000/m68000.h @@ -357,7 +357,7 @@ public: UINT32 ic_address[M68K_IC_SIZE]; /* instruction cache address data */ UINT32 ic_data[M68K_IC_SIZE]; /* instruction cache content data */ - bool ic_valid[M68K_IC_SIZE]; /* instruction cache valid flags */ + bool ic_valid[M68K_IC_SIZE]; /* instruction cache valid flags */ diff --git a/src/emu/cpu/m68000/m68kcpu.h b/src/emu/cpu/m68000/m68kcpu.h index aeb45aadd91..0ca635c630d 100644 --- a/src/emu/cpu/m68000/m68kcpu.h +++ b/src/emu/cpu/m68000/m68kcpu.h @@ -689,14 +689,14 @@ INLINE UINT32 m68ki_ic_readimm16(m68000_base_device *m68k, UINT32 address) if (m68k->cpu_type & (CPU_TYPE_EC020 | CPU_TYPE_020)) { UINT32 tag = (address >> 8) | (m68k->s_flag ? 0x1000000 : 0); - int idx = (address >> 2) & 0x3f; // 1-of-64 select + int idx = (address >> 2) & 0x3f; // 1-of-64 select // do a cache fill if the line is invalid or the tags don't match if ((!m68k->ic_valid[idx]) || (m68k->ic_address[idx] != tag)) { m68k->ic_data[idx] = m68k->read32(address & ~3); -// printf("m68k: doing cache fill at %08x (tag %08x idx %d)\n", address, tag, idx); +// printf("m68k: doing cache fill at %08x (tag %08x idx %d)\n", address, tag, idx); // if no buserror occured, validate the tag if (!m68k->mmu_tmp_buserror_occurred) diff --git a/src/emu/cpu/ucom4/ucom4.c b/src/emu/cpu/ucom4/ucom4.c index e7f25a26661..b415595a5b0 100644 --- a/src/emu/cpu/ucom4/ucom4.c +++ b/src/emu/cpu/ucom4/ucom4.c @@ -3,7 +3,7 @@ /* NEC uCOM-4 MCU family cores - + References: - 1981 NEC Microcomputers Catalog (later editions may have errors!) - Supplement to uCOM-43 Single Chip Microcomputer Users' Manual @@ -20,7 +20,7 @@ enum NEC_UCOM43 = 0, NEC_UCOM44, NEC_UCOM45 -}; +}; #include "ucom4.h" #include "debugger.h" @@ -115,7 +115,7 @@ enum void ucom4_cpu_device::device_start() { assert(NEC_UCOM4_PORTA == 0); - + m_program = &space(AS_PROGRAM); m_data = &space(AS_DATA); m_prgmask = (1 << m_prgwidth) - 1; @@ -195,12 +195,12 @@ void ucom4_cpu_device::device_reset() m_skip = false; m_timer->adjust(attotime::never); - + // clear interrupt m_int_line = CLEAR_LINE; m_int_f = 0; m_inte_f = (m_family == NEC_UCOM43) ? 0 : 1; - + // clear i/o for (int i = NEC_UCOM4_PORTC; i <= NEC_UCOM4_PORTI; i++) output_w(i, 0xf); @@ -221,9 +221,9 @@ void ucom4_cpu_device::execute_set_input(int line, int state) if (m_int_line == CLEAR_LINE && state) m_int_f = 1; m_int_line = state; - + break; - + default: break; } @@ -273,13 +273,13 @@ void ucom4_cpu_device::execute_run() m_bitmask = 1 << (m_op & 0x03); increment_pc(); fetch_arg(); - + if (m_skip) { m_skip = false; m_op = 0; // nop } - + // handle opcode switch (m_op & 0xf0) { @@ -287,9 +287,9 @@ void ucom4_cpu_device::execute_run() case 0x90: op_li(); break; case 0xa0: op_jmpcal(); break; case 0xb0: op_czp(); break; - + case 0xc0: case 0xd0: case 0xe0: case 0xf0: op_jcp(); break; - + default: switch (m_op) { @@ -374,7 +374,7 @@ void ucom4_cpu_device::execute_run() case 0x7c: op_sfb(); break; } break; // 0xfc - + } break; // 0xff diff --git a/src/emu/cpu/ucom4/ucom4.h b/src/emu/cpu/ucom4/ucom4.h index 07d80603c67..c215b2336f2 100644 --- a/src/emu/cpu/ucom4/ucom4.h +++ b/src/emu/cpu/ucom4/ucom4.h @@ -143,7 +143,7 @@ protected: bool m_skip; // skip next opcode int m_icount; emu_timer *m_timer; - + UINT16 m_pc; // program counter UINT8 m_acc; // 4-bit accumulator UINT8 m_dpl; // 4-bit data pointer low (RAM x) @@ -169,7 +169,7 @@ protected: devcb_write8 m_write_g; devcb_write8 m_write_h; devcb_write8 m_write_i; - + // misc internal helpers void increment_pc(); void fetch_arg(); diff --git a/src/emu/cpu/ucom4/ucom4d.c b/src/emu/cpu/ucom4/ucom4d.c index 531be0ed58c..14adfefbc79 100644 --- a/src/emu/cpu/ucom4/ucom4d.c +++ b/src/emu/cpu/ucom4/ucom4d.c @@ -121,7 +121,7 @@ CPU_DISASSEMBLE(ucom4) char *dst = buffer; dst += sprintf(dst, "%-4s ", s_mnemonics[instr]); - + // opcode parameter int bits = s_bits[instr]; if (bits) @@ -133,7 +133,7 @@ CPU_DISASSEMBLE(ucom4) param = (param << (bits / 10)) | (op2 & ((1 << (bits / 10)) - 1)); bits = (bits % 10) + (bits / 10); } - + // special case for CZP if (instr == mCZP) { diff --git a/src/emu/cpu/ucom4/ucom4op.inc b/src/emu/cpu/ucom4/ucom4op.inc index 8de834438b5..8ac0a462145 100644 --- a/src/emu/cpu/ucom4/ucom4op.inc +++ b/src/emu/cpu/ucom4/ucom4op.inc @@ -32,7 +32,7 @@ UINT8 ucom4_cpu_device::input_r(int index) { index &= 0xf; UINT8 inp = 0xf; - + switch (index) { case NEC_UCOM4_PORTA: inp = m_read_a(index, 0xff); break; @@ -62,7 +62,7 @@ void ucom4_cpu_device::output_w(int index, UINT8 data) case NEC_UCOM4_PORTG: m_write_g(index, data, 0xff); break; case NEC_UCOM4_PORTH: m_write_h(index, data, 0xff); break; case NEC_UCOM4_PORTI: m_write_i(index, data & 7, 0xff); break; - + default: logerror("%s write to unknown port %c = $%X at $%03X\n", tag(), 'A' + index, data & 0xf, m_pc); break; @@ -370,7 +370,7 @@ void ucom4_cpu_device::op_ci() { // CI X: skip next on ACC equals X m_skip = (m_acc == (m_arg & 0x0f)); - + if ((m_arg & 0xf0) != 0xc0) logerror("%s CI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_pc); } @@ -397,7 +397,7 @@ void ucom4_cpu_device::op_cli() { // CLI X: skip next on DPl equals X m_skip = (m_dpl == (m_arg & 0x0f)); - + if ((m_arg & 0xf0) != 0xe0) logerror("%s CLI opcode unexpected upper arg $%02X at $%03X\n", tag(), m_arg & 0xf0, m_pc); } @@ -530,7 +530,7 @@ void ucom4_cpu_device::op_taw() void ucom4_cpu_device::op_taz() { if (!check_op_43()) return; - + // TAZ: Transfer ACC to Z m_icount--; ucom43_reg_w(UCOM43_Z, m_acc); @@ -539,7 +539,7 @@ void ucom4_cpu_device::op_taz() void ucom4_cpu_device::op_thx() { if (!check_op_43()) return; - + // THX: Transfer DPh to X m_icount--; ucom43_reg_w(UCOM43_X, m_dph); @@ -548,7 +548,7 @@ void ucom4_cpu_device::op_thx() void ucom4_cpu_device::op_tly() { if (!check_op_43()) return; - + // TLY: Transfer DPl to Y m_icount--; ucom43_reg_w(UCOM43_Y, m_dpl); @@ -560,7 +560,7 @@ void ucom4_cpu_device::op_tly() void ucom4_cpu_device::op_xaw() { if (!check_op_43()) return; - + // XAW: Exchange ACC with W m_icount--; UINT8 old_acc = m_acc; @@ -571,7 +571,7 @@ void ucom4_cpu_device::op_xaw() void ucom4_cpu_device::op_xaz() { if (!check_op_43()) return; - + // XAZ: Exchange ACC with Z m_icount--; UINT8 old_acc = m_acc; @@ -582,7 +582,7 @@ void ucom4_cpu_device::op_xaz() void ucom4_cpu_device::op_xhr() { if (!check_op_43()) return; - + // XHR: Exchange DPh with R m_icount--; UINT8 old_dph = m_dph; @@ -593,7 +593,7 @@ void ucom4_cpu_device::op_xhr() void ucom4_cpu_device::op_xhx() { if (!check_op_43()) return; - + // XHX: Exchange DPh with X m_icount--; UINT8 old_dph = m_dph; @@ -604,7 +604,7 @@ void ucom4_cpu_device::op_xhx() void ucom4_cpu_device::op_xls() { if (!check_op_43()) return; - + // XLS: Exchange DPl with S m_icount--; UINT8 old_dpl = m_dpl; @@ -615,7 +615,7 @@ void ucom4_cpu_device::op_xls() void ucom4_cpu_device::op_xly() { if (!check_op_43()) return; - + // XLY: Exchange DPl with Y m_icount--; UINT8 old_dpl = m_dpl; @@ -626,7 +626,7 @@ void ucom4_cpu_device::op_xly() void ucom4_cpu_device::op_xc() { if (!check_op_43()) return; - + // XC: Exchange Carry F/F with Carry Save F/F UINT8 c = m_carry_f; m_carry_f = m_carry_s_f; @@ -639,7 +639,7 @@ void ucom4_cpu_device::op_xc() void ucom4_cpu_device::op_sfb() { if (!check_op_43()) return; - + // SFB B: Set a single bit of FLAG m_icount--; ucom43_reg_w(UCOM43_F, ucom43_reg_r(UCOM43_F) | m_bitmask); @@ -648,7 +648,7 @@ void ucom4_cpu_device::op_sfb() void ucom4_cpu_device::op_rfb() { if (!check_op_43()) return; - + // RFB B: Reset a single bit of FLAG m_icount--; ucom43_reg_w(UCOM43_F, ucom43_reg_r(UCOM43_F) & ~m_bitmask); @@ -657,7 +657,7 @@ void ucom4_cpu_device::op_rfb() void ucom4_cpu_device::op_fbt() { if (!check_op_43()) return; - + // FBT B: skip next on bit(FLAG) m_icount--; m_skip = ((ucom43_reg_r(UCOM43_F) & m_bitmask) != 0); @@ -666,7 +666,7 @@ void ucom4_cpu_device::op_fbt() void ucom4_cpu_device::op_fbf() { if (!check_op_43()) return; - + // FBF B: skip next on not bit(FLAG) m_icount--; m_skip = ((ucom43_reg_r(UCOM43_F) & m_bitmask) == 0); @@ -678,7 +678,7 @@ void ucom4_cpu_device::op_fbf() void ucom4_cpu_device::op_rar() { if (!check_op_43()) return; - + // RAR: Rotate ACC Right through Carry F/F UINT8 c = m_acc & 1; m_acc = m_acc >> 1 | m_carry_f << 3; @@ -691,7 +691,7 @@ void ucom4_cpu_device::op_rar() void ucom4_cpu_device::op_inm() { if (!check_op_43()) return; - + // INM: Increment RAM, skip next on carry UINT8 val = (ram_r() + 1) & 0xf; ram_w(val); @@ -701,7 +701,7 @@ void ucom4_cpu_device::op_inm() void ucom4_cpu_device::op_dem() { if (!check_op_43()) return; - + // DEM: Decrement RAM, skip next on carry UINT8 val = (ram_r() - 1) & 0xf; ram_w(val); @@ -714,7 +714,7 @@ void ucom4_cpu_device::op_dem() void ucom4_cpu_device::op_stm() { if (!check_op_43()) return; - + // STM X: Reset Timer F/F, Start Timer with X m_timer_f = 0; @@ -730,7 +730,7 @@ void ucom4_cpu_device::op_stm() void ucom4_cpu_device::op_ttm() { if (!check_op_43()) return; - + // TTM: skip next on Timer F/F m_skip = (m_timer_f != 0); } @@ -741,7 +741,7 @@ void ucom4_cpu_device::op_ttm() void ucom4_cpu_device::op_ei() { if (!check_op_43()) return; - + // EI: Set Interrupt Enable F/F m_inte_f = 1; } @@ -749,7 +749,7 @@ void ucom4_cpu_device::op_ei() void ucom4_cpu_device::op_di() { if (!check_op_43()) return; - + // DI: Reset Interrupt Enable F/F m_inte_f = 0; } diff --git a/src/emu/debug/dvbpoints.c b/src/emu/debug/dvbpoints.c index b1a2ce8b8fa..10871ad0800 100644 --- a/src/emu/debug/dvbpoints.c +++ b/src/emu/debug/dvbpoints.c @@ -234,8 +234,8 @@ void debug_view_breakpoints::view_update() m_total.y = 10; // Draw - debug_view_char *dest = m_viewdata; - astring linebuf; + debug_view_char *dest = m_viewdata; + astring linebuf; // Header if (m_visible.y > 0) diff --git a/src/emu/debug/dvwpoints.c b/src/emu/debug/dvwpoints.c index ddf28ea4863..bf6618ec7bf 100644 --- a/src/emu/debug/dvwpoints.c +++ b/src/emu/debug/dvwpoints.c @@ -261,8 +261,8 @@ void debug_view_watchpoints::view_update() m_total.y = 10; // Draw - debug_view_char *dest = m_viewdata; - astring linebuf; + debug_view_char *dest = m_viewdata; + astring linebuf; // Header if (m_visible.y > 0) diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index f146cfe2f54..7487c434db1 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -57,7 +57,7 @@ enum XTAL_2_5MHz = 2500000, /* Janken Man units */ XTAL_3MHz = 3000000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */ XTAL_3_12MHz = 3120000, /* SP0250 clock on Gottlieb games */ - XTAL_3_5MHz = 3500000, /* Reported by Commodore 65 document, true xtal unchecked on PCB */ + XTAL_3_5MHz = 3500000, /* Reported by Commodore 65 document, true xtal unchecked on PCB */ XTAL_3_52128MHz = 3521280, /* RCA COSMAC VIP */ XTAL_3_579545MHz = 3579545, /* NTSC color subcarrier, extremely common, used on 100's of PCBs (Keytronic custom part #48-300-010 is equivalent) */ XTAL_3_6864MHz = 3686400, /* CPS3 */ diff --git a/src/emu/fileio.h b/src/emu/fileio.h index 5b2c4d7948c..846f828a6be 100644 --- a/src/emu/fileio.h +++ b/src/emu/fileio.h @@ -154,7 +154,7 @@ private: astring m_fullpath; // full filename core_file * m_file; // core file pointer path_iterator m_iterator; // iterator for paths - path_iterator m_mediapaths; // media-path iterator + path_iterator m_mediapaths; // media-path iterator UINT32 m_crc; // file's CRC UINT32 m_openflags; // flags we used for the open hash_collection m_hashes; // collection of hashes @@ -168,7 +168,7 @@ private: UINT64 m__7zlength; // 7Z file length bool m_remove_on_close; // flag: remove the file when closing - bool m_restrict_to_mediapath; // flag: restrict to paths inside the media-path + bool m_restrict_to_mediapath; // flag: restrict to paths inside the media-path }; diff --git a/src/emu/machine/jvshost.c b/src/emu/machine/jvshost.c index ec4dd5a0f94..7be67f5dc47 100644 --- a/src/emu/machine/jvshost.c +++ b/src/emu/machine/jvshost.c @@ -48,13 +48,13 @@ void jvs_host::commit_raw() // - have the message length without the two header bytes but with the checksum byte in the second byte // - have at least one command byte if(send_size < 3 || send_buffer[0] == 0x00 || send_buffer[1] != send_size-1) { - logerror("JVS checksum error\n"); - // "This message is crap" doesn't exist so call it checksum error - recv_buffer[0] = 0x00; - recv_buffer[1] = 0x02; - recv_buffer[2] = 0x03; - recv_size = 3; - } else { + logerror("JVS checksum error\n"); + // "This message is crap" doesn't exist so call it checksum error + recv_buffer[0] = 0x00; + recv_buffer[1] = 0x02; + recv_buffer[2] = 0x03; + recv_size = 3; + } else { if(first_device) { first_device->message(send_buffer[0], send_buffer+2, send_size-2, recv_buffer+2, recv_size); recv_is_encoded = false; diff --git a/src/emu/render.h b/src/emu/render.h index b434e0db86b..2ee8e108a09 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -338,7 +338,7 @@ public: float width; // width (for line primitives) render_texinfo texture; // texture info (for quad primitives) render_quad_texuv texcoords; // texture coordinates (for quad primitives) - render_container * container; // the render container we belong to + render_container * container; // the render container we belong to private: // internal state diff --git a/src/emu/sound/saa1099.c b/src/emu/sound/saa1099.c index 5fcd843915a..106d0c55935 100644 --- a/src/emu/sound/saa1099.c +++ b/src/emu/sound/saa1099.c @@ -161,7 +161,7 @@ void saa1099_device::device_start() /* for each chip allocate one stream */ m_stream = stream_alloc(0, 2, m_sample_rate); - + save_item(NAME(m_noise_params)); save_item(NAME(m_env_enable)); save_item(NAME(m_env_reverse_right)); @@ -172,7 +172,7 @@ void saa1099_device::device_start() save_item(NAME(m_all_ch_enable)); save_item(NAME(m_sync_state)); save_item(NAME(m_selected_reg)); - + for (int i = 0; i < 6; i++) { save_item(NAME(m_channels[i].frequency), i); @@ -185,7 +185,7 @@ void saa1099_device::device_start() save_item(NAME(m_channels[i].freq), i); save_item(NAME(m_channels[i].level), i); } - + for (int i = 0; i < 2; i++) { save_item(NAME(m_noise[i].counter), i); diff --git a/src/emu/video.c b/src/emu/video.c index e9ed7a2490b..2518bd101c0 100644 --- a/src/emu/video.c +++ b/src/emu/video.c @@ -1048,7 +1048,7 @@ void video_manager::recompute_speed(const attotime &emutime) if (filerr == FILERR_NONE) save_snapshot(machine().first_screen(), file); } - //printf("Scheduled exit at %f\n", emutime.as_double()); + //printf("Scheduled exit at %f\n", emutime.as_double()); // schedule our demise machine().schedule_exit(); } diff --git a/src/emu/video/scn2674.c b/src/emu/video/scn2674.c index b581465eda7..025dd231f2c 100644 --- a/src/emu/video/scn2674.c +++ b/src/emu/video/scn2674.c @@ -699,16 +699,16 @@ void scn2674_device::device_timer(emu_timer &timer, device_timer_id id, int para if (!m_display_cb.isnull()) m_display_cb(m_bitmap, - i * m_hpixels_per_column, - m_linecounter, - tilerow, - space().read_byte(address), - address, - (charrow >= m_IR6_cursor_first_scanline) && m_cursor_on, - dw != 0, - m_gfx_enabled != 0, - charrow == m_IR7_cursor_underline_position, - m_IR7_cursor_blink && (m_screen->frame_number() & (m_IR7_cursor_rate_divisor ? 0x40 : 0x20))); + i * m_hpixels_per_column, + m_linecounter, + tilerow, + space().read_byte(address), + address, + (charrow >= m_IR6_cursor_first_scanline) && m_cursor_on, + dw != 0, + m_gfx_enabled != 0, + charrow == m_IR7_cursor_underline_position, + m_IR7_cursor_blink && (m_screen->frame_number() & (m_IR7_cursor_rate_divisor ? 0x40 : 0x20))); address = (address + 1) & 0xffff; if(address > ((m_IR9_display_buffer_last_address << 10) | 0x3ff)) diff --git a/src/emu/video/scn2674.h b/src/emu/video/scn2674.h index 52ec99c3af4..02efaf80fe1 100644 --- a/src/emu/video/scn2674.h +++ b/src/emu/video/scn2674.h @@ -19,8 +19,8 @@ #define SCN2674_DRAW_CHARACTER_MEMBER(_name) void _name(bitmap_rgb32 &bitmap, int x, int y, UINT8 linecount, UINT8 charcode, UINT16 address, UINT8 cursor, UINT8 dw, UINT8 lg, UINT8 ul, UINT8 blink) class scn2674_device : public device_t, - public device_video_interface, - public device_memory_interface + public device_video_interface, + public device_memory_interface { public: scn2674_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); |
