diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-10 13:19:57 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2016-01-10 13:19:57 +0100 |
commit | 96490888396584845d0fd923b44c3b7611e56f8e (patch) | |
tree | 66d6bf4cb72e6e1f5f438f1fee40c5c8ed72b274 /src/mame | |
parent | 283fbf13a4c8c07e3e45fdae316842d7a8608f2f (diff) |
modernized bookkeeping manager (nw)
Diffstat (limited to 'src/mame')
442 files changed, 1369 insertions, 1369 deletions
diff --git a/src/mame/audio/8080bw.cpp b/src/mame/audio/8080bw.cpp index e9586acff61..41fd7160765 100644 --- a/src/mame/audio/8080bw.cpp +++ b/src/mame/audio/8080bw.cpp @@ -719,7 +719,7 @@ WRITE8_MEMBER(_8080bw_state::polaris_sh_port_2_w) WRITE8_MEMBER(_8080bw_state::polaris_sh_port_3_w) { - coin_lockout_global_w(machine(), data & 0x04); /* SX8 */ + machine().bookkeeping().coin_lockout_global_w(data & 0x04); /* SX8 */ m_flip_screen = BIT(data, 5) & BIT(ioport("IN2")->read(), 2); /* SX11 */ @@ -925,7 +925,7 @@ WRITE8_MEMBER(_8080bw_state::schaser_sh_port_2_w) m_discrete->write(space, SCHASER_SND_EN, BIT(data, 1)); machine().sound().system_enable(BIT(data, 1)); - coin_lockout_global_w(machine(), BIT(data, 2)); + machine().bookkeeping().coin_lockout_global_w(BIT(data, 2)); m_schaser_background_disable = BIT(data, 3); m_schaser_background_select = BIT(data, 4); @@ -1082,7 +1082,7 @@ WRITE8_MEMBER(_8080bw_state::lupin3_sh_port_1_w) //machine().sound().system_enable(data & 0x20); - //coin_lockout_global_w(machine(), data & 0x80); + //machine().bookkeeping().coin_lockout_global_w(data & 0x80); m_port_1_last_extra = data; } diff --git a/src/mame/audio/atarijsa.cpp b/src/mame/audio/atarijsa.cpp index 99fe02bbdb3..6b9781c9e49 100644 --- a/src/mame/audio/atarijsa.cpp +++ b/src/mame/audio/atarijsa.cpp @@ -483,8 +483,8 @@ WRITE8_MEMBER( atari_jsa_oki_base_device::wrio_w ) m_cpu_bank->set_entry((data >> 6) & 3); // coin counters - coin_counter_w(space.machine(), 1, (data >> 5) & 1); - coin_counter_w(space.machine(), 0, (data >> 4) & 1); + space.machine().bookkeeping().coin_counter_w(1, (data >> 5) & 1); + space.machine().bookkeeping().coin_counter_w(0, (data >> 4) & 1); // update the OKI frequency if (m_oki1 != nullptr) @@ -687,8 +687,8 @@ WRITE8_MEMBER( atari_jsa_i_device::wrio_w ) m_cpu_bank->set_entry((data >> 6) & 3); // coin counters - coin_counter_w(machine(), 1, (data >> 5) & 1); - coin_counter_w(machine(), 0, (data >> 4) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 5) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 4) & 1); // handle TMS5220 I/O if (m_tms5220 != nullptr) diff --git a/src/mame/audio/cyberbal.cpp b/src/mame/audio/cyberbal.cpp index 8745be912e1..60383a64503 100644 --- a/src/mame/audio/cyberbal.cpp +++ b/src/mame/audio/cyberbal.cpp @@ -52,8 +52,8 @@ READ8_MEMBER(cyberbal_state::sound_6502_stat_r) WRITE8_MEMBER(cyberbal_state::sound_bank_select_w) { membank("soundbank")->set_base(&m_bank_base[0x1000 * ((data >> 6) & 3)]); - coin_counter_w(machine(), 1, (data >> 5) & 1); - coin_counter_w(machine(), 0, (data >> 4) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 5) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 4) & 1); m_daccpu->set_input_line(INPUT_LINE_RESET, (data & 0x08) ? CLEAR_LINE : ASSERT_LINE); if (!(data & 0x01)) machine().device("ymsnd")->reset(); } diff --git a/src/mame/audio/mw8080bw.cpp b/src/mame/audio/mw8080bw.cpp index 3c2b7f7a43a..16a337a6be0 100644 --- a/src/mame/audio/mw8080bw.cpp +++ b/src/mame/audio/mw8080bw.cpp @@ -173,7 +173,7 @@ WRITE8_MEMBER(mw8080bw_state::seawolf_audio_w) /* if (data & 0x10) enable MINE HIT sound */ if (rising_bits & 0x10) m_samples->start(4, 4); - coin_counter_w(machine(), 0, (data >> 5) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 5) & 0x01); /* D6 and D7 are not connected */ @@ -218,7 +218,7 @@ WRITE8_MEMBER(mw8080bw_state::gunfight_audio_w) { /* D0 and D1 are just tied to 1k resistors */ - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); /* the 74175 latches and inverts the top 4 bits */ switch ((~data >> 4) & 0x0f) @@ -339,7 +339,7 @@ WRITE8_MEMBER(mw8080bw_state::tornbase_audio_w) /* if (data & 0x40) enable WHISTLE sound */ } - coin_counter_w(machine(), 0, (data >> 7) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 7) & 0x01); } @@ -380,7 +380,7 @@ WRITE8_MEMBER(mw8080bw_state::zzzap_audio_2_w) before it appears again, not sure what it is supposed to sound like) */ - coin_counter_w(machine(), 0, (data >> 5) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 5) & 0x01); /* D4, D6 and D7 are not connected */ } @@ -812,7 +812,7 @@ WRITE8_MEMBER(mw8080bw_state::boothill_audio_w) { /* D0 and D1 are not connected */ - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); m_discrete->write(space, BOOTHILL_GAME_ON_EN, (data >> 3) & 0x01); @@ -1043,7 +1043,7 @@ WRITE8_MEMBER(mw8080bw_state::checkmat_audio_w) m_discrete->write(space, CHECKMAT_BOOM_EN, (data >> 1) & 0x01); - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); @@ -1252,7 +1252,7 @@ WRITE8_MEMBER(mw8080bw_state::desertgu_audio_1_w) { /* D0 and D1 are not connected */ - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); m_discrete->write(space, DESERTGU_GAME_ON_EN, (data >> 3) & 0x01); @@ -1525,7 +1525,7 @@ WRITE8_MEMBER(mw8080bw_state::dplay_audio_w) m_discrete->write(space, DPLAY_GAME_ON_EN, (data >> 4) & 0x01); - coin_counter_w(machine(), 0, (data >> 5) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 5) & 0x01); /* D6 and D7 are not connected */ } @@ -1573,7 +1573,7 @@ WRITE8_MEMBER(mw8080bw_state::gmissile_audio_1_w) /* D0 and D1 are not connected */ - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); @@ -1662,7 +1662,7 @@ WRITE8_MEMBER(mw8080bw_state::m4_audio_1_w) /* D0 and D1 are not connected */ - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); @@ -1912,7 +1912,7 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::clowns_audio_1_w) { - coin_counter_w(machine(), 0, (data >> 0) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 0x01); m_clowns_controller_select = (data >> 1) & 0x01; @@ -2277,7 +2277,7 @@ MACHINE_CONFIG_END WRITE8_MEMBER(mw8080bw_state::spacwalk_audio_1_w) { - coin_counter_w(machine(), 0, (data >> 0) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 0x01); m_clowns_controller_select = (data >> 1) & 0x01; @@ -2527,7 +2527,7 @@ WRITE8_MEMBER(mw8080bw_state::shuffle_audio_2_w) { m_discrete->write(space, SHUFFLE_FOUL_EN, (data >> 0) & 0x01); - coin_counter_w(machine(), 0, (data >> 1) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 1) & 0x01); /* D2-D7 are not connected */ } @@ -2689,7 +2689,7 @@ WRITE8_MEMBER(mw8080bw_state::dogpatch_audio_w) { /* D0, D1 and D7 are not used */ - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); machine().sound().system_enable((data >> 3) & 0x01); m_discrete->write(space, DOGPATCH_GAME_ON_EN, (data >> 3) & 0x01); @@ -3290,7 +3290,7 @@ WRITE8_MEMBER(mw8080bw_state::phantom2_audio_1_w) machine().sound().system_mute(!(data & 0x20)); machine().sound().system_enable((data >> 2) & 0x01); - coin_counter_w(machine(), 0, (data >> 3) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 3) & 0x01); /* if (data & 0x10) enable RADAR sound */ @@ -3410,7 +3410,7 @@ WRITE8_MEMBER(mw8080bw_state::bowler_audio_1_w) { /* D0 - selects controller on the cocktail PCB */ - coin_counter_w(machine(), 0, (data >> 1) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 1) & 0x01); machine().sound().system_enable((data >> 2) & 0x01); diff --git a/src/mame/audio/qix.cpp b/src/mame/audio/qix.cpp index 8d9f6ecb7ca..141b0d3b0a1 100644 --- a/src/mame/audio/qix.cpp +++ b/src/mame/audio/qix.cpp @@ -116,8 +116,8 @@ WRITE8_MEMBER(qix_state::sync_sndpia1_porta_w) WRITE8_MEMBER(qix_state::slither_coinctl_w) { - coin_lockout_w(machine(), 0, (~data >> 6) & 1); - coin_counter_w(machine(), 0, (data >> 5) & 1); + machine().bookkeeping().coin_lockout_w(0, (~data >> 6) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 5) & 1); } diff --git a/src/mame/audio/seibu.cpp b/src/mame/audio/seibu.cpp index 747af0bc422..9883e9b9a25 100644 --- a/src/mame/audio/seibu.cpp +++ b/src/mame/audio/seibu.cpp @@ -276,8 +276,8 @@ WRITE8_MEMBER( seibu_sound_device::bank_w ) WRITE8_MEMBER( seibu_sound_device::coin_w ) { - coin_counter_w(space.machine(), 0, data & 1); - coin_counter_w(space.machine(), 1, data & 2); + space.machine().bookkeeping().coin_counter_w(0, data & 1); + space.machine().bookkeeping().coin_counter_w(1, data & 2); } READ8_MEMBER( seibu_sound_device::soundlatch_r ) diff --git a/src/mame/audio/tx1.cpp b/src/mame/audio/tx1.cpp index b4dac235258..93de637e22d 100644 --- a/src/mame/audio/tx1.cpp +++ b/src/mame/audio/tx1.cpp @@ -464,8 +464,8 @@ WRITE8_MEMBER( buggyboy_sound_device::ym2_b_w ) if (!strcmp(space.machine().system().name, "buggyboyjr")) { - coin_counter_w(space.machine(), 0, data & 0x01); - coin_counter_w(space.machine(), 1, data & 0x02); + space.machine().bookkeeping().coin_counter_w(0, data & 0x01); + space.machine().bookkeeping().coin_counter_w(1, data & 0x02); } /* diff --git a/src/mame/drivers/20pacgal.cpp b/src/mame/drivers/20pacgal.cpp index 00df8eaecda..eacbe306fc2 100644 --- a/src/mame/drivers/20pacgal.cpp +++ b/src/mame/drivers/20pacgal.cpp @@ -129,7 +129,7 @@ WRITE8_MEMBER(_20pacgal_state::timer_pulse_w) WRITE8_MEMBER(_20pacgal_state::_20pacgal_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } diff --git a/src/mame/drivers/2mindril.cpp b/src/mame/drivers/2mindril.cpp index 24492ebd5f3..d1f27dd46ab 100644 --- a/src/mame/drivers/2mindril.cpp +++ b/src/mame/drivers/2mindril.cpp @@ -116,10 +116,10 @@ WRITE16_MEMBER(_2mindril_state::drill_io_w) switch(offset) { case 0x8/2: - coin_counter_w(machine(), 0, m_iodata[offset] & 0x0400); - coin_counter_w(machine(), 1, m_iodata[offset] & 0x0800); - coin_lockout_w(machine(), 0, ~m_iodata[offset] & 0x0100); - coin_lockout_w(machine(), 1, ~m_iodata[offset] & 0x0200); + machine().bookkeeping().coin_counter_w(0, m_iodata[offset] & 0x0400); + machine().bookkeeping().coin_counter_w(1, m_iodata[offset] & 0x0800); + machine().bookkeeping().coin_lockout_w(0, ~m_iodata[offset] & 0x0100); + machine().bookkeeping().coin_lockout_w(1, ~m_iodata[offset] & 0x0200); break; } diff --git a/src/mame/drivers/40love.cpp b/src/mame/drivers/40love.cpp index a002c30a502..ae302d8ec20 100644 --- a/src/mame/drivers/40love.cpp +++ b/src/mame/drivers/40love.cpp @@ -272,7 +272,7 @@ WRITE8_MEMBER(fortyl_state::nmi_enable_w) #if 0 WRITE8_MEMBER(fortyl_state::fortyl_coin_counter_w) { - coin_counter_w(machine(), offset,data); + machine().bookkeeping().coin_counter_w(offset,data); } #endif diff --git a/src/mame/drivers/5clown.cpp b/src/mame/drivers/5clown.cpp index a5be170dbe4..c0d07547e2d 100644 --- a/src/mame/drivers/5clown.cpp +++ b/src/mame/drivers/5clown.cpp @@ -650,10 +650,10 @@ WRITE8_MEMBER(_5clown_state::counters_w) -x-- ---- Unknown (increments at start). x--- ---- Unknown (increments at start). */ - coin_counter_w(machine(), 0, data & 0x10); /* Key In */ - coin_counter_w(machine(), 1, data & 0x20); /* Payout */ - coin_counter_w(machine(), 2, data & 0x40); /* unknown */ - coin_counter_w(machine(), 3, data & 0x80); /* unknown */ + machine().bookkeeping().coin_counter_w(0, data & 0x10); /* Key In */ + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* Payout */ + machine().bookkeeping().coin_counter_w(2, data & 0x40); /* unknown */ + machine().bookkeeping().coin_counter_w(3, data & 0x80); /* unknown */ } diff --git a/src/mame/drivers/8080bw.cpp b/src/mame/drivers/8080bw.cpp index a3474db7fe8..23c7a6472b9 100644 --- a/src/mame/drivers/8080bw.cpp +++ b/src/mame/drivers/8080bw.cpp @@ -2309,7 +2309,7 @@ MACHINE_CONFIG_END WRITE8_MEMBER(_8080bw_state::steelwkr_sh_port_3_w) { - coin_lockout_global_w(machine(), !(~data & 0x03)); /* possibly */ + machine().bookkeeping().coin_lockout_global_w(!(~data & 0x03)); /* possibly */ } static ADDRESS_MAP_START( steelwkr_io_map, AS_IO, 8, _8080bw_state ) diff --git a/src/mame/drivers/88games.cpp b/src/mame/drivers/88games.cpp index 81695376892..3aa93366913 100644 --- a/src/mame/drivers/88games.cpp +++ b/src/mame/drivers/88games.cpp @@ -50,8 +50,8 @@ WRITE8_MEMBER(_88games_state::bankedram_w) WRITE8_MEMBER(_88games_state::k88games_5f84_w) { /* bits 0/1 coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 enables ROM reading from the 051316 */ /* also 5fce == 2 read roms, == 3 read ram */ diff --git a/src/mame/drivers/airbustr.cpp b/src/mame/drivers/airbustr.cpp index 51d80cbcf71..3a000c60c30 100644 --- a/src/mame/drivers/airbustr.cpp +++ b/src/mame/drivers/airbustr.cpp @@ -321,10 +321,10 @@ WRITE8_MEMBER(airbustr_state::soundcommand2_w) WRITE8_MEMBER(airbustr_state::airbustr_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); - coin_lockout_w(machine(), 0, ~data & 4); - coin_lockout_w(machine(), 1, ~data & 8); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); + machine().bookkeeping().coin_lockout_w(0, ~data & 4); + machine().bookkeeping().coin_lockout_w(1, ~data & 8); } /* Memory Maps */ diff --git a/src/mame/drivers/albazc.cpp b/src/mame/drivers/albazc.cpp index 48febfde020..febf07ebf82 100644 --- a/src/mame/drivers/albazc.cpp +++ b/src/mame/drivers/albazc.cpp @@ -118,11 +118,11 @@ WRITE8_MEMBER(albazc_state::hanaroku_out_0_w) 7 meter5 (start) */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 2, data & 0x04); - coin_counter_w(machine(), 3, data & 0x08); - coin_counter_w(machine(), 4, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(2, data & 0x04); + machine().bookkeeping().coin_counter_w(3, data & 0x08); + machine().bookkeeping().coin_counter_w(4, data & 0x80); } WRITE8_MEMBER(albazc_state::hanaroku_out_1_w) diff --git a/src/mame/drivers/albazg.cpp b/src/mame/drivers/albazg.cpp index 0d9dc4ced1a..9666975f2f3 100644 --- a/src/mame/drivers/albazg.cpp +++ b/src/mame/drivers/albazg.cpp @@ -192,9 +192,9 @@ WRITE8_MEMBER(albazg_state::mux_w) WRITE8_MEMBER(albazg_state::yumefuda_output_w) { - coin_counter_w(machine(), 0, ~data & 4); - coin_counter_w(machine(), 1, ~data & 2); - coin_lockout_global_w(machine(), data & 1); + machine().bookkeeping().coin_counter_w(0, ~data & 4); + machine().bookkeeping().coin_counter_w(1, ~data & 2); + machine().bookkeeping().coin_lockout_global_w(data & 1); //data & 0x10 hopper-c (active LOW) //data & 0x08 divider (active HIGH) flip_screen_set(~data & 0x20); diff --git a/src/mame/drivers/aliens.cpp b/src/mame/drivers/aliens.cpp index 3a059979220..907b16a65fa 100644 --- a/src/mame/drivers/aliens.cpp +++ b/src/mame/drivers/aliens.cpp @@ -20,8 +20,8 @@ Preliminary driver by: WRITE8_MEMBER(aliens_state::aliens_coin_counter_w) { /* bits 0-1 = coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 5 = select work RAM or palette */ m_bank0000->set_bank((data & 0x20) >> 5); diff --git a/src/mame/drivers/alpha68k.cpp b/src/mame/drivers/alpha68k.cpp index 42ae3dc31ba..953cc63cd8d 100644 --- a/src/mame/drivers/alpha68k.cpp +++ b/src/mame/drivers/alpha68k.cpp @@ -202,7 +202,7 @@ DIP locations verified from manuals for: WRITE16_MEMBER(alpha68k_state::tnextspc_coin_counters_w) { - coin_counter_w(machine(), offset, data & 0x01); + machine().bookkeeping().coin_counter_w(offset, data & 0x01); } WRITE16_MEMBER(alpha68k_state::tnextspc_unknown_w) diff --git a/src/mame/drivers/amaticmg.cpp b/src/mame/drivers/amaticmg.cpp index 88e5c820560..bc4e6ce7f32 100644 --- a/src/mame/drivers/amaticmg.cpp +++ b/src/mame/drivers/amaticmg.cpp @@ -619,8 +619,8 @@ WRITE8_MEMBER(amaticmg_state::out_c_w) output_set_lamp_value(5, (data >> 4) & 1); /* HOLD2 */ output_set_lamp_value(6, (data >> 6) & 1); /* CANCEL */ -// coin_counter_w(machine(), 0, data & 0x04); /* Coin In */ -// coin_counter_w(machine(), 1, data & 0x01); /* Coin Out */ +// machine().bookkeeping().coin_counter_w(0, data & 0x04); /* Coin In */ +// machine().bookkeeping().coin_counter_w(1, data & 0x01); /* Coin Out */ logerror("port C: %2X\n", data); } diff --git a/src/mame/drivers/ambush.cpp b/src/mame/drivers/ambush.cpp index b4d9479edaa..835e601f91b 100644 --- a/src/mame/drivers/ambush.cpp +++ b/src/mame/drivers/ambush.cpp @@ -49,8 +49,8 @@ WRITE8_MEMBER(ambush_state::ambush_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } WRITE8_MEMBER(ambush_state::flip_screen_w) diff --git a/src/mame/drivers/arabian.cpp b/src/mame/drivers/arabian.cpp index ef74167bab0..a2155053875 100644 --- a/src/mame/drivers/arabian.cpp +++ b/src/mame/drivers/arabian.cpp @@ -86,8 +86,8 @@ WRITE8_MEMBER(arabian_state::ay8910_portb_w) m_mcu->set_input_line(INPUT_LINE_RESET, data & 0x10 ? CLEAR_LINE : ASSERT_LINE); /* clock the coin counters */ - coin_counter_w(machine(), 1, ~data & 0x02); - coin_counter_w(machine(), 0, ~data & 0x01); + machine().bookkeeping().coin_counter_w(1, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, ~data & 0x01); } diff --git a/src/mame/drivers/armedf.cpp b/src/mame/drivers/armedf.cpp index 2fe9162ffb5..21c19d4d74f 100644 --- a/src/mame/drivers/armedf.cpp +++ b/src/mame/drivers/armedf.cpp @@ -324,8 +324,8 @@ WRITE16_MEMBER(armedf_state::terraf_io_w) COMBINE_DATA(&m_vreg); - coin_counter_w(machine(), 0, (data & 1) >> 0); - coin_counter_w(machine(), 1, (data & 2) >> 1); + machine().bookkeeping().coin_counter_w(0, (data & 1) >> 0); + machine().bookkeeping().coin_counter_w(1, (data & 2) >> 1); flip_screen_set(m_vreg & 0x1000); } @@ -337,8 +337,8 @@ WRITE16_MEMBER(armedf_state::terrafjb_io_w) COMBINE_DATA(&m_vreg); - coin_counter_w(machine(), 0, (data & 1) >> 0); - coin_counter_w(machine(), 1, (data & 2) >> 1); + machine().bookkeeping().coin_counter_w(0, (data & 1) >> 0); + machine().bookkeeping().coin_counter_w(1, (data & 2) >> 1); flip_screen_set(m_vreg & 0x1000); } @@ -352,8 +352,8 @@ WRITE16_MEMBER(armedf_state::bootleg_io_w) COMBINE_DATA(&m_vreg); - coin_counter_w(machine(), 0, (data & 1) >> 0); - coin_counter_w(machine(), 1, (data & 2) >> 1); + machine().bookkeeping().coin_counter_w(0, (data & 1) >> 0); + machine().bookkeeping().coin_counter_w(1, (data & 2) >> 1); flip_screen_set(m_vreg & 0x1000); } diff --git a/src/mame/drivers/asteroid.cpp b/src/mame/drivers/asteroid.cpp index b8b8720c2bb..6000e75da2c 100644 --- a/src/mame/drivers/asteroid.cpp +++ b/src/mame/drivers/asteroid.cpp @@ -207,7 +207,7 @@ There is not a rev 03 known or dumped. An Asteroids rev 03 is not mentioned in a WRITE8_MEMBER(asteroid_state::astdelux_coin_counter_w) { - coin_counter_w(machine(), offset,data); + machine().bookkeeping().coin_counter_w(offset,data); } diff --git a/src/mame/drivers/astrcorp.cpp b/src/mame/drivers/astrcorp.cpp index caa7bbfe118..e542baf282c 100644 --- a/src/mame/drivers/astrcorp.cpp +++ b/src/mame/drivers/astrcorp.cpp @@ -223,9 +223,9 @@ WRITE16_MEMBER(astrocorp_state::showhand_outputs_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, (data & 0x0004)); // coin counter + machine().bookkeeping().coin_counter_w(0, (data & 0x0004)); // coin counter set_led_status(machine(), 0, (data & 0x0008)); // you win - if ((data & 0x0010)) increment_dispensed_tickets(machine(), 1); // coin out + if ((data & 0x0010)) machine().bookkeeping().increment_dispensed_tickets(1); // coin out set_led_status(machine(), 1, (data & 0x0020)); // coin/hopper jam } if (ACCESSING_BITS_8_15) @@ -259,9 +259,9 @@ WRITE16_MEMBER(astrocorp_state::skilldrp_outputs_w) if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, (data & 0x0001)); // key in | - coin_counter_w(machine(), 0, (data & 0x0002)); // coin in |- manual shows 1 in- and 1 out- counter - coin_counter_w(machine(), 1, (data & 0x0004)); // key out | + machine().bookkeeping().coin_counter_w(0, (data & 0x0001)); // key in | + machine().bookkeeping().coin_counter_w(0, (data & 0x0002)); // coin in |- manual shows 1 in- and 1 out- counter + machine().bookkeeping().coin_counter_w(1, (data & 0x0004)); // key out | machine().device<ticket_dispenser_device>("hopper")->write(space, 0, (data & 0x0008)<<4); // hopper motor? // (data & 0x0010) // hopper? set_led_status(machine(), 0, (data & 0x0020)); // error lamp (coin/hopper jam: "call attendant") diff --git a/src/mame/drivers/astrocde.cpp b/src/mame/drivers/astrocde.cpp index 9d72c9a9a5f..18e73057126 100644 --- a/src/mame/drivers/astrocde.cpp +++ b/src/mame/drivers/astrocde.cpp @@ -220,7 +220,7 @@ WRITE8_MEMBER(astrocde_state::seawolf2_sound_2_w)// Port 41 if (rising_bits & 0x10) m_samples->start(8, 3); /* Right Sonar */ if (rising_bits & 0x20) m_samples->start(3, 3); /* Left Sonar */ - coin_counter_w(machine(), 0, data & 0x40); /* Coin Counter */ + machine().bookkeeping().coin_counter_w(0, data & 0x40); /* Coin Counter */ } @@ -247,7 +247,7 @@ WRITE8_MEMBER(astrocde_state::ebases_trackball_select_w) WRITE8_MEMBER(astrocde_state::ebases_coin_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } @@ -260,8 +260,8 @@ WRITE8_MEMBER(astrocde_state::ebases_coin_w) READ8_MEMBER(astrocde_state::spacezap_io_r) { - coin_counter_w(machine(), 0, (offset >> 8) & 1); - coin_counter_w(machine(), 1, (offset >> 9) & 1); + machine().bookkeeping().coin_counter_w(0, (offset >> 8) & 1); + machine().bookkeeping().coin_counter_w(1, (offset >> 9) & 1); return m_p3handle ? m_p3handle->read() : 0xff; } @@ -279,13 +279,13 @@ READ8_MEMBER(astrocde_state::wow_io_r) switch ((offset >> 9) & 7) { - case 0: coin_counter_w(machine(), 0, data); break; - case 1: coin_counter_w(machine(), 1, data); break; + case 0: machine().bookkeeping().coin_counter_w(0, data); break; + case 1: machine().bookkeeping().coin_counter_w(1, data); break; case 2: m_sparkle[0] = data; break; case 3: m_sparkle[1] = data; break; case 4: m_sparkle[2] = data; break; case 5: m_sparkle[3] = data; break; - case 7: coin_counter_w(machine(), 2, data); break; + case 7: machine().bookkeeping().coin_counter_w(2, data); break; } return 0xff; } @@ -304,8 +304,8 @@ READ8_MEMBER(astrocde_state::gorf_io_1_r) switch ((offset >> 9) & 7) { - case 0: coin_counter_w(machine(), 0, data); break; - case 1: coin_counter_w(machine(), 1, data); break; + case 0: machine().bookkeeping().coin_counter_w(0, data); break; + case 1: machine().bookkeeping().coin_counter_w(1, data); break; case 2: m_sparkle[0] = data; break; case 3: m_sparkle[1] = data; break; case 4: m_sparkle[2] = data; break; @@ -356,9 +356,9 @@ READ8_MEMBER(astrocde_state::robby_io_r) switch ((offset >> 9) & 7) { - case 0: coin_counter_w(machine(), 0, data); break; - case 1: coin_counter_w(machine(), 1, data); break; - case 2: coin_counter_w(machine(), 2, data); break; + case 0: machine().bookkeeping().coin_counter_w(0, data); break; + case 1: machine().bookkeeping().coin_counter_w(1, data); break; + case 2: machine().bookkeeping().coin_counter_w(2, data); break; case 6: set_led_status(machine(), 0, data); break; case 7: set_led_status(machine(), 1, data); break; } @@ -375,8 +375,8 @@ READ8_MEMBER(astrocde_state::robby_io_r) READ8_MEMBER(astrocde_state::profpac_io_1_r) { - coin_counter_w(machine(), 0, (offset >> 8) & 1); - coin_counter_w(machine(), 1, (offset >> 9) & 1); + machine().bookkeeping().coin_counter_w(0, (offset >> 8) & 1); + machine().bookkeeping().coin_counter_w(1, (offset >> 9) & 1); set_led_status(machine(), 0, (offset >> 10) & 1); set_led_status(machine(), 1, (offset >> 11) & 1); return 0xff; @@ -429,8 +429,8 @@ WRITE8_MEMBER(astrocde_state::profpac_banksw_w) READ8_MEMBER(astrocde_state::demndrgn_io_r) { - coin_counter_w(machine(), 0, (offset >> 8) & 1); - coin_counter_w(machine(), 1, (offset >> 9) & 1); + machine().bookkeeping().coin_counter_w(0, (offset >> 8) & 1); + machine().bookkeeping().coin_counter_w(1, (offset >> 9) & 1); set_led_status(machine(), 0, (offset >> 10) & 1); set_led_status(machine(), 1, (offset >> 11) & 1); m_input_select = (offset >> 12) & 1; @@ -491,7 +491,7 @@ WRITE8_MEMBER(astrocde_state::tenpindx_lamp_w) WRITE8_MEMBER(astrocde_state::tenpindx_counter_w) { - coin_counter_w(machine(), 0, (data >> 0) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 1); if (data & 0xfc) osd_printf_debug("tenpindx_counter_w = %02X\n", data); } diff --git a/src/mame/drivers/astrof.cpp b/src/mame/drivers/astrof.cpp index 73cf8950681..66d4584066f 100644 --- a/src/mame/drivers/astrof.cpp +++ b/src/mame/drivers/astrof.cpp @@ -106,7 +106,7 @@ INPUT_CHANGED_MEMBER(astrof_state::coin_inserted) { /* coin insertion causes an NMI */ m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); - coin_counter_w(machine(), 0, newval); + machine().bookkeeping().coin_counter_w(0, newval); } diff --git a/src/mame/drivers/atarigt.cpp b/src/mame/drivers/atarigt.cpp index 4fe11fdd654..315d6e747dc 100644 --- a/src/mame/drivers/atarigt.cpp +++ b/src/mame/drivers/atarigt.cpp @@ -210,8 +210,8 @@ WRITE32_MEMBER(atarigt_state::latch_w) if (ACCESSING_BITS_16_23) { //cage_reset_w(space, data & 0x00100000); - coin_counter_w(machine(), 0, data & 0x00080000); - coin_counter_w(machine(), 1, data & 0x00010000); + machine().bookkeeping().coin_counter_w(0, data & 0x00080000); + machine().bookkeeping().coin_counter_w(1, data & 0x00010000); } } diff --git a/src/mame/drivers/atarisy2.cpp b/src/mame/drivers/atarisy2.cpp index 1486979e4f9..8bf4d0e3216 100644 --- a/src/mame/drivers/atarisy2.cpp +++ b/src/mame/drivers/atarisy2.cpp @@ -736,8 +736,8 @@ WRITE8_MEMBER(atarisy2_state::tms5220_strobe_w) WRITE8_MEMBER(atarisy2_state::coincount_w) { - coin_counter_w(machine(), 0, (data >> 0) & 1); - coin_counter_w(machine(), 1, (data >> 1) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 1) & 1); } diff --git a/src/mame/drivers/atetris.cpp b/src/mame/drivers/atetris.cpp index 76a157c57a7..61892668c33 100644 --- a/src/mame/drivers/atetris.cpp +++ b/src/mame/drivers/atetris.cpp @@ -157,8 +157,8 @@ READ8_MEMBER(atetris_state::slapstic_r) WRITE8_MEMBER(atetris_state::coincount_w) { - coin_counter_w(machine(), 0, (data >> 5) & 1); - coin_counter_w(machine(), 1, (data >> 4) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 5) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 4) & 1); } diff --git a/src/mame/drivers/avalnche.cpp b/src/mame/drivers/avalnche.cpp index 6fa16e5616e..aed559b2b7d 100644 --- a/src/mame/drivers/avalnche.cpp +++ b/src/mame/drivers/avalnche.cpp @@ -91,8 +91,8 @@ WRITE8_MEMBER(avalnche_state::avalance_video_invert_w) WRITE8_MEMBER(avalnche_state::catch_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } WRITE8_MEMBER(avalnche_state::avalance_credit_1_lamp_w) diff --git a/src/mame/drivers/bagman.cpp b/src/mame/drivers/bagman.cpp index 0d2f28aab57..fa953e17d33 100644 --- a/src/mame/drivers/bagman.cpp +++ b/src/mame/drivers/bagman.cpp @@ -120,7 +120,7 @@ WRITE8_MEMBER(bagman_state::ls259_w) WRITE8_MEMBER(bagman_state::coincounter_w) { - coin_counter_w(machine(), offset,data); + machine().bookkeeping().coin_counter_w(offset,data); } WRITE8_MEMBER(bagman_state::irq_mask_w) diff --git a/src/mame/drivers/baraduke.cpp b/src/mame/drivers/baraduke.cpp index ff5f32bf094..16ff40e3e88 100644 --- a/src/mame/drivers/baraduke.cpp +++ b/src/mame/drivers/baraduke.cpp @@ -119,9 +119,9 @@ WRITE8_MEMBER(baraduke_state::inputport_select_w) m_inputport_selected = data & 0x07; else if ((data & 0xe0) == 0xc0) { - coin_lockout_global_w(machine(), ~data & 1); - coin_counter_w(machine(), 0,data & 2); - coin_counter_w(machine(), 1,data & 4); + machine().bookkeeping().coin_lockout_global_w(~data & 1); + machine().bookkeeping().coin_counter_w(0,data & 2); + machine().bookkeeping().coin_counter_w(1,data & 4); } } diff --git a/src/mame/drivers/battlnts.cpp b/src/mame/drivers/battlnts.cpp index d3596e2d1b5..e4fa41bac78 100644 --- a/src/mame/drivers/battlnts.cpp +++ b/src/mame/drivers/battlnts.cpp @@ -43,8 +43,8 @@ WRITE8_MEMBER(battlnts_state::battlnts_bankswitch_w) m_rombank->set_entry((data & 0xc0) >> 6); /* bits 4 & 5 = coin counters */ - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* other bits unknown */ } diff --git a/src/mame/drivers/beathead.cpp b/src/mame/drivers/beathead.cpp index 2f7b18f674f..79221b41aa4 100644 --- a/src/mame/drivers/beathead.cpp +++ b/src/mame/drivers/beathead.cpp @@ -263,7 +263,7 @@ WRITE32_MEMBER( beathead_state::sound_reset_w ) WRITE32_MEMBER( beathead_state::coin_count_w ) { - coin_counter_w(machine(), 0, !offset); + machine().bookkeeping().coin_counter_w(0, !offset); } diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index 756c193742a..0e35eb6e90c 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -845,7 +845,7 @@ WRITE8_MEMBER(bfm_sc2_state::coininhib_w) { if ( changed & p ) { // this inhibit line has changed - coin_lockout_w(machine(), i, (~data & p) ); // update lockouts + machine().bookkeeping().coin_lockout_w(i, (~data & p) ); // update lockouts changed &= ~p; } diff --git a/src/mame/drivers/bladestl.cpp b/src/mame/drivers/bladestl.cpp index 14f8fc0a641..9b24bc3340d 100644 --- a/src/mame/drivers/bladestl.cpp +++ b/src/mame/drivers/bladestl.cpp @@ -65,8 +65,8 @@ READ8_MEMBER(bladestl_state::trackball_r) WRITE8_MEMBER(bladestl_state::bladestl_bankswitch_w) { /* bits 0 & 1 = coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bits 2 & 3 = lamps */ set_led_status(machine(), 0,data & 0x04); diff --git a/src/mame/drivers/blitz.cpp b/src/mame/drivers/blitz.cpp index ab634220cec..fc14d4c0c70 100644 --- a/src/mame/drivers/blitz.cpp +++ b/src/mame/drivers/blitz.cpp @@ -426,9 +426,9 @@ WRITE8_MEMBER(blitz_state::lamps_a_w) // output_set_lamp_value(4, 1 - ((data >> 4) & 1)); /* Lamp 4 */ // popmessage("written : %02X", data); -// coin_counter_w(machine(), 0, data & 0x40); /* counter1 */ -// coin_counter_w(machine(), 1, data & 0x80); /* counter2 */ -// coin_counter_w(machine(), 2, data & 0x20); /* counter3 */ +// machine().bookkeeping().coin_counter_w(0, data & 0x40); /* counter1 */ +// machine().bookkeeping().coin_counter_w(1, data & 0x80); /* counter2 */ +// machine().bookkeeping().coin_counter_w(2, data & 0x20); /* counter3 */ } diff --git a/src/mame/drivers/blitz68k.cpp b/src/mame/drivers/blitz68k.cpp index b00e0492e29..7130e2ae742 100644 --- a/src/mame/drivers/blitz68k.cpp +++ b/src/mame/drivers/blitz68k.cpp @@ -842,7 +842,7 @@ WRITE16_MEMBER(blitz68k_state::cjffruit_leds1_w) data = COMBINE_DATA(m_leds0); if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); // coin in + machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in set_led_status(machine(), 0, data & 0x0200); // win??? // 1 data & 0x0400 // win??? set_led_status(machine(), 2, data & 0x0800); // small @@ -982,7 +982,7 @@ WRITE16_MEMBER(blitz68k_state::deucesw2_leds1_w) data = COMBINE_DATA(m_leds0); if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); // coin in + machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in set_led_status(machine(), 0, data & 0x0200); // win??? // 1 data & 0x0400 // win??? set_led_status(machine(), 2, data & 0x0800); // small @@ -1172,7 +1172,7 @@ WRITE16_MEMBER(blitz68k_state::hermit_leds1_w) data = COMBINE_DATA(m_leds0); if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); // coin in + machine().bookkeeping().coin_counter_w(0, data & 0x0100); // coin in show_leds12(); } } diff --git a/src/mame/drivers/blktiger.cpp b/src/mame/drivers/blktiger.cpp index f79c4adac3c..8af9ce88f07 100644 --- a/src/mame/drivers/blktiger.cpp +++ b/src/mame/drivers/blktiger.cpp @@ -63,8 +63,8 @@ WRITE8_MEMBER(blktiger_state::blktiger_coinlockout_w) { if (ioport("COIN_LOCKOUT")->read() & 0x01) { - coin_lockout_w(machine(), 0,~data & 0x01); - coin_lockout_w(machine(), 1,~data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01); + machine().bookkeeping().coin_lockout_w(1,~data & 0x02); } } diff --git a/src/mame/drivers/blockhl.cpp b/src/mame/drivers/blockhl.cpp index 3d288cc5849..8cca358e26a 100644 --- a/src/mame/drivers/blockhl.cpp +++ b/src/mame/drivers/blockhl.cpp @@ -188,8 +188,8 @@ WRITE8_MEMBER( blockhl_state::banking_callback ) // bit 2, unknown (always 0) // bits 3/4 = coin counters - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x10); // bit 5 = select palette RAM or work RAM at 5800-5fff m_bank5800->set_bank(BIT(data, 5)); diff --git a/src/mame/drivers/blueprnt.cpp b/src/mame/drivers/blueprnt.cpp index 03d71b8fcd2..1c21a0ca56d 100644 --- a/src/mame/drivers/blueprnt.cpp +++ b/src/mame/drivers/blueprnt.cpp @@ -85,8 +85,8 @@ WRITE8_MEMBER(blueprnt_state::blueprnt_sound_command_w) WRITE8_MEMBER(blueprnt_state::blueprnt_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } /************************************* diff --git a/src/mame/drivers/bmcpokr.cpp b/src/mame/drivers/bmcpokr.cpp index 4b04ea6976a..6bd9d2c6ce8 100644 --- a/src/mame/drivers/bmcpokr.cpp +++ b/src/mame/drivers/bmcpokr.cpp @@ -327,8 +327,8 @@ WRITE16_MEMBER(bmcpokr_state::mux_w) if (ACCESSING_BITS_0_7) { m_hopper->write(space, 0, (data & 0x0001) ? 0x80 : 0x00); // hopper motor - coin_counter_w(machine(), 1, data & 0x0002); // coin-in / key-in - coin_counter_w(machine(), 2, data & 0x0004); // pay-out + machine().bookkeeping().coin_counter_w(1, data & 0x0002); // coin-in / key-in + machine().bookkeeping().coin_counter_w(2, data & 0x0004); // pay-out // data & 0x0060 // DSW mux // data & 0x0080 // ? always on } diff --git a/src/mame/drivers/bottom9.cpp b/src/mame/drivers/bottom9.cpp index d5e1fa3479c..7d3e5d9a61f 100644 --- a/src/mame/drivers/bottom9.cpp +++ b/src/mame/drivers/bottom9.cpp @@ -108,8 +108,8 @@ WRITE8_MEMBER(bottom9_state::bankswitch_w) WRITE8_MEMBER(bottom9_state::bottom9_1f90_w) { /* bits 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/boxer.cpp b/src/mame/drivers/boxer.cpp index d8300fc9dde..4fd0d093052 100644 --- a/src/mame/drivers/boxer.cpp +++ b/src/mame/drivers/boxer.cpp @@ -316,7 +316,7 @@ WRITE8_MEMBER(boxer_state::boxer_crowd_w) /* BIT2 => CROWD-2 */ /* BIT3 => CROWD-3 */ - coin_lockout_global_w(machine(), data & 1); + machine().bookkeeping().coin_lockout_global_w(data & 1); } diff --git a/src/mame/drivers/bwidow.cpp b/src/mame/drivers/bwidow.cpp index afe5c9654d7..c60baa7b024 100644 --- a/src/mame/drivers/bwidow.cpp +++ b/src/mame/drivers/bwidow.cpp @@ -335,8 +335,8 @@ WRITE8_MEMBER(bwidow_state::bwidow_misc_w) if (data == m_lastdata) return; set_led_status(machine(), 0,~data & 0x10); set_led_status(machine(), 1,~data & 0x20); - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); m_lastdata = data; } @@ -345,12 +345,12 @@ WRITE8_MEMBER(bwidow_state::spacduel_coin_counter_w) if (data == m_lastdata) return; set_led_status(machine(), 0, !BIT(data,5)); // start lamp set_led_status(machine(), 1, !BIT(data,4)); // select lamp - coin_lockout_w(machine(), 0, !BIT(data,3)); - coin_lockout_w(machine(), 1, !BIT(data,3)); - coin_lockout_w(machine(), 2, !BIT(data,3)); - coin_counter_w(machine(), 0, BIT(data,0)); - coin_counter_w(machine(), 1, BIT(data,1)); - coin_counter_w(machine(), 2, BIT(data,2)); + machine().bookkeeping().coin_lockout_w(0, !BIT(data,3)); + machine().bookkeeping().coin_lockout_w(1, !BIT(data,3)); + machine().bookkeeping().coin_lockout_w(2, !BIT(data,3)); + machine().bookkeeping().coin_counter_w(0, BIT(data,0)); + machine().bookkeeping().coin_counter_w(1, BIT(data,1)); + machine().bookkeeping().coin_counter_w(2, BIT(data,2)); m_lastdata = data; } diff --git a/src/mame/drivers/bzone.cpp b/src/mame/drivers/bzone.cpp index 03601f5cb6e..e3b43d4d4cf 100644 --- a/src/mame/drivers/bzone.cpp +++ b/src/mame/drivers/bzone.cpp @@ -266,7 +266,7 @@ CUSTOM_INPUT_MEMBER(bzone_state::clock_r) WRITE8_MEMBER(bzone_state::bzone_coin_counter_w) { - coin_counter_w(machine(), offset,data); + machine().bookkeeping().coin_counter_w(offset,data); } diff --git a/src/mame/drivers/cabal.cpp b/src/mame/drivers/cabal.cpp index 304d42390db..d60976bc679 100644 --- a/src/mame/drivers/cabal.cpp +++ b/src/mame/drivers/cabal.cpp @@ -175,8 +175,8 @@ READ8_MEMBER(cabal_state::cabalbl_snd1_r) WRITE8_MEMBER(cabal_state::cabalbl_coin_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); //data & 0x40? video enable? } diff --git a/src/mame/drivers/cabaret.cpp b/src/mame/drivers/cabaret.cpp index 8f9df7a020d..5141f26ea1b 100644 --- a/src/mame/drivers/cabaret.cpp +++ b/src/mame/drivers/cabaret.cpp @@ -154,10 +154,10 @@ WRITE8_MEMBER(cabaret_state::cabaret_nmi_and_coins_w) // popmessage("%02x",data); } - coin_counter_w(machine(), 0, data & 0x01); // coin_a - coin_counter_w(machine(), 1, data & 0x04); // coin_c - coin_counter_w(machine(), 2, data & 0x08); // key in - coin_counter_w(machine(), 3, data & 0x10); // coin m_out mech + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a + machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c + machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in + machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech set_led_status(machine(), 6, data & 0x40); // led for coin m_out / hopper active diff --git a/src/mame/drivers/caswin.cpp b/src/mame/drivers/caswin.cpp index fa8b3420104..43ff1c4748c 100644 --- a/src/mame/drivers/caswin.cpp +++ b/src/mame/drivers/caswin.cpp @@ -163,11 +163,11 @@ READ8_MEMBER(caswin_state::vvillage_rng_r) WRITE8_MEMBER(caswin_state::vvillage_output_w) { - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 1); // data & 4 payout counter - coin_lockout_w(machine(), 0,data & 0x20); - coin_lockout_w(machine(), 1,data & 0x20); + machine().bookkeeping().coin_lockout_w(0,data & 0x20); + machine().bookkeeping().coin_lockout_w(1,data & 0x20); } WRITE8_MEMBER(caswin_state::vvillage_lamps_w) diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index 8b2479e6625..f3f0ebf55c3 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -298,10 +298,10 @@ WRITE16_MEMBER(cave_state::cave_eeprom_msb_w) if (ACCESSING_BITS_8_15) // even address { - coin_lockout_w(machine(), 1,~data & 0x8000); - coin_lockout_w(machine(), 0,~data & 0x4000); - coin_counter_w(machine(), 1, data & 0x2000); - coin_counter_w(machine(), 0, data & 0x1000); + machine().bookkeeping().coin_lockout_w(1,~data & 0x8000); + machine().bookkeeping().coin_lockout_w(0,~data & 0x4000); + machine().bookkeeping().coin_counter_w(1, data & 0x2000); + machine().bookkeeping().coin_counter_w(0, data & 0x1000); // latch the bit m_eeprom->di_write((data & 0x0800) >> 11); @@ -363,10 +363,10 @@ WRITE16_MEMBER(cave_state::cave_eeprom_lsb_w) if (ACCESSING_BITS_0_7) // odd address { - coin_lockout_w(machine(), 1, ~data & 0x0008); - coin_lockout_w(machine(), 0, ~data & 0x0004); - coin_counter_w(machine(), 1, data & 0x0002); - coin_counter_w(machine(), 0, data & 0x0001); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x0008); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x0004); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); // latch the bit m_eeprom->di_write((data & 0x80) >> 7); @@ -384,8 +384,8 @@ WRITE16_MEMBER(cave_state::gaia_coin_lsb_w) { if (ACCESSING_BITS_0_7) // odd address { - coin_counter_w(machine(), 1, data & 0x0002); - coin_counter_w(machine(), 0, data & 0x0001); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); } } @@ -398,8 +398,8 @@ WRITE16_MEMBER(cave_state::metmqstr_eeprom_msb_w) if (ACCESSING_BITS_8_15) // even address { - coin_counter_w(machine(), 1, data & 0x2000); - coin_counter_w(machine(), 0, data & 0x1000); + machine().bookkeeping().coin_counter_w(1, data & 0x2000); + machine().bookkeeping().coin_counter_w(0, data & 0x1000); if (~data & 0x0100) { @@ -644,12 +644,12 @@ WRITE16_MEMBER(cave_state::korokoro_leds_w) set_led_status(machine(), 1, data & 0x4000); set_led_status(machine(), 2, data & 0x1000); // square button set_led_status(machine(), 3, data & 0x0800); // round button -// coin_lockout_w(machine(), 1, ~data & 0x0200); // coin lockouts? -// coin_lockout_w(machine(), 0, ~data & 0x0100); +// machine().bookkeeping().coin_lockout_w(1, ~data & 0x0200); // coin lockouts? +// machine().bookkeeping().coin_lockout_w(0, ~data & 0x0100); -// coin_counter_w(machine(), 2, data & 0x0080); -// coin_counter_w(machine(), 1, data & 0x0020); - coin_counter_w(machine(), 0, data & 0x0010); +// machine().bookkeeping().coin_counter_w(2, data & 0x0080); +// machine().bookkeeping().coin_counter_w(1, data & 0x0020); + machine().bookkeeping().coin_counter_w(0, data & 0x0010); set_led_status(machine(), 5, data & 0x0008); set_led_status(machine(), 6, data & 0x0004); @@ -843,7 +843,7 @@ WRITE16_MEMBER(cave_state::ppsatan_out_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x0001); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); set_led_status(machine(), 0, data & 0x0010); set_led_status(machine(), 1, data & 0x0020); diff --git a/src/mame/drivers/cbasebal.cpp b/src/mame/drivers/cbasebal.cpp index 6d4b46b0749..beca2e9a642 100644 --- a/src/mame/drivers/cbasebal.cpp +++ b/src/mame/drivers/cbasebal.cpp @@ -78,10 +78,10 @@ WRITE8_MEMBER(cbasebal_state::bankedram_w) WRITE8_MEMBER(cbasebal_state::cbasebal_coinctrl_w) { - coin_lockout_w(machine(), 0, ~data & 0x04); - coin_lockout_w(machine(), 1, ~data & 0x08); - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x04); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } diff --git a/src/mame/drivers/ccastles.cpp b/src/mame/drivers/ccastles.cpp index 7e6ee7c0f27..6d380f3b549 100644 --- a/src/mame/drivers/ccastles.cpp +++ b/src/mame/drivers/ccastles.cpp @@ -255,7 +255,7 @@ WRITE8_MEMBER(ccastles_state::led_w) WRITE8_MEMBER(ccastles_state::ccounter_w) { - coin_counter_w(machine(), offset, data & 1); + machine().bookkeeping().coin_counter_w(offset, data & 1); } diff --git a/src/mame/drivers/cchance.cpp b/src/mame/drivers/cchance.cpp index 0fd606a3051..0283cf99df9 100644 --- a/src/mame/drivers/cchance.cpp +++ b/src/mame/drivers/cchance.cpp @@ -58,9 +58,9 @@ public: WRITE8_MEMBER(cchance_state::output_0_w) { //---- --x- divider? - coin_lockout_w(machine(), 0, ~data & 1); + machine().bookkeeping().coin_lockout_w(0, ~data & 1); -// coin_counter_w(machine(), 0, ~data & 1); +// machine().bookkeeping().coin_counter_w(0, ~data & 1); } diff --git a/src/mame/drivers/centiped.cpp b/src/mame/drivers/centiped.cpp index e69467346a9..1d17a3107cd 100644 --- a/src/mame/drivers/centiped.cpp +++ b/src/mame/drivers/centiped.cpp @@ -629,13 +629,13 @@ READ8_MEMBER(centiped_state::caterplr_unknown_r) WRITE8_MEMBER(centiped_state::coin_count_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } WRITE8_MEMBER(centiped_state::bullsdrt_coin_count_w) { - coin_counter_w(machine(), 0, data); + machine().bookkeeping().coin_counter_w(0, data); } diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp index 53a53b1882a..28f85f089e3 100644 --- a/src/mame/drivers/cesclass.cpp +++ b/src/mame/drivers/cesclass.cpp @@ -115,7 +115,7 @@ WRITE16_MEMBER( cesclassic_state::outputs_w ) ---- --x- coin counter */ m_oki->set_bank_base((data & 0x40) ? 0x40000 : 0); - coin_counter_w(machine(), 0, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 2); if(data & ~0x62) logerror("Output: %02x\n",data); } diff --git a/src/mame/drivers/champbwl.cpp b/src/mame/drivers/champbwl.cpp index 709cd463600..745870f02bc 100644 --- a/src/mame/drivers/champbwl.cpp +++ b/src/mame/drivers/champbwl.cpp @@ -218,11 +218,11 @@ READ8_MEMBER(champbwl_state::trackball_r) WRITE8_MEMBER(champbwl_state::champbwl_misc_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); - coin_lockout_w(machine(), 0, ~data & 8); - coin_lockout_w(machine(), 1, ~data & 4); + machine().bookkeeping().coin_lockout_w(0, ~data & 8); + machine().bookkeeping().coin_lockout_w(1, ~data & 4); membank("bank1")->set_entry((data & 0x30) >> 4); } @@ -255,10 +255,10 @@ ADDRESS_MAP_END WRITE8_MEMBER(champbwl_state::doraemon_outputs_w) { - coin_counter_w(machine(), 0, data & 1); // coin in counter - coin_counter_w(machine(), 1, data & 2); // gift out counter + machine().bookkeeping().coin_counter_w(0, data & 1); // coin in counter + machine().bookkeeping().coin_counter_w(1, data & 2); // gift out counter - coin_lockout_w(machine(), 0, ~data & 8); // coin lockout + machine().bookkeeping().coin_lockout_w(0, ~data & 8); // coin lockout machine().device<ticket_dispenser_device>("hopper")->write(space, 0, (data & 0x04) ? 0x00 : 0x80); // gift out motor membank("bank1")->set_entry((data & 0x30) >> 4); diff --git a/src/mame/drivers/changela.cpp b/src/mame/drivers/changela.cpp index 4c9cb8909ca..3bf89bd85af 100644 --- a/src/mame/drivers/changela.cpp +++ b/src/mame/drivers/changela.cpp @@ -198,7 +198,7 @@ WRITE8_MEMBER(changela_state::changela_collision_reset_1) WRITE8_MEMBER(changela_state::changela_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index 2f9a85abe7b..533e094ff3a 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -107,7 +107,7 @@ WRITE8_MEMBER(chexx_state::via_b_out) digitalker_set_bank(data & 3); m_digitalker->set_output_gain(0, BIT(data,2) ? 1.0f : 0.0f); // bit 2 controls the Digitalker output - coin_counter_w(machine(), 0, BIT(~data,3)); + machine().bookkeeping().coin_counter_w(0, BIT(~data,3)); // bit 4 is EJECT // bit 7 is related to speaker out diff --git a/src/mame/drivers/chqflag.cpp b/src/mame/drivers/chqflag.cpp index 20dd8ac7958..052e2916a2a 100644 --- a/src/mame/drivers/chqflag.cpp +++ b/src/mame/drivers/chqflag.cpp @@ -56,8 +56,8 @@ WRITE8_MEMBER(chqflag_state::chqflag_bankswitch_w) WRITE8_MEMBER(chqflag_state::chqflag_vreg_w) { /* bits 0 & 1 = coin counters */ - coin_counter_w(machine(), 1, data & 0x01); - coin_counter_w(machine(), 0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x02); /* bit 4 = enable rom reading through K051316 #1 & #2 */ m_k051316_readroms = (data & 0x10); diff --git a/src/mame/drivers/chsuper.cpp b/src/mame/drivers/chsuper.cpp index dea5fee86bd..7b17ad25230 100644 --- a/src/mame/drivers/chsuper.cpp +++ b/src/mame/drivers/chsuper.cpp @@ -137,9 +137,9 @@ WRITE8_MEMBER( chsuper_state::chsuper_vram_w ) WRITE8_MEMBER( chsuper_state::chsuper_outporta_w ) // Port EEh { - coin_counter_w(machine(), 0, data & 0x01); // Coin counter + machine().bookkeeping().coin_counter_w(0, data & 0x01); // Coin counter output_set_lamp_value(0, (data >> 1) & 1); // Hold 1 / Black (Nero) lamp. - coin_counter_w(machine(), 1, data & 0x04); // Payout / Ticket Out pulse + machine().bookkeeping().coin_counter_w(1, data & 0x04); // Payout / Ticket Out pulse output_set_lamp_value(1, (data >> 3) & 1); // Hold 2 / Low (Bassa) lamp. // D4: unused... output_set_lamp_value(5, (data >> 5) & 1); // BET lamp diff --git a/src/mame/drivers/circusc.cpp b/src/mame/drivers/circusc.cpp index 64a19ac1392..f0955c0f396 100644 --- a/src/mame/drivers/circusc.cpp +++ b/src/mame/drivers/circusc.cpp @@ -97,7 +97,7 @@ WRITE8_MEMBER(circusc_state::circusc_sh_irqtrigger_w) WRITE8_MEMBER(circusc_state::circusc_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } WRITE8_MEMBER(circusc_state::circusc_sound_w) diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index d33d7ee8372..82d19df4fb2 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -491,8 +491,8 @@ WRITE16_MEMBER(cischeat_state::armchmp2_leds_w) if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x0040); - coin_counter_w(machine(), 1, data & 0x0080); + machine().bookkeeping().coin_counter_w(0, data & 0x0040); + machine().bookkeeping().coin_counter_w(1, data & 0x0080); } } @@ -525,9 +525,9 @@ WRITE16_MEMBER(cischeat_state::captflag_leds_w) COMBINE_DATA( &m_captflag_leds ); if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 1, data & 0x0100); // coin 2 + machine().bookkeeping().coin_counter_w(1, data & 0x0100); // coin 2 set_led_status(machine(), 0, data & 0x0200); // decide - coin_counter_w(machine(), 0, data & 0x0400); // coin 1 + machine().bookkeeping().coin_counter_w(0, data & 0x0400); // coin 1 set_led_status(machine(), 1, data & 0x2000); // select int power = (data & 0x1000); diff --git a/src/mame/drivers/cliffhgr.cpp b/src/mame/drivers/cliffhgr.cpp index 3d59e1456da..0a50dd302e1 100644 --- a/src/mame/drivers/cliffhgr.cpp +++ b/src/mame/drivers/cliffhgr.cpp @@ -165,7 +165,7 @@ WRITE8_MEMBER(cliffhgr_state::cliff_phillips_clear_w) WRITE8_MEMBER(cliffhgr_state::cliff_coin_counter_w) { - coin_counter_w(machine(), 0, (data & 0x40) ? 1 : 0 ); + machine().bookkeeping().coin_counter_w(0, (data & 0x40) ? 1 : 0 ); } READ8_MEMBER(cliffhgr_state::cliff_irq_ack_r) diff --git a/src/mame/drivers/cloak.cpp b/src/mame/drivers/cloak.cpp index 0190b1860e9..0792fb3490b 100644 --- a/src/mame/drivers/cloak.cpp +++ b/src/mame/drivers/cloak.cpp @@ -135,7 +135,7 @@ WRITE8_MEMBER(cloak_state::cloak_led_w) WRITE8_MEMBER(cloak_state::cloak_coin_counter_w) { - coin_counter_w(machine(), 1 - offset, data & 0x80); + machine().bookkeeping().coin_counter_w(1 - offset, data & 0x80); } WRITE8_MEMBER(cloak_state::cloak_custom_w) diff --git a/src/mame/drivers/cloud9.cpp b/src/mame/drivers/cloud9.cpp index 745e5c402c5..fe371336c63 100644 --- a/src/mame/drivers/cloud9.cpp +++ b/src/mame/drivers/cloud9.cpp @@ -221,7 +221,7 @@ WRITE8_MEMBER(cloud9_state::cloud9_led_w) WRITE8_MEMBER(cloud9_state::cloud9_coin_counter_w) { - coin_counter_w(machine(), offset, data & 0x80); + machine().bookkeeping().coin_counter_w(offset, data & 0x80); } diff --git a/src/mame/drivers/cocoloco.cpp b/src/mame/drivers/cocoloco.cpp index e3c34d62014..3111a461866 100644 --- a/src/mame/drivers/cocoloco.cpp +++ b/src/mame/drivers/cocoloco.cpp @@ -367,7 +367,7 @@ WRITE8_MEMBER( cocoloco_state::coincounter_w ) They explain in a sheet that the coin in for 50 pesetas behaves like 2x 25 pesetas (1 duro) coins, so has sense. */ - coin_counter_w(machine(), 0, data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x08); } diff --git a/src/mame/drivers/combatsc.cpp b/src/mame/drivers/combatsc.cpp index 2d9323791ef..a0ca9509c9d 100644 --- a/src/mame/drivers/combatsc.cpp +++ b/src/mame/drivers/combatsc.cpp @@ -258,8 +258,8 @@ WRITE8_MEMBER(combatsc_state::combatsc_coin_counter_w) /* b1: coin counter 2 */ /* b0: coin counter 1 */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } READ8_MEMBER(combatsc_state::trackball_r) diff --git a/src/mame/drivers/contra.cpp b/src/mame/drivers/contra.cpp index e10f10ca5e6..868741667dd 100644 --- a/src/mame/drivers/contra.cpp +++ b/src/mame/drivers/contra.cpp @@ -46,10 +46,10 @@ WRITE8_MEMBER(contra_state::contra_sh_irqtrigger_w) WRITE8_MEMBER(contra_state::contra_coin_counter_w) { if (data & 0x01) - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); if (data & 0x02) - coin_counter_w(machine(), 1, (data & 0x02) >> 1); + machine().bookkeeping().coin_counter_w(1, (data & 0x02) >> 1); } WRITE8_MEMBER(contra_state::cpu_sound_command_w) diff --git a/src/mame/drivers/coolpool.cpp b/src/mame/drivers/coolpool.cpp index c54ec39c031..cfdc7f36027 100644 --- a/src/mame/drivers/coolpool.cpp +++ b/src/mame/drivers/coolpool.cpp @@ -206,8 +206,8 @@ WRITE16_MEMBER(coolpool_state::amerdart_misc_w) { logerror("%08x:IOP_system_w %04x\n",space.device().safe_pc(),data); - coin_counter_w(machine(), 0, ~data & 0x0001); - coin_counter_w(machine(), 1, ~data & 0x0002); + machine().bookkeeping().coin_counter_w(0, ~data & 0x0001); + machine().bookkeeping().coin_counter_w(1, ~data & 0x0002); /* bits 10-15 are counted down over time */ @@ -420,8 +420,8 @@ WRITE16_MEMBER(coolpool_state::coolpool_misc_w) { logerror("%08x:IOP_system_w %04x\n",space.device().safe_pc(),data); - coin_counter_w(machine(), 0, ~data & 0x0001); - coin_counter_w(machine(), 1, ~data & 0x0002); + machine().bookkeeping().coin_counter_w(0, ~data & 0x0001); + machine().bookkeeping().coin_counter_w(1, ~data & 0x0002); m_dsp->set_input_line(INPUT_LINE_RESET, (data & 0x0400) ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/mame/drivers/corona.cpp b/src/mame/drivers/corona.cpp index d861d4bf7e0..e539bacba32 100644 --- a/src/mame/drivers/corona.cpp +++ b/src/mame/drivers/corona.cpp @@ -545,8 +545,8 @@ WRITE8_MEMBER(corona_state::mux_port_w) */ m_input_selector = (data ^ 0xff) & 0x3f; /* Input Selector, */ - coin_counter_w(machine(), 0, (data ^ 0xff) & 0x40); /* Credits In (mechanical meters) */ - coin_counter_w(machine(), 1, (data ^ 0xff) & 0x80); /* Credits Out (mechanical meters) */ + machine().bookkeeping().coin_counter_w(0, (data ^ 0xff) & 0x40); /* Credits In (mechanical meters) */ + machine().bookkeeping().coin_counter_w(1, (data ^ 0xff) & 0x80); /* Credits Out (mechanical meters) */ // logerror("muxsel: %02x \n", m_input_selector); } @@ -564,9 +564,9 @@ WRITE8_MEMBER(corona_state::wc_meters_w) Data is written inverted. */ - coin_counter_w(machine(), 0, (data ^ 0xff) & 0x01); /* Credits In */ - coin_counter_w(machine(), 1, (data ^ 0xff) & 0x02); /* Credits In (through Coin 3) */ - coin_counter_w(machine(), 2, (data ^ 0xff) & 0x04); /* Credits Out */ + machine().bookkeeping().coin_counter_w(0, (data ^ 0xff) & 0x01); /* Credits In */ + machine().bookkeeping().coin_counter_w(1, (data ^ 0xff) & 0x02); /* Credits In (through Coin 3) */ + machine().bookkeeping().coin_counter_w(2, (data ^ 0xff) & 0x04); /* Credits Out */ // popmessage("meters: %02x", (data ^ 0xff)); } diff --git a/src/mame/drivers/cps1.cpp b/src/mame/drivers/cps1.cpp index 18565289bcd..41501147cef 100644 --- a/src/mame/drivers/cps1.cpp +++ b/src/mame/drivers/cps1.cpp @@ -331,10 +331,10 @@ WRITE16_MEMBER(cps_state::cps1_coinctrl_w) { if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); - coin_counter_w(machine(), 1, data & 0x0200); - coin_lockout_w(machine(), 0, ~data & 0x0400); - coin_lockout_w(machine(), 1, ~data & 0x0800); + machine().bookkeeping().coin_counter_w(0, data & 0x0100); + machine().bookkeeping().coin_counter_w(1, data & 0x0200); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x0400); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x0800); // bit 15 = CPS-A custom reset? } @@ -344,10 +344,10 @@ WRITE16_MEMBER(cps_state::cpsq_coinctrl2_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 2, data & 0x01); - coin_lockout_w(machine(), 2, ~data & 0x02); - coin_counter_w(machine(), 3, data & 0x04); - coin_lockout_w(machine(), 3, ~data & 0x08); + machine().bookkeeping().coin_counter_w(2, data & 0x01); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x02); + machine().bookkeeping().coin_counter_w(3, data & 0x04); + machine().bookkeeping().coin_lockout_w(3, ~data & 0x08); } } diff --git a/src/mame/drivers/cps2.cpp b/src/mame/drivers/cps2.cpp index a5cc6776637..0353d0045b2 100644 --- a/src/mame/drivers/cps2.cpp +++ b/src/mame/drivers/cps2.cpp @@ -749,7 +749,7 @@ WRITE16_MEMBER( cps_state::cps2_eeprom_port_w ) if (m_audiocpu != nullptr) m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x0008) ? CLEAR_LINE : ASSERT_LINE); - coin_counter_w(machine(), 0, data & 0x0001); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); if (m_cps2_dial_type == 1) // pzloop2 { // Puzz Loop 2 uses coin counter 2 input to switch between stick and paddle controls @@ -757,22 +757,22 @@ WRITE16_MEMBER( cps_state::cps2_eeprom_port_w ) } else { - coin_counter_w(machine(), 1, data & 0x0002); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); } if (strncmp(machine().system().name, "mmatrix", 7) == 0) // Mars Matrix seems to require the coin lockout bit to be reversed { - coin_lockout_w(machine(), 0, data & 0x0010); - coin_lockout_w(machine(), 1, data & 0x0020); - coin_lockout_w(machine(), 2, data & 0x0040); - coin_lockout_w(machine(), 3, data & 0x0080); + machine().bookkeeping().coin_lockout_w(0, data & 0x0010); + machine().bookkeeping().coin_lockout_w(1, data & 0x0020); + machine().bookkeeping().coin_lockout_w(2, data & 0x0040); + machine().bookkeeping().coin_lockout_w(3, data & 0x0080); } else { - coin_lockout_w(machine(), 0, ~data & 0x0010); - coin_lockout_w(machine(), 1, ~data & 0x0020); - coin_lockout_w(machine(), 2, ~data & 0x0040); - coin_lockout_w(machine(), 3, ~data & 0x0080); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x0010); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x0020); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x0040); + machine().bookkeeping().coin_lockout_w(3, ~data & 0x0080); } /* diff --git a/src/mame/drivers/crimfght.cpp b/src/mame/drivers/crimfght.cpp index febda7d58ff..e7d510e47bc 100644 --- a/src/mame/drivers/crimfght.cpp +++ b/src/mame/drivers/crimfght.cpp @@ -23,8 +23,8 @@ WRITE8_MEMBER(crimfght_state::crimfght_coin_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } READ8_MEMBER(crimfght_state::k052109_051960_r) diff --git a/src/mame/drivers/cultures.cpp b/src/mame/drivers/cultures.cpp index a27bfe2b492..f9d58e31d57 100644 --- a/src/mame/drivers/cultures.cpp +++ b/src/mame/drivers/cultures.cpp @@ -177,7 +177,7 @@ WRITE8_MEMBER(cultures_state::bg_bank_w) m_bg2_bank = (data & 0xc) >> 2; m_bg2_tilemap->mark_all_dirty(); } - coin_counter_w(machine(), 0, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x10); } diff --git a/src/mame/drivers/dacholer.cpp b/src/mame/drivers/dacholer.cpp index 000140a5407..d05867024cb 100644 --- a/src/mame/drivers/dacholer.cpp +++ b/src/mame/drivers/dacholer.cpp @@ -208,8 +208,8 @@ WRITE8_MEMBER(dacholer_state::bg_bank_w) WRITE8_MEMBER(dacholer_state::coins_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); set_led_status(machine(), 0, data & 4); set_led_status(machine(), 1, data & 8); diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 80202aa2645..b4039d593bd 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -219,10 +219,10 @@ WRITE16_MEMBER(darius_state::darius_ioc_w) case 0x30: /* coin control */ /* bits 7,5,4,0 used on reset */ /* bit 4 used whenever bg is blanked ? */ - coin_lockout_w(machine(), 0, ~data & 0x02); - coin_lockout_w(machine(), 1, ~data & 0x04); - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x02); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x40); m_coin_word = data & 0xffff; //popmessage(" address %04x value %04x",offset,data); return; diff --git a/src/mame/drivers/dassault.cpp b/src/mame/drivers/dassault.cpp index c3a3557e889..5df8e0e002c 100644 --- a/src/mame/drivers/dassault.cpp +++ b/src/mame/drivers/dassault.cpp @@ -241,7 +241,7 @@ READ16_MEMBER(dassault_state::dassault_control_r) WRITE16_MEMBER(dassault_state::dassault_control_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); if (data & 0xfffe) logerror("Coin cointrol %04x\n", data); } diff --git a/src/mame/drivers/dblcrown.cpp b/src/mame/drivers/dblcrown.cpp index 3778813c4cc..0a8748477b6 100644 --- a/src/mame/drivers/dblcrown.cpp +++ b/src/mame/drivers/dblcrown.cpp @@ -298,8 +298,8 @@ WRITE8_MEMBER( dblcrown_state::output_w ) x-x- --xx unknown */ - coin_counter_w(machine(), 0, data & 0x10); /* Coin In counter pulse */ - coin_counter_w(machine(), 1 ,data & 0x08); /* Payout counter pulse */ + machine().bookkeeping().coin_counter_w(0, data & 0x10); /* Coin In counter pulse */ + machine().bookkeeping().coin_counter_w(1 ,data & 0x08); /* Payout counter pulse */ // popmessage("out: %02x", data); } diff --git a/src/mame/drivers/dbz.cpp b/src/mame/drivers/dbz.cpp index d2e05b7181d..6372c089fb1 100644 --- a/src/mame/drivers/dbz.cpp +++ b/src/mame/drivers/dbz.cpp @@ -89,8 +89,8 @@ WRITE16_MEMBER(dbz_state::dbzcontrol_w) else m_k053246->k053246_set_objcha_line( CLEAR_LINE); - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } WRITE16_MEMBER(dbz_state::dbz_sound_command_w) diff --git a/src/mame/drivers/ddenlovr.cpp b/src/mame/drivers/ddenlovr.cpp index e29451a027f..b004aa03a85 100644 --- a/src/mame/drivers/ddenlovr.cpp +++ b/src/mame/drivers/ddenlovr.cpp @@ -1701,12 +1701,12 @@ CUSTOM_INPUT_MEMBER(ddenlovr_state::ddenlovr_blitter_irq_r) WRITE16_MEMBER(ddenlovr_state::ddenlovr_coincounter_0_w) { if (ACCESSING_BITS_0_7) - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE16_MEMBER(ddenlovr_state::ddenlovr_coincounter_1_w) { if (ACCESSING_BITS_0_7) - coin_counter_w(machine(), 1, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 1); } @@ -1936,8 +1936,8 @@ WRITE16_MEMBER(ddenlovr_state::quiz365_coincounter_w) { if (m_input_sel == 0x1c) { - coin_counter_w(machine(), 0, ~data & 1); - coin_counter_w(machine(), 1, ~data & 4); + machine().bookkeeping().coin_counter_w(0, ~data & 1); + machine().bookkeeping().coin_counter_w(1, ~data & 4); } } } @@ -2012,8 +2012,8 @@ WRITE16_MEMBER(ddenlovr_state::ddenlovj_coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x04); // data & 0x80 ? } } @@ -2186,8 +2186,8 @@ WRITE16_MEMBER(ddenlovr_state::nettoqc_coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x04); // data & 0x80 ? } } @@ -2451,8 +2451,8 @@ WRITE8_MEMBER(ddenlovr_state::mmpanic_lockout_w) { if (m_dsw_sel == 0x0c) { - coin_counter_w(machine(), 0, (~data) & 0x01); - coin_lockout_w(machine(), 0, (~data) & 0x02); + machine().bookkeeping().coin_counter_w(0, (~data) & 0x01); + machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02); set_led_status(machine(), 1, (~data) & 0x04); } } @@ -2609,8 +2609,8 @@ WRITE8_MEMBER(ddenlovr_state::funkyfig_lockout_w) { case 0x2c: m_funkyfig_lockout = data; - coin_counter_w(machine(), 0, data & 0x01); - coin_lockout_w(machine(), 0, (~data) & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02); if (data & ~0x03) logerror("%06x: warning, unknown bits written, lockout = %02x\n", space.device().safe_pc(), data); break; @@ -2757,8 +2757,8 @@ WRITE8_MEMBER(ddenlovr_state::hanakanz_coincounter_w) // bit 2 = hopper (if bet on) // bit 3 = 1 if bet off - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); if (data & 0xf0) logerror("%04x: warning, coin counter = %02x\n", space.device().safe_pc(), data); @@ -3001,8 +3001,8 @@ WRITE8_MEMBER(ddenlovr_state::mjchuuka_coincounter_w) // bit 3 = lockout // bit 8? - coin_counter_w(machine(), 0, data & 0x01); - coin_lockout_w(machine(), 0, (~data) & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_lockout_w(0, (~data) & 0x08); if (data & 0x74) logerror("%04x: warning, coin counter = %02x\n", space.device().safe_pc(), data); @@ -3180,8 +3180,8 @@ WRITE8_MEMBER(ddenlovr_state::mjmyster_coincounter_w) switch (m_input_sel) { case 0x0c: - coin_counter_w(machine(), 0, (~data) & 0x01); // coin in - coin_counter_w(machine(), 0, (~data) & 0x02); // coin out actually + machine().bookkeeping().coin_counter_w(0, (~data) & 0x01); // coin in + machine().bookkeeping().coin_counter_w(0, (~data) & 0x02); // coin out actually #ifdef MAME_DEBUG // popmessage("cc: %02x",data); #endif @@ -3304,8 +3304,8 @@ WRITE8_MEMBER(ddenlovr_state::hginga_coins_w) // bit 2 = hopper (if bet on) // bit 3 = 1 if bet on // bit 7? - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); #ifdef MAME_DEBUG // popmessage("COINS %02x", data); #endif @@ -3439,8 +3439,8 @@ WRITE8_MEMBER(ddenlovr_state::hgokou_input_w) // bit 1 = out counter // bit 2 = hopper // bit 7 = ? - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); m_hopper = data & 0x04; #ifdef MAME_DEBUG // popmessage("COINS %02x",data); @@ -3607,7 +3607,7 @@ WRITE8_MEMBER(ddenlovr_state::hparadis_coin_w) { switch (m_input_sel) { - case 0x0c: coin_counter_w(machine(), 0, data & 1); break; + case 0x0c: machine().bookkeeping().coin_counter_w(0, data & 1); break; case 0x0d: break; default: logerror("%04x: coins_w with select = %02x, data = %02x\n",space.device().safe_pc(), m_input_sel, data); @@ -3836,7 +3836,7 @@ WRITE8_MEMBER(ddenlovr_state::mjflove_blitter_w) WRITE8_MEMBER(ddenlovr_state::mjflove_coincounter_w) { // bit 0 = in counter - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); if (data & 0xfe) { @@ -3925,8 +3925,8 @@ WRITE8_MEMBER(ddenlovr_state::mjgnight_coincounter_w) set_led_status(machine(), 0, data & 0x01); // led? 1 in-game, 0 in service mode / while booting - coin_counter_w(machine(), 0, data & 0x04); // coin-out - coin_counter_w(machine(), 1, data & 0x08); // coin-in + machine().bookkeeping().coin_counter_w(0, data & 0x04); // coin-out + machine().bookkeeping().coin_counter_w(1, data & 0x08); // coin-in if (data & 0xf2) logerror("%04x: warning, coin counter = %02x\n", space.device().safe_pc(), data); @@ -4008,8 +4008,8 @@ WRITE8_MEMBER(ddenlovr_state::sryudens_coincounter_w) // bit 4 = ? on except during boot or test mode // bit 7 = ? mostly on - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); m_hopper = data & 0x04; if (data & 0x68) @@ -4069,8 +4069,8 @@ WRITE8_MEMBER(ddenlovr_state::janshinp_coincounter_w) // bit 3 = ? on except during boot or test mode // bit 7 = ? mostly on - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); if (data & ~0x8b) logerror("%04x: warning, coin counter = %02x\n", space.device().safe_pc(), data); @@ -4272,7 +4272,7 @@ WRITE8_MEMBER(ddenlovr_state::htengoku_coin_w) // bit 0 = coin counter // bit 1 = out counter // bit 2 = hopper - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); m_hopper = data & 0x04; #ifdef MAME_DEBUG // popmessage("COINS %02x",data); diff --git a/src/mame/drivers/ddribble.cpp b/src/mame/drivers/ddribble.cpp index 40e2df29ee6..4000dd166af 100644 --- a/src/mame/drivers/ddribble.cpp +++ b/src/mame/drivers/ddribble.cpp @@ -63,8 +63,8 @@ WRITE8_MEMBER(ddribble_state::ddribble_coin_counter_w) /* b2-b3: unknown */ /* b1: coin counter 2 */ /* b0: coin counter 1 */ - coin_counter_w(machine(), 0,(data) & 0x01); - coin_counter_w(machine(), 1,(data >> 1) & 0x01); + machine().bookkeeping().coin_counter_w(0,(data) & 0x01); + machine().bookkeeping().coin_counter_w(1,(data >> 1) & 0x01); } READ8_MEMBER(ddribble_state::ddribble_vlm5030_busy_r) diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index fc96684c779..c7fa5025d59 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -135,7 +135,7 @@ WRITE8_MEMBER(destiny_state::display_w) WRITE8_MEMBER(destiny_state::out_w) { // d0: coin blocker - coin_lockout_w(machine(), 0, ~data & 1); + machine().bookkeeping().coin_lockout_w(0, ~data & 1); // d1: paper cutter 1 // d2: paper cutter 2 @@ -156,7 +156,7 @@ INPUT_CHANGED_MEMBER(destiny_state::coin_inserted) // coincounter on coin insert if (((int)(FPTR)param) == 0) - coin_counter_w(machine(), 0, newval); + machine().bookkeeping().coin_counter_w(0, newval); } WRITE8_MEMBER(destiny_state::sound_w) diff --git a/src/mame/drivers/destroyr.cpp b/src/mame/drivers/destroyr.cpp index 25e2d0367ca..6f2972470c3 100644 --- a/src/mame/drivers/destroyr.cpp +++ b/src/mame/drivers/destroyr.cpp @@ -222,8 +222,8 @@ WRITE8_MEMBER(destroyr_state::misc_w) m_wavemod = data & 0x10; m_potmask[1] = data & 0x20; - coin_lockout_w(machine(), 0, !m_attract); - coin_lockout_w(machine(), 1, !m_attract); + machine().bookkeeping().coin_lockout_w(0, !m_attract); + machine().bookkeeping().coin_lockout_w(1, !m_attract); } diff --git a/src/mame/drivers/dgpix.cpp b/src/mame/drivers/dgpix.cpp index eef53a0fbb7..d3a3f8d270e 100644 --- a/src/mame/drivers/dgpix.cpp +++ b/src/mame/drivers/dgpix.cpp @@ -309,8 +309,8 @@ WRITE32_MEMBER(dgpix_state::vbuffer_w) WRITE32_MEMBER(dgpix_state::coin_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } READ32_MEMBER(dgpix_state::vblank_r) diff --git a/src/mame/drivers/djboy.cpp b/src/mame/drivers/djboy.cpp index 0b0fdfb7045..ae0efeed0ee 100644 --- a/src/mame/drivers/djboy.cpp +++ b/src/mame/drivers/djboy.cpp @@ -222,8 +222,8 @@ WRITE8_MEMBER(djboy_state::cpu1_bankswitch_w) WRITE8_MEMBER(djboy_state::coin_count_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } /******************************************************************************/ diff --git a/src/mame/drivers/dkong.cpp b/src/mame/drivers/dkong.cpp index 4c90fe71f35..94914192c9b 100644 --- a/src/mame/drivers/dkong.cpp +++ b/src/mame/drivers/dkong.cpp @@ -578,7 +578,7 @@ WRITE8_MEMBER(dkong_state::p8257_ctl_w) WRITE8_MEMBER(dkong_state::dkong3_coin_counter_w) { - coin_counter_w(machine(), offset, data & 0x01); + machine().bookkeeping().coin_counter_w(offset, data & 0x01); } WRITE8_MEMBER(dkong_state::p8257_drq_w) @@ -596,7 +596,7 @@ READ8_MEMBER(dkong_state::dkong_in2_r) UINT8 r; r = (ioport("IN2")->read() & 0xBF) | (mcustatus << 6); - coin_counter_w(machine(), offset, r >> 7); + machine().bookkeeping().coin_counter_w(offset, r >> 7); if (r & 0x10) r = (r & ~0x10) | 0x80; /* service ==> coin */ return r; @@ -609,7 +609,7 @@ READ8_MEMBER(dkong_state::dkongjr_in2_r) UINT8 r; r = (ioport("IN2")->read() & 0xBF) | 0x40; - coin_counter_w(machine(), offset, r >> 7); + machine().bookkeeping().coin_counter_w(offset, r >> 7); if (r & 0x10) r = (r & ~0x10) | 0x80; /* service ==> coin */ return r; diff --git a/src/mame/drivers/dlair.cpp b/src/mame/drivers/dlair.cpp index 54d89029efb..f640c8b33b0 100644 --- a/src/mame/drivers/dlair.cpp +++ b/src/mame/drivers/dlair.cpp @@ -265,7 +265,7 @@ WRITE8_MEMBER(dlair_state::misc_w) UINT8 diff = data ^ m_last_misc; m_last_misc = data; - coin_counter_w(machine(), 0, (~data >> 4) & 1); + machine().bookkeeping().coin_counter_w(0, (~data >> 4) & 1); /* on bit 5 going low, push the data out to the laserdisc player */ if ((diff & 0x20) && !(data & 0x20)) @@ -291,8 +291,8 @@ WRITE8_MEMBER(dlair_state::dleuro_misc_w) UINT8 diff = data ^ m_last_misc; m_last_misc = data; - coin_counter_w(machine(), 1, (~data >> 3) & 1); - coin_counter_w(machine(), 0, (~data >> 4) & 1); + machine().bookkeeping().coin_counter_w(1, (~data >> 3) & 1); + machine().bookkeeping().coin_counter_w(0, (~data >> 4) & 1); /* on bit 5 going low, push the data out to the laserdisc player */ if ((diff & 0x20) && !(data & 0x20)) diff --git a/src/mame/drivers/drgnmst.cpp b/src/mame/drivers/drgnmst.cpp index 357477e03c4..4ecbee712d5 100644 --- a/src/mame/drivers/drgnmst.cpp +++ b/src/mame/drivers/drgnmst.cpp @@ -45,9 +45,9 @@ Notes: WRITE16_MEMBER(drgnmst_state::drgnmst_coin_w) { - coin_counter_w(machine(), 0, data & 0x100); - coin_lockout_w(machine(), 0, ~data & 0x400); - coin_lockout_w(machine(), 1, ~data & 0x800); + machine().bookkeeping().coin_counter_w(0, data & 0x100); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x400); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x800); } WRITE16_MEMBER(drgnmst_state::drgnmst_snd_command_w) diff --git a/src/mame/drivers/dunhuang.cpp b/src/mame/drivers/dunhuang.cpp index 91c9fd5f022..44c44c38510 100644 --- a/src/mame/drivers/dunhuang.cpp +++ b/src/mame/drivers/dunhuang.cpp @@ -479,7 +479,7 @@ WRITE8_MEMBER(dunhuang_state::dunhuang_rombank_w) membank("bank1")->set_entry(((data >> 2) & 0x7)); // COIN OUT: data & 0x20 - coin_counter_w(machine(), 0, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x40); m_hopper = data & 0x80; } diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index 591a1530e7f..5100f7f9d2e 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -211,12 +211,12 @@ WRITE_LINE_MEMBER(dynax_state::jantouki_sound_callback) WRITE8_MEMBER(dynax_state::dynax_coincounter_0_w) { - coin_counter_w(machine(), 0, data); + machine().bookkeeping().coin_counter_w(0, data); } WRITE8_MEMBER(dynax_state::dynax_coincounter_1_w) { - coin_counter_w(machine(), 1, data); + machine().bookkeeping().coin_counter_w(1, data); } READ8_MEMBER(dynax_state::ret_ff) @@ -601,7 +601,7 @@ WRITE8_MEMBER(dynax_state::hjingi_bank_w) WRITE8_MEMBER(dynax_state::hjingi_lockout_w) { - coin_lockout_w(machine(), 0, (~data) & 0x01); + machine().bookkeeping().coin_lockout_w(0, (~data) & 0x01); } WRITE8_MEMBER(dynax_state::hjingi_hopper_w) @@ -1158,8 +1158,8 @@ WRITE8_MEMBER(dynax_state::tenkai_ip_w) switch (m_input_sel) { case 0x0c: - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); // bit 2? // bit 3? // popmessage("%02x", data); diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp index c4d5e1c83b0..bce9f1ada06 100644 --- a/src/mame/drivers/ecoinf2.cpp +++ b/src/mame/drivers/ecoinf2.cpp @@ -187,11 +187,11 @@ public: DECLARE_WRITE8_MEMBER(ppi8255_ic24_write_c_inhibits) { - coin_lockout_w(machine(), 0, (data & 0x01) ); - coin_lockout_w(machine(), 1, (data & 0x02) ); - coin_lockout_w(machine(), 2, (data & 0x04) ); - coin_lockout_w(machine(), 3, (data & 0x08) ); - coin_lockout_w(machine(), 4, (data & 0x10) ); + machine().bookkeeping().coin_lockout_w(0, (data & 0x01) ); + machine().bookkeeping().coin_lockout_w(1, (data & 0x02) ); + machine().bookkeeping().coin_lockout_w(2, (data & 0x04) ); + machine().bookkeeping().coin_lockout_w(3, (data & 0x08) ); + machine().bookkeeping().coin_lockout_w(4, (data & 0x10) ); //int wdog = (data& 0x80); } diff --git a/src/mame/drivers/eolith.cpp b/src/mame/drivers/eolith.cpp index df62012572c..400e535e5be 100644 --- a/src/mame/drivers/eolith.cpp +++ b/src/mame/drivers/eolith.cpp @@ -131,7 +131,7 @@ READ32_MEMBER(eolith_state::eolith_custom_r) WRITE32_MEMBER(eolith_state::systemcontrol_w) { m_buffer = (data & 0x80) >> 7; - coin_counter_w(machine(), 0, data & m_coin_counter_bit); + machine().bookkeeping().coin_counter_w(0, data & m_coin_counter_bit); set_led_status(machine(), 0, data & 1); m_eepromoutport->write(data, 0xff); diff --git a/src/mame/drivers/eolith16.cpp b/src/mame/drivers/eolith16.cpp index fc9da7b255b..6fe073c131c 100644 --- a/src/mame/drivers/eolith16.cpp +++ b/src/mame/drivers/eolith16.cpp @@ -45,7 +45,7 @@ public: WRITE16_MEMBER(eolith16_state::eeprom_w) { m_vbuffer = (data & 0x80) >> 7; - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); m_eepromoutport->write(data, 0xff); diff --git a/src/mame/drivers/ettrivia.cpp b/src/mame/drivers/ettrivia.cpp index f1aca240256..76b8c8b4d12 100644 --- a/src/mame/drivers/ettrivia.cpp +++ b/src/mame/drivers/ettrivia.cpp @@ -93,7 +93,7 @@ WRITE8_MEMBER(ettrivia_state::ettrivia_control_w) m_question_bank = (data >> 3) & 3; - coin_counter_w(machine(), 0, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x80); flip_screen_set(data & 1); } diff --git a/src/mame/drivers/exidy440.cpp b/src/mame/drivers/exidy440.cpp index 7c4b1d9814b..d4f5f37d8e7 100644 --- a/src/mame/drivers/exidy440.cpp +++ b/src/mame/drivers/exidy440.cpp @@ -375,7 +375,7 @@ WRITE8_MEMBER(exidy440_state::exidy440_input_port_3_w) WRITE8_MEMBER(exidy440_state::exidy440_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } diff --git a/src/mame/drivers/exterm.cpp b/src/mame/drivers/exterm.cpp index e2072f8fa39..1b3d1f4c7e8 100644 --- a/src/mame/drivers/exterm.cpp +++ b/src/mame/drivers/exterm.cpp @@ -163,8 +163,8 @@ WRITE16_MEMBER(exterm_state::exterm_output_port_0_w) m_slave->set_input_line(INPUT_LINE_RESET, PULSE_LINE); /* Bits 14-15 = Coin counters */ - coin_counter_w(machine(), 0, data & 0x8000); - coin_counter_w(machine(), 1, data & 0x4000); + machine().bookkeeping().coin_counter_w(0, data & 0x8000); + machine().bookkeeping().coin_counter_w(1, data & 0x4000); } COMBINE_DATA(&m_last); diff --git a/src/mame/drivers/exzisus.cpp b/src/mame/drivers/exzisus.cpp index 7cd7f2d8c8b..2c0830798ea 100644 --- a/src/mame/drivers/exzisus.cpp +++ b/src/mame/drivers/exzisus.cpp @@ -63,10 +63,10 @@ WRITE8_MEMBER(exzisus_state::cpub_bankswitch_w) WRITE8_MEMBER(exzisus_state::coincounter_w) { - coin_lockout_w(machine(), 0,~data & 0x01); - coin_lockout_w(machine(), 1,~data & 0x02); - coin_counter_w(machine(), 0,data & 0x04); - coin_counter_w(machine(), 1,data & 0x08); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01); + machine().bookkeeping().coin_lockout_w(1,~data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x04); + machine().bookkeeping().coin_counter_w(1,data & 0x08); } // is it ok that cpub_reset refers to cpuc? diff --git a/src/mame/drivers/fastlane.cpp b/src/mame/drivers/fastlane.cpp index 0eda767b887..6dea035e86c 100644 --- a/src/mame/drivers/fastlane.cpp +++ b/src/mame/drivers/fastlane.cpp @@ -39,8 +39,8 @@ WRITE8_MEMBER(fastlane_state::k007121_registers_w) WRITE8_MEMBER(fastlane_state::fastlane_bankswitch_w) { /* bits 0 & 1 coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bits 2 & 3 = bank number */ membank("bank1")->set_entry((data & 0x0c) >> 2); diff --git a/src/mame/drivers/feversoc.cpp b/src/mame/drivers/feversoc.cpp index 9767c83713e..eb810a83fc4 100644 --- a/src/mame/drivers/feversoc.cpp +++ b/src/mame/drivers/feversoc.cpp @@ -144,18 +144,18 @@ WRITE32_MEMBER(feversoc_state::output_w) if(ACCESSING_BITS_16_31) { /* probably eeprom stuff too */ - coin_lockout_w(machine(), 0,~data>>16 & 0x40); - coin_lockout_w(machine(), 1,~data>>16 & 0x40); - coin_counter_w(machine(), 0,data>>16 & 1); + machine().bookkeeping().coin_lockout_w(0,~data>>16 & 0x40); + machine().bookkeeping().coin_lockout_w(1,~data>>16 & 0x40); + machine().bookkeeping().coin_counter_w(0,data>>16 & 1); //data>>16 & 2 coin out - coin_counter_w(machine(), 1,data>>16 & 4); + machine().bookkeeping().coin_counter_w(1,data>>16 & 4); //data>>16 & 8 coin hopper m_oki->set_bank_base(0x40000 * (((data>>16) & 0x20)>>5)); } if(ACCESSING_BITS_0_15) { /* -xxx xxxx lamps*/ - coin_counter_w(machine(), 2,data & 0x2000); //key in + machine().bookkeeping().coin_counter_w(2,data & 0x2000); //key in //data & 0x4000 key out } } diff --git a/src/mame/drivers/finalizr.cpp b/src/mame/drivers/finalizr.cpp index 98f09e6bf54..d962c81ebc7 100644 --- a/src/mame/drivers/finalizr.cpp +++ b/src/mame/drivers/finalizr.cpp @@ -42,8 +42,8 @@ WRITE8_MEMBER(finalizr_state::finalizr_videoctrl_w) WRITE8_MEMBER(finalizr_state::finalizr_coin_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } WRITE8_MEMBER(finalizr_state::finalizr_flipscreen_w) diff --git a/src/mame/drivers/firefox.cpp b/src/mame/drivers/firefox.cpp index c9c2eab54ae..5ef2b3fb8f5 100644 --- a/src/mame/drivers/firefox.cpp +++ b/src/mame/drivers/firefox.cpp @@ -488,7 +488,7 @@ WRITE8_MEMBER(firefox_state::led_w) WRITE8_MEMBER(firefox_state::firefox_coin_counter_w) { - coin_counter_w( machine(), offset, data & 0x80 ); + machine().bookkeeping().coin_counter_w(offset, data & 0x80 ); } diff --git a/src/mame/drivers/firetrk.cpp b/src/mame/drivers/firetrk.cpp index 94deb2221d7..bcde2b58259 100644 --- a/src/mame/drivers/firetrk.cpp +++ b/src/mame/drivers/firetrk.cpp @@ -82,8 +82,8 @@ WRITE8_MEMBER(firetrk_state::firetrk_output_w) /* BIT4 => ATTRACT */ m_discrete->write(space, FIRETRUCK_ATTRACT_EN, data & 0x10); - coin_lockout_w(machine(), 0, !(data & 0x10)); - coin_lockout_w(machine(), 1, !(data & 0x10)); + machine().bookkeeping().coin_lockout_w(0, !(data & 0x10)); + machine().bookkeeping().coin_lockout_w(1, !(data & 0x10)); /* BIT5 => START3 LAMP */ set_led_status(machine(), 2, !(data & 0x20)); @@ -102,8 +102,8 @@ WRITE8_MEMBER(firetrk_state::superbug_output_w) /* BIT1 => ATTRACT */ m_discrete->write(space, SUPERBUG_ATTRACT_EN, offset & 0x02); - coin_lockout_w(machine(), 0, !(offset & 0x02)); - coin_lockout_w(machine(), 1, !(offset & 0x02)); + machine().bookkeeping().coin_lockout_w(0, !(offset & 0x02)); + machine().bookkeeping().coin_lockout_w(1, !(offset & 0x02)); /* BIT2 => FLASH */ m_flash = offset & 0x04; @@ -128,13 +128,13 @@ WRITE8_MEMBER(firetrk_state::montecar_output_1_w) /* BIT4 => UNUSED */ /* BIT5 => COIN3 COUNTER */ - coin_counter_w(machine(), 0, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x80); /* BIT6 => COIN2 COUNTER */ - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x40); /* BIT7 => COIN1 COUNTER */ - coin_counter_w(machine(), 2, data & 0x20); + machine().bookkeeping().coin_counter_w(2, data & 0x20); } diff --git a/src/mame/drivers/flkatck.cpp b/src/mame/drivers/flkatck.cpp index 50fc26d94b8..e893d67a639 100644 --- a/src/mame/drivers/flkatck.cpp +++ b/src/mame/drivers/flkatck.cpp @@ -29,8 +29,8 @@ INTERRUPT_GEN_MEMBER(flkatck_state::flkatck_interrupt) WRITE8_MEMBER(flkatck_state::flkatck_bankswitch_w) { /* bits 3-4: coin counters */ - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x10); /* bits 0-1: bank # */ if ((data & 0x03) != 0x03) /* for safety */ diff --git a/src/mame/drivers/flower.cpp b/src/mame/drivers/flower.cpp index a790731185b..06891e9c4a2 100644 --- a/src/mame/drivers/flower.cpp +++ b/src/mame/drivers/flower.cpp @@ -94,12 +94,12 @@ WRITE8_MEMBER(flower_state::flower_soundcpu_irq_ack) WRITE8_MEMBER(flower_state::flower_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE8_MEMBER(flower_state::flower_coin_lockout_w) { - coin_lockout_global_w(machine(), ~data & 1); + machine().bookkeeping().coin_lockout_global_w(~data & 1); } WRITE8_MEMBER(flower_state::sound_command_w) diff --git a/src/mame/drivers/foodf.cpp b/src/mame/drivers/foodf.cpp index 878a1444250..78f0f945f85 100644 --- a/src/mame/drivers/foodf.cpp +++ b/src/mame/drivers/foodf.cpp @@ -171,8 +171,8 @@ WRITE8_MEMBER(foodf_state::digital_w) output_set_led_value(0, (data >> 4) & 1); output_set_led_value(1, (data >> 5) & 1); - coin_counter_w(machine(), 0, (data >> 6) & 1); - coin_counter_w(machine(), 1, (data >> 7) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 6) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 7) & 1); } diff --git a/src/mame/drivers/freekick.cpp b/src/mame/drivers/freekick.cpp index a4f278bf972..935de91e019 100644 --- a/src/mame/drivers/freekick.cpp +++ b/src/mame/drivers/freekick.cpp @@ -66,7 +66,7 @@ WRITE8_MEMBER(freekick_state::flipscreen_w) WRITE8_MEMBER(freekick_state::coin_w) { - coin_counter_w(machine(), offset, ~data & 1); + machine().bookkeeping().coin_counter_w(offset, ~data & 1); } WRITE8_MEMBER(freekick_state::spinner_select_w) diff --git a/src/mame/drivers/funkybee.cpp b/src/mame/drivers/funkybee.cpp index a9bfb7d751b..9c059b052f9 100644 --- a/src/mame/drivers/funkybee.cpp +++ b/src/mame/drivers/funkybee.cpp @@ -87,7 +87,7 @@ READ8_MEMBER(funkybee_state::funkybee_input_port_0_r) WRITE8_MEMBER(funkybee_state::funkybee_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } static ADDRESS_MAP_START( funkybee_map, AS_PROGRAM, 8, funkybee_state ) diff --git a/src/mame/drivers/funworld.cpp b/src/mame/drivers/funworld.cpp index 6f24d9dac56..67735df765a 100644 --- a/src/mame/drivers/funworld.cpp +++ b/src/mame/drivers/funworld.cpp @@ -1022,8 +1022,8 @@ WRITE8_MEMBER(funworld_state::funworld_lamp_a_w) output_set_lamp_value(3, (data >> 7) & 1); /* Hold4 / High */ output_set_lamp_value(5, 1-((data >> 5) & 1)); /* Cancel / Collect (inverted) */ - coin_counter_w(machine(), 0, data & 0x01); /* Credit In counter */ - coin_counter_w(machine(), 7, data & 0x04); /* Credit Out counter, mapped as coin 8 */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Credit In counter */ + machine().bookkeeping().coin_counter_w(7, data & 0x04); /* Credit Out counter, mapped as coin 8 */ output_set_lamp_value(7, 1-((data >> 6) & 1)); /* Hopper Motor (inverted) */ diff --git a/src/mame/drivers/gaelco.cpp b/src/mame/drivers/gaelco.cpp index 0353c50542a..56063dc3bed 100644 --- a/src/mame/drivers/gaelco.cpp +++ b/src/mame/drivers/gaelco.cpp @@ -50,11 +50,11 @@ WRITE16_MEMBER(gaelco_state::bigkarnk_coin_w) { case 0x00: /* Coin Lockouts */ case 0x01: - coin_lockout_w(machine(), (offset >> 3) & 0x01, ~data & 0x01); + machine().bookkeeping().coin_lockout_w((offset >> 3) & 0x01, ~data & 0x01); break; case 0x02: /* Coin Counters */ case 0x03: - coin_counter_w(machine(), (offset >> 3) & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, data & 0x01); break; } } diff --git a/src/mame/drivers/galaga.cpp b/src/mame/drivers/galaga.cpp index cb509ed4265..55541922615 100644 --- a/src/mame/drivers/galaga.cpp +++ b/src/mame/drivers/galaga.cpp @@ -785,13 +785,13 @@ WRITE8_MEMBER(galaga_state::out_0) { set_led_status(machine(), 1,data & 1); set_led_status(machine(), 0,data & 2); - coin_counter_w(machine(), 1,~data & 4); - coin_counter_w(machine(), 0,~data & 8); + machine().bookkeeping().coin_counter_w(1,~data & 4); + machine().bookkeeping().coin_counter_w(0,~data & 8); } WRITE8_MEMBER(galaga_state::out_1) { - coin_lockout_global_w(machine(), data & 1); + machine().bookkeeping().coin_lockout_global_w(data & 1); } READ8_MEMBER(galaga_state::namco_52xx_rom_r) diff --git a/src/mame/drivers/galastrm.cpp b/src/mame/drivers/galastrm.cpp index e6329108fe9..b3a303b083d 100644 --- a/src/mame/drivers/galastrm.cpp +++ b/src/mame/drivers/galastrm.cpp @@ -138,10 +138,10 @@ popmessage(t); { if (ACCESSING_BITS_24_31) { - coin_lockout_w(machine(), 0, ~data & 0x01000000); - coin_lockout_w(machine(), 1, ~data & 0x02000000); - coin_counter_w(machine(), 0, data & 0x04000000); - coin_counter_w(machine(), 1, data & 0x04000000); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02000000); + machine().bookkeeping().coin_counter_w(0, data & 0x04000000); + machine().bookkeeping().coin_counter_w(1, data & 0x04000000); m_coin_word = (data >> 16) &0xffff; } //logerror("CPU #0 PC %06x: write input %06x\n",device->safe_pc(),offset); diff --git a/src/mame/drivers/galaxi.cpp b/src/mame/drivers/galaxi.cpp index cb2e04cb85f..e65eb04bbe9 100644 --- a/src/mame/drivers/galaxi.cpp +++ b/src/mame/drivers/galaxi.cpp @@ -268,7 +268,7 @@ WRITE16_MEMBER(galaxi_state::galaxi_500004_w) { m_ticket = data & 0x0100; m_hopper = data & 0x1000; - coin_counter_w(machine(), 0, data & 0x2000); // coins + machine().bookkeeping().coin_counter_w(0, data & 0x2000); // coins } COMBINE_DATA(&m_out[2]); diff --git a/src/mame/drivers/galaxian.cpp b/src/mame/drivers/galaxian.cpp index 220d97029eb..f943a4541f1 100644 --- a/src/mame/drivers/galaxian.cpp +++ b/src/mame/drivers/galaxian.cpp @@ -724,19 +724,19 @@ WRITE8_MEMBER(galaxian_state::start_lamp_w) WRITE8_MEMBER(galaxian_state::coin_lock_w) { /* many variants and bootlegs don't have this */ - coin_lockout_global_w(machine(), ~data & 1); + machine().bookkeeping().coin_lockout_global_w(~data & 1); } WRITE8_MEMBER(galaxian_state::coin_count_0_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE8_MEMBER(galaxian_state::coin_count_1_w) { - coin_counter_w(machine(), 1, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 1); } @@ -883,7 +883,7 @@ WRITE8_MEMBER(galaxian_state::theend_ppi8255_w) WRITE8_MEMBER(galaxian_state::theend_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x80); } diff --git a/src/mame/drivers/galpani2.cpp b/src/mame/drivers/galpani2.cpp index c3f87db9680..a658e02409b 100644 --- a/src/mame/drivers/galpani2.cpp +++ b/src/mame/drivers/galpani2.cpp @@ -320,10 +320,10 @@ WRITE8_MEMBER(galpani2_state::galpani2_mcu_nmi2_w)//driven by CPU2's int5 ISR WRITE8_MEMBER(galpani2_state::galpani2_coin_lockout_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_lockout_w(machine(), 0,~data & 0x04); - coin_lockout_w(machine(), 1,~data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x04); + machine().bookkeeping().coin_lockout_w(1,~data & 0x08); // & 0x10 CARD in lockout? // & 0x20 CARD in lockout? // & 0x40 CARD out diff --git a/src/mame/drivers/galpanic.cpp b/src/mame/drivers/galpanic.cpp index ba02735d3ab..b47226747c1 100644 --- a/src/mame/drivers/galpanic.cpp +++ b/src/mame/drivers/galpanic.cpp @@ -117,11 +117,11 @@ WRITE16_MEMBER(galpanic_state::galpanic_coin_w) { if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x100); - coin_counter_w(machine(), 1, data & 0x200); + machine().bookkeeping().coin_counter_w(0, data & 0x100); + machine().bookkeeping().coin_counter_w(1, data & 0x200); - coin_lockout_w(machine(), 0, ~data & 0x400); - coin_lockout_w(machine(), 1, ~data & 0x800); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x400); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x800); } } diff --git a/src/mame/drivers/gameplan.cpp b/src/mame/drivers/gameplan.cpp index ad593e0e036..497d8b3e74a 100644 --- a/src/mame/drivers/gameplan.cpp +++ b/src/mame/drivers/gameplan.cpp @@ -115,7 +115,7 @@ READ8_MEMBER(gameplan_state::io_port_r) WRITE_LINE_MEMBER(gameplan_state::coin_w) { - coin_counter_w(machine(), 0, ~state & 1); + machine().bookkeeping().coin_counter_w(0, ~state & 1); } diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index 99f8c161ebc..4ea2eb3203b 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -476,13 +476,13 @@ WRITE8_MEMBER(gaplus_state::out_lamps0) { set_led_status(machine(), 0, data & 1); set_led_status(machine(), 1, data & 2); - coin_lockout_global_w(machine(), data & 4); - coin_counter_w(machine(), 0, ~data & 8); + machine().bookkeeping().coin_lockout_global_w(data & 4); + machine().bookkeeping().coin_counter_w(0, ~data & 8); } WRITE8_MEMBER(gaplus_state::out_lamps1) { - coin_counter_w(machine(), 1, ~data & 1); + machine().bookkeeping().coin_counter_w(1, ~data & 1); } void gaplus_state::machine_start() diff --git a/src/mame/drivers/gberet.cpp b/src/mame/drivers/gberet.cpp index 219bd0c7906..64496a345b6 100644 --- a/src/mame/drivers/gberet.cpp +++ b/src/mame/drivers/gberet.cpp @@ -112,15 +112,15 @@ TIMER_DEVICE_CALLBACK_MEMBER(gberet_state::gberet_interrupt_tick) WRITE8_MEMBER(gberet_state::gberet_coin_counter_w) { /* bits 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } WRITE8_MEMBER(gberet_state::mrgoemon_coin_counter_w) { /* bits 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); /* bits 5-7 = ROM bank select */ membank("bank1")->set_entry(((data & 0xe0) >> 5)); diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index 99530342433..54ef2156486 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -155,8 +155,8 @@ WRITE16_MEMBER(gcpinbal_state::ioc_w) // return; // // case 0x88/2: /* coin control (+ others) ??? */ -// coin_lockout_w(machine(), 0, ~data & 0x01); -// coin_lockout_w(machine(), 1, ~data & 0x02); +// machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); +// machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); //popmessage(" address %04x value %04x", offset, data); // } diff --git a/src/mame/drivers/gei.cpp b/src/mame/drivers/gei.cpp index 2e15c346a96..a1ccf346831 100644 --- a/src/mame/drivers/gei.cpp +++ b/src/mame/drivers/gei.cpp @@ -205,7 +205,7 @@ WRITE8_MEMBER(gei_state::lamps_w) WRITE8_MEMBER(gei_state::sound_w) { /* bit 3 - coin lockout, lamp10 in poker / lamp6 in trivia test modes */ - coin_lockout_global_w(machine(), ~data & 0x08); + machine().bookkeeping().coin_lockout_global_w(~data & 0x08); set_led_status(machine(), 9,data & 0x08); /* bit 5 - ticket out in trivia games */ @@ -222,8 +222,8 @@ WRITE8_MEMBER(gei_state::sound_w) WRITE8_MEMBER(gei_state::sound2_w) { /* bit 3,6 - coin lockout, lamp10+11 in selection test mode */ - coin_lockout_w(machine(), 0, ~data & 0x08); - coin_lockout_w(machine(), 1, ~data & 0x40); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x08); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x40); set_led_status(machine(), 9,data & 0x08); set_led_status(machine(), 10,data & 0x40); diff --git a/src/mame/drivers/glass.cpp b/src/mame/drivers/glass.cpp index 34b3ebfae9a..504874be32d 100644 --- a/src/mame/drivers/glass.cpp +++ b/src/mame/drivers/glass.cpp @@ -66,11 +66,11 @@ WRITE16_MEMBER(glass_state::glass_coin_w) { case 0x00: /* Coin Lockouts */ case 0x01: - coin_lockout_w(machine(), (offset >> 3) & 0x01, ~data & 0x01); + machine().bookkeeping().coin_lockout_w((offset >> 3) & 0x01, ~data & 0x01); break; case 0x02: /* Coin Counters */ case 0x03: - coin_counter_w(machine(), (offset >> 3) & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, data & 0x01); break; case 0x04: /* Sound Muting (if bit 0 == 1, sound output stream = 0) */ break; diff --git a/src/mame/drivers/gluck2.cpp b/src/mame/drivers/gluck2.cpp index 1676e11c1fc..5802238eddc 100644 --- a/src/mame/drivers/gluck2.cpp +++ b/src/mame/drivers/gluck2.cpp @@ -332,9 +332,9 @@ WRITE8_MEMBER(gluck2_state::counters_w) */ data = data ^ 0xff; // inverted - coin_counter_w(machine(), 0, data & 0x10); /* coins */ - coin_counter_w(machine(), 1, data & 0x02); /* notes */ - coin_counter_w(machine(), 2, data & 0x04); /* payout */ + machine().bookkeeping().coin_counter_w(0, data & 0x10); /* coins */ + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* notes */ + machine().bookkeeping().coin_counter_w(2, data & 0x04); /* payout */ } diff --git a/src/mame/drivers/gng.cpp b/src/mame/drivers/gng.cpp index bcb2af6418f..f6949d6ff96 100644 --- a/src/mame/drivers/gng.cpp +++ b/src/mame/drivers/gng.cpp @@ -39,7 +39,7 @@ WRITE8_MEMBER(gng_state::gng_bankswitch_w) WRITE8_MEMBER(gng_state::gng_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } static ADDRESS_MAP_START( gng_map, AS_PROGRAM, 8, gng_state ) diff --git a/src/mame/drivers/goldnpkr.cpp b/src/mame/drivers/goldnpkr.cpp index 97f87b6bbba..b60e31d25f2 100644 --- a/src/mame/drivers/goldnpkr.cpp +++ b/src/mame/drivers/goldnpkr.cpp @@ -1508,9 +1508,9 @@ WRITE8_MEMBER(goldnpkr_state::lamps_a_w) output_set_lamp_value(3, (data >> 3) & 1); /* Lamp 3 */ output_set_lamp_value(4, (data >> 4) & 1); /* Lamp 4 */ - coin_counter_w(machine(), 0, data & 0x40); /* counter1 */ - coin_counter_w(machine(), 1, data & 0x80); /* counter2 */ - coin_counter_w(machine(), 2, data & 0x20); /* counter3 */ + machine().bookkeeping().coin_counter_w(0, data & 0x40); /* counter1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x80); /* counter2 */ + machine().bookkeeping().coin_counter_w(2, data & 0x20); /* counter3 */ } WRITE8_MEMBER(goldnpkr_state::sound_w) diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index db0a65e5dd1..4001d09fbf2 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -376,11 +376,11 @@ WRITE8_MEMBER(sanghopm_state::coincount_w) x--- -xx- Unknown. */ - coin_counter_w(machine(), 0, data & 0x08); /* counter1 coin a */ - coin_counter_w(machine(), 1, data & 0x10); /* counter2 coin b */ - coin_counter_w(machine(), 2, data & 0x20); /* counter3 key in */ - coin_counter_w(machine(), 3, data & 0x40); /* counter4 coin c */ - coin_counter_w(machine(), 4, data & 0x01); /* counter5 payout */ + machine().bookkeeping().coin_counter_w(0, data & 0x08); /* counter1 coin a */ + machine().bookkeeping().coin_counter_w(1, data & 0x10); /* counter2 coin b */ + machine().bookkeeping().coin_counter_w(2, data & 0x20); /* counter3 key in */ + machine().bookkeeping().coin_counter_w(3, data & 0x40); /* counter4 coin c */ + machine().bookkeeping().coin_counter_w(4, data & 0x01); /* counter5 payout */ } WRITE8_MEMBER(sanghopm_state::enable_w) @@ -749,11 +749,11 @@ WRITE8_MEMBER(goldstar_state::cm_coincount_w) interestingly there is no counter for coin B in the cm/cmaster games */ - coin_counter_w(machine(), 0, data & 0x40); /* Counter 1 Coin A */ - coin_counter_w(machine(), 1, data & 0x20); /* Counter 2 Key In */ - coin_counter_w(machine(), 2, data & 0x10); /* Counter 3 Coin C */ - coin_counter_w(machine(), 3, data & 0x08); /* Counter 4 Coin D */ - coin_counter_w(machine(), 4, data & 0x01); /* Counter 5 Payout */ + machine().bookkeeping().coin_counter_w(0, data & 0x40); /* Counter 1 Coin A */ + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* Counter 2 Key In */ + machine().bookkeeping().coin_counter_w(2, data & 0x10); /* Counter 3 Coin C */ + machine().bookkeeping().coin_counter_w(3, data & 0x08); /* Counter 4 Coin D */ + machine().bookkeeping().coin_counter_w(4, data & 0x01); /* Counter 5 Payout */ if (data & 0x86) popmessage("counters: %02X", data); @@ -1026,9 +1026,9 @@ WRITE8_MEMBER(unkch_state::coincount_w) m_ticket_dispenser->write(space, offset, data & 0x80); - coin_counter_w(machine(), 0, data & 0x04); /* Credit counter */ - coin_counter_w(machine(), 1, data & 0x08); /* Key In counter */ - coin_counter_w(machine(), 2, data & 0x02); /* payout counter */ + machine().bookkeeping().coin_counter_w(0, data & 0x04); /* Credit counter */ + machine().bookkeeping().coin_counter_w(1, data & 0x08); /* Key In counter */ + machine().bookkeeping().coin_counter_w(2, data & 0x02); /* payout counter */ //popmessage("coin counters: %02x", data); } diff --git a/src/mame/drivers/gottlieb.cpp b/src/mame/drivers/gottlieb.cpp index 45defc43421..1118a330455 100644 --- a/src/mame/drivers/gottlieb.cpp +++ b/src/mame/drivers/gottlieb.cpp @@ -311,7 +311,7 @@ WRITE8_MEMBER(gottlieb_state::general_output_w) gottlieb_laserdisc_video_control_w(space, offset, data); /* bit 4 normally controls the coin meter */ - coin_counter_w(machine(), 0, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x10); /* bit 5 doesn't have a generic function */ /* bit 6 controls "COIN1"; it appears that no games used this */ diff --git a/src/mame/drivers/gradius3.cpp b/src/mame/drivers/gradius3.cpp index 94b4e5f2ed5..cde1399e4bf 100644 --- a/src/mame/drivers/gradius3.cpp +++ b/src/mame/drivers/gradius3.cpp @@ -75,8 +75,8 @@ WRITE16_MEMBER(gradius3_state::cpuA_ctrl_w) data >>= 8; /* bits 0-1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 selects layer priority */ m_priority = data & 0x04; diff --git a/src/mame/drivers/grchamp.cpp b/src/mame/drivers/grchamp.cpp index ebb65186a9a..9cfe75dbc7a 100644 --- a/src/mame/drivers/grchamp.cpp +++ b/src/mame/drivers/grchamp.cpp @@ -94,7 +94,7 @@ void grchamp_state::machine_start() void grchamp_state::machine_reset() { /* if the coin system is 1 way, lock Coin B (Page 40) */ - coin_lockout_w(machine(), 1, (ioport("DSWB")->read() & 0x10) ? 1 : 0); + machine().bookkeeping().coin_lockout_w(1, (ioport("DSWB")->read() & 0x10) ? 1 : 0); } @@ -178,7 +178,7 @@ WRITE8_MEMBER(grchamp_state::cpu0_outputs_w) /* bit 4: coin lockout */ /* bit 5: Game Over lamp */ /* bit 6-7: n/c */ - coin_lockout_global_w(machine(), (data >> 4) & 1); + machine().bookkeeping().coin_lockout_global_w((data >> 4) & 1); output_set_value("led0", (~data >> 5) & 1); break; diff --git a/src/mame/drivers/gridlee.cpp b/src/mame/drivers/gridlee.cpp index 072fa04dd56..4dbd748e980 100644 --- a/src/mame/drivers/gridlee.cpp +++ b/src/mame/drivers/gridlee.cpp @@ -283,7 +283,7 @@ WRITE8_MEMBER(gridlee_state::led_1_w) WRITE8_MEMBER(gridlee_state::gridlee_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); logerror("coin counter %s\n", (data & 1) ? "on" : "off"); } diff --git a/src/mame/drivers/groundfx.cpp b/src/mame/drivers/groundfx.cpp index b0284d8f662..b4649993cb2 100644 --- a/src/mame/drivers/groundfx.cpp +++ b/src/mame/drivers/groundfx.cpp @@ -123,10 +123,10 @@ WRITE32_MEMBER(groundfx_state::groundfx_input_w) case 0x01: if (ACCESSING_BITS_24_31) { - coin_lockout_w(machine(), 0,~data & 0x01000000); - coin_lockout_w(machine(), 1,~data & 0x02000000); - coin_counter_w(machine(), 0, data & 0x04000000); - coin_counter_w(machine(), 1, data & 0x08000000); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(1,~data & 0x02000000); + machine().bookkeeping().coin_counter_w(0, data & 0x04000000); + machine().bookkeeping().coin_counter_w(1, data & 0x08000000); m_coin_word = (data >> 16) &0xffff; } break; diff --git a/src/mame/drivers/gunbustr.cpp b/src/mame/drivers/gunbustr.cpp index c17c60159fb..515663f0bb8 100644 --- a/src/mame/drivers/gunbustr.cpp +++ b/src/mame/drivers/gunbustr.cpp @@ -103,13 +103,13 @@ WRITE32_MEMBER(gunbustr_state::gunbustr_input_w) { if (m_coin_lockout) { - coin_lockout_w(machine(), 0, ~data & 0x01000000); - coin_lockout_w(machine(), 1, ~data & 0x02000000); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02000000); } // game does not write a separate counter for coin 2! maybe in linked mode? - coin_counter_w(machine(), 0, data & 0x04000000); - coin_counter_w(machine(), 1, data & 0x04000000); + machine().bookkeeping().coin_counter_w(0, data & 0x04000000); + machine().bookkeeping().coin_counter_w(1, data & 0x04000000); m_coin_word = (data >> 16) &0xffff; } //logerror("CPU #0 PC %06x: write input %06x\n",device->safe_pc(),offset); diff --git a/src/mame/drivers/hcastle.cpp b/src/mame/drivers/hcastle.cpp index 8e2ccb15ce1..8b12afc5b74 100644 --- a/src/mame/drivers/hcastle.cpp +++ b/src/mame/drivers/hcastle.cpp @@ -29,8 +29,8 @@ WRITE8_MEMBER(hcastle_state::hcastle_soundirq_w) WRITE8_MEMBER(hcastle_state::hcastle_coin_w) { - coin_counter_w(machine(), 0, data & 0x40); - coin_counter_w(machine(), 1, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x80); } diff --git a/src/mame/drivers/hexion.cpp b/src/mame/drivers/hexion.cpp index 08c9d911fb2..2eb38d0957c 100644 --- a/src/mame/drivers/hexion.cpp +++ b/src/mame/drivers/hexion.cpp @@ -91,8 +91,8 @@ WRITE8_MEMBER(hexion_state::coincntr_w) //logerror("%04x: coincntr_w %02x\n",space.device().safe_pc(),data); /* bits 0/1 = coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bit 5 = flip screen */ flip_screen_set(data & 0x20); diff --git a/src/mame/drivers/highvdeo.cpp b/src/mame/drivers/highvdeo.cpp index caf4022d786..ed006d5a028 100644 --- a/src/mame/drivers/highvdeo.cpp +++ b/src/mame/drivers/highvdeo.cpp @@ -403,8 +403,8 @@ WRITE16_MEMBER(highvdeo_state::nyj_write2_w) xxx- ---- Unknown. */ // popmessage("%04x",data); - coin_counter_w(machine(), 0, ~data & 0x0f); // Coins (all) - coin_counter_w(machine(), 1, ~data & 0x10); // Notes (all) + machine().bookkeeping().coin_counter_w(0, ~data & 0x0f); // Coins (all) + machine().bookkeeping().coin_counter_w(1, ~data & 0x10); // Notes (all) } WRITE16_MEMBER(highvdeo_state::tv_tcf_bankselect_w) @@ -470,8 +470,8 @@ WRITE16_MEMBER(highvdeo_state::write2_w) for(i=0;i<4;i++) { - coin_counter_w(machine(), i,data & 0x20); - coin_lockout_w(machine(), i,~data & 0x08); + machine().bookkeeping().coin_counter_w(i,data & 0x20); + machine().bookkeeping().coin_lockout_w(i,~data & 0x08); } } @@ -1559,8 +1559,8 @@ WRITE16_MEMBER(highvdeo_state::fashion_output_w) for(i=0;i<4;i++) { - coin_counter_w(machine(), i,data & 0x20); - coin_lockout_w(machine(), i,~data & 0x01); + machine().bookkeeping().coin_counter_w(i,data & 0x20); + machine().bookkeeping().coin_lockout_w(i,~data & 0x01); } } diff --git a/src/mame/drivers/homedata.cpp b/src/mame/drivers/homedata.cpp index b10c744920f..ce48e62fc65 100644 --- a/src/mame/drivers/homedata.cpp +++ b/src/mame/drivers/homedata.cpp @@ -356,7 +356,7 @@ WRITE8_MEMBER(homedata_state::reikaids_upd7807_portc_w) membank("bank2")->set_entry(data & 0x03); - coin_counter_w(machine(), 0, ~data & 0x80); + machine().bookkeeping().coin_counter_w(0, ~data & 0x80); if (BIT(m_upd7807_portc, 5) && !BIT(data, 5)) /* write clock 1->0 */ m_ymsnd->write(space, BIT(data, 3), m_upd7807_porta); @@ -495,7 +495,7 @@ WRITE8_MEMBER(homedata_state::pteacher_upd7807_portc_w) membank("bank2")->set_entry((data & 0x0c) >> 2); - coin_counter_w(machine(), 0, ~data & 0x80); + machine().bookkeeping().coin_counter_w(0, ~data & 0x80); if (BIT(m_upd7807_portc, 5) && !BIT(data, 5)) /* clock 1->0 */ m_sn->write(space, 0, m_upd7807_porta); diff --git a/src/mame/drivers/hvyunit.cpp b/src/mame/drivers/hvyunit.cpp index 50a6d72ae95..21ec09dfe4b 100644 --- a/src/mame/drivers/hvyunit.cpp +++ b/src/mame/drivers/hvyunit.cpp @@ -303,8 +303,8 @@ WRITE8_MEMBER(hvyunit_state::hu_scrolly_w) WRITE8_MEMBER(hvyunit_state::coin_count_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } diff --git a/src/mame/drivers/hyperspt.cpp b/src/mame/drivers/hyperspt.cpp index 522b599ad35..1a052fc6e87 100644 --- a/src/mame/drivers/hyperspt.cpp +++ b/src/mame/drivers/hyperspt.cpp @@ -23,7 +23,7 @@ Based on drivers from Juno First emulator by Chris Hardy (chrish@kcbbs.gen.nz) WRITE8_MEMBER(hyperspt_state::hyperspt_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } WRITE8_MEMBER(hyperspt_state::irq_mask_w) diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index a3d83290bdb..fdcef3b390c 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -275,10 +275,10 @@ WRITE8_MEMBER( icecold_state::ay8910_1_b_w ) if (m_motenbl == 0) { output_set_value("start", BIT(data, 0)); - coin_counter_w(machine(), 1, BIT(data, 1)); // hopper counter - coin_counter_w(machine(), 2, BIT(data, 2)); // good game counter - coin_lockout_w(machine(), 0, BIT(data, 3)); // not used ?? - coin_counter_w(machine(), 0, BIT(data, 4)); // coin counter + machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); // hopper counter + machine().bookkeeping().coin_counter_w(2, BIT(data, 2)); // good game counter + machine().bookkeeping().coin_lockout_w(0, BIT(data, 3)); // not used ?? + machine().bookkeeping().coin_counter_w(0, BIT(data, 4)); // coin counter // BIT 5 errant ball solenoid // BIT 7 hopper motor } diff --git a/src/mame/drivers/igs009.cpp b/src/mame/drivers/igs009.cpp index e11dd69a961..c476d76a879 100644 --- a/src/mame/drivers/igs009.cpp +++ b/src/mame/drivers/igs009.cpp @@ -392,10 +392,10 @@ WRITE8_MEMBER(igs009_state::nmi_and_coins_w) // popmessage("%02x",data); } - coin_counter_w(machine(), 0, data & 0x01); // coin_a - coin_counter_w(machine(), 1, data & 0x04); // coin_c - coin_counter_w(machine(), 2, data & 0x08); // key in - coin_counter_w(machine(), 3, data & 0x10); // coin m_out mech + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a + machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c + machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in + machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech set_led_status(machine(), 6, data & 0x40); // led for coin m_out / m_hopper active diff --git a/src/mame/drivers/igs011.cpp b/src/mame/drivers/igs011.cpp index b0e6d1566f4..5375a46d499 100644 --- a/src/mame/drivers/igs011.cpp +++ b/src/mame/drivers/igs011.cpp @@ -1440,7 +1440,7 @@ WRITE16_MEMBER(igs011_state::drgnwrld_igs003_w) { case 0x00: if (ACCESSING_BITS_0_7) - coin_counter_w(machine(), 0,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 2); if (data & ~0x2) logerror("%06x: warning, unknown bits written in coin counter = %02x\n", space.device().safe_pc(), data); @@ -1504,7 +1504,7 @@ WRITE16_MEMBER(igs011_state::lhb_inputs_w) if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x20 ); + machine().bookkeeping().coin_counter_w(0, data & 0x20 ); // coin out data & 0x40 m_igs_hopper = data & 0x80; } @@ -1549,7 +1549,7 @@ WRITE16_MEMBER(igs011_state::lhb2_igs003_w) if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x20); // coin out data & 0x40 m_igs_hopper = data & 0x80; } @@ -1696,7 +1696,7 @@ WRITE16_MEMBER(igs011_state::wlcc_igs003_w) case 0x02: if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin out data & 0x02 m_oki->set_bank_base((data & 0x10) ? 0x40000 : 0); @@ -1764,7 +1764,7 @@ WRITE16_MEMBER(igs011_state::xymg_igs003_w) if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x20); // coin out data & 0x40 m_igs_hopper = data & 0x80; } @@ -1837,8 +1837,8 @@ WRITE16_MEMBER(igs011_state::vbowl_igs003_w) case 0x02: if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } if (data & ~0x3) diff --git a/src/mame/drivers/igs017.cpp b/src/mame/drivers/igs017.cpp index ffa5cc3abdf..1d1d439b3fc 100644 --- a/src/mame/drivers/igs017.cpp +++ b/src/mame/drivers/igs017.cpp @@ -1177,8 +1177,8 @@ void igs017_state::mgcs_igs029_run() { case 0x01: m_oki->set_bank_base((data & 0x10) ? 0x40000 : 0); - coin_counter_w(machine(), 0, (~data) & 0x20); // coin in - coin_counter_w(machine(), 1, (~data) & 0x40); // coin out + machine().bookkeeping().coin_counter_w(0, (~data) & 0x20); // coin in + machine().bookkeeping().coin_counter_w(1, (~data) & 0x40); // coin out // popmessage("PORT1 %02X", data); @@ -1456,7 +1456,7 @@ WRITE16_MEMBER(igs017_state::sdmg2_magic_w) if (ACCESSING_BITS_0_7) { m_input_select = data & 0x1f; - coin_counter_w(machine(), 0, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x20); // coin out data & 0x40 m_hopper = data & 0x80; } @@ -1537,7 +1537,7 @@ WRITE16_MEMBER(igs017_state::mgdha_magic_w) if (ACCESSING_BITS_0_7) { // coin out data & 0x40 - coin_counter_w(machine(), 0, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x80); } if ( data & ~0xc0 ) @@ -1628,13 +1628,13 @@ WRITE8_MEMBER(igs017_state::tjsb_output_w) switch(m_input_select) { case 0x00: - coin_counter_w(machine(), 0, data & 0x80); // coin in + machine().bookkeeping().coin_counter_w(0, data & 0x80); // coin in if (!(data & ~0x80)) return; break; case 0x01: - coin_counter_w(machine(), 1, data & 0x01); // coin out + machine().bookkeeping().coin_counter_w(1, data & 0x01); // coin out if (!(data & ~0x01)) return; break; @@ -2101,8 +2101,8 @@ WRITE16_MEMBER(igs017_state::lhzb2a_input_select_w) { m_input_select = data & 0x1f; // keys m_hopper = data & 0x20; // hopper motor - coin_counter_w(machine(), 1, data & 0x40); // coin out counter - coin_counter_w(machine(), 0, data & 0x80); // coin in counter + machine().bookkeeping().coin_counter_w(1, data & 0x40); // coin out counter + machine().bookkeeping().coin_counter_w(0, data & 0x80); // coin in counter } if (ACCESSING_BITS_8_15) { @@ -2150,8 +2150,8 @@ WRITE16_MEMBER(igs017_state::slqz2_magic_w) m_oki->set_bank_base((data & 0x01) ? 0x40000 : 0); // m_hopper = data & 0x20; // hopper motor -// coin_counter_w(machine(), 1, data & 0x40); // coin out counter - coin_counter_w(machine(), 0, data & 0x80); // coin in counter +// machine().bookkeeping().coin_counter_w(1, data & 0x40); // coin out counter + machine().bookkeeping().coin_counter_w(0, data & 0x80); // coin in counter if ( data & 0x7e ) logerror("%s: warning, unknown bits written in oki bank = %04x\n", machine().describe_context(), data); diff --git a/src/mame/drivers/igspoker.cpp b/src/mame/drivers/igspoker.cpp index d5a0d2e5e3e..7a41561eab3 100644 --- a/src/mame/drivers/igspoker.cpp +++ b/src/mame/drivers/igspoker.cpp @@ -242,10 +242,10 @@ void igspoker_state::show_out() WRITE8_MEMBER(igspoker_state::igs_nmi_and_coins_w) { - coin_counter_w(machine(), 0, data & 0x01); // coin_a - coin_counter_w(machine(), 1, data & 0x04); // coin_c - coin_counter_w(machine(), 2, data & 0x08); // key in - coin_counter_w(machine(), 3, data & 0x10); // coin m_out mech + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a + machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c + machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in + machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech set_led_status(machine(), 6, data & 0x20); // led for coin m_out / m_hopper active diff --git a/src/mame/drivers/ikki.cpp b/src/mame/drivers/ikki.cpp index 8b64a62f80f..3b289da1a2f 100644 --- a/src/mame/drivers/ikki.cpp +++ b/src/mame/drivers/ikki.cpp @@ -35,8 +35,8 @@ READ8_MEMBER(ikki_state::ikki_e000_r) WRITE8_MEMBER(ikki_state::ikki_coin_counters) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } /************************************* diff --git a/src/mame/drivers/iqblock.cpp b/src/mame/drivers/iqblock.cpp index 0eca3938257..d5afe07ed01 100644 --- a/src/mame/drivers/iqblock.cpp +++ b/src/mame/drivers/iqblock.cpp @@ -103,7 +103,7 @@ WRITE8_MEMBER(iqblock_state::port_C_w) m_videoenable = data & 0x20; /* bit 6 is coin counter */ - coin_counter_w(machine(), 0,data & 0x40); + machine().bookkeeping().coin_counter_w(0,data & 0x40); /* bit 7 could be a second coin counter, but coin 2 doesn't seem to work... */ } diff --git a/src/mame/drivers/itech32.cpp b/src/mame/drivers/itech32.cpp index f484f36f101..1da34373e38 100644 --- a/src/mame/drivers/itech32.cpp +++ b/src/mame/drivers/itech32.cpp @@ -716,7 +716,7 @@ WRITE8_MEMBER(itech32_state::drivedge_portb_out) set_led_status(machine(), 2, data & 0x02); set_led_status(machine(), 3, data & 0x04); machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3); - coin_counter_w(machine(), 0, (data & 0x20) >> 5); + machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5); } @@ -734,7 +734,7 @@ WRITE8_MEMBER(itech32_state::pia_portb_out) /* bit 5 controls the coin counter */ /* bit 6 controls the diagnostic sound LED */ machine().device<ticket_dispenser_device>("ticket")->write(machine().driver_data()->generic_space(), 0, (data & 0x10) << 3); - coin_counter_w(machine(), 0, (data & 0x20) >> 5); + machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5); } diff --git a/src/mame/drivers/itech8.cpp b/src/mame/drivers/itech8.cpp index f49d848514c..13b33bdaf1d 100644 --- a/src/mame/drivers/itech8.cpp +++ b/src/mame/drivers/itech8.cpp @@ -749,7 +749,7 @@ WRITE8_MEMBER(itech8_state::pia_portb_out) /* bit 6 controls the diagnostic sound LED */ m_pia_portb_data = data; m_ticket->write(space, 0, (data & 0x10) << 3); - coin_counter_w(machine(), 0, (data & 0x20) >> 5); + machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5); } @@ -763,7 +763,7 @@ WRITE8_MEMBER(itech8_state::ym2203_portb_out) /* bit 7 controls the ticket dispenser */ m_pia_portb_data = data; m_ticket->write(machine().driver_data()->generic_space(), 0, data & 0x80); - coin_counter_w(machine(), 0, (data & 0x20) >> 5); + machine().bookkeeping().coin_counter_w(0, (data & 0x20) >> 5); } diff --git a/src/mame/drivers/jackal.cpp b/src/mame/drivers/jackal.cpp index 58e42c5c4c1..5a14ddc2e46 100644 --- a/src/mame/drivers/jackal.cpp +++ b/src/mame/drivers/jackal.cpp @@ -121,8 +121,8 @@ WRITE8_MEMBER(jackal_state::jackal_rambank_w) if (data & 0x04) popmessage("jackal_rambank_w %02x", data); - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); m_spritebank = &rgn[((data & 0x08) << 13)]; m_rambank = &rgn[((data & 0x10) << 12)]; diff --git a/src/mame/drivers/jackie.cpp b/src/mame/drivers/jackie.cpp index 71d5b4dd436..8b3b804d0e6 100644 --- a/src/mame/drivers/jackie.cpp +++ b/src/mame/drivers/jackie.cpp @@ -318,10 +318,10 @@ WRITE8_MEMBER(jackie_state::unk_reg3_hi_w){ unk_reg_hi_w( offset, data, 2 ); } WRITE8_MEMBER(jackie_state::nmi_and_coins_w) { - coin_counter_w(machine(), 0, data & 0x01); // coin_a - coin_counter_w(machine(), 1, data & 0x04); // coin_c - coin_counter_w(machine(), 2, data & 0x08); // key in - coin_counter_w(machine(), 3, data & 0x10); // coin m_out mech + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a + machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c + machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in + machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin m_out mech set_led_status(machine(), 6, data & 0x20); // led for coin m_out / m_hopper active diff --git a/src/mame/drivers/jangou.cpp b/src/mame/drivers/jangou.cpp index 7139164808b..a72c7c1a9b6 100644 --- a/src/mame/drivers/jangou.cpp +++ b/src/mame/drivers/jangou.cpp @@ -290,9 +290,9 @@ WRITE8_MEMBER(jangou_state::output_w) ---- ---x coin counter */ // printf("%02x\n", data); - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); // flip_screen_set(data & 0x04); -// coin_lockout_w(machine(), 0, ~data & 0x20); +// machine().bookkeeping().coin_lockout_w(0, ~data & 0x20); } READ8_MEMBER(jangou_state::input_mux_r) diff --git a/src/mame/drivers/jankenmn.cpp b/src/mame/drivers/jankenmn.cpp index fcdaee24841..f8092eda7c2 100644 --- a/src/mame/drivers/jankenmn.cpp +++ b/src/mame/drivers/jankenmn.cpp @@ -222,14 +222,14 @@ WRITE8_MEMBER(jankenmn_state::lamps3_w) output_set_lamp_value(15, data >> 1 & 1); // d2: payout (waits for hopper status) - coin_counter_w(machine(), 2, data & 0x04); + machine().bookkeeping().coin_counter_w(2, data & 0x04); // d3: right multiplier lamp(2), d4: left multiplier lamp(1) output_set_lamp_value(0, data >> 4 & 1); output_set_lamp_value(1, data >> 3 & 1); // d5: assume coin lockout - coin_lockout_global_w(machine(), ~data & 0x20); + machine().bookkeeping().coin_lockout_global_w(~data & 0x20); // d0, d6, d7: N/C? if (data & 0x04) diff --git a/src/mame/drivers/jedi.cpp b/src/mame/drivers/jedi.cpp index 4f012bac5bd..9d97f299716 100644 --- a/src/mame/drivers/jedi.cpp +++ b/src/mame/drivers/jedi.cpp @@ -227,7 +227,7 @@ WRITE8_MEMBER(jedi_state::a2d_select_w) WRITE8_MEMBER(jedi_state::jedi_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } diff --git a/src/mame/drivers/jollyjgr.cpp b/src/mame/drivers/jollyjgr.cpp index dbcbf32d460..8026d553914 100644 --- a/src/mame/drivers/jollyjgr.cpp +++ b/src/mame/drivers/jollyjgr.cpp @@ -205,7 +205,7 @@ WRITE8_MEMBER(jollyjgr_state::jollyjgr_misc_w) WRITE8_MEMBER(jollyjgr_state::jollyjgr_coin_lookout_w) { - coin_lockout_global_w(machine(), data & 1); + machine().bookkeeping().coin_lockout_global_w(data & 1); /* bits 4, 5, 6 and 7 are used too */ } diff --git a/src/mame/drivers/jongkyo.cpp b/src/mame/drivers/jongkyo.cpp index c15ed4bcc22..46e762a799f 100644 --- a/src/mame/drivers/jongkyo.cpp +++ b/src/mame/drivers/jongkyo.cpp @@ -153,7 +153,7 @@ WRITE8_MEMBER(jongkyo_state::jongkyo_coin_counter_w) /* bit 0 = hopper out? */ /* bit 1 = coin counter */ - coin_counter_w(machine(), 0, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 2); /* bit 2 always set? */ m_flip_screen = (data & 4) >> 2; diff --git a/src/mame/drivers/joystand.cpp b/src/mame/drivers/joystand.cpp index de3162b20f0..fafaf01a525 100644 --- a/src/mame/drivers/joystand.cpp +++ b/src/mame/drivers/joystand.cpp @@ -394,8 +394,8 @@ WRITE16_MEMBER(joystand_state::outputs_w) COMBINE_DATA(&m_outputs[0]); if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, BIT(data, 0)); // coin counter 1 - coin_counter_w(machine(), 1, BIT(data, 1)); // coin counter 2 + machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); // coin counter 1 + machine().bookkeeping().coin_counter_w(1, BIT(data, 1)); // coin counter 2 output_set_value("blocker", BIT(data, 2)); output_set_value("error_lamp", BIT(data, 3)); // counter error diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp index b83d1d1770b..f8a5b55b9d8 100644 --- a/src/mame/drivers/junofrst.cpp +++ b/src/mame/drivers/junofrst.cpp @@ -279,7 +279,7 @@ WRITE8_MEMBER(junofrst_state::flip_screen_w) WRITE8_MEMBER(junofrst_state::coincounter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } WRITE8_MEMBER(junofrst_state::irq_enable_w) diff --git a/src/mame/drivers/kaneko16.cpp b/src/mame/drivers/kaneko16.cpp index 7102dd31341..ccdc5218704 100644 --- a/src/mame/drivers/kaneko16.cpp +++ b/src/mame/drivers/kaneko16.cpp @@ -139,10 +139,10 @@ WRITE16_MEMBER(kaneko16_state::kaneko16_coin_lockout_w) { if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); - coin_counter_w(machine(), 1, data & 0x0200); - coin_lockout_w(machine(), 0, (~data) & 0x0400 ); - coin_lockout_w(machine(), 1, (~data) & 0x0800 ); + machine().bookkeeping().coin_counter_w(0, data & 0x0100); + machine().bookkeeping().coin_counter_w(1, data & 0x0200); + machine().bookkeeping().coin_lockout_w(0, (~data) & 0x0400 ); + machine().bookkeeping().coin_lockout_w(1, (~data) & 0x0800 ); } } @@ -218,10 +218,10 @@ WRITE16_MEMBER(kaneko16_state::kaneko16_eeprom_w) if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); - coin_counter_w(machine(), 1, data & 0x0200); - coin_lockout_w(machine(), 0, data & 0x8000); - coin_lockout_w(machine(), 1, data & 0x8000); + machine().bookkeeping().coin_counter_w(0, data & 0x0100); + machine().bookkeeping().coin_counter_w(1, data & 0x0200); + machine().bookkeeping().coin_lockout_w(0, data & 0x8000); + machine().bookkeeping().coin_lockout_w(1, data & 0x8000); } } @@ -418,10 +418,10 @@ WRITE16_MEMBER(kaneko16_gtmr_state::bloodwar_coin_lockout_w) { if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); - coin_counter_w(machine(), 1, data & 0x0200); - coin_lockout_w(machine(), 0, data & 0x8000); - coin_lockout_w(machine(), 1, data & 0x8000); + machine().bookkeeping().coin_counter_w(0, data & 0x0100); + machine().bookkeeping().coin_counter_w(1, data & 0x0200); + machine().bookkeeping().coin_lockout_w(0, data & 0x8000); + machine().bookkeeping().coin_lockout_w(1, data & 0x8000); } } diff --git a/src/mame/drivers/kangaroo.cpp b/src/mame/drivers/kangaroo.cpp index e5fad3069d5..54ef454f871 100644 --- a/src/mame/drivers/kangaroo.cpp +++ b/src/mame/drivers/kangaroo.cpp @@ -237,8 +237,8 @@ WRITE8_MEMBER(kangaroo_state::mcu_sim_w) WRITE8_MEMBER(kangaroo_state::kangaroo_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } diff --git a/src/mame/drivers/kas89.cpp b/src/mame/drivers/kas89.cpp index 7ae13148326..81971b80f2d 100644 --- a/src/mame/drivers/kas89.cpp +++ b/src/mame/drivers/kas89.cpp @@ -345,8 +345,8 @@ WRITE8_MEMBER(kas89_state::control_w) m_main_nmi_enable = data & 0x40; - coin_counter_w(machine(), 0, (data ^ 0xff) & 0x01); /* Credits In counter */ - coin_counter_w(machine(), 1, (data ^ 0xff) & 0x02); /* Credits Out counter */ + machine().bookkeeping().coin_counter_w(0, (data ^ 0xff) & 0x01); /* Credits In counter */ + machine().bookkeeping().coin_counter_w(1, (data ^ 0xff) & 0x02); /* Credits Out counter */ } WRITE8_MEMBER(kas89_state::sound_comm_w) diff --git a/src/mame/drivers/kenseim.cpp b/src/mame/drivers/kenseim.cpp index 3ecc40645fc..00a06c52462 100644 --- a/src/mame/drivers/kenseim.cpp +++ b/src/mame/drivers/kenseim.cpp @@ -352,8 +352,8 @@ WRITE8_MEMBER(kenseim_state::cpu_portc_w) // d5: coin lock // d6: left start button lamp // d7: right start button lamp - coin_lockout_w(machine(), 0, (data & 0x10) ? 0 : 1); // toggles if you attempt to insert a coin when there are already 15 coins inserted - coin_counter_w(machine(), 0, (data & 0x20) ? 0 : 1); + machine().bookkeeping().coin_lockout_w(0, (data & 0x10) ? 0 : 1); // toggles if you attempt to insert a coin when there are already 15 coins inserted + machine().bookkeeping().coin_counter_w(0, (data & 0x20) ? 0 : 1); output_set_value("startlamp1", (data & 0x80) ? 0 : 1); output_set_value("startlamp2", (data & 0x40) ? 0 : 1); } @@ -400,10 +400,10 @@ WRITE16_MEMBER(kenseim_state::cps1_kensei_w) if (ACCESSING_BITS_8_15) { // NOTE: remapped from default jamma output pins: - // coin_counter_w(machine(), 0, data & 0x0100); - // coin_counter_w(machine(), 1, data & 0x0200); - // coin_lockout_w(machine(), 0, ~data & 0x0400); - // coin_lockout_w(machine(), 1, ~data & 0x0800); + // machine().bookkeeping().coin_counter_w(0, data & 0x0100); + // machine().bookkeeping().coin_counter_w(1, data & 0x0200); + // machine().bookkeeping().coin_lockout_w(0, ~data & 0x0400); + // machine().bookkeeping().coin_lockout_w(1, ~data & 0x0800); // bit 15 = CPS-A custom reset? diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index f67cf5fdbb8..9ac53694e40 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -475,8 +475,8 @@ WRITE32_MEMBER(konamigx_state::eeprom_w) m_eepromout->write(odata, 0xff); - coin_counter_w(machine(), 0, odata & 0x08); - coin_counter_w(machine(), 1, odata & 0x10); + machine().bookkeeping().coin_counter_w(0, odata & 0x08); + machine().bookkeeping().coin_counter_w(1, odata & 0x10); m_gx_wrport1_0 = odata; } diff --git a/src/mame/drivers/kopunch.cpp b/src/mame/drivers/kopunch.cpp index 168d9eb4f81..85c00fa98a0 100644 --- a/src/mame/drivers/kopunch.cpp +++ b/src/mame/drivers/kopunch.cpp @@ -118,8 +118,8 @@ WRITE8_MEMBER(kopunch_state::lamp_w) WRITE8_MEMBER(kopunch_state::coin_w) { - coin_counter_w(machine(), 0, ~data & 0x80); - coin_counter_w(machine(), 1, ~data & 0x40); + machine().bookkeeping().coin_counter_w(0, ~data & 0x80); + machine().bookkeeping().coin_counter_w(1, ~data & 0x40); // if ((data & 0x3f) != 0x3e) // printf("port 34 = %02x ",data); diff --git a/src/mame/drivers/kungfur.cpp b/src/mame/drivers/kungfur.cpp index ceb5f2919d1..e6bf38c2d71 100644 --- a/src/mame/drivers/kungfur.cpp +++ b/src/mame/drivers/kungfur.cpp @@ -141,7 +141,7 @@ WRITE8_MEMBER(kungfur_state::kungfur_output_w) // d5: N/C? // d6: coincounter - coin_counter_w(machine(), 0, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x40); } diff --git a/src/mame/drivers/kurukuru.cpp b/src/mame/drivers/kurukuru.cpp index 8e49060e1e7..ef8248de862 100644 --- a/src/mame/drivers/kurukuru.cpp +++ b/src/mame/drivers/kurukuru.cpp @@ -309,9 +309,9 @@ WRITE8_MEMBER(kurukuru_state::kurukuru_out_latch_w) 07 | Not connected | unused */ - coin_counter_w(machine(), 0, data & 0x01); /* Coin Counter 1 */ - coin_counter_w(machine(), 1, data & 0x20); /* Coin Counter 2 */ - coin_lockout_global_w(machine(), data & 0x40); /* Coin Lock */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Coin Counter 1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* Coin Counter 2 */ + machine().bookkeeping().coin_lockout_global_w(data & 0x40); /* Coin Lock */ m_hopper->write(space, 0, (data & 0x40)); /* Hopper Motor */ if (data & 0x9e) diff --git a/src/mame/drivers/kyugo.cpp b/src/mame/drivers/kyugo.cpp index c83b94fff65..21c80927bfd 100644 --- a/src/mame/drivers/kyugo.cpp +++ b/src/mame/drivers/kyugo.cpp @@ -135,7 +135,7 @@ ADDRESS_MAP_END WRITE8_MEMBER(kyugo_state::kyugo_coin_counter_w) { - coin_counter_w(machine(), offset, data & 1); + machine().bookkeeping().coin_counter_w(offset, data & 1); } static ADDRESS_MAP_START( gyrodine_sub_portmap, AS_IO, 8, kyugo_state ) diff --git a/src/mame/drivers/labyrunr.cpp b/src/mame/drivers/labyrunr.cpp index d21b85bdaef..e8f0957d10f 100644 --- a/src/mame/drivers/labyrunr.cpp +++ b/src/mame/drivers/labyrunr.cpp @@ -41,8 +41,8 @@ WRITE8_MEMBER(labyrunr_state::labyrunr_bankswitch_w) membank("bank1")->set_entry(data & 0x07); // shall we check if data&7 > #banks? /* bits 3 and 4 are coin counters */ - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x10); } static ADDRESS_MAP_START( labyrunr_map, AS_PROGRAM, 8, labyrunr_state ) diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index 545fee182bf..2d9ea56a2e4 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -129,9 +129,9 @@ WRITE8_MEMBER(laserbat_state_base::ct_io_w) +-----+-----------------------------+--------------------+--------------+ */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 2, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(2, data & 0x04); flip_screen_set((bool(data & 0x08) && !bool(m_row1->read() & 0x10)) ? 1 : 0); m_input_mux = (data >> 4) & 0x03; diff --git a/src/mame/drivers/lethalj.cpp b/src/mame/drivers/lethalj.cpp index 308144db328..902f13d22d0 100644 --- a/src/mame/drivers/lethalj.cpp +++ b/src/mame/drivers/lethalj.cpp @@ -175,7 +175,7 @@ CUSTOM_INPUT_MEMBER(lethalj_state::cclownz_paddle) WRITE16_MEMBER(lethalj_state::ripribit_control_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); m_ticket->write(space, 0, ((data >> 1) & 1) << 7); output_set_lamp_value(0, (data >> 2) & 1); } @@ -187,7 +187,7 @@ WRITE16_MEMBER(lethalj_state::cfarm_control_w) output_set_lamp_value(0, (data >> 2) & 1); output_set_lamp_value(1, (data >> 3) & 1); output_set_lamp_value(2, (data >> 4) & 1); - coin_counter_w(machine(), 0, (data >> 7) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1); } @@ -197,7 +197,7 @@ WRITE16_MEMBER(lethalj_state::cclownz_control_w) output_set_lamp_value(0, (data >> 2) & 1); output_set_lamp_value(1, (data >> 4) & 1); output_set_lamp_value(2, (data >> 5) & 1); - coin_counter_w(machine(), 0, (data >> 6) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 6) & 1); } diff --git a/src/mame/drivers/liberatr.cpp b/src/mame/drivers/liberatr.cpp index f0f77750814..8e91f4e9afc 100644 --- a/src/mame/drivers/liberatr.cpp +++ b/src/mame/drivers/liberatr.cpp @@ -167,7 +167,7 @@ WRITE8_MEMBER( liberatr_state::led_w ) WRITE8_MEMBER( liberatr_state::coin_counter_w ) { - ::coin_counter_w(machine(), offset ^ 0x01, data & 0x10); + machine().bookkeeping().coin_counter_w(offset ^ 0x01, data & 0x10); } diff --git a/src/mame/drivers/limenko.cpp b/src/mame/drivers/limenko.cpp index 62b9cb01e74..57c7f1df3b4 100644 --- a/src/mame/drivers/limenko.cpp +++ b/src/mame/drivers/limenko.cpp @@ -117,7 +117,7 @@ public: WRITE32_MEMBER(limenko_state::limenko_coincounter_w) { - coin_counter_w(machine(),0,data & 0x10000); + machine().bookkeeping().coin_counter_w(0,data & 0x10000); } diff --git a/src/mame/drivers/lockon.cpp b/src/mame/drivers/lockon.cpp index 3dff4710044..9cd3536ea4d 100644 --- a/src/mame/drivers/lockon.cpp +++ b/src/mame/drivers/lockon.cpp @@ -423,9 +423,9 @@ WRITE_LINE_MEMBER(lockon_state::ym2203_irq) WRITE8_MEMBER(lockon_state::ym2203_out_b) { - coin_counter_w(machine(), 0, data & 0x80); - coin_counter_w(machine(), 1, data & 0x40); - coin_counter_w(machine(), 2, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x40); + machine().bookkeeping().coin_counter_w(2, data & 0x20); /* 'Lock-On' lamp */ set_led_status(machine(), 1, !(data & 0x10)); diff --git a/src/mame/drivers/lordgun.cpp b/src/mame/drivers/lordgun.cpp index e25acbe1cc6..15b66477bf1 100644 --- a/src/mame/drivers/lordgun.cpp +++ b/src/mame/drivers/lordgun.cpp @@ -178,7 +178,7 @@ WRITE8_MEMBER(lordgun_state::lordgun_eeprom_w) logerror("%s: Unknown EEPROM bit written %02X\n",machine().describe_context(),data); } - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); // Update light guns positions for (i = 0; i < 2; i++) @@ -210,8 +210,8 @@ WRITE8_MEMBER(lordgun_state::aliencha_eeprom_w) // bit 1? cleared during screen transitions m_whitescreen = !(data & 0x02); - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x10); // latch the bit m_eeprom->di_write((data & 0x80) >> 7); diff --git a/src/mame/drivers/luckgrln.cpp b/src/mame/drivers/luckgrln.cpp index e2c4543a910..126ec5490e7 100644 --- a/src/mame/drivers/luckgrln.cpp +++ b/src/mame/drivers/luckgrln.cpp @@ -562,10 +562,10 @@ WRITE8_MEMBER(luckgrln_state::counters_w) xxxx ---- unused */ - coin_counter_w(machine(), 0, data & 0x01); /* COIN 1 */ - coin_counter_w(machine(), 1, data & 0x04); /* COIN 2 */ - coin_counter_w(machine(), 2, data & 0x08); /* COIN 3 */ - coin_counter_w(machine(), 3, data & 0x02); /* KEY IN */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* COIN 1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x04); /* COIN 2 */ + machine().bookkeeping().coin_counter_w(2, data & 0x08); /* COIN 3 */ + machine().bookkeeping().coin_counter_w(3, data & 0x02); /* KEY IN */ } diff --git a/src/mame/drivers/lwings.cpp b/src/mame/drivers/lwings.cpp index 762264188fd..9b3167d21a5 100644 --- a/src/mame/drivers/lwings.cpp +++ b/src/mame/drivers/lwings.cpp @@ -85,8 +85,8 @@ WRITE8_MEMBER(lwings_state::lwings_bankswitch_w) m_nmi_mask = data & 8; /* bits 6 and 7 are coin counters */ - coin_counter_w(machine(), 1, data & 0x40); - coin_counter_w(machine(), 0, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x80); } INTERRUPT_GEN_MEMBER(lwings_state::lwings_interrupt) diff --git a/src/mame/drivers/m107.cpp b/src/mame/drivers/m107.cpp index 599d1da3167..d9034a10e77 100644 --- a/src/mame/drivers/m107.cpp +++ b/src/mame/drivers/m107.cpp @@ -108,8 +108,8 @@ WRITE16_MEMBER(m107_state::coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); } } diff --git a/src/mame/drivers/m63.cpp b/src/mame/drivers/m63.cpp index b58fb3a397c..1a0f04752eb 100644 --- a/src/mame/drivers/m63.cpp +++ b/src/mame/drivers/m63.cpp @@ -384,7 +384,7 @@ UINT32 m63_state::screen_update_m63(screen_device &screen, bitmap_ind16 &bitmap, WRITE8_MEMBER(m63_state::coin_w) { - coin_counter_w(machine(), offset, data & 0x01); + machine().bookkeeping().coin_counter_w(offset, data & 0x01); } WRITE8_MEMBER(m63_state::snd_irq_w) diff --git a/src/mame/drivers/m90.cpp b/src/mame/drivers/m90.cpp index 9c59f67b44b..6386e102c15 100644 --- a/src/mame/drivers/m90.cpp +++ b/src/mame/drivers/m90.cpp @@ -41,8 +41,8 @@ WRITE16_MEMBER(m90_state::m90_coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); if (data & 0xfc) logerror("Coin counter %02x\n",data); } diff --git a/src/mame/drivers/m92.cpp b/src/mame/drivers/m92.cpp index 6f06921f32b..be44923f8d1 100644 --- a/src/mame/drivers/m92.cpp +++ b/src/mame/drivers/m92.cpp @@ -308,8 +308,8 @@ WRITE16_MEMBER(m92_state::m92_coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* Bit 0x8 is Motor(?!), used in Hook, In The Hunt, UCops */ /* Bit 0x8 is Memcard related in RTypeLeo */ /* Bit 0x40 set in Blade Master test mode input check */ diff --git a/src/mame/drivers/magic10.cpp b/src/mame/drivers/magic10.cpp index 9de8bc1a97a..211cd05d6ea 100644 --- a/src/mame/drivers/magic10.cpp +++ b/src/mame/drivers/magic10.cpp @@ -279,7 +279,7 @@ WRITE16_MEMBER(magic10_state::magic10_out_w) output_set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - PLAY (BET/TAKE/CANCEL) */ output_set_lamp_value(8, (data >> 8) & 1); /* Lamp 8 - PAYOUT/SUPERGAME */ - coin_counter_w(machine(), 0, data & 0x400); + machine().bookkeeping().coin_counter_w(0, data & 0x400); } /*************************** diff --git a/src/mame/drivers/magicfly.cpp b/src/mame/drivers/magicfly.cpp index f9cc51343ab..bb82206dda1 100644 --- a/src/mame/drivers/magicfly.cpp +++ b/src/mame/drivers/magicfly.cpp @@ -655,9 +655,9 @@ WRITE8_MEMBER(magicfly_state::mux_port_w) m_dac->write_unsigned8(data & 0x80); /* Sound DAC */ - coin_counter_w(machine(), 0, data & 0x40); /* Coin1 */ - coin_counter_w(machine(), 1, data & 0x10); /* Coin2 */ - coin_counter_w(machine(), 2, data & 0x20); /* Payout */ + machine().bookkeeping().coin_counter_w(0, data & 0x40); /* Coin1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x10); /* Coin2 */ + machine().bookkeeping().coin_counter_w(2, data & 0x20); /* Payout */ } diff --git a/src/mame/drivers/mainevt.cpp b/src/mame/drivers/mainevt.cpp index 840da8b536b..99ecb9851da 100644 --- a/src/mame/drivers/mainevt.cpp +++ b/src/mame/drivers/mainevt.cpp @@ -66,8 +66,8 @@ WRITE8_MEMBER(mainevt_state::mainevt_bankswitch_w) WRITE8_MEMBER(mainevt_state::mainevt_coin_w) { - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); set_led_status(machine(), 0, data & 0x01); set_led_status(machine(), 1, data & 0x02); set_led_status(machine(), 2, data & 0x04); diff --git a/src/mame/drivers/majorpkr.cpp b/src/mame/drivers/majorpkr.cpp index 7238599f40c..73443543037 100644 --- a/src/mame/drivers/majorpkr.cpp +++ b/src/mame/drivers/majorpkr.cpp @@ -713,10 +713,10 @@ WRITE8_MEMBER(majorpkr_state::pulses_w) ---x ---- Watchdog? (constant writes). xxx- ---- Unknown. */ - coin_counter_w(machine(), 3, data & 0x01); /* Credits Out (all) */ - coin_counter_w(machine(), 2, data & 0x02); /* Credits 3 */ - coin_counter_w(machine(), 0, data & 0x04); /* Credits 1 */ - coin_counter_w(machine(), 1, data & 0x08); /* Credits 2 */ + machine().bookkeeping().coin_counter_w(3, data & 0x01); /* Credits Out (all) */ + machine().bookkeeping().coin_counter_w(2, data & 0x02); /* Credits 3 */ + machine().bookkeeping().coin_counter_w(0, data & 0x04); /* Credits 1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x08); /* Credits 2 */ if (data & 0xe0) logerror("Pulse: Write to 10h: %02x\n", data); diff --git a/src/mame/drivers/mappy.cpp b/src/mame/drivers/mappy.cpp index aad2fa4a05d..e36ebb8bbb2 100644 --- a/src/mame/drivers/mappy.cpp +++ b/src/mame/drivers/mappy.cpp @@ -1626,8 +1626,8 @@ WRITE8_MEMBER(mappy_state::out_lamps) { set_led_status(machine(), 0, data & 1); set_led_status(machine(), 1, data & 2); - coin_lockout_global_w(machine(), data & 4); - coin_counter_w(machine(), 0, ~data & 8); + machine().bookkeeping().coin_lockout_global_w(data & 4); + machine().bookkeeping().coin_counter_w(0, ~data & 8); } MACHINE_START_MEMBER(mappy_state,mappy) diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index da15ec7ec95..68baa532a57 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -402,7 +402,7 @@ WRITE8_MEMBER(maygay1b_state::m1_lockout_w) int i; for (i=0; i<6; i++) { - coin_lockout_w(machine(), i, data & (1 << i) ); + machine().bookkeeping().coin_lockout_w(i, data & (1 << i) ); } } diff --git a/src/mame/drivers/mazerbla.cpp b/src/mame/drivers/mazerbla.cpp index 5abb56792ac..e18df263c85 100644 --- a/src/mame/drivers/mazerbla.cpp +++ b/src/mame/drivers/mazerbla.cpp @@ -891,7 +891,7 @@ WRITE8_MEMBER(mazerbla_state::zpu_lamps_w) WRITE8_MEMBER(mazerbla_state::zpu_coin_counter_w) { /* bit 6 = coin counter */ - coin_counter_w(machine(), offset, BIT(data, 6)); + machine().bookkeeping().coin_counter_w(offset, BIT(data, 6)); } WRITE8_MEMBER(mazerbla_state::cfb_led_w) diff --git a/src/mame/drivers/mcatadv.cpp b/src/mame/drivers/mcatadv.cpp index 9c9186a20fe..74b00d9738e 100644 --- a/src/mame/drivers/mcatadv.cpp +++ b/src/mame/drivers/mcatadv.cpp @@ -157,10 +157,10 @@ WRITE16_MEMBER(mcatadv_state::mcat_coin_w) { if(ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x1000); - coin_counter_w(machine(), 1, data & 0x2000); - coin_lockout_w(machine(), 0, ~data & 0x4000); - coin_lockout_w(machine(), 1, ~data & 0x8000); + machine().bookkeeping().coin_counter_w(0, data & 0x1000); + machine().bookkeeping().coin_counter_w(1, data & 0x2000); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x4000); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x8000); } } #endif diff --git a/src/mame/drivers/mcr.cpp b/src/mame/drivers/mcr.cpp index 43639f70999..a02781e4d56 100644 --- a/src/mame/drivers/mcr.cpp +++ b/src/mame/drivers/mcr.cpp @@ -314,9 +314,9 @@ WRITE8_MEMBER(mcr_state::mcr_control_port_w) D0 = coin meter 1 */ - coin_counter_w(machine(), 0, (data >> 0) & 1); - coin_counter_w(machine(), 1, (data >> 1) & 1); - coin_counter_w(machine(), 2, (data >> 2) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 1) & 1); + machine().bookkeeping().coin_counter_w(2, (data >> 2) & 1); mcr_cocktail_flip = (data >> 6) & 1; } @@ -384,7 +384,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(mcr_state::dpoker_hopper_callback) dpoker_coin_status &= ~8; } - coin_counter_w(machine(), 3, dpoker_coin_status & 8); + machine().bookkeeping().coin_counter_w(3, dpoker_coin_status & 8); } TIMER_DEVICE_CALLBACK_MEMBER(mcr_state::dpoker_coin_in_callback) diff --git a/src/mame/drivers/mcr3.cpp b/src/mame/drivers/mcr3.cpp index 1c8069c0f17..cc0a1347ce1 100644 --- a/src/mame/drivers/mcr3.cpp +++ b/src/mame/drivers/mcr3.cpp @@ -133,7 +133,7 @@ WRITE8_MEMBER(mcr3_state::mcrmono_control_port_w) D0 = coin meter 1 */ - coin_counter_w(machine(), 0, (data >> 0) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 1); mcr_cocktail_flip = (data >> 6) & 1; } diff --git a/src/mame/drivers/megazone.cpp b/src/mame/drivers/megazone.cpp index 60d7b9eb0b0..52422a8a860 100644 --- a/src/mame/drivers/megazone.cpp +++ b/src/mame/drivers/megazone.cpp @@ -71,7 +71,7 @@ WRITE8_MEMBER(megazone_state::i8039_irqen_and_status_w) WRITE8_MEMBER(megazone_state::megazone_coin_counter_w) { - coin_counter_w(machine(), 1 - offset, data); /* 1-offset, because coin counters are in reversed order */ + machine().bookkeeping().coin_counter_w(1 - offset, data); /* 1-offset, because coin counters are in reversed order */ } WRITE8_MEMBER(megazone_state::irq_mask_w) diff --git a/src/mame/drivers/merit.cpp b/src/mame/drivers/merit.cpp index 01c902011ce..1623b62a357 100644 --- a/src/mame/drivers/merit.cpp +++ b/src/mame/drivers/merit.cpp @@ -335,7 +335,7 @@ WRITE8_MEMBER(merit_state::led2_w) set_led_status(machine(), 9,~data & 0x10); /* coin counter */ - coin_counter_w(machine(),0,0x80-(data & 0x80)); + machine().bookkeeping().coin_counter_w(0,0x80-(data & 0x80)); } WRITE8_MEMBER(merit_state::misc_w) diff --git a/src/mame/drivers/metro.cpp b/src/mame/drivers/metro.cpp index 10492a1fabb..f7006122d15 100644 --- a/src/mame/drivers/metro.cpp +++ b/src/mame/drivers/metro.cpp @@ -450,8 +450,8 @@ WRITE16_MEMBER(metro_state::metro_coin_lockout_1word_w) { if (ACCESSING_BITS_0_7) { -// coin_lockout_w(machine(), 0, data & 1); -// coin_lockout_w(machine(), 1, data & 2); +// machine().bookkeeping().coin_lockout_w(0, data & 1); +// machine().bookkeeping().coin_lockout_w(1, data & 2); } if (data & ~3) logerror("CPU #0 PC %06X : unknown bits of coin lockout written: %04X\n", space.device().safe_pc(), data); } @@ -459,7 +459,7 @@ WRITE16_MEMBER(metro_state::metro_coin_lockout_1word_w) WRITE16_MEMBER(metro_state::metro_coin_lockout_4words_w) { -// coin_lockout_w(machine(), (offset >> 1) & 1, offset & 1); +// machine().bookkeeping().coin_lockout_w((offset >> 1) & 1, offset & 1); if (data & ~1) logerror("CPU #0 PC %06X : unknown bits of coin lockout written: %04X\n", space.device().safe_pc(), data); } @@ -1879,10 +1879,10 @@ WRITE8_MEMBER(metro_state::vmetal_control_w) { /* Lower nibble is the coin control bits shown in service mode, but in game mode they're different */ - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); /* 2nd coin schute activates coin 0 counter in game mode?? */ -// coin_lockout_w(machine(), 0, data & 0x01); /* always on in game mode?? */ - coin_lockout_w(machine(), 1, data & 0x02); /* never activated in game mode?? */ + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); /* 2nd coin schute activates coin 0 counter in game mode?? */ +// machine().bookkeeping().coin_lockout_w(0, data & 0x01); /* always on in game mode?? */ + machine().bookkeeping().coin_lockout_w(1, data & 0x02); /* never activated in game mode?? */ if ((data & 0x40) == 0) m_essnd->reset(); diff --git a/src/mame/drivers/meyc8080.cpp b/src/mame/drivers/meyc8080.cpp index ff2529984ac..7f093ff1c53 100644 --- a/src/mame/drivers/meyc8080.cpp +++ b/src/mame/drivers/meyc8080.cpp @@ -251,12 +251,12 @@ WRITE8_MEMBER(meyc8080_state::counters_w) xxxx ---- Seems unused... */ - coin_counter_w(machine(), 0, ~data & 0x01); /* Coin1 */ - coin_counter_w(machine(), 1, ~data & 0x04); /* Bets */ - coin_counter_w(machine(), 2, ~data & 0x02); /* Payout */ + machine().bookkeeping().coin_counter_w(0, ~data & 0x01); /* Coin1 */ + machine().bookkeeping().coin_counter_w(1, ~data & 0x04); /* Bets */ + machine().bookkeeping().coin_counter_w(2, ~data & 0x02); /* Payout */ /* Only Draw Poker (2-11) (mdrawpkra) */ - coin_counter_w(machine(), 3, ~data & 0x08); /* Manual Keyout */ + machine().bookkeeping().coin_counter_w(3, ~data & 0x08); /* Manual Keyout */ logerror("counters: %02x\n", ~data); } diff --git a/src/mame/drivers/mgames.cpp b/src/mame/drivers/mgames.cpp index 22437828406..ab63eea304f 100644 --- a/src/mame/drivers/mgames.cpp +++ b/src/mame/drivers/mgames.cpp @@ -483,7 +483,7 @@ WRITE8_MEMBER(mgames_state::outport5_w) WRITE8_MEMBER(mgames_state::outport6_w) { - coin_counter_w(machine(), 1, data & 0x02); /* Payout pulse */ + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* Payout pulse */ m_output[6] = data; popmessage("outport6 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]); @@ -503,7 +503,7 @@ WRITE8_MEMBER(mgames_state::outport6_w) WRITE8_MEMBER(mgames_state::outport7_w) { - coin_counter_w(machine(), 0, data & 0x02); /* Coin pulse */ + machine().bookkeeping().coin_counter_w(0, data & 0x02); /* Coin pulse */ m_output[7] = data; popmessage("outport7 : %02X %02X %02X %02X %02X %02X %02X %02X", m_output[0], m_output[1], m_output[2], m_output[3], m_output[4], m_output[5], m_output[6], m_output[7]); diff --git a/src/mame/drivers/midas.cpp b/src/mame/drivers/midas.cpp index b853c14e382..8fbe0890bef 100644 --- a/src/mame/drivers/midas.cpp +++ b/src/mame/drivers/midas.cpp @@ -178,7 +178,7 @@ WRITE16_MEMBER(midas_state::livequiz_coin_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x0001); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); } #ifdef MAME_DEBUG // popmessage("coin %04X", data); @@ -234,8 +234,8 @@ WRITE16_MEMBER(midas_state::hammer_coin_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x0001); - coin_counter_w(machine(), 1, data & 0x0002); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); } #ifdef MAME_DEBUG // popmessage("coin %04X", data); diff --git a/src/mame/drivers/mikie.cpp b/src/mame/drivers/mikie.cpp index a5cf578d288..fb6cc53262a 100644 --- a/src/mame/drivers/mikie.cpp +++ b/src/mame/drivers/mikie.cpp @@ -79,7 +79,7 @@ WRITE8_MEMBER(mikie_state::mikie_sh_irqtrigger_w) WRITE8_MEMBER(mikie_state::mikie_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } WRITE8_MEMBER(mikie_state::irq_mask_w) diff --git a/src/mame/drivers/mil4000.cpp b/src/mame/drivers/mil4000.cpp index 9ac2c37e375..30e29985c98 100644 --- a/src/mame/drivers/mil4000.cpp +++ b/src/mame/drivers/mil4000.cpp @@ -297,7 +297,7 @@ WRITE16_MEMBER(mil4000_state::output_w) int i; for(i=0;i<3;i++) - coin_counter_w(machine(), i, data & 0x2000); + machine().bookkeeping().coin_counter_w(i, data & 0x2000); output_set_lamp_value(0, (data) & 1); /* HOLD1 */ output_set_lamp_value(1, (data >> 1) & 1); /* HOLD2 */ diff --git a/src/mame/drivers/miniboy7.cpp b/src/mame/drivers/miniboy7.cpp index 158f19c0ef7..0350aea554a 100644 --- a/src/mame/drivers/miniboy7.cpp +++ b/src/mame/drivers/miniboy7.cpp @@ -309,7 +309,7 @@ WRITE8_MEMBER(miniboy7_state::ay_pa_w) // output_set_lamp_value(3, (data >> 3) & 1); // [-x---] // output_set_lamp_value(4, (data >> 4) & 1); // [x----] - coin_counter_w(machine(), 0, data & 0x40); // counter + machine().bookkeeping().coin_counter_w(0, data & 0x40); // counter // popmessage("Out Lamps: %02x", data); // logerror("Out Lamps: %02x\n", data); diff --git a/src/mame/drivers/mirax.cpp b/src/mame/drivers/mirax.cpp index 1a967193379..ec3bdaf751c 100644 --- a/src/mame/drivers/mirax.cpp +++ b/src/mame/drivers/mirax.cpp @@ -289,12 +289,12 @@ WRITE8_MEMBER(mirax_state::sound_cmd_w) WRITE8_MEMBER(mirax_state::coin_counter0_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE8_MEMBER(mirax_state::coin_counter1_w) { - coin_counter_w(machine(), 1, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 1); } /* One address flips X, the other flips Y, but I can't tell which is which - Since the value is the same for the 2 addresses, it doesn't really matter */ diff --git a/src/mame/drivers/missile.cpp b/src/mame/drivers/missile.cpp index 9fa69eaafd4..857f7447f26 100644 --- a/src/mame/drivers/missile.cpp +++ b/src/mame/drivers/missile.cpp @@ -728,9 +728,9 @@ WRITE8_MEMBER(missile_state::missile_w) else if (offset < 0x4900) { m_flipscreen = ~data & 0x40; - coin_counter_w(machine(), 0, data & 0x20); - coin_counter_w(machine(), 1, data & 0x10); - coin_counter_w(machine(), 2, data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x20); + machine().bookkeeping().coin_counter_w(1, data & 0x10); + machine().bookkeeping().coin_counter_w(2, data & 0x08); set_led_status(machine(), 1, ~data & 0x04); set_led_status(machine(), 0, ~data & 0x02); m_ctrld = data & 1; diff --git a/src/mame/drivers/mpu4hw.cpp b/src/mame/drivers/mpu4hw.cpp index ed6031f5a90..34f869dc46f 100644 --- a/src/mame/drivers/mpu4hw.cpp +++ b/src/mame/drivers/mpu4hw.cpp @@ -1033,10 +1033,10 @@ READ8_MEMBER(mpu4_state::pia_ic5_portb_r) } LOG(("%s: IC5 PIA Read of Port B (coin input AUX2)\n",machine().describe_context())); - coin_lockout_w(machine(), 0, (m_pia5->b_output() & 0x01) ); - coin_lockout_w(machine(), 1, (m_pia5->b_output() & 0x02) ); - coin_lockout_w(machine(), 2, (m_pia5->b_output() & 0x04) ); - coin_lockout_w(machine(), 3, (m_pia5->b_output() & 0x08) ); + machine().bookkeeping().coin_lockout_w(0, (m_pia5->b_output() & 0x01) ); + machine().bookkeeping().coin_lockout_w(1, (m_pia5->b_output() & 0x02) ); + machine().bookkeeping().coin_lockout_w(2, (m_pia5->b_output() & 0x04) ); + machine().bookkeeping().coin_lockout_w(3, (m_pia5->b_output() & 0x08) ); return m_aux2_port->read() | m_aux2_input; } diff --git a/src/mame/drivers/msisaac.cpp b/src/mame/drivers/msisaac.cpp index ef44297be33..2311b85907f 100644 --- a/src/mame/drivers/msisaac.cpp +++ b/src/mame/drivers/msisaac.cpp @@ -59,7 +59,7 @@ WRITE8_MEMBER(msisaac_state::flip_screen_w) WRITE8_MEMBER(msisaac_state::msisaac_coin_counter_w) { - coin_counter_w(machine(), offset,data); + machine().bookkeeping().coin_counter_w(offset,data); } #endif diff --git a/src/mame/drivers/multfish.cpp b/src/mame/drivers/multfish.cpp index e0a46ede44c..e38cb36b1cc 100644 --- a/src/mame/drivers/multfish.cpp +++ b/src/mame/drivers/multfish.cpp @@ -376,14 +376,14 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_hopper_w) m_hopper_motor = data & 0x10; - coin_lockout_w(machine(), 0, data & 0x01); - coin_lockout_w(machine(), 1, data & 0x01); - coin_lockout_w(machine(), 2, data & 0x01); - coin_lockout_w(machine(), 3, data & 0x01); - coin_lockout_w(machine(), 4, data & 0x04); - coin_lockout_w(machine(), 5, data & 0x04); - coin_lockout_w(machine(), 6, data & 0x04); - coin_lockout_w(machine(), 7, data & 0x04); + machine().bookkeeping().coin_lockout_w(0, data & 0x01); + machine().bookkeeping().coin_lockout_w(1, data & 0x01); + machine().bookkeeping().coin_lockout_w(2, data & 0x01); + machine().bookkeeping().coin_lockout_w(3, data & 0x01); + machine().bookkeeping().coin_lockout_w(4, data & 0x04); + machine().bookkeeping().coin_lockout_w(5, data & 0x04); + machine().bookkeeping().coin_lockout_w(6, data & 0x04); + machine().bookkeeping().coin_lockout_w(7, data & 0x04); } WRITE8_MEMBER(igrosoft_gamble_state::rollfr_hopper_w) @@ -394,14 +394,14 @@ WRITE8_MEMBER(igrosoft_gamble_state::rollfr_hopper_w) m_hopper_motor = data & 0x10; - coin_lockout_w(machine(), 0,~data & 0x01); - coin_lockout_w(machine(), 1,~data & 0x01); - coin_lockout_w(machine(), 2,~data & 0x01); - coin_lockout_w(machine(), 3,~data & 0x01); - coin_lockout_w(machine(), 4, data & 0x04); - coin_lockout_w(machine(), 5, data & 0x04); - coin_lockout_w(machine(), 6, data & 0x04); - coin_lockout_w(machine(), 7, data & 0x04); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01); + machine().bookkeeping().coin_lockout_w(1,~data & 0x01); + machine().bookkeeping().coin_lockout_w(2,~data & 0x01); + machine().bookkeeping().coin_lockout_w(3,~data & 0x01); + machine().bookkeeping().coin_lockout_w(4, data & 0x04); + machine().bookkeeping().coin_lockout_w(5, data & 0x04); + machine().bookkeeping().coin_lockout_w(6, data & 0x04); + machine().bookkeeping().coin_lockout_w(7, data & 0x04); } DRIVER_INIT_MEMBER(igrosoft_gamble_state,customl) @@ -902,12 +902,12 @@ WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_counters_w) -X-- ---- Key Out Counter 27A X--- ---- Total Bet Counter 28B */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 2, data & 0x04); - coin_counter_w(machine(), 3, data & 0x10); - coin_counter_w(machine(), 4, data & 0x40); - coin_counter_w(machine(), 5, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(2, data & 0x04); + machine().bookkeeping().coin_counter_w(3, data & 0x10); + machine().bookkeeping().coin_counter_w(4, data & 0x40); + machine().bookkeeping().coin_counter_w(5, data & 0x80); } WRITE8_MEMBER(igrosoft_gamble_state::igrosoft_gamble_f3_w) diff --git a/src/mame/drivers/mw18w.cpp b/src/mame/drivers/mw18w.cpp index edeca7e1a22..60ab1471c44 100644 --- a/src/mame/drivers/mw18w.cpp +++ b/src/mame/drivers/mw18w.cpp @@ -55,7 +55,7 @@ WRITE8_MEMBER(mw18w_state::mw18w_sound0_w) // d5: crash sound // d6-d7: brake sound - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE8_MEMBER(mw18w_state::mw18w_sound1_w) diff --git a/src/mame/drivers/mw8080bw.cpp b/src/mame/drivers/mw8080bw.cpp index 3dd1d71383c..20ca4906434 100644 --- a/src/mame/drivers/mw8080bw.cpp +++ b/src/mame/drivers/mw8080bw.cpp @@ -896,8 +896,8 @@ MACHINE_START_MEMBER(mw8080bw_state,maze) WRITE8_MEMBER(mw8080bw_state::maze_coin_counter_w) { /* the data is not used, just pulse the counter */ - coin_counter_w(machine(), 0, 0); - coin_counter_w(machine(), 0, 1); + machine().bookkeeping().coin_counter_w(0, 0); + machine().bookkeeping().coin_counter_w(0, 1); } @@ -2505,7 +2505,7 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::invaders_coin_input_r) { UINT32 ret = ioport(INVADERS_COIN_INPUT_PORT_TAG)->read(); - coin_counter_w(machine(), 0, !ret); + machine().bookkeeping().coin_counter_w(0, !ret); return ret; } @@ -2712,7 +2712,7 @@ CUSTOM_INPUT_MEMBER(mw8080bw_state::blueshrk_coin_input_r) { UINT32 ret = ioport(BLUESHRK_COIN_INPUT_PORT_TAG)->read(); - coin_counter_w(machine(), 0, !ret); + machine().bookkeeping().coin_counter_w(0, !ret); return ret; } diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index af70533bc20..4fb045627b0 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -360,9 +360,9 @@ READ8_MEMBER(namcos1_state::dsw_r) WRITE8_MEMBER(namcos1_state::coin_w) { - coin_lockout_global_w(machine(), ~data & 1); - coin_counter_w(machine(), 0, data & 2); - coin_counter_w(machine(), 1, data & 4); + machine().bookkeeping().coin_lockout_global_w(~data & 1); + machine().bookkeeping().coin_counter_w(0, data & 2); + machine().bookkeeping().coin_counter_w(1, data & 4); } void namcos1_state::update_DACs() diff --git a/src/mame/drivers/namcos86.cpp b/src/mame/drivers/namcos86.cpp index 8d04e7e758a..3630d09a316 100644 --- a/src/mame/drivers/namcos86.cpp +++ b/src/mame/drivers/namcos86.cpp @@ -273,9 +273,9 @@ WRITE8_MEMBER(namcos86_state::watchdog2_w) WRITE8_MEMBER(namcos86_state::coin_w) { - coin_lockout_global_w(machine(), data & 1); - coin_counter_w(machine(), 0,~data & 2); - coin_counter_w(machine(), 1,~data & 4); + machine().bookkeeping().coin_lockout_global_w(data & 1); + machine().bookkeeping().coin_counter_w(0,~data & 2); + machine().bookkeeping().coin_counter_w(1,~data & 4); } WRITE8_MEMBER(namcos86_state::led_w) diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index 8e4f7480517..74692366d81 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -163,8 +163,8 @@ ADDRESS_MAP_END WRITE8_MEMBER(nbmj8688_state::barline_output_w) { - coin_lockout_w(machine(), 0,~data & 0x80); - coin_counter_w(machine(), 0,data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x80); + machine().bookkeeping().coin_counter_w(0,data & 0x02); } static ADDRESS_MAP_START( barline_io_map, AS_IO, 8, nbmj8688_state ) diff --git a/src/mame/drivers/nemesis.cpp b/src/mame/drivers/nemesis.cpp index b58f3dfaaa0..90954e866a4 100644 --- a/src/mame/drivers/nemesis.cpp +++ b/src/mame/drivers/nemesis.cpp @@ -105,7 +105,7 @@ WRITE16_MEMBER(nemesis_state::gx400_irq1_enable_word_w) m_irq1_on = data & 0x0001; if (ACCESSING_BITS_8_15) - coin_lockout_w(machine(), 1, data & 0x0100); + machine().bookkeeping().coin_lockout_w(1, data & 0x0100); } WRITE16_MEMBER(nemesis_state::gx400_irq2_enable_word_w) @@ -114,7 +114,7 @@ WRITE16_MEMBER(nemesis_state::gx400_irq2_enable_word_w) m_irq2_on = data & 0x0001; if (ACCESSING_BITS_8_15) - coin_lockout_w(machine(), 0, data & 0x0100); + machine().bookkeeping().coin_lockout_w(0, data & 0x0100); } WRITE16_MEMBER(nemesis_state::gx400_irq4_enable_word_w) @@ -129,7 +129,7 @@ WRITE16_MEMBER(nemesis_state::nemesis_irq_enable_word_w) m_irq_on = data & 0xff; if (ACCESSING_BITS_8_15) - coin_lockout_global_w(machine(), data & 0x0100); + machine().bookkeeping().coin_lockout_global_w(data & 0x0100); } WRITE16_MEMBER(nemesis_state::konamigt_irq_enable_word_w) @@ -138,7 +138,7 @@ WRITE16_MEMBER(nemesis_state::konamigt_irq_enable_word_w) m_irq_on = data & 0xff; if (ACCESSING_BITS_8_15) - coin_lockout_w(machine(), 1, data & 0x0100); + machine().bookkeeping().coin_lockout_w(1, data & 0x0100); } WRITE16_MEMBER(nemesis_state::konamigt_irq2_enable_word_w) @@ -147,7 +147,7 @@ WRITE16_MEMBER(nemesis_state::konamigt_irq2_enable_word_w) m_irq2_on = data & 0xff; if (ACCESSING_BITS_8_15) - coin_lockout_w(machine(), 0, data & 0x0100); + machine().bookkeeping().coin_lockout_w(0, data & 0x0100); } diff --git a/src/mame/drivers/niyanpai.cpp b/src/mame/drivers/niyanpai.cpp index 81bbe457dcc..87dfcc07f85 100644 --- a/src/mame/drivers/niyanpai.cpp +++ b/src/mame/drivers/niyanpai.cpp @@ -118,8 +118,8 @@ WRITE16_MEMBER(niyanpai_state::tmp68301_parallel_port_w) // bit 8-9 video page select? m_motor_on = data & 4; - coin_counter_w(machine(),0,data & 1); - coin_lockout_w(machine(),0,data & 0x08); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_lockout_w(0,data & 0x08); } CUSTOM_INPUT_MEMBER(niyanpai_state::musobana_outcoin_flag_r) diff --git a/src/mame/drivers/norautp.cpp b/src/mame/drivers/norautp.cpp index aa3fec44bc2..eb168764ab3 100644 --- a/src/mame/drivers/norautp.cpp +++ b/src/mame/drivers/norautp.cpp @@ -698,9 +698,9 @@ WRITE8_MEMBER(norautp_state::counterlamps_w) output_set_lamp_value(10, (data >> 0) & 1); /* HI lamp */ output_set_lamp_value(11, (data >> 1) & 1); /* LO lamp */ - coin_counter_w(machine(), 0, data & 0x10); /* Coin1/3 counter */ - coin_counter_w(machine(), 1, data & 0x20); /* Coin2 counter */ - coin_counter_w(machine(), 2, data & 0x08); /* Payout pulse */ + machine().bookkeeping().coin_counter_w(0, data & 0x10); /* Coin1/3 counter */ + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* Coin2 counter */ + machine().bookkeeping().coin_counter_w(2, data & 0x08); /* Payout pulse */ } diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index 95d3e58ca6b..0497f3e01d0 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -599,8 +599,8 @@ WRITE8_MEMBER(nss_state::port_03_w) WRITE8_MEMBER(nss_state::port_04_w) { - coin_counter_w(machine(), 0, (data >> 0) & 1); - coin_counter_w(machine(), 1, (data >> 1) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 0) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 1) & 1); } WRITE8_MEMBER(nss_state::port_07_w) diff --git a/src/mame/drivers/ohmygod.cpp b/src/mame/drivers/ohmygod.cpp index ce3040bd926..22bd57f4f5f 100644 --- a/src/mame/drivers/ohmygod.cpp +++ b/src/mame/drivers/ohmygod.cpp @@ -34,8 +34,8 @@ WRITE16_MEMBER(ohmygod_state::ohmygod_ctrl_w) } if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x1000); - coin_counter_w(machine(), 1, data & 0x2000); + machine().bookkeeping().coin_counter_w(0, data & 0x1000); + machine().bookkeeping().coin_counter_w(1, data & 0x2000); } } diff --git a/src/mame/drivers/ojankohs.cpp b/src/mame/drivers/ojankohs.cpp index f9d1ca50faa..2a64f82ff83 100644 --- a/src/mame/drivers/ojankohs.cpp +++ b/src/mame/drivers/ojankohs.cpp @@ -180,12 +180,12 @@ READ8_MEMBER(ojankohs_state::ccasino_dipsw4_r) WRITE8_MEMBER(ojankohs_state::ojankoy_coinctr_w) { - coin_counter_w(machine(), 0, BIT(data, 0)); + machine().bookkeeping().coin_counter_w(0, BIT(data, 0)); } WRITE8_MEMBER(ojankohs_state::ccasino_coinctr_w) { - coin_counter_w(machine(), 0, BIT(data, 1)); + machine().bookkeeping().coin_counter_w(0, BIT(data, 1)); } diff --git a/src/mame/drivers/omegrace.cpp b/src/mame/drivers/omegrace.cpp index d3c8e871588..e59884e1a9a 100644 --- a/src/mame/drivers/omegrace.cpp +++ b/src/mame/drivers/omegrace.cpp @@ -322,8 +322,8 @@ READ8_MEMBER(omegrace_state::omegrace_spinner1_r) WRITE8_MEMBER(omegrace_state::omegrace_leds_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bits 2 to 5 are the start leds (4 and 5 cocktail only) */ set_led_status(machine(), 0,~data & 0x04); diff --git a/src/mame/drivers/onetwo.cpp b/src/mame/drivers/onetwo.cpp index 603d5edd9e5..35b54cbd5b8 100644 --- a/src/mame/drivers/onetwo.cpp +++ b/src/mame/drivers/onetwo.cpp @@ -137,8 +137,8 @@ WRITE8_MEMBER(onetwo_state::onetwo_cpubank_w) WRITE8_MEMBER(onetwo_state::onetwo_coin_counters_w) { machine().watchdog_reset(); - coin_counter_w(machine(), 0, BIT(data, 1)); - coin_counter_w(machine(), 1, BIT(data, 2)); + machine().bookkeeping().coin_counter_w(0, BIT(data, 1)); + machine().bookkeeping().coin_counter_w(1, BIT(data, 2)); } WRITE8_MEMBER(onetwo_state::onetwo_soundlatch_w) diff --git a/src/mame/drivers/orbit.cpp b/src/mame/drivers/orbit.cpp index ee9af4fd8af..7e380c35bc8 100644 --- a/src/mame/drivers/orbit.cpp +++ b/src/mame/drivers/orbit.cpp @@ -79,8 +79,8 @@ void orbit_state::update_misc_flags(address_space &space, UINT8 val) set_led_status(machine(), 0, BIT(m_misc_flags, 3)); set_led_status(machine(), 1, BIT(m_misc_flags, 6)); - coin_lockout_w(machine(), 0, !BIT(m_misc_flags, 1)); - coin_lockout_w(machine(), 1, !BIT(m_misc_flags, 1)); + machine().bookkeeping().coin_lockout_w(0, !BIT(m_misc_flags, 1)); + machine().bookkeeping().coin_lockout_w(1, !BIT(m_misc_flags, 1)); } diff --git a/src/mame/drivers/overdriv.cpp b/src/mame/drivers/overdriv.cpp index f7dca2c4844..81b67e33a6d 100644 --- a/src/mame/drivers/overdriv.cpp +++ b/src/mame/drivers/overdriv.cpp @@ -98,8 +98,8 @@ WRITE16_MEMBER(overdriv_state::cpuA_ctrl_w) /* bit 1 is clear during service mode - function unknown */ set_led_status(machine(), 0, data & 0x08); - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); //logerror("%06x: write %04x to cpuA_ctrl_w\n",space.device().safe_pc(),data); } diff --git a/src/mame/drivers/pacland.cpp b/src/mame/drivers/pacland.cpp index acc515b1554..95dde079db2 100644 --- a/src/mame/drivers/pacland.cpp +++ b/src/mame/drivers/pacland.cpp @@ -228,9 +228,9 @@ READ8_MEMBER(pacland_state::input_r) WRITE8_MEMBER(pacland_state::coin_w) { - coin_lockout_global_w(machine(), data & 1); - coin_counter_w(machine(), 0, ~data & 2); - coin_counter_w(machine(), 1, ~data & 4); + machine().bookkeeping().coin_lockout_global_w(data & 1); + machine().bookkeeping().coin_counter_w(0, ~data & 2); + machine().bookkeeping().coin_counter_w(1, ~data & 4); } WRITE8_MEMBER(pacland_state::led_w) diff --git a/src/mame/drivers/pacman.cpp b/src/mame/drivers/pacman.cpp index 4d72b6a114e..a1371f35b60 100644 --- a/src/mame/drivers/pacman.cpp +++ b/src/mame/drivers/pacman.cpp @@ -509,13 +509,13 @@ WRITE8_MEMBER(pacman_state::pacman_leds_w) WRITE8_MEMBER(pacman_state::pacman_coin_counter_w) { - coin_counter_w(machine(), offset,data & 1); + machine().bookkeeping().coin_counter_w(offset,data & 1); } WRITE8_MEMBER(pacman_state::pacman_coin_lockout_global_w) { - coin_lockout_global_w(machine(), ~data & 0x01); + machine().bookkeeping().coin_lockout_global_w(~data & 0x01); } diff --git a/src/mame/drivers/pandoras.cpp b/src/mame/drivers/pandoras.cpp index d00b436de6e..2a424001b12 100644 --- a/src/mame/drivers/pandoras.cpp +++ b/src/mame/drivers/pandoras.cpp @@ -67,9 +67,9 @@ WRITE8_MEMBER(pandoras_state::pandoras_int_control_w) m_maincpu->set_input_line(M6809_IRQ_LINE, CLEAR_LINE); m_irq_enable_a = data; break; - case 0x02: coin_counter_w(machine(), 0,data & 0x01); + case 0x02: machine().bookkeeping().coin_counter_w(0,data & 0x01); break; - case 0x03: coin_counter_w(machine(), 1,data & 0x01); + case 0x03: machine().bookkeeping().coin_counter_w(1,data & 0x01); break; case 0x05: pandoras_flipscreen_w(space, 0, data); break; diff --git a/src/mame/drivers/panicr.cpp b/src/mame/drivers/panicr.cpp index 4654fd6e806..9229541b9ed 100644 --- a/src/mame/drivers/panicr.cpp +++ b/src/mame/drivers/panicr.cpp @@ -399,8 +399,8 @@ WRITE8_MEMBER(panicr_state::scrollx_hi_w) WRITE8_MEMBER(panicr_state::output_w) { // d6, d7: play counter? (it only triggers on 1st coin) - coin_counter_w(machine(), 0, (data & 0x40) ? 1 : 0); - coin_counter_w(machine(), 1, (data & 0x80) ? 1 : 0); + machine().bookkeeping().coin_counter_w(0, (data & 0x40) ? 1 : 0); + machine().bookkeeping().coin_counter_w(1, (data & 0x80) ? 1 : 0); logerror("output_w %02x\n", data); diff --git a/src/mame/drivers/paradise.cpp b/src/mame/drivers/paradise.cpp index 07dd95971ab..e146a22f1a9 100644 --- a/src/mame/drivers/paradise.cpp +++ b/src/mame/drivers/paradise.cpp @@ -120,7 +120,7 @@ WRITE8_MEMBER(paradise_state::paradise_okibank_w) WRITE8_MEMBER(paradise_state::torus_coin_counter_w) { - coin_counter_w(machine(), 0, data ^ 0xff); + machine().bookkeeping().coin_counter_w(0, data ^ 0xff); } static ADDRESS_MAP_START( base_map, AS_PROGRAM, 8, paradise_state ) diff --git a/src/mame/drivers/parodius.cpp b/src/mame/drivers/parodius.cpp index da90e5be579..ad9a6ec7c61 100644 --- a/src/mame/drivers/parodius.cpp +++ b/src/mame/drivers/parodius.cpp @@ -46,8 +46,8 @@ WRITE8_MEMBER(parodius_state::parodius_3fc0_w) logerror("%04x: 3fc0 = %02x\n",space.device().safe_pc(),data); /* bit 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 3 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/pengo.cpp b/src/mame/drivers/pengo.cpp index 2a921f26e2b..c47fb18f97f 100644 --- a/src/mame/drivers/pengo.cpp +++ b/src/mame/drivers/pengo.cpp @@ -115,7 +115,7 @@ public: WRITE8_MEMBER(pengo_state::pengo_coin_counter_w) { - coin_counter_w(machine(), offset, data & 1); + machine().bookkeeping().coin_counter_w(offset, data & 1); } WRITE8_MEMBER(pengo_state::irq_mask_w) diff --git a/src/mame/drivers/pgm.cpp b/src/mame/drivers/pgm.cpp index b8a5d87e214..19390b8dc35 100644 --- a/src/mame/drivers/pgm.cpp +++ b/src/mame/drivers/pgm.cpp @@ -215,10 +215,10 @@ WRITE16_MEMBER(pgm_state::pgm_videoram_w) WRITE16_MEMBER(pgm_state::pgm_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x0001); - coin_counter_w(machine(), 1, data & 0x0002); - coin_counter_w(machine(), 2, data & 0x0004); - coin_counter_w(machine(), 3, data & 0x0008); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); + machine().bookkeeping().coin_counter_w(2, data & 0x0004); + machine().bookkeeping().coin_counter_w(3, data & 0x0008); } READ16_MEMBER(pgm_state::z80_ram_r) diff --git a/src/mame/drivers/pingpong.cpp b/src/mame/drivers/pingpong.cpp index a8446aa2f4d..5231f76cd78 100644 --- a/src/mame/drivers/pingpong.cpp +++ b/src/mame/drivers/pingpong.cpp @@ -51,8 +51,8 @@ WRITE8_MEMBER(pingpong_state::coin_w) m_intenable = data & 0x0c; /* bit 0/1 = coin counters */ - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 2); /* other bits unknown */ } diff --git a/src/mame/drivers/pkscram.cpp b/src/mame/drivers/pkscram.cpp index fea75a9f05c..f7a32364b5e 100644 --- a/src/mame/drivers/pkscram.cpp +++ b/src/mame/drivers/pkscram.cpp @@ -111,7 +111,7 @@ WRITE16_MEMBER(pkscram_state::pkscramble_output_w) m_interrupt_line_active = 0; } - coin_counter_w(machine(), 0, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x80); } static ADDRESS_MAP_START( pkscramble_map, AS_PROGRAM, 16, pkscram_state ) diff --git a/src/mame/drivers/playmark.cpp b/src/mame/drivers/playmark.cpp index 918e3e26f7f..0506cfda83b 100644 --- a/src/mame/drivers/playmark.cpp +++ b/src/mame/drivers/playmark.cpp @@ -74,8 +74,8 @@ WRITE16_MEMBER(playmark_state::coinctrl_w) { if (ACCESSING_BITS_8_15) { - coin_counter_w(machine(), 0, data & 0x0100); - coin_counter_w(machine(), 1, data & 0x0200); + machine().bookkeeping().coin_counter_w(0, data & 0x0100); + machine().bookkeeping().coin_counter_w(1, data & 0x0200); } if (data & 0xfcff) logerror("Writing %04x to unknown coin control bits\n", data); @@ -93,10 +93,10 @@ WRITE16_MEMBER(playmark_state::wbeachvl_coin_eeprom_w) if (ACCESSING_BITS_0_7) { /* bits 0-3 are coin counters? (only 0 used?) */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 2, data & 0x04); - coin_counter_w(machine(), 3, data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(2, data & 0x04); + machine().bookkeeping().coin_counter_w(3, data & 0x08); /* bits 5-7 control EEPROM */ m_eeprom->cs_write((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); @@ -124,8 +124,8 @@ WRITE16_MEMBER(playmark_state::hotmind_coin_eeprom_w) } machine().device<ticket_dispenser_device>("ticket")->write(space, 0, (data & 0x08) ? 0x80 : 0); - coin_counter_w(machine(), 0, data & 0x20); /* Coin In counter - transistor driven */ - coin_counter_w(machine(), 1, data & 0x40); /* Token/Ticket Out counter - transistor driven */ + machine().bookkeeping().coin_counter_w(0, data & 0x20); /* Coin In counter - transistor driven */ + machine().bookkeeping().coin_counter_w(1, data & 0x40); /* Token/Ticket Out counter - transistor driven */ m_eeprom->cs_write((data & 1) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->di_write((data & 4) >> 2); @@ -152,15 +152,15 @@ WRITE16_MEMBER(playmark_state::luckboomh_dispenser_w) } machine().device<ticket_dispenser_device>("ticket")->write(space, 0, (data & 0x08) ? 0x80 : 0); - coin_counter_w(machine(), 0, data & 0x20); /* Coin In counter - transistor driven */ - coin_counter_w(machine(), 1, data & 0x40); /* Token/Ticket Out counter - transistor driven */ + machine().bookkeeping().coin_counter_w(0, data & 0x20); /* Coin In counter - transistor driven */ + machine().bookkeeping().coin_counter_w(1, data & 0x40); /* Token/Ticket Out counter - transistor driven */ } } WRITE16_MEMBER(playmark_state::hrdtimes_coin_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } WRITE16_MEMBER(playmark_state::playmark_snd_command_w) diff --git a/src/mame/drivers/plygonet.cpp b/src/mame/drivers/plygonet.cpp index a2e66a140bc..83574fc000b 100644 --- a/src/mame/drivers/plygonet.cpp +++ b/src/mame/drivers/plygonet.cpp @@ -108,8 +108,8 @@ WRITE8_MEMBER(polygonet_state::polygonet_sys_w) D17 = COIN2 - Coin counter 2 D16 = COIN1 - Coin counter 1 */ - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); if (~data & 0x20) m_maincpu->set_input_line(M68K_IRQ_5, CLEAR_LINE); diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index 48d1da026d4..d793a0262b2 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -353,13 +353,13 @@ WRITE8_MEMBER(polepos_state::out_0) // no start lamps in pole position // set_led_status(machine(), 1,data & 1); // set_led_status(machine(), 0,data & 2); - coin_counter_w(machine(), 1,~data & 4); - coin_counter_w(machine(), 0,~data & 8); + machine().bookkeeping().coin_counter_w(1,~data & 4); + machine().bookkeeping().coin_counter_w(0,~data & 8); } WRITE8_MEMBER(polepos_state::out_1) { - coin_lockout_global_w(machine(), data & 1); + machine().bookkeeping().coin_lockout_global_w(data & 1); } READ8_MEMBER(polepos_state::namco_52xx_rom_r) diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp index 4f76c55871e..56aa2190ccd 100644 --- a/src/mame/drivers/pong.cpp +++ b/src/mame/drivers/pong.cpp @@ -224,7 +224,7 @@ public: NETDEV_ANALOG_CALLBACK_MEMBER(coin_counter_cb) { - coin_counter_w(machine(), 0, (data > 2.0) ? 0 : 1); + machine().bookkeeping().coin_counter_w(0, (data > 2.0) ? 0 : 1); } DECLARE_INPUT_CHANGED_MEMBER(cb_free_play) diff --git a/src/mame/drivers/portrait.cpp b/src/mame/drivers/portrait.cpp index 11e2dd93c39..0653c9dd745 100644 --- a/src/mame/drivers/portrait.cpp +++ b/src/mame/drivers/portrait.cpp @@ -95,9 +95,9 @@ WRITE8_MEMBER(portrait_state::ctrl_w) { /* bits 4 and 5 are unknown */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 2, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(2, data & 0x04); /* the 2 lamps near the camera */ set_led_status(machine(), 0, data & 0x08); diff --git a/src/mame/drivers/powerbal.cpp b/src/mame/drivers/powerbal.cpp index c9137bc4667..8c92483c44c 100644 --- a/src/mame/drivers/powerbal.cpp +++ b/src/mame/drivers/powerbal.cpp @@ -53,7 +53,7 @@ WRITE16_MEMBER(powerbal_state::magicstk_coin_eeprom_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x20); m_eeprom->cs_write((data & 8) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->di_write((data & 2) >> 1); diff --git a/src/mame/drivers/ppmast93.cpp b/src/mame/drivers/ppmast93.cpp index 172a279d169..b3d2bc556fb 100644 --- a/src/mame/drivers/ppmast93.cpp +++ b/src/mame/drivers/ppmast93.cpp @@ -194,8 +194,8 @@ WRITE8_MEMBER(ppmast93_state::bgram_w) WRITE8_MEMBER(ppmast93_state::port4_w) { - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x10); membank("cpubank")->set_entry(data & 0x07); } diff --git a/src/mame/drivers/psychic5.cpp b/src/mame/drivers/psychic5.cpp index 63353a90ef9..bb7180b2f03 100644 --- a/src/mame/drivers/psychic5.cpp +++ b/src/mame/drivers/psychic5.cpp @@ -387,8 +387,8 @@ WRITE8_MEMBER(psychic5_state::bombsa_bankselect_w) WRITE8_MEMBER(psychic5_state::psychic5_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); // bit 7 toggles flip screen if (data & 0x80) diff --git a/src/mame/drivers/quantum.cpp b/src/mame/drivers/quantum.cpp index af72f9fcb4d..cdb1e8b16c0 100644 --- a/src/mame/drivers/quantum.cpp +++ b/src/mame/drivers/quantum.cpp @@ -114,8 +114,8 @@ WRITE16_MEMBER(quantum_state::led_w) if (ACCESSING_BITS_0_7) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0, data & 2); - coin_counter_w(machine(), 1, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 2); + machine().bookkeeping().coin_counter_w(1, data & 1); /* bit 3 = select second trackball for cocktail mode? */ diff --git a/src/mame/drivers/rallyx.cpp b/src/mame/drivers/rallyx.cpp index 25b73075293..0590fc37082 100644 --- a/src/mame/drivers/rallyx.cpp +++ b/src/mame/drivers/rallyx.cpp @@ -253,11 +253,11 @@ WRITE8_MEMBER(rallyx_state::rallyx_latch_w) break; case 0x06: - coin_lockout_w(machine(), 0, !bit); + machine().bookkeeping().coin_lockout_w(0, !bit); break; case 0x07: - coin_counter_w(machine(), 0, bit); + machine().bookkeeping().coin_counter_w(0, bit); break; } } @@ -286,14 +286,14 @@ WRITE8_MEMBER(rallyx_state::locomotn_latch_w) break; case 0x04: /* OUT1 */ - coin_counter_w(machine(), 0, bit); + machine().bookkeeping().coin_counter_w(0, bit); break; case 0x05: /* OUT2 */ break; case 0x06: /* OUT3 */ - coin_counter_w(machine(), 1,bit); + machine().bookkeeping().coin_counter_w(1,bit); break; case 0x07: /* STARSON */ diff --git a/src/mame/drivers/rampart.cpp b/src/mame/drivers/rampart.cpp index 014a1c1177d..523650d5915 100644 --- a/src/mame/drivers/rampart.cpp +++ b/src/mame/drivers/rampart.cpp @@ -98,8 +98,8 @@ WRITE16_MEMBER(rampart_state::latch_w) { if (data & 0x1000) logerror("Color bank set to 1!\n"); - coin_counter_w(machine(), 0, (data >> 9) & 1); - coin_counter_w(machine(), 1, (data >> 8) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 9) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 8) & 1); } /* lower byte being modified? */ diff --git a/src/mame/drivers/retofinv.cpp b/src/mame/drivers/retofinv.cpp index b6eebccd332..7814b7707e3 100644 --- a/src/mame/drivers/retofinv.cpp +++ b/src/mame/drivers/retofinv.cpp @@ -110,12 +110,12 @@ WRITE8_MEMBER(retofinv_state::irq1_ack_w) WRITE8_MEMBER(retofinv_state::coincounter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE8_MEMBER(retofinv_state::coinlockout_w) { - coin_lockout_w(machine(), 0,~data & 1); + machine().bookkeeping().coin_lockout_w(0,~data & 1); } diff --git a/src/mame/drivers/rmhaihai.cpp b/src/mame/drivers/rmhaihai.cpp index 9ab6847225c..e5ce3256085 100644 --- a/src/mame/drivers/rmhaihai.cpp +++ b/src/mame/drivers/rmhaihai.cpp @@ -192,8 +192,8 @@ WRITE8_MEMBER(rmhaihai_state::ctrl_w) // (data & 0x02) is switched on and off in service mode - coin_lockout_w(machine(), 0, ~data & 0x04); - coin_counter_w(machine(), 0, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x08); // (data & 0x10) is medal in service mode diff --git a/src/mame/drivers/rockrage.cpp b/src/mame/drivers/rockrage.cpp index 49d255e190d..f691a23c579 100644 --- a/src/mame/drivers/rockrage.cpp +++ b/src/mame/drivers/rockrage.cpp @@ -69,8 +69,8 @@ WRITE8_MEMBER(rockrage_state::rockrage_bankswitch_w) m_rombank->set_entry((data & 0x70) >> 4); /* bits 0 & 1 = coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* other bits unknown */ } diff --git a/src/mame/drivers/rollerg.cpp b/src/mame/drivers/rollerg.cpp index c2fccbef616..ec5e0c07bea 100644 --- a/src/mame/drivers/rollerg.cpp +++ b/src/mame/drivers/rollerg.cpp @@ -24,8 +24,8 @@ WRITE8_MEMBER(rollerg_state::rollerg_0010_w) logerror("%04x: write %02x to 0010\n",space.device().safe_pc(), data); /* bits 0/1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 enables 051316 ROM reading */ m_readzoomroms = data & 0x04; diff --git a/src/mame/drivers/royalmah.cpp b/src/mame/drivers/royalmah.cpp index e89aacc7be1..5a37bae7207 100644 --- a/src/mame/drivers/royalmah.cpp +++ b/src/mame/drivers/royalmah.cpp @@ -273,7 +273,7 @@ PALETTE_INIT_MEMBER(royalmah_state,mjderngr) WRITE8_MEMBER(royalmah_state::royalmah_palbank_w) { /* bit 1 = coin counter */ - coin_counter_w(machine(), 0,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 2); /* bit 2 = flip screen */ m_flip_screen = (data & 4) >> 2; @@ -286,7 +286,7 @@ WRITE8_MEMBER(royalmah_state::royalmah_palbank_w) WRITE8_MEMBER(royalmah_state::mjderngr_coin_w) { /* bit 1 = coin counter */ - coin_counter_w(machine(), 0,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 2); /* bit 2 = flip screen */ m_flip_screen = (data & 4) >> 2; @@ -447,8 +447,8 @@ WRITE8_MEMBER(royalmah_state::mjapinky_palbank_w) { m_flip_screen = (data & 4) >> 2; m_palette_base = (data >> 3) & 0x01; - coin_counter_w(machine(), 0,data & 2); // in - coin_counter_w(machine(), 1,data & 1); // out + machine().bookkeeping().coin_counter_w(0,data & 2); // in + machine().bookkeeping().coin_counter_w(1,data & 1); // out } READ8_MEMBER(royalmah_state::mjapinky_dsw_r) @@ -895,8 +895,8 @@ READ8_MEMBER(royalmah_state::janptr96_unknown_r) WRITE8_MEMBER(royalmah_state::janptr96_coin_counter_w) { m_flip_screen = (data & 4) >> 2; - coin_counter_w(machine(), 0,data & 2); // in - coin_counter_w(machine(), 1,data & 1); // out + machine().bookkeeping().coin_counter_w(0,data & 2); // in + machine().bookkeeping().coin_counter_w(1,data & 1); // out } static ADDRESS_MAP_START( janptr96_iomap, AS_IO, 8, royalmah_state ) @@ -922,8 +922,8 @@ ADDRESS_MAP_END WRITE8_MEMBER(royalmah_state::mjifb_coin_counter_w) { m_flip_screen = ((data & 4) >> 2) ^ 1; - coin_counter_w(machine(), 0,data & 2); // in - coin_counter_w(machine(), 1,data & 1); // out + machine().bookkeeping().coin_counter_w(0,data & 2); // in + machine().bookkeeping().coin_counter_w(1,data & 1); // out } READ8_MEMBER(royalmah_state::mjifb_rom_io_r) @@ -1260,8 +1260,8 @@ WRITE8_MEMBER(royalmah_state::mjvegasa_rom_io_w) WRITE8_MEMBER(royalmah_state::mjvegasa_coin_counter_w) { m_flip_screen = (data & 4) >> 2; - coin_counter_w(machine(), 0,data & 2); // in - coin_counter_w(machine(), 1,data & 1); // out + machine().bookkeeping().coin_counter_w(0,data & 2); // in + machine().bookkeeping().coin_counter_w(1,data & 1); // out } // hopper? diff --git a/src/mame/drivers/sandscrp.cpp b/src/mame/drivers/sandscrp.cpp index 324ef2a4b97..50937085c9b 100644 --- a/src/mame/drivers/sandscrp.cpp +++ b/src/mame/drivers/sandscrp.cpp @@ -226,8 +226,8 @@ WRITE16_MEMBER(sandscrp_state::coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x0001); - coin_counter_w(machine(), 1, data & 0x0002); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); + machine().bookkeeping().coin_counter_w(1, data & 0x0002); } } diff --git a/src/mame/drivers/sauro.cpp b/src/mame/drivers/sauro.cpp index b9df15c4f61..6a243455319 100644 --- a/src/mame/drivers/sauro.cpp +++ b/src/mame/drivers/sauro.cpp @@ -144,14 +144,14 @@ READ8_MEMBER(sauro_state::sauro_sound_command_r) WRITE8_MEMBER(sauro_state::coin1_w) { - coin_counter_w(machine(), 0, data); - coin_counter_w(machine(), 0, 0); // to get the coin counter working in sauro, as it doesn't write 0 + machine().bookkeeping().coin_counter_w(0, data); + machine().bookkeeping().coin_counter_w(0, 0); // to get the coin counter working in sauro, as it doesn't write 0 } WRITE8_MEMBER(sauro_state::coin2_w) { - coin_counter_w(machine(), 1, data); - coin_counter_w(machine(), 1, 0); // to get the coin counter working in sauro, as it doesn't write 0 + machine().bookkeeping().coin_counter_w(1, data); + machine().bookkeeping().coin_counter_w(1, 0); // to get the coin counter working in sauro, as it doesn't write 0 } WRITE8_MEMBER(sauro_state::flip_screen_w) diff --git a/src/mame/drivers/sbasketb.cpp b/src/mame/drivers/sbasketb.cpp index 44a075468ea..3a80a242f7e 100644 --- a/src/mame/drivers/sbasketb.cpp +++ b/src/mame/drivers/sbasketb.cpp @@ -57,7 +57,7 @@ WRITE8_MEMBER(sbasketb_state::sbasketb_sh_irqtrigger_w) WRITE8_MEMBER(sbasketb_state::sbasketb_coin_counter_w) { - coin_counter_w(machine(), offset, data); + machine().bookkeeping().coin_counter_w(offset, data); } WRITE8_MEMBER(sbasketb_state::irq_mask_w) diff --git a/src/mame/drivers/sbrkout.cpp b/src/mame/drivers/sbrkout.cpp index cfeb1e305e5..35916102b81 100644 --- a/src/mame/drivers/sbrkout.cpp +++ b/src/mame/drivers/sbrkout.cpp @@ -304,7 +304,7 @@ WRITE8_MEMBER(sbrkout_state::serve_2_led_w) WRITE8_MEMBER(sbrkout_state::coincount_w) { - coin_counter_w(machine(), 0, offset & 1); + machine().bookkeeping().coin_counter_w(0, offset & 1); } diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index c055079212f..d856b5f5154 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -206,7 +206,7 @@ WRITE16_MEMBER(sderby_state::sderby_out_w) output_set_lamp_value(2, (data >> 1) & 1); /* Lamp 2 - BET */ output_set_lamp_value(3, (data >> 15) & 1); /* Lamp 3 - END OF RACE */ - coin_counter_w(machine(), 0, data & 0x2000); + machine().bookkeeping().coin_counter_w(0, data & 0x2000); } @@ -255,7 +255,7 @@ WRITE16_MEMBER(sderby_state::scmatto_out_w) output_set_lamp_value(6, (data >> 5) & 1); /* Lamp 6 - START */ output_set_lamp_value(7, (data >> 6) & 1); /* Lamp 7 - BET */ - coin_counter_w(machine(), 0, data & 0x2000); + machine().bookkeeping().coin_counter_w(0, data & 0x2000); } diff --git a/src/mame/drivers/seabattl.cpp b/src/mame/drivers/seabattl.cpp index f72561980f7..b0a64aee03d 100644 --- a/src/mame/drivers/seabattl.cpp +++ b/src/mame/drivers/seabattl.cpp @@ -284,7 +284,7 @@ WRITE8_MEMBER(seabattl_state::seabattl_control_w) // bit 3: inverse image // bit 4: lamp // bit 5: enable wave - coin_counter_w(machine(), 0, BIT(data, 2)); + machine().bookkeeping().coin_counter_w(0, BIT(data, 2)); output_set_lamp_value(0, BIT(data,4)); m_waveenable = BIT(data, 5); } diff --git a/src/mame/drivers/segac2.cpp b/src/mame/drivers/segac2.cpp index 01ec8968901..1ab671ae694 100644 --- a/src/mame/drivers/segac2.cpp +++ b/src/mame/drivers/segac2.cpp @@ -431,10 +431,10 @@ WRITE8_MEMBER(segac2_state::io_portd_w) D1 : To CN1 pin J. (Coin meter 2) D0 : To CN1 pin 8. (Coin meter 1) */ - //coin_lockout_w(space.machine(), 1, data & 0x08); - //coin_lockout_w(space.machine(), 0, data & 0x04); - coin_counter_w(space.machine(), 1, data & 0x02); - coin_counter_w(space.machine(), 0, data & 0x01); + //space.machine().bookkeeping().coin_lockout_w(1, data & 0x08); + //space.machine().bookkeeping().coin_lockout_w(0, data & 0x04); + space.machine().bookkeeping().coin_counter_w(1, data & 0x02); + space.machine().bookkeeping().coin_counter_w(0, data & 0x01); } WRITE8_MEMBER(segac2_state::io_porth_w) @@ -569,8 +569,8 @@ WRITE8_MEMBER(segac2_state::counter_timer_w) break; case 0x10: /* coin counter */ -// coin_counter_w(space.machine(), 0,1); -// coin_counter_w(space.machine(), 0,0); +// space.machine().bookkeeping().coin_counter_w(0,1); +// space.machine().bookkeeping().coin_counter_w(0,0); break; case 0x12: /* set coinage info -- followed by two 4-bit values */ diff --git a/src/mame/drivers/segag80r.cpp b/src/mame/drivers/segag80r.cpp index 6eb4edb91f3..c07976572e7 100644 --- a/src/mame/drivers/segag80r.cpp +++ b/src/mame/drivers/segag80r.cpp @@ -268,8 +268,8 @@ READ8_MEMBER(segag80r_state::spaceod_port_fc_r) WRITE8_MEMBER(segag80r_state::coin_count_w) { - coin_counter_w(machine(), 0, (data >> 7) & 1); - coin_counter_w(machine(), 1, (data >> 6) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 6) & 1); } @@ -291,7 +291,7 @@ WRITE8_MEMBER(segag80r_state::sindbadm_soundport_w) WRITE8_MEMBER(segag80r_state::sindbadm_misc_w) { - coin_counter_w(machine(), 0, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x02); // osd_printf_debug("Unknown = %02X\n", data); } diff --git a/src/mame/drivers/segag80v.cpp b/src/mame/drivers/segag80v.cpp index 5410b92b122..46d87e5ddc9 100644 --- a/src/mame/drivers/segag80v.cpp +++ b/src/mame/drivers/segag80v.cpp @@ -349,8 +349,8 @@ READ8_MEMBER(segag80v_state::multiply_r) WRITE8_MEMBER(segag80v_state::coin_count_w) { - coin_counter_w(machine(), 0, (data >> 7) & 1); - coin_counter_w(machine(), 1, (data >> 6) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1); + machine().bookkeeping().coin_counter_w(1, (data >> 6) & 1); } diff --git a/src/mame/drivers/segahang.cpp b/src/mame/drivers/segahang.cpp index d74a074e55e..b5eaf6af88e 100644 --- a/src/mame/drivers/segahang.cpp +++ b/src/mame/drivers/segahang.cpp @@ -73,8 +73,8 @@ WRITE8_MEMBER( segahang_state::video_lamps_w ) set_led_status(machine(), 0, data & 0x04); // bits 0 & 1: update coin counters - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); } diff --git a/src/mame/drivers/segajw.cpp b/src/mame/drivers/segajw.cpp index 5b4dae626ee..f5d2cda8035 100644 --- a/src/mame/drivers/segajw.cpp +++ b/src/mame/drivers/segajw.cpp @@ -122,7 +122,7 @@ READ16_MEMBER(segajw_state::coinlockout_r) WRITE16_MEMBER(segajw_state::coinlockout_w) { - coin_lockout_w(machine(), 0, data & 1); + machine().bookkeeping().coin_lockout_w(0, data & 1); m_coin_lockout = data; for(int i=0; i<3; i++) diff --git a/src/mame/drivers/segas16a.cpp b/src/mame/drivers/segas16a.cpp index 5dfa7865ca0..fcf5d2c842e 100644 --- a/src/mame/drivers/segas16a.cpp +++ b/src/mame/drivers/segas16a.cpp @@ -198,8 +198,8 @@ WRITE8_MEMBER( segas16a_state::misc_control_w ) m_segaic16vid->set_display_enable(data & 0x10); // bits 0 & 1: update coin counters - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); } diff --git a/src/mame/drivers/segas16b.cpp b/src/mame/drivers/segas16b.cpp index 923135b376b..a51c9b4105f 100644 --- a/src/mame/drivers/segas16b.cpp +++ b/src/mame/drivers/segas16b.cpp @@ -1132,8 +1132,8 @@ WRITE16_MEMBER( segas16b_state::standard_io_w ) m_segaic16vid->set_display_enable(data & 0x20); set_led_status(machine(), 1, data & 0x08); set_led_status(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); return; } logerror("%06X:standard_io_w - unknown write access to address %04X = %04X & %04X\n", space.device().safe_pc(), offset * 2, data, mem_mask); diff --git a/src/mame/drivers/segas18.cpp b/src/mame/drivers/segas18.cpp index c945f173cdd..3263dd3123e 100644 --- a/src/mame/drivers/segas18.cpp +++ b/src/mame/drivers/segas18.cpp @@ -202,10 +202,10 @@ WRITE8_MEMBER( segas18_state::misc_outputs_w ) m_sprites->set_flip(data & 0x20); // These are correct according to cgfm's docs, but mwalker and ddcrew both // enable the lockout and never turn it off - // coin_lockout_w(machine(), 1, data & 0x08); - // coin_lockout_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x01); + // machine().bookkeeping().coin_lockout_w(1, data & 0x08); + // machine().bookkeeping().coin_lockout_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); } diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index d25a065ec1e..62cac59f7a2 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -891,10 +891,10 @@ void segas32_state::common_io_chip_w(address_space &space, int which, offs_t off m_eeprom->cs_write((data & 0x20) ? ASSERT_LINE : CLEAR_LINE); m_eeprom->clk_write((data & 0x40) ? ASSERT_LINE : CLEAR_LINE); } -/* coin_lockout_w(machine(), 1 + 2*which, data & 0x08); - coin_lockout_w(machine(), 0 + 2*which, data & 0x04);*/ - coin_counter_w(machine(), 1 + 2*which, data & 0x02); - coin_counter_w(machine(), 0 + 2*which, data & 0x01); +/* machine().bookkeeping().coin_lockout_w(1 + 2*which, data & 0x08); + machine().bookkeeping().coin_lockout_w(0 + 2*which, data & 0x04);*/ + machine().bookkeeping().coin_counter_w(1 + 2*which, data & 0x02); + machine().bookkeeping().coin_counter_w(0 + 2*which, data & 0x01); break; /* tile banking */ diff --git a/src/mame/drivers/segaufo.cpp b/src/mame/drivers/segaufo.cpp index 5a81f9ba547..d7bc6f4dbe5 100644 --- a/src/mame/drivers/segaufo.cpp +++ b/src/mame/drivers/segaufo.cpp @@ -318,8 +318,8 @@ WRITE8_MEMBER(ufo_state::ufo_lamps_w) // d4,d5: ? // d6,d7: coincounters - coin_counter_w(machine(), 0, data & 0x40); // 100 Y - coin_counter_w(machine(), 1, data & 0x80); // 500 Y + machine().bookkeeping().coin_counter_w(0, data & 0x40); // 100 Y + machine().bookkeeping().coin_counter_w(1, data & 0x80); // 500 Y } @@ -385,7 +385,7 @@ WRITE8_MEMBER(ufo_state::ex_cp_lamps_w) // d2,d3,d6,d7: p1/p2 coincounters for (int i = 0; i < 4; i++) - coin_counter_w(machine(), i, data >> (2 + (i&1) + (i&2) * 2) & 1); + machine().bookkeeping().coin_counter_w(i, data >> (2 + (i&1) + (i&2) * 2) & 1); } WRITE8_MEMBER(ufo_state::ex_crane_xyz_w) diff --git a/src/mame/drivers/segaxbd.cpp b/src/mame/drivers/segaxbd.cpp index 5758c0957c2..595b3fcc312 100644 --- a/src/mame/drivers/segaxbd.cpp +++ b/src/mame/drivers/segaxbd.cpp @@ -854,7 +854,7 @@ void segaxbd_state::generic_iochip0_lamps_w(UINT8 data) // d4: coin counter // d7: mute audio (always handled above) // other bits: lamps - coin_counter_w(machine(), 0, (data >> 4) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 4) & 0x01); // // aburner2: diff --git a/src/mame/drivers/seibuspi.cpp b/src/mame/drivers/seibuspi.cpp index 27011a13ef4..161d87ae25f 100644 --- a/src/mame/drivers/seibuspi.cpp +++ b/src/mame/drivers/seibuspi.cpp @@ -1080,8 +1080,8 @@ WRITE8_MEMBER(seibuspi_state::z80_bank_w) WRITE8_MEMBER(seibuspi_state::spi_coin_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); // coin latch used by single boards if (data) diff --git a/src/mame/drivers/sengokmj.cpp b/src/mame/drivers/sengokmj.cpp index e334531a305..3a95d926d9e 100644 --- a/src/mame/drivers/sengokmj.cpp +++ b/src/mame/drivers/sengokmj.cpp @@ -371,9 +371,9 @@ WRITE16_MEMBER(sengokmj_state::out_w) /* ---- ---- ---- -x-- Coin counter (done AFTER you press start)*/ /* ---- ---- ---- --x- Cash enable (lockout)*/ /* ---- ---- ---- ---x Hopper 10 */ - coin_lockout_w(machine(), 0,~data & 2); - coin_lockout_w(machine(), 1,~data & 2); - coin_counter_w(machine(), 0,data & 4); + machine().bookkeeping().coin_lockout_w(0,~data & 2); + machine().bookkeeping().coin_lockout_w(1,~data & 2); + machine().bookkeeping().coin_counter_w(0,data & 4); m_hopper_io = ((data & 1)<<6); // popmessage("%02x",m_hopper_io); } diff --git a/src/mame/drivers/seta2.cpp b/src/mame/drivers/seta2.cpp index e5d4499c8aa..983f22a6d0f 100644 --- a/src/mame/drivers/seta2.cpp +++ b/src/mame/drivers/seta2.cpp @@ -151,8 +151,8 @@ WRITE16_MEMBER(seta2_state::grdians_lockout_w) if (ACCESSING_BITS_0_7) { // initially 0, then either $25 (coin 1) or $2a (coin 2) - coin_counter_w(machine(), 0,data & 0x01); // or 0x04 - coin_counter_w(machine(), 1,data & 0x02); // or 0x08 + machine().bookkeeping().coin_counter_w(0,data & 0x01); // or 0x04 + machine().bookkeeping().coin_counter_w(1,data & 0x02); // or 0x08 } // popmessage("%04X", data & 0xffff); } @@ -344,8 +344,8 @@ WRITE16_MEMBER(seta2_state::pzlbowl_coin_counter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0,data & 0x10); - coin_counter_w(machine(), 1,data & 0x20); + machine().bookkeeping().coin_counter_w(0,data & 0x10); + machine().bookkeeping().coin_counter_w(1,data & 0x20); } } @@ -422,10 +422,10 @@ WRITE16_MEMBER(seta2_state::reelquak_coin_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); // coin in - coin_counter_w(machine(), 1, data & 0x02); // coin in - coin_counter_w(machine(), 2, data & 0x04); // pay out - coin_counter_w(machine(), 3, data & 0x08); // key in + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin in + machine().bookkeeping().coin_counter_w(1, data & 0x02); // coin in + machine().bookkeeping().coin_counter_w(2, data & 0x04); // pay out + machine().bookkeeping().coin_counter_w(3, data & 0x08); // key in // data & 0x10); // Sound IRQ Ack.? 1->0 // data & 0x20); // Vblank IRQ.? 1 } @@ -474,11 +474,11 @@ WRITE16_MEMBER(seta2_state::samshoot_coin_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); // Are these connected? They are set in I/O test - coin_lockout_w(machine(), 0,~data & 0x40); - coin_lockout_w(machine(), 1,~data & 0x80); + machine().bookkeeping().coin_lockout_w(0,~data & 0x40); + machine().bookkeeping().coin_lockout_w(1,~data & 0x80); } // popmessage("%04x",data); } diff --git a/src/mame/drivers/sf.cpp b/src/mame/drivers/sf.cpp index f1e63e78cc9..094ffe5305e 100644 --- a/src/mame/drivers/sf.cpp +++ b/src/mame/drivers/sf.cpp @@ -127,11 +127,11 @@ WRITE16_MEMBER(sf_state::protection_w) WRITE8_MEMBER(sf_state::coin_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_lockout_w(machine(), 0, ~data & 0x10); - coin_lockout_w(machine(), 1, ~data & 0x20); - coin_lockout_w(machine(), 2, ~data & 0x40); /* is there a third coin input? */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x10); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x20); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x40); /* is there a third coin input? */ } WRITE8_MEMBER(sf_state::soundcmd_w) diff --git a/src/mame/drivers/sg1000a.cpp b/src/mame/drivers/sg1000a.cpp index 2da7f13e8f1..509146b18b9 100644 --- a/src/mame/drivers/sg1000a.cpp +++ b/src/mame/drivers/sg1000a.cpp @@ -255,7 +255,7 @@ WRITE_LINE_MEMBER(sg1000a_state::vdp_interrupt) WRITE8_MEMBER(sg1000a_state::sg1000a_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); } /************************************* diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index 5b610aa7cce..f6e434c4cd8 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -73,10 +73,10 @@ WRITE16_MEMBER(shangha3_state::shangha3_coinctrl_w) { if (ACCESSING_BITS_8_15) { - coin_lockout_w(machine(), 0,~data & 0x0400); - coin_lockout_w(machine(), 1,~data & 0x0400); - coin_counter_w(machine(), 0,data & 0x0100); - coin_counter_w(machine(), 1,data & 0x0200); + machine().bookkeeping().coin_lockout_w(0,~data & 0x0400); + machine().bookkeeping().coin_lockout_w(1,~data & 0x0400); + machine().bookkeeping().coin_counter_w(0,data & 0x0100); + machine().bookkeeping().coin_counter_w(1,data & 0x0200); } } @@ -87,10 +87,10 @@ WRITE16_MEMBER(shangha3_state::heberpop_coinctrl_w) /* the sound ROM bank is selected by the main CPU! */ m_oki->set_bank_base((data & 0x08) ? 0x40000 : 0x00000); - coin_lockout_w(machine(), 0,~data & 0x04); - coin_lockout_w(machine(), 1,~data & 0x04); - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x04); + machine().bookkeeping().coin_lockout_w(1,~data & 0x04); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); } } @@ -101,10 +101,10 @@ WRITE16_MEMBER(shangha3_state::blocken_coinctrl_w) /* the sound ROM bank is selected by the main CPU! */ m_oki->set_bank_base(((data >> 4) & 3) * 0x40000); - coin_lockout_w(machine(), 0,~data & 0x04); - coin_lockout_w(machine(), 1,~data & 0x04); - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x04); + machine().bookkeeping().coin_lockout_w(1,~data & 0x04); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); } } diff --git a/src/mame/drivers/shanghai.cpp b/src/mame/drivers/shanghai.cpp index 115e07028bf..1aeb26c541f 100644 --- a/src/mame/drivers/shanghai.cpp +++ b/src/mame/drivers/shanghai.cpp @@ -140,8 +140,8 @@ WRITE16_MEMBER(shanghai_state::shanghai_coin_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 2); } } diff --git a/src/mame/drivers/shisen.cpp b/src/mame/drivers/shisen.cpp index 3433fb52ab6..8b1c1347c66 100644 --- a/src/mame/drivers/shisen.cpp +++ b/src/mame/drivers/shisen.cpp @@ -37,8 +37,8 @@ WRITE8_MEMBER(shisen_state::coin_w) { if ((data & 0xf9) != 0x01) logerror("coin ctrl = %02x\n",data); - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x04); } diff --git a/src/mame/drivers/shootout.cpp b/src/mame/drivers/shootout.cpp index cd74445a0b8..0824a3704b7 100644 --- a/src/mame/drivers/shootout.cpp +++ b/src/mame/drivers/shootout.cpp @@ -62,7 +62,7 @@ WRITE8_MEMBER(shootout_state::flipscreen_w) WRITE8_MEMBER(shootout_state::coincounter_w) { - coin_counter_w(machine(), 0, data); + machine().bookkeeping().coin_counter_w(0, data); } /*******************************************************************************/ diff --git a/src/mame/drivers/sigmab52.cpp b/src/mame/drivers/sigmab52.cpp index b02121908f7..3e2fa180220 100644 --- a/src/mame/drivers/sigmab52.cpp +++ b/src/mame/drivers/sigmab52.cpp @@ -275,7 +275,7 @@ WRITE8_MEMBER(sigmab52_state::tower_lamps_w) WRITE8_MEMBER(sigmab52_state::coin_enable_w) { - coin_lockout_w(machine(), 0, data & 0x01 ? 0 : 1); + machine().bookkeeping().coin_lockout_w(0, data & 0x01 ? 0 : 1); } WRITE8_MEMBER(sigmab52_state::audiocpu_cmd_irq_w) diff --git a/src/mame/drivers/sigmab98.cpp b/src/mame/drivers/sigmab98.cpp index 7456def48c4..26427502ff0 100644 --- a/src/mame/drivers/sigmab98.cpp +++ b/src/mame/drivers/sigmab98.cpp @@ -861,9 +861,9 @@ WRITE8_MEMBER(sigmab98_state::c4_w) // 20 led? (starts blinking after coin in) WRITE8_MEMBER(sigmab98_state::c6_w) { - coin_lockout_w(machine(), 0, (~data) & 0x02); + machine().bookkeeping().coin_lockout_w(0, (~data) & 0x02); - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x04); if ((data & 0x08) && !(m_c6 & 0x08)) m_buffered_spriteram->copy(); @@ -1159,13 +1159,13 @@ void sigmab98_state::show_3_outputs() // Port 31 WRITE8_MEMBER(sigmab98_state::sammymdl_coin_w) { - coin_counter_w(machine(), 0, data & 0x01 ); // coin1 in - coin_counter_w(machine(), 1, data & 0x02 ); // coin2 in - coin_counter_w(machine(), 2, data & 0x04 ); // medal in + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // coin1 in + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // coin2 in + machine().bookkeeping().coin_counter_w(2, data & 0x04 ); // medal in -// coin_lockout_w(machine(), 1, (~data) & 0x08 ); // coin2 lockout? -// coin_lockout_w(machine(), 0, (~data) & 0x10 ); // coin1 lockout -// coin_lockout_w(machine(), 2, (~data) & 0x20 ); // medal lockout? +// machine().bookkeeping().coin_lockout_w(1, (~data) & 0x08 ); // coin2 lockout? +// machine().bookkeeping().coin_lockout_w(0, (~data) & 0x10 ); // coin1 lockout +// machine().bookkeeping().coin_lockout_w(2, (~data) & 0x20 ); // medal lockout? m_out[0] = data; show_3_outputs(); @@ -1449,7 +1449,7 @@ WRITE8_MEMBER(sigmab98_state::haekaka_leds_w) WRITE8_MEMBER(sigmab98_state::haekaka_coin_w) { - coin_counter_w(machine(), 0, data & 0x01 ); // medal out + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // medal out // data & 0x02 ? // data & 0x04 ? // data & 0x10 ? diff --git a/src/mame/drivers/silkroad.cpp b/src/mame/drivers/silkroad.cpp index ed80f4eebdc..17a42041e8b 100644 --- a/src/mame/drivers/silkroad.cpp +++ b/src/mame/drivers/silkroad.cpp @@ -149,8 +149,8 @@ WRITE32_MEMBER(silkroad_state::silk_coin_counter_w) { if (ACCESSING_BITS_16_23) { - coin_counter_w(machine(), 0, data & 0x10000); - coin_counter_w(machine(), 1, data & 0x80000); + machine().bookkeeping().coin_counter_w(0, data & 0x10000); + machine().bookkeeping().coin_counter_w(1, data & 0x80000); } } diff --git a/src/mame/drivers/skykid.cpp b/src/mame/drivers/skykid.cpp index 37172964a2d..f2227626b66 100644 --- a/src/mame/drivers/skykid.cpp +++ b/src/mame/drivers/skykid.cpp @@ -28,9 +28,9 @@ WRITE8_MEMBER(skykid_state::inputport_select_w) m_inputport_selected = data & 0x07; else if ((data & 0xe0) == 0xc0) { - coin_lockout_global_w(machine(), ~data & 1); - coin_counter_w(machine(), 0,data & 2); - coin_counter_w(machine(), 1,data & 4); + machine().bookkeeping().coin_lockout_global_w(~data & 1); + machine().bookkeeping().coin_counter_w(0,data & 2); + machine().bookkeeping().coin_counter_w(1,data & 4); } } diff --git a/src/mame/drivers/skylncr.cpp b/src/mame/drivers/skylncr.cpp index 13956fdff5b..514df8d8100 100644 --- a/src/mame/drivers/skylncr.cpp +++ b/src/mame/drivers/skylncr.cpp @@ -406,7 +406,7 @@ WRITE8_MEMBER(skylncr_state::reelscroll4_w) WRITE8_MEMBER(skylncr_state::skylncr_coin_w) { - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x04); } READ8_MEMBER(skylncr_state::ret_ff) diff --git a/src/mame/drivers/smsmcorp.cpp b/src/mame/drivers/smsmcorp.cpp index 1533ea76fe7..fb87530ebe8 100644 --- a/src/mame/drivers/smsmcorp.cpp +++ b/src/mame/drivers/smsmcorp.cpp @@ -417,9 +417,9 @@ WRITE8_MEMBER(smsmfg_state::ppi0_b_w) output_set_lamp_value(8, !BIT(data,7)); /* Stand Light */ output_set_lamp_value(9, !BIT(data,6)); /* Cancel Light */ - coin_counter_w(machine(), 0, BIT(data,1)); - coin_lockout_w(machine(), 0, BIT(data,5)); - coin_lockout_w(machine(), 1, BIT(data,4)); + machine().bookkeeping().coin_counter_w(0, BIT(data,1)); + machine().bookkeeping().coin_lockout_w(0, BIT(data,5)); + machine().bookkeeping().coin_lockout_w(1, BIT(data,4)); } /************************************* diff --git a/src/mame/drivers/snk.cpp b/src/mame/drivers/snk.cpp index d92edba9c4e..4e2b1f95301 100644 --- a/src/mame/drivers/snk.cpp +++ b/src/mame/drivers/snk.cpp @@ -750,29 +750,29 @@ CUSTOM_INPUT_MEMBER(snk_state::gwarb_rotary) WRITE8_MEMBER(snk_state::athena_coin_counter_w) { - coin_counter_w(machine(), 0, ~data & 2); - coin_counter_w(machine(), 1, ~data & 1); + machine().bookkeeping().coin_counter_w(0, ~data & 2); + machine().bookkeeping().coin_counter_w(1, ~data & 1); } WRITE8_MEMBER(snk_state::ikari_coin_counter_w) { if (~data & 0x80) { - coin_counter_w(machine(), 0, 1); - coin_counter_w(machine(), 0, 0); + machine().bookkeeping().coin_counter_w(0, 1); + machine().bookkeeping().coin_counter_w(0, 0); } if (~data & 0x40) { - coin_counter_w(machine(), 1, 1); - coin_counter_w(machine(), 1, 0); + machine().bookkeeping().coin_counter_w(1, 1); + machine().bookkeeping().coin_counter_w(1, 0); } } WRITE8_MEMBER(snk_state::tdfever_coin_counter_w) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } WRITE8_MEMBER(snk_state::countryc_trackball_w) diff --git a/src/mame/drivers/snookr10.cpp b/src/mame/drivers/snookr10.cpp index 5d2865ece1e..b838c41d800 100644 --- a/src/mame/drivers/snookr10.cpp +++ b/src/mame/drivers/snookr10.cpp @@ -705,9 +705,9 @@ WRITE8_MEMBER(snookr10_state::output_port_0_w) output_set_lamp_value(5, m_bit3); /* Lamp 5 - STOP4 */ output_set_lamp_value(6, m_bit4); /* Lamp 6 - STOP5 */ - coin_counter_w(machine(), 0, data & 0x01); /* Coin in */ - coin_counter_w(machine(), 1, data & 0x10); /* Key in */ - coin_counter_w(machine(), 2, data & 0x04); /* Payout x10 */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Coin in */ + machine().bookkeeping().coin_counter_w(1, data & 0x10); /* Key in */ + machine().bookkeeping().coin_counter_w(2, data & 0x04); /* Payout x10 */ // logerror("high: %04x - low: %X \n", m_outporth, m_outportl); // popmessage("written : %02X", data); diff --git a/src/mame/drivers/sonson.cpp b/src/mame/drivers/sonson.cpp index ff280dd58a7..41550d7ac4f 100644 --- a/src/mame/drivers/sonson.cpp +++ b/src/mame/drivers/sonson.cpp @@ -71,12 +71,12 @@ WRITE8_MEMBER(sonson_state::sonson_sh_irqtrigger_w) WRITE8_MEMBER(sonson_state::sonson_coin1_counter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } WRITE8_MEMBER(sonson_state::sonson_coin2_counter_w) { - coin_counter_w(machine(), 1, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 1); } static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, sonson_state ) diff --git a/src/mame/drivers/speedbal.cpp b/src/mame/drivers/speedbal.cpp index 2768cd1b7fe..4f36a46aee1 100644 --- a/src/mame/drivers/speedbal.cpp +++ b/src/mame/drivers/speedbal.cpp @@ -44,8 +44,8 @@ void speedbal_state::machine_start() WRITE8_MEMBER(speedbal_state::coincounter_w) { - coin_counter_w(machine(), 0, data & 0x80); - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x40); flip_screen_set(data & 8); // also changes data & 0x10 at the same time too (flipx and flipy?) /* unknown: (data & 0x10) and (data & 4) */ } diff --git a/src/mame/drivers/splash.cpp b/src/mame/drivers/splash.cpp index 17e6b6692d5..5b32c10d8c0 100644 --- a/src/mame/drivers/splash.cpp +++ b/src/mame/drivers/splash.cpp @@ -79,11 +79,11 @@ WRITE16_MEMBER(splash_state::coin_w) { case 0x00: /* Coin Lockouts */ case 0x01: - coin_lockout_w( machine(), (offset >> 3) & 0x01, (data & 0x0400) >> 8); + machine().bookkeeping().coin_lockout_w((offset >> 3) & 0x01, (data & 0x0400) >> 8); break; case 0x02: /* Coin Counters */ case 0x03: - coin_counter_w( machine(), (offset >> 3) & 0x01, (data & 0x0100) >> 8); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, (data & 0x0100) >> 8); break; } } diff --git a/src/mame/drivers/spoker.cpp b/src/mame/drivers/spoker.cpp index 293454d442b..0cab30d34e2 100644 --- a/src/mame/drivers/spoker.cpp +++ b/src/mame/drivers/spoker.cpp @@ -154,10 +154,10 @@ WRITE8_MEMBER(spoker_state::nmi_and_coins_w) // popmessage("%02x",data); } - coin_counter_w(machine(), 0, data & 0x01); // coin_a - coin_counter_w(machine(), 1, data & 0x04); // coin_c - coin_counter_w(machine(), 2, data & 0x08); // key in - coin_counter_w(machine(), 3, data & 0x10); // coin out mech + machine().bookkeeping().coin_counter_w(0, data & 0x01); // coin_a + machine().bookkeeping().coin_counter_w(1, data & 0x04); // coin_c + machine().bookkeeping().coin_counter_w(2, data & 0x08); // key in + machine().bookkeeping().coin_counter_w(3, data & 0x10); // coin out mech set_led_status(machine(), 6, data & 0x40); // led for coin out / hopper active diff --git a/src/mame/drivers/sprint4.cpp b/src/mame/drivers/sprint4.cpp index 5dd951e6841..b6c6d6a2819 100644 --- a/src/mame/drivers/sprint4.cpp +++ b/src/mame/drivers/sprint4.cpp @@ -193,7 +193,7 @@ WRITE8_MEMBER(sprint4_state::sprint4_lamp_w) #ifdef UNUSED_FUNCTION WRITE8_MEMBER(sprint4_state::sprint4_lockout_w) { - coin_lockout_global_w(machine(), ~offset & 1); + machine().bookkeeping().coin_lockout_global_w(~offset & 1); } #endif diff --git a/src/mame/drivers/sprint8.cpp b/src/mame/drivers/sprint8.cpp index d0827739fb7..72c96dade39 100644 --- a/src/mame/drivers/sprint8.cpp +++ b/src/mame/drivers/sprint8.cpp @@ -85,7 +85,7 @@ READ8_MEMBER(sprint8_state::sprint8_input_r) WRITE8_MEMBER(sprint8_state::sprint8_lockout_w) { - coin_lockout_w(machine(), offset, !(data & 1)); + machine().bookkeeping().coin_lockout_w(offset, !(data & 1)); } diff --git a/src/mame/drivers/spy.cpp b/src/mame/drivers/spy.cpp index a37a42d0bce..0806c904736 100644 --- a/src/mame/drivers/spy.cpp +++ b/src/mame/drivers/spy.cpp @@ -284,8 +284,8 @@ WRITE8_MEMBER(spy_state::spy_3f90_w) ********************************************************************/ /* bits 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x04) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/srmp2.cpp b/src/mame/drivers/srmp2.cpp index fb37d80f5e8..ca80decc53a 100644 --- a/src/mame/drivers/srmp2.cpp +++ b/src/mame/drivers/srmp2.cpp @@ -164,8 +164,8 @@ WRITE16_MEMBER(srmp2_state::srmp2_flags_w) */ - coin_counter_w( machine(), 0, ((data & 0x01) >> 0) ); - coin_lockout_w( machine(), 0, (((~data) & 0x10) >> 4) ); + machine().bookkeeping().coin_counter_w(0, ((data & 0x01) >> 0) ); + machine().bookkeeping().coin_lockout_w(0, (((~data) & 0x10) >> 4) ); m_adpcm_bank = ( (data & 0x20) >> 5 ); m_color_bank = ( (data & 0x80) >> 7 ); } @@ -178,8 +178,8 @@ WRITE16_MEMBER(srmp2_state::mjyuugi_flags_w) ---x ---- : Coin Lock Out */ - coin_counter_w( machine(), 0, ((data & 0x01) >> 0) ); - coin_lockout_w( machine(), 0, (((~data) & 0x10) >> 4) ); + machine().bookkeeping().coin_counter_w(0, ((data & 0x01) >> 0) ); + machine().bookkeeping().coin_lockout_w(0, (((~data) & 0x10) >> 4) ); } @@ -476,8 +476,8 @@ WRITE8_MEMBER(srmp2_state::srmp3_flags_w) */ - coin_counter_w( machine(), 0, ((data & 0x01) >> 0) ); - coin_lockout_w( machine(), 0, (((~data) & 0x10) >> 4) ); + machine().bookkeeping().coin_counter_w(0, ((data & 0x01) >> 0) ); + machine().bookkeeping().coin_lockout_w(0, (((~data) & 0x10) >> 4) ); m_gfx_bank = (data >> 6) & 0x03; } diff --git a/src/mame/drivers/sspeedr.cpp b/src/mame/drivers/sspeedr.cpp index a85b2103fc0..be0515ba88b 100644 --- a/src/mame/drivers/sspeedr.cpp +++ b/src/mame/drivers/sspeedr.cpp @@ -45,7 +45,7 @@ WRITE8_MEMBER(sspeedr_state::sspeedr_lamp_w) { output_set_value("lampGO", (data >> 0) & 1); output_set_value("lampEP", (data >> 1) & 1); - coin_counter_w(machine(), 0, data & 8); + machine().bookkeeping().coin_counter_w(0, data & 8); } diff --git a/src/mame/drivers/ssv.cpp b/src/mame/drivers/ssv.cpp index 14bd978b709..c8c2ae7bc09 100644 --- a/src/mame/drivers/ssv.cpp +++ b/src/mame/drivers/ssv.cpp @@ -290,10 +290,10 @@ WRITE16_MEMBER(ssv_state::lockout_w) // popmessage("%02X",data & 0xff); if (ACCESSING_BITS_0_7) { - coin_lockout_w(machine(), 1,~data & 0x01); - coin_lockout_w(machine(), 0,~data & 0x02); - coin_counter_w(machine(), 1, data & 0x04); - coin_counter_w(machine(), 0, data & 0x08); + machine().bookkeeping().coin_lockout_w(1,~data & 0x01); + machine().bookkeeping().coin_lockout_w(0,~data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x08); // data & 0x40? enable_video(data & 0x80); } @@ -305,10 +305,10 @@ WRITE16_MEMBER(ssv_state::lockout_inv_w) // popmessage("%02X",data & 0xff); if (ACCESSING_BITS_0_7) { - coin_lockout_w(machine(), 1, data & 0x01); - coin_lockout_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x04); - coin_counter_w(machine(), 0, data & 0x08); + machine().bookkeeping().coin_lockout_w(1, data & 0x01); + machine().bookkeeping().coin_lockout_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x08); // data & 0x40? enable_video(data & 0x80); } diff --git a/src/mame/drivers/stactics.cpp b/src/mame/drivers/stactics.cpp index 2b556a6b752..0c0db821402 100644 --- a/src/mame/drivers/stactics.cpp +++ b/src/mame/drivers/stactics.cpp @@ -139,7 +139,7 @@ CUSTOM_INPUT_MEMBER(stactics_state::get_rng) WRITE8_MEMBER(stactics_state::coinlockout_w) { - coin_lockout_w(machine(), offset, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(offset, ~data & 0x01); } diff --git a/src/mame/drivers/starshp1.cpp b/src/mame/drivers/starshp1.cpp index d52a674f60d..0ea641da560 100644 --- a/src/mame/drivers/starshp1.cpp +++ b/src/mame/drivers/starshp1.cpp @@ -54,8 +54,8 @@ WRITE8_MEMBER(starshp1_state::starshp1_audio_w) break; } - coin_lockout_w(machine(), 0, !m_attract); - coin_lockout_w(machine(), 1, !m_attract); + machine().bookkeeping().coin_lockout_w(0, !m_attract); + machine().bookkeeping().coin_lockout_w(1, !m_attract); } diff --git a/src/mame/drivers/stuntair.cpp b/src/mame/drivers/stuntair.cpp index 924a6b4434a..749416a13c5 100644 --- a/src/mame/drivers/stuntair.cpp +++ b/src/mame/drivers/stuntair.cpp @@ -292,8 +292,8 @@ WRITE8_MEMBER(stuntair_state::stuntair_nmienable_w) WRITE8_MEMBER(stuntair_state::stuntair_coin_w) { // lower 2 bits are coin counters, excluding 1st coin(?) - coin_counter_w(machine(), 0, data >> 0 & 1); - coin_counter_w(machine(), 1, data >> 1 & 1); + machine().bookkeeping().coin_counter_w(0, data >> 0 & 1); + machine().bookkeeping().coin_counter_w(1, data >> 1 & 1); // other bits: unknown if (data & 0xfc) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index d2037ecf941..c75d566f39d 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -124,10 +124,10 @@ WRITE8_MEMBER(stv_state::stv_ioga_w) case 0x07: m_system_output = data & 0xf; /*Why does the BIOS tests these as ACTIVE HIGH? A program bug?*/ - coin_counter_w(machine(), 0,~data & 0x01); - coin_counter_w(machine(), 1,~data & 0x02); - coin_lockout_w(machine(), 0,~data & 0x04); - coin_lockout_w(machine(), 1,~data & 0x08); + machine().bookkeeping().coin_counter_w(0,~data & 0x01); + machine().bookkeeping().coin_counter_w(1,~data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x04); + machine().bookkeeping().coin_lockout_w(1,~data & 0x08); break; } } diff --git a/src/mame/drivers/subsino.cpp b/src/mame/drivers/subsino.cpp index 2b1a82eb621..f14832594df 100644 --- a/src/mame/drivers/subsino.cpp +++ b/src/mame/drivers/subsino.cpp @@ -675,10 +675,10 @@ WRITE8_MEMBER(subsino_state::subsino_out_a_w) output_set_lamp_value(14, (data >> 6) & 1); /* Lamp 14 */ output_set_lamp_value(15, (data >> 7) & 1); /* Lamp 15 */ - coin_counter_w( machine(), 0, data & 0x01 ); /* coin / keyin */ - coin_counter_w( machine(), 1, data & 0x02 ); /* keyin / coin */ - coin_counter_w( machine(), 2, data & 0x10 ); /* keyout */ - coin_counter_w( machine(), 3, data & 0x20 ); /* payout */ + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); /* coin / keyin */ + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); /* keyin / coin */ + machine().bookkeeping().coin_counter_w(2, data & 0x10 ); /* keyout */ + machine().bookkeeping().coin_counter_w(3, data & 0x20 ); /* payout */ m_hopper->write(space, 0, (data & 0x0020) ? 0x80 : 0); // hopper motor diff --git a/src/mame/drivers/subsino2.cpp b/src/mame/drivers/subsino2.cpp index 9cb83e9e67a..362c3ef74e7 100644 --- a/src/mame/drivers/subsino2.cpp +++ b/src/mame/drivers/subsino2.cpp @@ -916,7 +916,7 @@ WRITE16_MEMBER(subsino2_state::bishjan_outputs_w) { // coin out data & 0x01; machine().device<ticket_dispenser_device>("hopper")->write(space, 0, (data & 0x0002) ? 0x80 : 0); // hopper - coin_counter_w(machine(), 0, data & 0x0010 ); + machine().bookkeeping().coin_counter_w(0, data & 0x0010 ); } break; } @@ -999,8 +999,8 @@ WRITE8_MEMBER(subsino2_state::expcard_outputs_w) break; case 3: // A - coin_counter_w(machine(), 0, data & 0x01 ); // coin in - coin_counter_w(machine(), 1, data & 0x02 ); // key in + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // coin in + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // key in set_led_status(machine(), 5, data & 0x10); // start break; @@ -1020,10 +1020,10 @@ WRITE8_MEMBER(subsino2_state::mtrain_outputs_w) switch (offset) { case 0: - coin_counter_w(machine(), 0, data & 0x01 ); // key in - coin_counter_w(machine(), 1, data & 0x02 ); // coin in - coin_counter_w(machine(), 2, data & 0x10 ); // pay out -// coin_counter_w(machine(), 3, data & 0x20 ); // hopper motor + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // key in + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // coin in + machine().bookkeeping().coin_counter_w(2, data & 0x10 ); // pay out +// machine().bookkeeping().coin_counter_w(3, data & 0x20 ); // hopper motor break; case 1: @@ -1150,8 +1150,8 @@ WRITE8_MEMBER(subsino2_state::saklove_outputs_w) switch (offset) { case 0: - coin_counter_w(machine(), 0, data & 0x01 ); // coin in - coin_counter_w(machine(), 1, data & 0x02 ); // key in + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // coin in + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // key in break; case 1: @@ -1246,8 +1246,8 @@ WRITE8_MEMBER(subsino2_state::xplan_outputs_w) break; case 3: // A - coin_counter_w(machine(), 0, data & 0x01 ); - coin_counter_w(machine(), 1, data & 0x02 ); + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); set_led_status(machine(), 6, data & 0x10); // start / take break; @@ -1346,8 +1346,8 @@ WRITE8_MEMBER(subsino2_state::xtrain_outputs_w) break; case 3: // A - coin_counter_w(machine(), 0, data & 0x01 ); // coin in - coin_counter_w(machine(), 1, data & 0x02 ); // key in + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); // coin in + machine().bookkeeping().coin_counter_w(1, data & 0x02 ); // key in set_led_status(machine(), 7, data & 0x10); // start break; diff --git a/src/mame/drivers/suna16.cpp b/src/mame/drivers/suna16.cpp index 3e0b4c4b864..967bb1c0b2d 100644 --- a/src/mame/drivers/suna16.cpp +++ b/src/mame/drivers/suna16.cpp @@ -58,7 +58,7 @@ WRITE16_MEMBER(suna16_state::bssoccer_leds_w) set_led_status(machine(), 1, data & 0x02); set_led_status(machine(), 2, data & 0x04); set_led_status(machine(), 3, data & 0x08); - coin_counter_w(machine(), 0, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x10); } if (data & ~0x1f) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", space.device().safe_pc(), data); } @@ -68,7 +68,7 @@ WRITE16_MEMBER(suna16_state::uballoon_leds_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); set_led_status(machine(), 0, data & 0x02); set_led_status(machine(), 1, data & 0x04); } @@ -80,7 +80,7 @@ WRITE16_MEMBER(suna16_state::bestbest_coin_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x04); } if (data & ~0x04) logerror("CPU#0 PC %06X - Leds unknown bits: %04X\n", space.device().safe_pc(), data); } diff --git a/src/mame/drivers/suna8.cpp b/src/mame/drivers/suna8.cpp index 65546359bb0..67d8bfe19e5 100644 --- a/src/mame/drivers/suna8.cpp +++ b/src/mame/drivers/suna8.cpp @@ -550,8 +550,8 @@ WRITE8_MEMBER(suna8_state::hardhead_bankswitch_w) WRITE8_MEMBER(suna8_state::hardhead_flipscreen_w) { flip_screen_set(data & 0x04); - coin_lockout_w ( machine(), 0, data & 0x08); - coin_lockout_w ( machine(), 1, data & 0x10); + machine().bookkeeping().coin_lockout_w(0, data & 0x08); + machine().bookkeeping().coin_lockout_w(1, data & 0x10); } static ADDRESS_MAP_START( hardhead_map, AS_PROGRAM, 8, suna8_state ) @@ -596,8 +596,8 @@ WRITE8_MEMBER(suna8_state::rranger_bankswitch_w) m_bank1->set_entry(bank); flip_screen_set(data & 0x20); - coin_lockout_w ( machine(), 0, data & 0x40); - coin_lockout_w ( machine(), 1, data & 0x80); + machine().bookkeeping().coin_lockout_w(0, data & 0x40); + machine().bookkeeping().coin_lockout_w(1, data & 0x80); } /* @@ -710,7 +710,7 @@ WRITE8_MEMBER(suna8_state::brickzn_leds_w) { set_led_status(machine(), 0, data & 0x01); set_led_status(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x04); logerror("CPU #0 - PC %04X: leds = %02X\n",space.device().safe_pc(),data); if (data & ~0x07) logerror("CPU #0 - PC %04X: unknown leds bits: %02X\n",space.device().safe_pc(),data); @@ -920,7 +920,7 @@ WRITE8_MEMBER(suna8_state::hardhea2_leds_w) { set_led_status(machine(), 0, data & 0x01); set_led_status(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x04); if (data & ~0x07) logerror("CPU #0 - PC %04X: unknown leds bits: %02X\n",space.device().safe_pc(),data); } @@ -1076,7 +1076,7 @@ WRITE8_MEMBER(suna8_state::starfigh_leds_w) { set_led_status(machine(), 0, data & 0x01); set_led_status(machine(), 1, data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x04); m_gfxbank = (data & 0x08) ? 4 : 0; if (data & ~0x0f) logerror("CPU #0 - PC %04X: unknown leds bits: %02X\n",space.device().safe_pc(),data); @@ -1209,7 +1209,7 @@ WRITE8_MEMBER(suna8_state::sparkman_rombank_w) */ WRITE8_MEMBER(suna8_state::sparkman_coin_counter_w) { - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); } // To do: implement this, affects the duration of copyright screen diff --git a/src/mame/drivers/supdrapo.cpp b/src/mame/drivers/supdrapo.cpp index 9eded3118c7..447e0736208 100644 --- a/src/mame/drivers/supdrapo.cpp +++ b/src/mame/drivers/supdrapo.cpp @@ -241,12 +241,12 @@ WRITE8_MEMBER(supdrapo_state::debug7c00_w) WRITE8_MEMBER(supdrapo_state::coinin_w) { - coin_counter_w(machine(), 0, data & 0x01); /* Coin In */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* Coin In */ } WRITE8_MEMBER(supdrapo_state::payout_w) { - coin_counter_w(machine(), 1, data & 0x01); /* Payout */ + machine().bookkeeping().coin_counter_w(1, data & 0x01); /* Payout */ } diff --git a/src/mame/drivers/superchs.cpp b/src/mame/drivers/superchs.cpp index 42e55078f4c..3f88465df2e 100644 --- a/src/mame/drivers/superchs.cpp +++ b/src/mame/drivers/superchs.cpp @@ -147,10 +147,10 @@ WRITE32_MEMBER(superchs_state::superchs_input_w) { if (ACCESSING_BITS_24_31) { - coin_lockout_w(machine(), 0,~data & 0x01000000); - coin_lockout_w(machine(), 1,~data & 0x02000000); - coin_counter_w(machine(), 0, data & 0x04000000); - coin_counter_w(machine(), 1, data & 0x08000000); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(1,~data & 0x02000000); + machine().bookkeeping().coin_counter_w(0, data & 0x04000000); + machine().bookkeeping().coin_counter_w(1, data & 0x08000000); m_coin_word=(data >> 16) &0xffff; } } diff --git a/src/mame/drivers/superdq.cpp b/src/mame/drivers/superdq.cpp index cea2bc6189a..800684765ee 100644 --- a/src/mame/drivers/superdq.cpp +++ b/src/mame/drivers/superdq.cpp @@ -164,8 +164,8 @@ WRITE8_MEMBER(superdq_state::superdq_io_w) if ( data & 0x40 ) /* bit 6 = irqack */ m_maincpu->set_input_line(0, CLEAR_LINE); - coin_counter_w( machine(), 0, data & 0x08 ); - coin_counter_w( machine(), 1, data & 0x04 ); + machine().bookkeeping().coin_counter_w(0, data & 0x08 ); + machine().bookkeeping().coin_counter_w(1, data & 0x04 ); m_color_bank = ( data & 2 ) ? 1 : 0; diff --git a/src/mame/drivers/superqix.cpp b/src/mame/drivers/superqix.cpp index 3e25d7f450d..1fb0b9f9b0b 100644 --- a/src/mame/drivers/superqix.cpp +++ b/src/mame/drivers/superqix.cpp @@ -208,13 +208,13 @@ WRITE8_MEMBER(superqix_state::bootleg_mcu_p1_w) // ??? break; case 1: - coin_counter_w(machine(), 0,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 1); break; case 2: - coin_counter_w(machine(), 1,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 1); break; case 3: - coin_lockout_global_w(machine(), (data & 1) ^ m_invert_coin_lockout); + machine().bookkeeping().coin_lockout_global_w((data & 1) ^ m_invert_coin_lockout); break; case 4: flip_screen_set(data & 1); @@ -275,13 +275,13 @@ WRITE8_MEMBER(superqix_state::sqixu_mcu_p2_w) // bit 0 = unknown (clocked often) // bit 1 = coin cointer 1 - coin_counter_w(machine(), 0,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 2); // bit 2 = coin counter 2 - coin_counter_w(machine(), 1,data & 4); + machine().bookkeeping().coin_counter_w(1,data & 4); // bit 3 = coin lockout - coin_lockout_global_w(machine(), ~data & 8); + machine().bookkeeping().coin_lockout_global_w(~data & 8); // bit 4 = flip screen flip_screen_set(data & 0x10); diff --git a/src/mame/drivers/superwng.cpp b/src/mame/drivers/superwng.cpp index 649b2e448e7..cf599bd80dd 100644 --- a/src/mame/drivers/superwng.cpp +++ b/src/mame/drivers/superwng.cpp @@ -302,12 +302,12 @@ WRITE8_MEMBER(superwng_state::superwng_flip_screen_w) WRITE8_MEMBER(superwng_state::superwng_cointcnt1_w) { - coin_counter_w(machine(), 0, data); + machine().bookkeeping().coin_counter_w(0, data); } WRITE8_MEMBER(superwng_state::superwng_cointcnt2_w) { - coin_counter_w(machine(), 1, data); + machine().bookkeeping().coin_counter_w(1, data); } WRITE8_MEMBER(superwng_state::superwng_hopper_w) diff --git a/src/mame/drivers/suprnova.cpp b/src/mame/drivers/suprnova.cpp index 3d56e0465b8..95d08b082c5 100644 --- a/src/mame/drivers/suprnova.cpp +++ b/src/mame/drivers/suprnova.cpp @@ -605,10 +605,10 @@ WRITE32_MEMBER(skns_state::skns_io_w) case 2: if(ACCESSING_BITS_24_31) { /* Coin Lock/Count */ -// coin_counter_w(machine(), 0, data & 0x01000000); -// coin_counter_w(machine(), 1, data & 0x02000000); -// coin_lockout_w(machine(), 0, ~data & 0x04000000); -// coin_lockout_w(machine(), 1, ~data & 0x08000000); // Works in puzzloop, others behave strange. +// machine().bookkeeping().coin_counter_w(0, data & 0x01000000); +// machine().bookkeeping().coin_counter_w(1, data & 0x02000000); +// machine().bookkeeping().coin_lockout_w(0, ~data & 0x04000000); +// machine().bookkeeping().coin_lockout_w(1, ~data & 0x08000000); // Works in puzzloop, others behave strange. } if(ACCESSING_BITS_16_23) { /* Analogue Input Select */ diff --git a/src/mame/drivers/suprridr.cpp b/src/mame/drivers/suprridr.cpp index 4072f9dbfac..21319ed6f61 100644 --- a/src/mame/drivers/suprridr.cpp +++ b/src/mame/drivers/suprridr.cpp @@ -156,7 +156,7 @@ WRITE8_MEMBER(suprridr_state::sound_irq_ack_w) WRITE8_MEMBER(suprridr_state::coin_lock_w) { /* cleared when 9 credits are hit, but never reset! */ -/* coin_lockout_global_w(machine(), ~data & 1); */ +/* machine().bookkeeping().coin_lockout_global_w(~data & 1); */ } diff --git a/src/mame/drivers/surpratk.cpp b/src/mame/drivers/surpratk.cpp index ad65d4db4ab..84ce10061a7 100644 --- a/src/mame/drivers/surpratk.cpp +++ b/src/mame/drivers/surpratk.cpp @@ -42,8 +42,8 @@ WRITE8_MEMBER(surpratk_state::surpratk_5fc0_w) logerror("%04x: 3fc0 = %02x\n",space.device().safe_pc(),data); /* bit 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 3 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/drivers/system1.cpp b/src/mame/drivers/system1.cpp index 66d9c792700..3c707a23a24 100644 --- a/src/mame/drivers/system1.cpp +++ b/src/mame/drivers/system1.cpp @@ -445,7 +445,7 @@ WRITE8_MEMBER(system1_state::videomode_w) m_videomode_prev = data; /* bit 0 is for the coin counters */ - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); /* remaining signals are video-related */ system1_videomode_w(space, 0, data); diff --git a/src/mame/drivers/system16.cpp b/src/mame/drivers/system16.cpp index c71cbeab08c..d85fa3a5a04 100644 --- a/src/mame/drivers/system16.cpp +++ b/src/mame/drivers/system16.cpp @@ -167,8 +167,8 @@ WRITE16_MEMBER(segas1x_bootleg_state::sys16_coinctrl_w) m_refreshenable = m_coinctrl & 0x20; set_led_status(machine(), 1, m_coinctrl & 0x08); set_led_status(machine(), 0, m_coinctrl & 0x04); - coin_counter_w(machine(), 1, m_coinctrl & 0x02); - coin_counter_w(machine(), 0, m_coinctrl & 0x01); + machine().bookkeeping().coin_counter_w(1, m_coinctrl & 0x02); + machine().bookkeeping().coin_counter_w(0, m_coinctrl & 0x01); /* bit 6 is also used (1 most of the time; 0 in dduxbl, sdi, wb3; tturf has it normally 1 but 0 after coin insertion) */ /* eswat sets bit 4 */ diff --git a/src/mame/drivers/taito_b.cpp b/src/mame/drivers/taito_b.cpp index 768ea171221..eb0cff9f77c 100644 --- a/src/mame/drivers/taito_b.cpp +++ b/src/mame/drivers/taito_b.cpp @@ -423,10 +423,10 @@ WRITE16_MEMBER(taitob_state::player_34_coin_ctrl_w) COMBINE_DATA(&m_coin_word); /* coin counters and lockout */ - coin_lockout_w(machine(), 2, ~data & 0x0100); - coin_lockout_w(machine(), 3, ~data & 0x0200); - coin_counter_w(machine(), 2, data & 0x0400); - coin_counter_w(machine(), 3, data & 0x0800); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x0100); + machine().bookkeeping().coin_lockout_w(3, ~data & 0x0200); + machine().bookkeeping().coin_counter_w(2, data & 0x0400); + machine().bookkeeping().coin_counter_w(3, data & 0x0800); } READ16_MEMBER(taitob_state::pbobble_input_bypass_r) diff --git a/src/mame/drivers/taito_f2.cpp b/src/mame/drivers/taito_f2.cpp index 446bd8c56f3..bf7cb9f4849 100644 --- a/src/mame/drivers/taito_f2.cpp +++ b/src/mame/drivers/taito_f2.cpp @@ -283,10 +283,10 @@ WRITE16_MEMBER(taitof2_state::growl_coin_word_w)/* what about coins 3&4 ?? */ { if (ACCESSING_BITS_0_7) { - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); } } @@ -294,14 +294,14 @@ WRITE16_MEMBER(taitof2_state::taitof2_4p_coin_word_w) { if (ACCESSING_BITS_0_7) { - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); - coin_lockout_w(machine(), 2, ~data & 0x04); - coin_lockout_w(machine(), 3, ~data & 0x08); - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); - coin_counter_w(machine(), 2, data & 0x40); - coin_counter_w(machine(), 3, data & 0x80); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x04); + machine().bookkeeping().coin_lockout_w(3, ~data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); + machine().bookkeeping().coin_counter_w(2, data & 0x40); + machine().bookkeeping().coin_counter_w(3, data & 0x80); } } @@ -309,14 +309,14 @@ WRITE16_MEMBER(taitof2_state::ninjak_coin_word_w) { if (ACCESSING_BITS_8_15) { - coin_lockout_w(machine(), 0, ~data & 0x0100); - coin_lockout_w(machine(), 1, ~data & 0x0200); - coin_lockout_w(machine(), 2, ~data & 0x0400); - coin_lockout_w(machine(), 3, ~data & 0x0800); - coin_counter_w(machine(), 0, data & 0x1000); - coin_counter_w(machine(), 1, data & 0x2000); - coin_counter_w(machine(), 2, data & 0x4000); - coin_counter_w(machine(), 3, data & 0x8000); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x0100); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x0200); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x0400); + machine().bookkeeping().coin_lockout_w(3, ~data & 0x0800); + machine().bookkeeping().coin_counter_w(0, data & 0x1000); + machine().bookkeeping().coin_counter_w(1, data & 0x2000); + machine().bookkeeping().coin_counter_w(2, data & 0x4000); + machine().bookkeeping().coin_counter_w(3, data & 0x8000); } } diff --git a/src/mame/drivers/taito_f3.cpp b/src/mame/drivers/taito_f3.cpp index 67eeac31518..a892f6487d7 100644 --- a/src/mame/drivers/taito_f3.cpp +++ b/src/mame/drivers/taito_f3.cpp @@ -77,10 +77,10 @@ WRITE32_MEMBER(taito_f3_state::f3_control_w) case 0x01: /* Coin counters & lockouts */ if (ACCESSING_BITS_24_31) { - coin_lockout_w(machine(), 0,~data & 0x01000000); - coin_lockout_w(machine(), 1,~data & 0x02000000); - coin_counter_w(machine(), 0, data & 0x04000000); - coin_counter_w(machine(), 1, data & 0x08000000); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(1,~data & 0x02000000); + machine().bookkeeping().coin_counter_w(0, data & 0x04000000); + machine().bookkeeping().coin_counter_w(1, data & 0x08000000); m_coin_word[0]=(data>>16)&0xffff; } return; @@ -95,10 +95,10 @@ WRITE32_MEMBER(taito_f3_state::f3_control_w) case 0x05: /* Player 3 & 4 coin counters */ if (ACCESSING_BITS_24_31) { - coin_lockout_w(machine(), 2,~data & 0x01000000); - coin_lockout_w(machine(), 3,~data & 0x02000000); - coin_counter_w(machine(), 2, data & 0x04000000); - coin_counter_w(machine(), 3, data & 0x08000000); + machine().bookkeeping().coin_lockout_w(2,~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(3,~data & 0x02000000); + machine().bookkeeping().coin_counter_w(2, data & 0x04000000); + machine().bookkeeping().coin_counter_w(3, data & 0x08000000); m_coin_word[1]=(data>>16)&0xffff; } return; diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 41e57d48498..78e5f4ec1a3 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -453,10 +453,10 @@ WRITE8_MEMBER(taitol_state::bank3_w) WRITE8_MEMBER(taitol_state::control2_w) { - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); } READ8_MEMBER(taitol_state::portA_r) diff --git a/src/mame/drivers/taito_x.cpp b/src/mame/drivers/taito_x.cpp index 39de0f8e06f..9d068780e0b 100644 --- a/src/mame/drivers/taito_x.cpp +++ b/src/mame/drivers/taito_x.cpp @@ -364,10 +364,10 @@ WRITE16_MEMBER(taitox_state::daisenpu_input_w) switch (offset) { case 0x04: /* coin counters and lockout */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); - coin_lockout_w(machine(), 0,~data & 0x04); - coin_lockout_w(machine(), 1,~data & 0x08); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); + machine().bookkeeping().coin_lockout_w(0,~data & 0x04); + machine().bookkeeping().coin_lockout_w(1,~data & 0x08); //logerror("taitox coin control %04x to offset %04x\n",data,offset); break; @@ -382,10 +382,10 @@ WRITE16_MEMBER(taitox_state::kyustrkr_input_w) switch (offset) { case 0x04: /* coin counters and lockout */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); - coin_lockout_w(machine(), 0,data & 0x04); - coin_lockout_w(machine(), 1,data & 0x08); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); + machine().bookkeeping().coin_lockout_w(0,data & 0x04); + machine().bookkeeping().coin_lockout_w(1,data & 0x08); //logerror("taitox coin control %04x to offset %04x\n",data,offset); break; diff --git a/src/mame/drivers/tank8.cpp b/src/mame/drivers/tank8.cpp index 80ac03680c2..bc63cd8ffde 100644 --- a/src/mame/drivers/tank8.cpp +++ b/src/mame/drivers/tank8.cpp @@ -34,7 +34,7 @@ READ8_MEMBER(tank8_state::collision_r) WRITE8_MEMBER(tank8_state::lockout_w) { - coin_lockout_w(machine(), offset, ~data & 1); + machine().bookkeeping().coin_lockout_w(offset, ~data & 1); } diff --git a/src/mame/drivers/tankbatt.cpp b/src/mame/drivers/tankbatt.cpp index dabda547e02..10c8eb9bf45 100644 --- a/src/mame/drivers/tankbatt.cpp +++ b/src/mame/drivers/tankbatt.cpp @@ -149,14 +149,14 @@ WRITE8_MEMBER(tankbatt_state::irq_ack_w) WRITE8_MEMBER(tankbatt_state::coincounter_w) { - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 1); } WRITE8_MEMBER(tankbatt_state::coinlockout_w) { - coin_lockout_w(machine(), 0,data & 1); - coin_lockout_w(machine(), 1,data & 1); + machine().bookkeeping().coin_lockout_w(0,data & 1); + machine().bookkeeping().coin_lockout_w(1,data & 1); } static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, tankbatt_state ) diff --git a/src/mame/drivers/tankbust.cpp b/src/mame/drivers/tankbust.cpp index 7775c80d6d4..b7c4044cdc5 100644 --- a/src/mame/drivers/tankbust.cpp +++ b/src/mame/drivers/tankbust.cpp @@ -96,7 +96,7 @@ WRITE8_MEMBER(tankbust_state::e0xx_w) break; case 2: /* 0xe002 coin counter */ - coin_counter_w(machine(), 0, data&1); + machine().bookkeeping().coin_counter_w(0, data&1); break; case 6: /* 0xe006 screen disable ?? or disable screen update */ diff --git a/src/mame/drivers/targeth.cpp b/src/mame/drivers/targeth.cpp index 518346d2b55..7715e634236 100644 --- a/src/mame/drivers/targeth.cpp +++ b/src/mame/drivers/targeth.cpp @@ -61,7 +61,7 @@ WRITE16_MEMBER(targeth_state::OKIM6295_bankswitch_w) WRITE16_MEMBER(targeth_state::targeth_coin_counter_w) { - coin_counter_w( machine(), (offset >> 3) & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, data & 0x01); } static ADDRESS_MAP_START( main_map, AS_PROGRAM, 16, targeth_state ) diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index 2f8a08eb6c6..4f6a062eb3a 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -24,7 +24,7 @@ Might be some priority glitches WRITE8_MEMBER(tbowl_state::coincounter_w) { - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); } /*** Banking diff --git a/src/mame/drivers/tempest.cpp b/src/mame/drivers/tempest.cpp index 7d0e939f127..2766933035c 100644 --- a/src/mame/drivers/tempest.cpp +++ b/src/mame/drivers/tempest.cpp @@ -408,9 +408,9 @@ WRITE8_MEMBER(tempest_state::tempest_led_w) WRITE8_MEMBER(tempest_state::tempest_coin_w) { - coin_counter_w(machine(), 0, (data & 0x01)); - coin_counter_w(machine(), 1, (data & 0x02)); - coin_counter_w(machine(), 2, (data & 0x04)); + machine().bookkeeping().coin_counter_w(0, (data & 0x01)); + machine().bookkeeping().coin_counter_w(1, (data & 0x02)); + machine().bookkeeping().coin_counter_w(2, (data & 0x04)); m_avg->set_flip_x(data & 0x08); m_avg->set_flip_y(data & 0x10); } diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 8982a7657f5..602ce7faa0b 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -281,7 +281,7 @@ WRITE16_MEMBER(tetrisp2_state::rocknms_sub2main_w) WRITE16_MEMBER(tetrisp2_state::tetrisp2_coincounter_w) { - coin_counter_w( machine(), 0, (data & 0x0001)); + machine().bookkeeping().coin_counter_w(0, (data & 0x0001)); } @@ -331,9 +331,9 @@ WRITE16_MEMBER(tetrisp2_state::nndmseal_coincounter_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w( machine(), 0, data & 0x0001 ); + machine().bookkeeping().coin_counter_w(0, data & 0x0001 ); // data & 0x0004 ? - coin_lockout_w( machine(), 0,(~data) & 0x0008 ); + machine().bookkeeping().coin_lockout_w(0,(~data) & 0x0008 ); } if (ACCESSING_BITS_8_15) { diff --git a/src/mame/drivers/thayers.cpp b/src/mame/drivers/thayers.cpp index 2016c1b4436..338e08582b5 100644 --- a/src/mame/drivers/thayers.cpp +++ b/src/mame/drivers/thayers.cpp @@ -409,7 +409,7 @@ WRITE8_MEMBER(thayers_state::laserdsc_control_w) */ - coin_counter_w(machine(), 0, BIT(data, 4)); + machine().bookkeeping().coin_counter_w(0, BIT(data, 4)); if (BIT(data, 5)) { diff --git a/src/mame/drivers/thedealr.cpp b/src/mame/drivers/thedealr.cpp index 827a3af6d52..ed348bd9163 100644 --- a/src/mame/drivers/thedealr.cpp +++ b/src/mame/drivers/thedealr.cpp @@ -164,10 +164,10 @@ WRITE8_MEMBER(thedealr_state::iox_w) case 0x40: // coin counters m_iox_coins = data; - coin_counter_w(machine(), 0, (~data) & 0x02); // coin1 or service coin - coin_counter_w(machine(), 1, (~data) & 0x04); // coupon - coin_counter_w(machine(), 2, (~data) & 0x08); // service coin - coin_counter_w(machine(), 3, (~data) & 0x10); // coin-out + machine().bookkeeping().coin_counter_w(0, (~data) & 0x02); // coin1 or service coin + machine().bookkeeping().coin_counter_w(1, (~data) & 0x04); // coupon + machine().bookkeeping().coin_counter_w(2, (~data) & 0x08); // service coin + machine().bookkeeping().coin_counter_w(3, (~data) & 0x10); // coin-out if ((~data) & 0xe1) logerror("%s: unknown bits written to command %02X: %02X\n", machine().describe_context(), m_iox_cmd, data); break; diff --git a/src/mame/drivers/thoop2.cpp b/src/mame/drivers/thoop2.cpp index 1d48c2c5bb7..0afe1ccf3d5 100644 --- a/src/mame/drivers/thoop2.cpp +++ b/src/mame/drivers/thoop2.cpp @@ -66,11 +66,11 @@ WRITE16_MEMBER(thoop2_state::thoop2_coin_w) switch ((offset >> 3)){ case 0x00: /* Coin Lockouts */ case 0x01: - coin_lockout_w(machine(), (offset >> 3) & 0x01, ~data & 0x01); + machine().bookkeeping().coin_lockout_w((offset >> 3) & 0x01, ~data & 0x01); break; case 0x02: /* Coin Counters */ case 0x03: - coin_counter_w(machine(), (offset >> 3) & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, data & 0x01); break; } } diff --git a/src/mame/drivers/thunderx.cpp b/src/mame/drivers/thunderx.cpp index 0149e610533..37dee298876 100644 --- a/src/mame/drivers/thunderx.cpp +++ b/src/mame/drivers/thunderx.cpp @@ -325,8 +325,8 @@ WRITE8_MEMBER(thunderx_state::scontra_bankswitch_w) m_bank5800->set_bank((data & 0x10) >> 4); // bits 5-6 coin counters - coin_counter_w(machine(), 0, data & 0x20); - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x20); + machine().bookkeeping().coin_counter_w(1, data & 0x40); // bit 7 controls layer priority m_priority = data & 0x80; @@ -340,8 +340,8 @@ WRITE8_MEMBER(thunderx_state::thunderx_videobank_w) m_bank5800->set_bank(data & 0x10 ? 2 : (data & 0x1)); /* bits 1-2 coin counters */ - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x04); /* bit 3 controls layer priority */ m_priority = data & 0x08; @@ -352,8 +352,8 @@ WRITE8_MEMBER(thunderx_state::gbusters_videobank_w) // same as thunderx without the PMC m_bank5800->set_bank(data & 0x1); - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x04); m_priority = data & 0x08; } diff --git a/src/mame/drivers/tiamc1.cpp b/src/mame/drivers/tiamc1.cpp index ac9d19a3df8..a7fd52a0015 100644 --- a/src/mame/drivers/tiamc1.cpp +++ b/src/mame/drivers/tiamc1.cpp @@ -129,8 +129,8 @@ void tiamc1_state::machine_reset() WRITE8_MEMBER(tiamc1_state::tiamc1_control_w) { - coin_lockout_w(machine(), 0, ~data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x04); } diff --git a/src/mame/drivers/timeplt.cpp b/src/mame/drivers/timeplt.cpp index e5fdf8e2e35..caf5505ee2f 100644 --- a/src/mame/drivers/timeplt.cpp +++ b/src/mame/drivers/timeplt.cpp @@ -86,7 +86,7 @@ WRITE8_MEMBER(timeplt_state::nmi_enable_w) WRITE8_MEMBER(timeplt_state::coincounter_w) { - coin_counter_w(machine(), offset >> 1, data); + machine().bookkeeping().coin_counter_w(offset >> 1, data); } READ8_MEMBER(timeplt_state::psurge_protection_r) diff --git a/src/mame/drivers/toaplan2.cpp b/src/mame/drivers/toaplan2.cpp index 8d85b96fad2..f0d6ff28817 100644 --- a/src/mame/drivers/toaplan2.cpp +++ b/src/mame/drivers/toaplan2.cpp @@ -539,14 +539,14 @@ WRITE8_MEMBER(toaplan2_state::toaplan2_coin_w) if (data & 0x0f) { - coin_lockout_w( machine(), 0, ((data & 4) ? 0 : 1) ); - coin_lockout_w( machine(), 1, ((data & 8) ? 0 : 1) ); - coin_counter_w( machine(), 0, (data & 1) ); - coin_counter_w( machine(), 1, (data & 2) ); + machine().bookkeeping().coin_lockout_w(0, ((data & 4) ? 0 : 1) ); + machine().bookkeeping().coin_lockout_w(1, ((data & 8) ? 0 : 1) ); + machine().bookkeeping().coin_counter_w(0, (data & 1) ); + machine().bookkeeping().coin_counter_w(1, (data & 2) ); } else { - coin_lockout_global_w(machine(), 1); // Lock all coin slots + machine().bookkeeping().coin_lockout_global_w(1); // Lock all coin slots } if (data & 0xe0) { @@ -556,8 +556,8 @@ WRITE8_MEMBER(toaplan2_state::toaplan2_coin_w) WRITE8_MEMBER(toaplan2_state::pwrkick_coin_w) { - coin_counter_w( machine(), 0, (data & 2) >> 1 ); - coin_counter_w( machine(), 1, (data & 8) >> 3 ); + machine().bookkeeping().coin_counter_w(0, (data & 2) >> 1 ); + machine().bookkeeping().coin_counter_w(1, (data & 8) >> 3 ); m_pwrkick_hopper = (data & 0x80) >> 7; } diff --git a/src/mame/drivers/tonton.cpp b/src/mame/drivers/tonton.cpp index 15fa04e69c4..36770d448a8 100644 --- a/src/mame/drivers/tonton.cpp +++ b/src/mame/drivers/tonton.cpp @@ -75,8 +75,8 @@ WRITE_LINE_MEMBER(tonton_state::tonton_vdp0_interrupt) WRITE8_MEMBER(tonton_state::tonton_outport_w) { - coin_counter_w(machine(), offset, data & 0x01); - coin_lockout_global_w(machine(), data & 0x02); /* Coin Lock */ + machine().bookkeeping().coin_counter_w(offset, data & 0x01); + machine().bookkeeping().coin_lockout_global_w(data & 0x02); /* Coin Lock */ m_hopper->write(space, 0, (data & 0x02)); /* Hopper Motor */ // if(data & 0xfe) diff --git a/src/mame/drivers/toratora.cpp b/src/mame/drivers/toratora.cpp index b0ba0f65998..b422680e6f9 100644 --- a/src/mame/drivers/toratora.cpp +++ b/src/mame/drivers/toratora.cpp @@ -138,9 +138,9 @@ WRITE8_MEMBER(toratora_state::clear_tv_w) WRITE8_MEMBER(toratora_state::port_b_u1_w) { if (m_pia_u1->port_b_z_mask() & 0x20) - coin_counter_w(machine(), 0, 1); + machine().bookkeeping().coin_counter_w(0, 1); else - coin_counter_w(machine(), 0, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x20); } diff --git a/src/mame/drivers/tourtabl.cpp b/src/mame/drivers/tourtabl.cpp index a1d79b07e6f..c7429d8f520 100644 --- a/src/mame/drivers/tourtabl.cpp +++ b/src/mame/drivers/tourtabl.cpp @@ -41,7 +41,7 @@ WRITE8_MEMBER(tourtabl_state::tourtabl_led_w) set_led_status(machine(), 2, data & 0x10); /* start 4 */ set_led_status(machine(), 3, data & 0x80); /* select game */ - coin_lockout_global_w(machine(), !(data & 0x80)); + machine().bookkeeping().coin_lockout_global_w(!(data & 0x80)); } diff --git a/src/mame/drivers/toypop.cpp b/src/mame/drivers/toypop.cpp index c5141ce1447..1b5d309a7ac 100644 --- a/src/mame/drivers/toypop.cpp +++ b/src/mame/drivers/toypop.cpp @@ -488,13 +488,13 @@ READ8_MEMBER(toypop_state::dipB_h){ return ioport("DSW2")->read() >> 4; } WRITE8_MEMBER(toypop_state::out_coin0) { - coin_lockout_global_w(machine(), data & 4); - coin_counter_w(machine(), 0, ~data & 8); + machine().bookkeeping().coin_lockout_global_w(data & 4); + machine().bookkeeping().coin_counter_w(0, ~data & 8); } WRITE8_MEMBER(toypop_state::out_coin1) { - coin_counter_w(machine(), 1, ~data & 1); + machine().bookkeeping().coin_counter_w(1, ~data & 1); } WRITE8_MEMBER(toypop_state::flip) diff --git a/src/mame/drivers/trackfld.cpp b/src/mame/drivers/trackfld.cpp index 1fa7fef0ab3..c898f8d4bde 100644 --- a/src/mame/drivers/trackfld.cpp +++ b/src/mame/drivers/trackfld.cpp @@ -199,7 +199,7 @@ MAIN BOARD: WRITE8_MEMBER(trackfld_state::coin_w) { - coin_counter_w(machine(), offset, data & 1); + machine().bookkeeping().coin_counter_w(offset, data & 1); } WRITE8_MEMBER(trackfld_state::questions_bank_w) diff --git a/src/mame/drivers/triplhnt.cpp b/src/mame/drivers/triplhnt.cpp index 79371d00ea0..26461ba9e66 100644 --- a/src/mame/drivers/triplhnt.cpp +++ b/src/mame/drivers/triplhnt.cpp @@ -62,8 +62,8 @@ void triplhnt_state::triplhnt_update_misc(address_space &space, int offset) set_led_status(machine(), 0, m_misc_flags & 0x02); - coin_lockout_w(machine(), 0, !(m_misc_flags & 0x08)); - coin_lockout_w(machine(), 1, !(m_misc_flags & 0x08)); + machine().bookkeeping().coin_lockout_w(0, !(m_misc_flags & 0x08)); + machine().bookkeeping().coin_lockout_w(1, !(m_misc_flags & 0x08)); m_discrete->write(space, TRIPLHNT_SCREECH_EN, m_misc_flags & 0x04); // screech m_discrete->write(space, TRIPLHNT_LAMP_EN, m_misc_flags & 0x02); // Lamp is used to reset noise diff --git a/src/mame/drivers/trvquest.cpp b/src/mame/drivers/trvquest.cpp index 15f657e9c85..7d32adce5a8 100644 --- a/src/mame/drivers/trvquest.cpp +++ b/src/mame/drivers/trvquest.cpp @@ -50,7 +50,7 @@ READ8_MEMBER(gameplan_state::trvquest_question_r) WRITE_LINE_MEMBER(gameplan_state::trvquest_coin_w) { - coin_counter_w(machine(), 0, ~state & 1); + machine().bookkeeping().coin_counter_w(0, ~state & 1); } WRITE_LINE_MEMBER(gameplan_state::trvquest_misc_w) diff --git a/src/mame/drivers/tsamurai.cpp b/src/mame/drivers/tsamurai.cpp index 1fb49ea6bd8..f157d504367 100644 --- a/src/mame/drivers/tsamurai.cpp +++ b/src/mame/drivers/tsamurai.cpp @@ -127,7 +127,7 @@ WRITE8_MEMBER(tsamurai_state::flip_screen_w) WRITE8_MEMBER(tsamurai_state::coincounter_w) { - coin_counter_w(machine(), offset,data); + machine().bookkeeping().coin_counter_w(offset,data); } diff --git a/src/mame/drivers/tubep.cpp b/src/mame/drivers/tubep.cpp index 5276b0b915f..f4d692faec5 100644 --- a/src/mame/drivers/tubep.cpp +++ b/src/mame/drivers/tubep.cpp @@ -126,7 +126,7 @@ WRITE8_MEMBER(tubep_state::tubep_LS259_w) port b0: bit0 - coin 1 counter port b1 bit0 - coin 2 counter */ - coin_counter_w(machine(), offset,data&1); + machine().bookkeeping().coin_counter_w(offset,data&1); break; case 2: //something... @@ -399,7 +399,7 @@ WRITE8_MEMBER(tubep_state::rjammer_LS259_w) { case 0: case 1: - coin_counter_w(machine(), offset,data&1); /* bit 0 = coin counter */ + machine().bookkeeping().coin_counter_w(offset,data&1); /* bit 0 = coin counter */ break; case 5: //screen_flip_w(offset,data&1); /* bit 0 = screen flip, active high */ diff --git a/src/mame/drivers/tunhunt.cpp b/src/mame/drivers/tunhunt.cpp index cc567c6778e..c05c1f73815 100644 --- a/src/mame/drivers/tunhunt.cpp +++ b/src/mame/drivers/tunhunt.cpp @@ -70,8 +70,8 @@ WRITE8_MEMBER(tunhunt_state::control_w) */ m_control = data; - coin_counter_w( machine(), 0,data&0x01 ); - coin_counter_w( machine(), 1,data&0x02 ); + machine().bookkeeping().coin_counter_w(0,data&0x01 ); + machine().bookkeeping().coin_counter_w(1,data&0x02 ); set_led_status( machine(), 0, data&0x40 ); /* start */ } diff --git a/src/mame/drivers/turbo.cpp b/src/mame/drivers/turbo.cpp index 66caf369ea4..efdd80f201a 100644 --- a/src/mame/drivers/turbo.cpp +++ b/src/mame/drivers/turbo.cpp @@ -295,8 +295,8 @@ WRITE8_MEMBER(turbo_state::subroc3d_ppi0b_w) /* bit 2 = STLA (START LAMP) */ /* bit 3 = NOUSE (n/c) */ /* bit 4 = FLIP (not really flip, just offset) */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); set_led_status(machine(), 0, data & 0x04); m_subroc3d_flip = (data >> 4) & 1; } @@ -342,8 +342,8 @@ WRITE8_MEMBER(turbo_state::buckrog_ppi1c_w) /* bit 6 = STLA (START LAMP) */ /* bit 7 = NOUSE (BODY SONIC) */ m_buckrog_obch = data & 0x07; - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); set_led_status(machine(), 0, data & 0x40); } @@ -405,10 +405,10 @@ WRITE8_MEMBER(turbo_state::turbo_coin_and_lamp_w) switch (offset & 7) { case 0: - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); break; case 1: - coin_counter_w(machine(), 1, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 1); break; case 3: set_led_status(machine(), 0, data & 1); diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp index 8a4d65e4753..e1cf1a85242 100644 --- a/src/mame/drivers/tutankhm.cpp +++ b/src/mame/drivers/tutankhm.cpp @@ -106,7 +106,7 @@ WRITE8_MEMBER(tutankhm_state::sound_mute_w) WRITE8_MEMBER(tutankhm_state::tutankhm_coin_counter_w) { - coin_counter_w(machine(), offset ^ 1, data); + machine().bookkeeping().coin_counter_w(offset ^ 1, data); } diff --git a/src/mame/drivers/twin16.cpp b/src/mame/drivers/twin16.cpp index ca384c658a0..d05c6371ccb 100644 --- a/src/mame/drivers/twin16.cpp +++ b/src/mame/drivers/twin16.cpp @@ -97,9 +97,9 @@ WRITE16_MEMBER(twin16_state::CPUA_register_w) if (rising_edge & 0x10) m_subcpu->set_input_line(M68K_IRQ_6, HOLD_LINE); - coin_counter_w(machine(), 0, m_CPUA_register & 0x01); - coin_counter_w(machine(), 1, m_CPUA_register & 0x02); - coin_counter_w(machine(), 2, m_CPUA_register & 0x04); + machine().bookkeeping().coin_counter_w(0, m_CPUA_register & 0x01); + machine().bookkeeping().coin_counter_w(1, m_CPUA_register & 0x02); + machine().bookkeeping().coin_counter_w(2, m_CPUA_register & 0x04); } } @@ -139,8 +139,8 @@ WRITE16_MEMBER(fround_state::fround_CPU_register_w) if ((old & 0x08) == 0 && (m_CPUA_register & 0x08)) m_audiocpu->set_input_line_and_vector(0, HOLD_LINE, 0xff); - coin_counter_w(machine(), 0, m_CPUA_register & 0x01); - coin_counter_w(machine(), 1, m_CPUA_register & 0x02); + machine().bookkeeping().coin_counter_w(0, m_CPUA_register & 0x01); + machine().bookkeeping().coin_counter_w(1, m_CPUA_register & 0x02); } } diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index f573d8f06a0..18b1c55e79c 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -413,16 +413,16 @@ READ8_MEMBER(tx1_state::ts_r) WRITE8_MEMBER(tx1_state::tx1_coin_cnt_w) { - coin_counter_w(machine(), 0, data & 0x80); - coin_counter_w(machine(), 1, data & 0x40); -// coin_counter_w(machine(), 2, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x40); +// machine().bookkeeping().coin_counter_w(2, data & 0x40); } WRITE8_MEMBER(tx1_state::bb_coin_cnt_w) { - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); -// coin_counter_w(machine(), 2, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); +// machine().bookkeeping().coin_counter_w(2, data & 0x04); } WRITE8_MEMBER(tx1_state::tx1_ppi_latch_w) diff --git a/src/mame/drivers/uapce.cpp b/src/mame/drivers/uapce.cpp index f0d093a0ef4..8d95ceb1eb5 100644 --- a/src/mame/drivers/uapce.cpp +++ b/src/mame/drivers/uapce.cpp @@ -153,7 +153,7 @@ WRITE8_MEMBER(uapce_state::jamma_if_control_latch_w) Pin 'z' is a normally ground connection, but on this board it is isolated from ground. The wiring harness also has the corresponding wire separate from the others. */ - coin_counter_w(machine(), 0, BIT(data,5)); + machine().bookkeeping().coin_counter_w(0, BIT(data,5)); /* D4 : Connects the START1 switch input from the JAMMA connector to the "RUN" key input of the control pad multiplexer. diff --git a/src/mame/drivers/ultratnk.cpp b/src/mame/drivers/ultratnk.cpp index 82ae96aa553..d2843da110a 100644 --- a/src/mame/drivers/ultratnk.cpp +++ b/src/mame/drivers/ultratnk.cpp @@ -138,7 +138,7 @@ WRITE8_MEMBER(ultratnk_state::ultratnk_led_2_w) WRITE8_MEMBER(ultratnk_state::ultratnk_lockout_w) { - coin_lockout_global_w(machine(), ~offset & 1); + machine().bookkeeping().coin_lockout_global_w(~offset & 1); } diff --git a/src/mame/drivers/ultrsprt.cpp b/src/mame/drivers/ultrsprt.cpp index 825432110e2..b79c9784b1d 100644 --- a/src/mame/drivers/ultrsprt.cpp +++ b/src/mame/drivers/ultrsprt.cpp @@ -117,7 +117,7 @@ WRITE32_MEMBER(ultrsprt_state::eeprom_w) m_cpu_vram_page = vram_page; } - coin_counter_w(machine(), 0, data & 0x10000000); + machine().bookkeeping().coin_counter_w(0, data & 0x10000000); m_audiocpu->set_input_line(INPUT_LINE_RESET, data & 0x80000000 ? CLEAR_LINE : ASSERT_LINE); } } diff --git a/src/mame/drivers/umipoker.cpp b/src/mame/drivers/umipoker.cpp index 9cbd21aed21..c0ed6bda4ee 100644 --- a/src/mame/drivers/umipoker.cpp +++ b/src/mame/drivers/umipoker.cpp @@ -278,9 +278,9 @@ WRITE16_MEMBER(umipoker_state::umi_counters_w) xxxx xxxx x--x xxx- Unknown / Not used. */ - coin_counter_w(machine(), 0, data & 0x20); /* COIN 1 */ - coin_counter_w(machine(), 1, data & 0x40); /* COIN 2 */ - coin_counter_w(machine(), 2, data & 0x01); /* PAYOUT */ + machine().bookkeeping().coin_counter_w(0, data & 0x20); /* COIN 1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x40); /* COIN 2 */ + machine().bookkeeping().coin_counter_w(2, data & 0x01); /* PAYOUT */ } WRITE16_MEMBER(umipoker_state::saiyu_counters_w) @@ -300,9 +300,9 @@ WRITE16_MEMBER(umipoker_state::saiyu_counters_w) x--x xxx- xxxx xxxx Unknown / Not used. */ - coin_counter_w(machine(), 0, data & 0x2000); /* COIN 1 */ - coin_counter_w(machine(), 1, data & 0x4000); /* COIN 2 */ - coin_counter_w(machine(), 2, data & 0x0100); /* PAYOUT */ + machine().bookkeeping().coin_counter_w(0, data & 0x2000); /* COIN 1 */ + machine().bookkeeping().coin_counter_w(1, data & 0x4000); /* COIN 2 */ + machine().bookkeeping().coin_counter_w(2, data & 0x0100); /* PAYOUT */ } diff --git a/src/mame/drivers/undrfire.cpp b/src/mame/drivers/undrfire.cpp index 43cdfa1751d..0e26c15749d 100644 --- a/src/mame/drivers/undrfire.cpp +++ b/src/mame/drivers/undrfire.cpp @@ -268,10 +268,10 @@ WRITE32_MEMBER(undrfire_state::undrfire_input_w) { if (ACCESSING_BITS_24_31) { - coin_lockout_w(machine(), 0,~data & 0x01000000); - coin_lockout_w(machine(), 1,~data & 0x02000000); - coin_counter_w(machine(), 0, data & 0x04000000); - coin_counter_w(machine(), 1, data & 0x08000000); + machine().bookkeeping().coin_lockout_w(0,~data & 0x01000000); + machine().bookkeeping().coin_lockout_w(1,~data & 0x02000000); + machine().bookkeeping().coin_counter_w(0, data & 0x04000000); + machine().bookkeeping().coin_counter_w(1, data & 0x08000000); m_coin_word = (data >> 16) &0xffff; } } diff --git a/src/mame/drivers/unico.cpp b/src/mame/drivers/unico.cpp index bb3b2c5c7d6..5e7c28c6801 100644 --- a/src/mame/drivers/unico.cpp +++ b/src/mame/drivers/unico.cpp @@ -91,7 +91,7 @@ WRITE16_MEMBER(unico_state::zeropnt_sound_bank_w) UINT8 *src = dst + 0x80000 + 0x20000 + 0x20000 * bank; memcpy(dst + 0x20000, src, 0x20000); - coin_counter_w(machine(), 0,data & 0x1000); + machine().bookkeeping().coin_counter_w(0,data & 0x1000); set_led_status(machine(), 0,data & 0x0800); // Start 1 set_led_status(machine(), 1,data & 0x0400); // Start 2 } @@ -186,7 +186,7 @@ WRITE32_MEMBER(unico_state::zeropnt2_leds_w) { if (ACCESSING_BITS_16_23) { - coin_counter_w(machine(), 0,data & 0x00010000); + machine().bookkeeping().coin_counter_w(0,data & 0x00010000); set_led_status(machine(), 0,data & 0x00800000); // Start 1 set_led_status(machine(), 1,data & 0x00400000); // Start 2 } diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp index 0bbebfb6d39..8454f0c135e 100644 --- a/src/mame/drivers/upscope.cpp +++ b/src/mame/drivers/upscope.cpp @@ -148,7 +148,7 @@ WRITE8_MEMBER( upscope_state::upscope_cia_1_porta_w ) case 0x02: /* coin counter */ - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); break; case 0x03: diff --git a/src/mame/drivers/vendetta.cpp b/src/mame/drivers/vendetta.cpp index cee29989869..04795e83708 100644 --- a/src/mame/drivers/vendetta.cpp +++ b/src/mame/drivers/vendetta.cpp @@ -167,8 +167,8 @@ void vendetta_state::vendetta_video_banking( int select ) WRITE8_MEMBER(vendetta_state::vendetta_5fe0_w) { /* bit 0,1 coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 = BRAMBK ?? */ diff --git a/src/mame/drivers/vicdual.cpp b/src/mame/drivers/vicdual.cpp index d330de2587e..16443eb7824 100644 --- a/src/mame/drivers/vicdual.cpp +++ b/src/mame/drivers/vicdual.cpp @@ -112,8 +112,8 @@ INPUT_CHANGED_MEMBER(vicdual_state::coin_changed) if (newval) { /* increment the coin counter */ - coin_counter_w(machine(), 0, 1); - coin_counter_w(machine(), 0, 0); + machine().bookkeeping().coin_counter_w(0, 1); + machine().bookkeeping().coin_counter_w(0, 0); coin_in(); } @@ -2301,8 +2301,8 @@ INPUT_CHANGED_MEMBER(vicdual_state::nsub_coin_in) } // increment coin counter - coin_counter_w(machine(), which, 1); - coin_counter_w(machine(), which, 0); + machine().bookkeeping().coin_counter_w(which, 1); + machine().bookkeeping().coin_counter_w(which, 0); break; // service coin diff --git a/src/mame/drivers/videopin.cpp b/src/mame/drivers/videopin.cpp index 36f089ed347..a315f8cd751 100644 --- a/src/mame/drivers/videopin.cpp +++ b/src/mame/drivers/videopin.cpp @@ -174,7 +174,7 @@ WRITE8_MEMBER(videopin_state::out1_w) if (m_mask) m_maincpu->set_input_line(INPUT_LINE_NMI, CLEAR_LINE); - coin_lockout_global_w(machine(), ~data & 0x08); + machine().bookkeeping().coin_lockout_global_w(~data & 0x08); /* Convert octave data to divide value and write to sound */ m_discrete->write(space, VIDEOPIN_OCTAVE_DATA, (0x01 << (~data & 0x07)) & 0xfe); @@ -192,7 +192,7 @@ WRITE8_MEMBER(videopin_state::out2_w) /* D6 => BELL */ /* D7 => ATTRACT */ - coin_counter_w(machine(), 0, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x10); m_discrete->write(space, VIDEOPIN_BELL_EN, data & 0x40); // Bell m_discrete->write(space, VIDEOPIN_BONG_EN, data & 0x20); // Bong diff --git a/src/mame/drivers/vigilant.cpp b/src/mame/drivers/vigilant.cpp index 3539dd77587..12f0dc881bd 100644 --- a/src/mame/drivers/vigilant.cpp +++ b/src/mame/drivers/vigilant.cpp @@ -49,8 +49,8 @@ WRITE8_MEMBER(vigilant_state::vigilant_out2_w) /* D2 = COB1 = Coin Counter B? */ /* The hardware has both coin counters hooked up to a single meter. */ - coin_counter_w(machine(), 0,data & 0x02); - coin_counter_w(machine(), 1,data & 0x04); + machine().bookkeeping().coin_counter_w(0,data & 0x02); + machine().bookkeeping().coin_counter_w(1,data & 0x04); // data & 0x01 cocktail mode } @@ -62,8 +62,8 @@ WRITE8_MEMBER(vigilant_state::kikcubic_coin_w) /* bit 1 is used but unknown */ /* bits 4/5 are coin counters */ - coin_counter_w(machine(), 0,data & 0x10); - coin_counter_w(machine(), 1,data & 0x20); + machine().bookkeeping().coin_counter_w(0,data & 0x10); + machine().bookkeeping().coin_counter_w(1,data & 0x20); } diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index 3a574a64802..941cb3cb09f 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -163,7 +163,7 @@ WRITE8_MEMBER(vsnes_state::sprite_dma_1_w) WRITE8_MEMBER(vsnes_state::vsnes_coin_counter_w) { - coin_counter_w( machine(), 0, data & 0x01 ); + machine().bookkeeping().coin_counter_w(0, data & 0x01 ); m_coin = data; //"bnglngby" and "cluclu" @@ -181,7 +181,7 @@ READ8_MEMBER(vsnes_state::vsnes_coin_counter_r) WRITE8_MEMBER(vsnes_state::vsnes_coin_counter_1_w) { - coin_counter_w( machine(), 1, data & 0x01 ); + machine().bookkeeping().coin_counter_w(1, data & 0x01 ); if( data & 0xfe ) //vsbball service mode { //do something? diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index 243375d0acd..ecb2884a20c 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -106,7 +106,7 @@ WRITE8_MEMBER(wackygtr_state::status_lamps_w) set_lamps(0, data & 0x3f); - coin_counter_w(machine(), 0, BIT(data, 6)); + machine().bookkeeping().coin_counter_w(0, BIT(data, 6)); m_ticket->write(space, 0, data & 0x80); } @@ -132,7 +132,7 @@ WRITE8_MEMBER(wackygtr_state::alligators_ctrl1_w) m_pit8253_1->write_gate1(BIT(data, 3)); m_pit8253_1->write_gate2(BIT(data, 4)); - coin_lockout_w(machine(), 0, data & 0x40 ? 0 : 1); + machine().bookkeeping().coin_lockout_w(0, data & 0x40 ? 0 : 1); } WRITE8_MEMBER(wackygtr_state::alligators_ctrl2_w) diff --git a/src/mame/drivers/wallc.cpp b/src/mame/drivers/wallc.cpp index ac88a99bfaa..7e6243e6f60 100644 --- a/src/mame/drivers/wallc.cpp +++ b/src/mame/drivers/wallc.cpp @@ -170,7 +170,7 @@ UINT32 wallc_state::screen_update_wallc(screen_device &screen, bitmap_ind16 &bit WRITE8_MEMBER(wallc_state::wallc_coin_counter_w) { - coin_counter_w(machine(), 0,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 2); } static ADDRESS_MAP_START( wallc_map, AS_PROGRAM, 8, wallc_state ) diff --git a/src/mame/drivers/warpwarp.cpp b/src/mame/drivers/warpwarp.cpp index 9a4e1ed7675..2fce51c4283 100644 --- a/src/mame/drivers/warpwarp.cpp +++ b/src/mame/drivers/warpwarp.cpp @@ -206,11 +206,11 @@ WRITE8_MEMBER(warpwarp_state::geebee_out7_w) set_led_status(machine(), 2,data & 1); break; case 3: - coin_counter_w(machine(), 0,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 1); break; case 4: if (strcmp(machine().system().name, "geebeeb")) - coin_lockout_global_w(machine(), ~data & 1); + machine().bookkeeping().coin_lockout_global_w(~data & 1); break; case 5: if( m_geebee_bgw != (data & 1) ) @@ -296,10 +296,10 @@ WRITE8_MEMBER(warpwarp_state::warpwarp_out3_w) /* n.c. */ break; case 4: - coin_lockout_global_w(machine(), ~data & 1); + machine().bookkeeping().coin_lockout_global_w(~data & 1); break; case 5: - coin_counter_w(machine(), 0,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 1); break; case 6: m_ball_on = data & 1; diff --git a/src/mame/drivers/wheelfir.cpp b/src/mame/drivers/wheelfir.cpp index 1667b2d2161..e2f2c10c88c 100644 --- a/src/mame/drivers/wheelfir.cpp +++ b/src/mame/drivers/wheelfir.cpp @@ -656,8 +656,8 @@ READ16_MEMBER(wheelfir_state::wheelfir_snd_r) WRITE16_MEMBER(wheelfir_state::coin_cnt_w) { /* bits 0/1 coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); } diff --git a/src/mame/drivers/wink.cpp b/src/mame/drivers/wink.cpp index f38bf2c1c5e..df9e42a26f7 100644 --- a/src/mame/drivers/wink.cpp +++ b/src/mame/drivers/wink.cpp @@ -109,7 +109,7 @@ WRITE8_MEMBER(wink_state::tile_banking_w) WRITE8_MEMBER(wink_state::wink_coin_counter_w) { - coin_counter_w(machine(), offset,data & 1); + machine().bookkeeping().coin_counter_w(offset,data & 1); } READ8_MEMBER(wink_state::analog_port_r) diff --git a/src/mame/drivers/wiz.cpp b/src/mame/drivers/wiz.cpp index b2f673bc82a..d6d04e677b8 100644 --- a/src/mame/drivers/wiz.cpp +++ b/src/mame/drivers/wiz.cpp @@ -295,7 +295,7 @@ READ8_MEMBER(wiz_state::wiz_protection_r) WRITE8_MEMBER(wiz_state::wiz_coin_counter_w) { - coin_counter_w(machine(), offset, data & 1); + machine().bookkeeping().coin_counter_w(offset, data & 1); } WRITE8_MEMBER(wiz_state::wiz_main_nmi_mask_w) diff --git a/src/mame/drivers/wolfpack.cpp b/src/mame/drivers/wolfpack.cpp index 093f54c5434..945df323ad4 100644 --- a/src/mame/drivers/wolfpack.cpp +++ b/src/mame/drivers/wolfpack.cpp @@ -105,7 +105,7 @@ WRITE8_MEMBER(wolfpack_state::wolfpack_start_speech_w) WRITE8_MEMBER(wolfpack_state::wolfpack_attract_w) { - coin_lockout_global_w(machine(), !(data & 1)); + machine().bookkeeping().coin_lockout_global_w(!(data & 1)); } diff --git a/src/mame/drivers/wyvernf0.cpp b/src/mame/drivers/wyvernf0.cpp index 1b32bd96aa0..01c7bbd83ae 100644 --- a/src/mame/drivers/wyvernf0.cpp +++ b/src/mame/drivers/wyvernf0.cpp @@ -321,8 +321,8 @@ WRITE8_MEMBER(wyvernf0_state::rambank_w) flip_screen_x_set(data & 0x01); flip_screen_y_set(data & 0x02); - coin_lockout_w(machine(), 0, !(data & 0x40)); - coin_lockout_w(machine(), 1, !(data & 0x40)); + machine().bookkeeping().coin_lockout_w(0, !(data & 0x40)); + machine().bookkeeping().coin_lockout_w(1, !(data & 0x40)); m_rambank = data; membank("rambank")->set_entry((data & 0x80) ? 1 : 0); diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index f0cac836222..fb5e3a62705 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -38,7 +38,7 @@ WRITE16_MEMBER(xmen_state::eeprom_w) if (ACCESSING_BITS_0_7) { /* bit 0 = coin counter */ - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* bit 2 is data */ /* bit 3 is clock (active high) */ diff --git a/src/mame/drivers/xyonix.cpp b/src/mame/drivers/xyonix.cpp index 35847a7f445..8086885d7a4 100644 --- a/src/mame/drivers/xyonix.cpp +++ b/src/mame/drivers/xyonix.cpp @@ -60,8 +60,8 @@ void xyonix_state::handle_coins(int coin) m_credits += coinage_table[tmp][1]; m_coins -= coinage_table[tmp][0]; } - coin_lockout_global_w(machine(), 0); /* Unlock all coin slots */ - coin_counter_w(machine(),1,1); coin_counter_w(machine(),1,0); /* Count slot B */ + machine().bookkeeping().coin_lockout_global_w(0); /* Unlock all coin slots */ + machine().bookkeeping().coin_counter_w(1,1); machine().bookkeeping().coin_counter_w(1,0); /* Count slot B */ } if (coin & 2) // Coin 1 ! @@ -73,8 +73,8 @@ void xyonix_state::handle_coins(int coin) m_credits += coinage_table[tmp][1]; m_coins -= coinage_table[tmp][0]; } - coin_lockout_global_w(machine(), 0); /* Unlock all coin slots */ - coin_counter_w(machine(),0,1); coin_counter_w(machine(),0,0); /* Count slot A */ + machine().bookkeeping().coin_lockout_global_w(0); /* Unlock all coin slots */ + machine().bookkeeping().coin_counter_w(0,1); machine().bookkeeping().coin_counter_w(0,0); /* Count slot A */ } if (m_credits >= 9) diff --git a/src/mame/drivers/zaccaria.cpp b/src/mame/drivers/zaccaria.cpp index fbb47193d40..4fe0e0bc162 100644 --- a/src/mame/drivers/zaccaria.cpp +++ b/src/mame/drivers/zaccaria.cpp @@ -237,7 +237,7 @@ READ8_MEMBER(zaccaria_state::prot2_r) WRITE8_MEMBER(zaccaria_state::coin_w) { - coin_counter_w(machine(), 0,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 1); } WRITE8_MEMBER(zaccaria_state::nmi_mask_w) diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index e17ab41afe6..7611396f7a0 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -380,7 +380,7 @@ CUSTOM_INPUT_MEMBER(zaxxon_state::razmataz_dial_r) WRITE8_MEMBER(zaxxon_state::zaxxon_coin_counter_w) { - coin_counter_w(machine(), offset, data & 0x01); + machine().bookkeeping().coin_counter_w(offset, data & 0x01); } diff --git a/src/mame/drivers/zodiack.cpp b/src/mame/drivers/zodiack.cpp index 2e1c0737769..64692f27fb8 100644 --- a/src/mame/drivers/zodiack.cpp +++ b/src/mame/drivers/zodiack.cpp @@ -136,8 +136,8 @@ WRITE8_MEMBER( zodiack_state::master_soundlatch_w ) WRITE8_MEMBER( zodiack_state::control_w ) { /* Bit 0-1 - coin counters */ - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x01); /* Bit 2 - ???? */ } diff --git a/src/mame/machine/ajax.cpp b/src/mame/machine/ajax.cpp index 15d4ca3415b..b7b27e4068f 100644 --- a/src/mame/machine/ajax.cpp +++ b/src/mame/machine/ajax.cpp @@ -42,8 +42,8 @@ WRITE8_MEMBER(ajax_state::ajax_bankswitch_w) bank += 4; /* coin counters */ - coin_counter_w(machine(), 0, data & 0x20); - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x20); + machine().bookkeeping().coin_counter_w(1, data & 0x40); /* priority */ m_priority = data & 0x08; diff --git a/src/mame/machine/atarifb.cpp b/src/mame/machine/atarifb.cpp index 02cf56c65ba..c5d7667635c 100644 --- a/src/mame/machine/atarifb.cpp +++ b/src/mame/machine/atarifb.cpp @@ -31,7 +31,7 @@ WRITE8_MEMBER(atarifb_state::atarifb4_out1_w) m_discrete->write(space, ATARIFB_ATTRACT_EN, data & 0x10); // Attract m_discrete->write(space, ATARIFB_NOISE_EN, data & 0x04); // Noise Enable / Kicker - coin_counter_w(machine(), 1, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x80); } @@ -85,7 +85,7 @@ WRITE8_MEMBER(atarifb_state::atarifb_out2_w) { m_discrete->write(space, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd - coin_counter_w (machine(), 0, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x10); } @@ -93,9 +93,9 @@ WRITE8_MEMBER(atarifb_state::soccer_out2_w) { m_discrete->write(space, ATARIFB_CROWD_DATA, data & 0x0f); // Crowd - coin_counter_w (machine(), 0, data & 0x10); - coin_counter_w (machine(), 1, data & 0x20); - coin_counter_w (machine(), 2, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); + machine().bookkeeping().coin_counter_w(2, data & 0x40); } diff --git a/src/mame/machine/bonzeadv.cpp b/src/mame/machine/bonzeadv.cpp index 0cd31e4ea01..b2bec33c7e1 100644 --- a/src/mame/machine/bonzeadv.cpp +++ b/src/mame/machine/bonzeadv.cpp @@ -390,10 +390,10 @@ WRITE16_MEMBER(asuka_state::bonzeadv_cchip_ram_w) { m_cc_port = data; - coin_lockout_w(machine(), 1, data & 0x80); - coin_lockout_w(machine(), 0, data & 0x40); - coin_counter_w(machine(), 1, data & 0x20); - coin_counter_w(machine(), 0, data & 0x10); + machine().bookkeeping().coin_lockout_w(1, data & 0x80); + machine().bookkeeping().coin_lockout_w(0, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); } if (offset == 0x0e && data != 0x00) diff --git a/src/mame/machine/bublbobl.cpp b/src/mame/machine/bublbobl.cpp index 3998d02f2d6..df5cf37dbac 100644 --- a/src/mame/machine/bublbobl.cpp +++ b/src/mame/machine/bublbobl.cpp @@ -201,7 +201,7 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w) //logerror("%04x: 6801U4 port 1 write %02x\n", space.device().safe_pc(), data); // bit 4: coin lockout - coin_lockout_global_w(machine(), ~data & 0x10); + machine().bookkeeping().coin_lockout_global_w(~data & 0x10); // bit 5: select 1-way or 2-way coin counter diff --git a/src/mame/machine/carpolo.cpp b/src/mame/machine/carpolo.cpp index a1ae3466f6e..a252fe6ac42 100644 --- a/src/mame/machine/carpolo.cpp +++ b/src/mame/machine/carpolo.cpp @@ -355,7 +355,7 @@ WRITE8_MEMBER(carpolo_state::pia_0_port_a_w) bit 6 - Player 1 crash sound bit 7 - Ball hit pulse sound */ - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); m_ttl7474_1f_1->clear_w((data & 0x08) >> 3); diff --git a/src/mame/machine/cchip.cpp b/src/mame/machine/cchip.cpp index 60a35b56ddf..2149d4c0c08 100644 --- a/src/mame/machine/cchip.cpp +++ b/src/mame/machine/cchip.cpp @@ -76,10 +76,10 @@ WRITE16_MEMBER( taitox_state::cchip1_ram_w ) { m_cc_port = data; - coin_lockout_w(space.machine(), 1, data & 0x08); - coin_lockout_w(space.machine(), 0, data & 0x04); - coin_counter_w(space.machine(), 1, data & 0x02); - coin_counter_w(space.machine(), 0, data & 0x01); + space.machine().bookkeeping().coin_lockout_w(1, data & 0x08); + space.machine().bookkeeping().coin_lockout_w(0, data & 0x04); + space.machine().bookkeeping().coin_counter_w(1, data & 0x02); + space.machine().bookkeeping().coin_counter_w(0, data & 0x01); } else { diff --git a/src/mame/machine/gaelco2.cpp b/src/mame/machine/gaelco2.cpp index 182078b9b5c..95b415eb7d2 100644 --- a/src/mame/machine/gaelco2.cpp +++ b/src/mame/machine/gaelco2.cpp @@ -142,33 +142,33 @@ DRIVER_INIT_MEMBER(gaelco2_state,snowboar) WRITE16_MEMBER(gaelco2_state::gaelco2_coin_w) { /* Coin Lockouts */ - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); /* Coin Counters */ - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); } WRITE16_MEMBER(gaelco2_state::gaelco2_coin2_w) { /* coin counters */ - coin_counter_w(machine(), offset & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w(offset & 0x01, data & 0x01); } WRITE16_MEMBER(wrally2_state::wrally2_coin_w) { /* coin counters */ - coin_counter_w(machine(), (offset >> 3) & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, data & 0x01); } WRITE16_MEMBER(gaelco2_state::touchgo_coin_w) { if ((offset >> 2) == 0){ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); - coin_counter_w(machine(), 2, data & 0x04); - coin_counter_w(machine(), 3, data & 0x08); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); + machine().bookkeeping().coin_counter_w(2, data & 0x04); + machine().bookkeeping().coin_counter_w(3, data & 0x08); } } diff --git a/src/mame/machine/galaxold.cpp b/src/mame/machine/galaxold.cpp index 2c7d11fddc6..7df3016a774 100644 --- a/src/mame/machine/galaxold.cpp +++ b/src/mame/machine/galaxold.cpp @@ -87,23 +87,23 @@ MACHINE_RESET_MEMBER(galaxold_state,hunchbkg) WRITE8_MEMBER(galaxold_state::galaxold_coin_lockout_w) { - coin_lockout_global_w(machine(), ~data & 1); + machine().bookkeeping().coin_lockout_global_w(~data & 1); } WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_w) { - coin_counter_w(machine(), offset, data & 0x01); + machine().bookkeeping().coin_counter_w(offset, data & 0x01); } WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_1_w) { - coin_counter_w(machine(), 1, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x01); } WRITE8_MEMBER(galaxold_state::galaxold_coin_counter_2_w) { - coin_counter_w(machine(), 2, data & 0x01); + machine().bookkeeping().coin_counter_w(2, data & 0x01); } diff --git a/src/mame/machine/harddriv.cpp b/src/mame/machine/harddriv.cpp index 9f4a74f8948..997765122ea 100644 --- a/src/mame/machine/harddriv.cpp +++ b/src/mame/machine/harddriv.cpp @@ -357,7 +357,7 @@ WRITE16_MEMBER( harddriv_state::hd68k_wr0_write ) case 6: /* CC1 */ case 7: /* CC2 */ - coin_counter_w(space.machine(), offset - 6, data); + space.machine().bookkeeping().coin_counter_w(offset - 6, data); break; } } diff --git a/src/mame/machine/mhavoc.cpp b/src/mame/machine/mhavoc.cpp index 67453c09d87..1e5e8cf3057 100644 --- a/src/mame/machine/mhavoc.cpp +++ b/src/mame/machine/mhavoc.cpp @@ -279,10 +279,10 @@ WRITE8_MEMBER(mhavoc_state::alphaone_out_0_w) set_led_status(machine(), 1, ~data & 0x10); /* Bit 1 = right coin counter */ - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* Bit 0 = left coin counter */ - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); logerror("alphaone_out_0_w(%02X)\n", data); } @@ -291,10 +291,10 @@ logerror("alphaone_out_0_w(%02X)\n", data); WRITE8_MEMBER(mhavoc_state::mhavoc_out_1_w) { /* Bit 1 = left coin counter */ - coin_counter_w(machine(), 0, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x02); /* Bit 0 = right coin counter */ - coin_counter_w(machine(), 1, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x01); } /************************************* diff --git a/src/mame/machine/opwolf.cpp b/src/mame/machine/opwolf.cpp index 1e164f60b07..e356e55a156 100644 --- a/src/mame/machine/opwolf.cpp +++ b/src/mame/machine/opwolf.cpp @@ -560,7 +560,7 @@ TIMER_CALLBACK_MEMBER(opwolf_state::cchip_timer) m_cchip_ram[0x52] = 0x55; m_cchip_coins[slot] -= m_cchip_coins_for_credit[slot]; } - coin_counter_w(machine(), slot, 1); + machine().bookkeeping().coin_counter_w(slot, 1); } if (m_cchip_ram[0x53] > 9) @@ -581,10 +581,10 @@ TIMER_CALLBACK_MEMBER(opwolf_state::cchip_timer) m_cchip_last_05=m_cchip_ram[0x5]; // Cchip handles coin lockout (68k flags error if more than 9 coins) - coin_lockout_w(machine(), 1, m_cchip_ram[0x53] == 9); - coin_lockout_w(machine(), 0, m_cchip_ram[0x53] == 9); - coin_counter_w(machine(), 0, 0); - coin_counter_w(machine(), 1, 0); + machine().bookkeeping().coin_lockout_w(1, m_cchip_ram[0x53] == 9); + machine().bookkeeping().coin_lockout_w(0, m_cchip_ram[0x53] == 9); + machine().bookkeeping().coin_counter_w(0, 0); + machine().bookkeeping().coin_counter_w(1, 0); // Special handling for last level if (m_cchip_ram[0x1b] == 0x6) diff --git a/src/mame/machine/qix.cpp b/src/mame/machine/qix.cpp index 8c83f3532c6..a54ffb984eb 100644 --- a/src/mame/machine/qix.cpp +++ b/src/mame/machine/qix.cpp @@ -225,8 +225,8 @@ WRITE8_MEMBER(qix_state::qix_68705_portA_w) WRITE8_MEMBER(qix_state::qix_68705_portB_w) { m_68705_port_out[1] = data; - coin_lockout_w(machine(), 0, (~data >> 6) & 1); - coin_counter_w(machine(), 0, (data >> 7) & 1); + machine().bookkeeping().coin_lockout_w(0, (~data >> 6) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 7) & 1); } @@ -266,8 +266,8 @@ WRITE8_MEMBER(qix_state::qix_pia_w) WRITE8_MEMBER(qix_state::qix_coinctl_w) { - coin_lockout_w(machine(), 0, (~data >> 2) & 1); - coin_counter_w(machine(), 0, (data >> 1) & 1); + machine().bookkeeping().coin_lockout_w(0, (~data >> 2) & 1); + machine().bookkeeping().coin_counter_w(0, (data >> 1) & 1); } diff --git a/src/mame/machine/rbisland.cpp b/src/mame/machine/rbisland.cpp index 41e95d329c2..951b97225f8 100644 --- a/src/mame/machine/rbisland.cpp +++ b/src/mame/machine/rbisland.cpp @@ -753,10 +753,10 @@ TIMER_CALLBACK_MEMBER(rbisland_state::cchip_timer) m_CRAM[1][0x149] = 0xFF; } - coin_lockout_w(machine(), 1, m_CRAM[0][8] & 0x80); - coin_lockout_w(machine(), 0, m_CRAM[0][8] & 0x40); - coin_counter_w(machine(), 1, m_CRAM[0][8] & 0x20); - coin_counter_w(machine(), 0, m_CRAM[0][8] & 0x10); + machine().bookkeeping().coin_lockout_w(1, m_CRAM[0][8] & 0x80); + machine().bookkeeping().coin_lockout_w(0, m_CRAM[0][8] & 0x40); + machine().bookkeeping().coin_counter_w(1, m_CRAM[0][8] & 0x20); + machine().bookkeeping().coin_counter_w(0, m_CRAM[0][8] & 0x10); m_CRAM[0][3] = ioport("800007")->read(); /* STARTn + SERVICE1 */ m_CRAM[0][4] = ioport("800009")->read(); /* COINn */ diff --git a/src/mame/machine/simpsons.cpp b/src/mame/machine/simpsons.cpp index b54da52e43c..420f65bef31 100644 --- a/src/mame/machine/simpsons.cpp +++ b/src/mame/machine/simpsons.cpp @@ -33,8 +33,8 @@ WRITE8_MEMBER(simpsons_state::simpsons_eeprom_w) WRITE8_MEMBER(simpsons_state::simpsons_coin_counter_w) { /* bit 0,1 coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 selects mono or stereo sound */ /* bit 3 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/machine/starwars.cpp b/src/mame/machine/starwars.cpp index 75699bc50a0..b9dadf719cc 100644 --- a/src/mame/machine/starwars.cpp +++ b/src/mame/machine/starwars.cpp @@ -67,11 +67,11 @@ WRITE8_MEMBER(starwars_state::starwars_out_w) switch (offset & 7) { case 0: /* Coin counter 1 */ - coin_counter_w(machine(), 0, data); + machine().bookkeeping().coin_counter_w(0, data); break; case 1: /* Coin counter 2 */ - coin_counter_w(machine(), 1, data); + machine().bookkeeping().coin_counter_w(1, data); break; case 2: /* LED 3 */ diff --git a/src/mame/machine/stfight.cpp b/src/mame/machine/stfight.cpp index f0aba6a01c3..2ffe2d57a95 100644 --- a/src/mame/machine/stfight.cpp +++ b/src/mame/machine/stfight.cpp @@ -156,8 +156,8 @@ INTERRUPT_GEN_MEMBER(stfight_state::stfight_vb_interrupt) WRITE8_MEMBER(stfight_state::stfight_io_w) { // TODO: What is bit 4? - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); } READ8_MEMBER(stfight_state::stfight_coin_r) diff --git a/src/mame/machine/taitoio.cpp b/src/mame/machine/taitoio.cpp index 6d2bcadd9b0..7ec4223c354 100644 --- a/src/mame/machine/taitoio.cpp +++ b/src/mame/machine/taitoio.cpp @@ -137,10 +137,10 @@ WRITE8_MEMBER( tc0220ioc_device::write ) case 0x04: /* coin counters and lockout, hi nibble irrelevant */ - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); //if (data & 0xf0) //logerror("PC %06x: warning - write %02x to TC0220IOC address %02x\n",space.device().safe_pc(),data,offset); @@ -260,10 +260,10 @@ WRITE8_MEMBER( tc0510nio_device::write ) break; case 0x04: /* coin counters and lockout */ - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); break; default: @@ -387,10 +387,10 @@ WRITE8_MEMBER( tc0640fio_device::write ) break; case 0x04: /* coin counters and lockout */ - coin_lockout_w(machine(), 0, ~data & 0x01); - coin_lockout_w(machine(), 1, ~data & 0x02); - coin_counter_w(machine(), 0, data & 0x04); - coin_counter_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x04); + machine().bookkeeping().coin_counter_w(1, data & 0x08); break; default: diff --git a/src/mame/machine/taitosj.cpp b/src/mame/machine/taitosj.cpp index f32f2fc83df..ac4cdfd85c7 100644 --- a/src/mame/machine/taitosj.cpp +++ b/src/mame/machine/taitosj.cpp @@ -56,7 +56,7 @@ void taitosj_state::machine_reset() WRITE8_MEMBER(taitosj_state::taitosj_bankswitch_w) { - coin_lockout_global_w(machine(), ~data & 1); + machine().bookkeeping().coin_lockout_global_w(~data & 1); if(data & 0x80) membank("bank1")->set_entry(1); else membank("bank1")->set_entry(0); diff --git a/src/mame/machine/ticket.cpp b/src/mame/machine/ticket.cpp index 595a22b40a9..8f73cf78133 100644 --- a/src/mame/machine/ticket.cpp +++ b/src/mame/machine/ticket.cpp @@ -202,7 +202,7 @@ void ticket_dispenser_device::device_timer(emu_timer &timer, device_timer_id id, // if we just dispensed, increment global count if (m_status == m_ticketdispensed) { - increment_dispensed_tickets(machine(), 1); + machine().bookkeeping().increment_dispensed_tickets(1); LOG(("Ticket Dispensed\n")); } } diff --git a/src/mame/machine/tnzs.cpp b/src/mame/machine/tnzs.cpp index 108a5fa1522..cd1eafb6562 100644 --- a/src/mame/machine/tnzs.cpp +++ b/src/mame/machine/tnzs.cpp @@ -70,10 +70,10 @@ WRITE8_MEMBER(tnzs_state::tnzs_port2_w) { // logerror("I8742:%04x Write %02x to port 2\n", space.device().safe_pcbase(), data); - coin_lockout_w(machine(), 0, (data & 0x40)); - coin_lockout_w(machine(), 1, (data & 0x80)); - coin_counter_w(machine(), 0, (~data & 0x10)); - coin_counter_w(machine(), 1, (~data & 0x20)); + machine().bookkeeping().coin_lockout_w(0, (data & 0x40)); + machine().bookkeeping().coin_lockout_w(1, (data & 0x80)); + machine().bookkeeping().coin_counter_w(0, (~data & 0x10)); + machine().bookkeeping().coin_counter_w(1, (~data & 0x20)); m_input_select = data; } @@ -123,7 +123,7 @@ void tnzs_state::mcu_handle_coins( int coin ) if (coin & 0x01) /* coin A */ { // logerror("Coin dropped into slot A\n"); - coin_counter_w(machine(),0,1); coin_counter_w(machine(),0,0); /* Count slot A */ + machine().bookkeeping().coin_counter_w(0,1); machine().bookkeeping().coin_counter_w(0,0); /* Count slot A */ m_mcu_coins_a++; if (m_mcu_coins_a >= m_mcu_coinage[0]) { @@ -132,11 +132,11 @@ void tnzs_state::mcu_handle_coins( int coin ) if (m_mcu_credits >= 9) { m_mcu_credits = 9; - coin_lockout_global_w(machine(), 1); /* Lock all coin slots */ + machine().bookkeeping().coin_lockout_global_w(1); /* Lock all coin slots */ } else { - coin_lockout_global_w(machine(), 0); /* Unlock all coin slots */ + machine().bookkeeping().coin_lockout_global_w(0); /* Unlock all coin slots */ } } } @@ -144,7 +144,7 @@ void tnzs_state::mcu_handle_coins( int coin ) if (coin & 0x02) /* coin B */ { // logerror("Coin dropped into slot B\n"); - coin_counter_w(machine(),1,1); coin_counter_w(machine(),1,0); /* Count slot B */ + machine().bookkeeping().coin_counter_w(1,1); machine().bookkeeping().coin_counter_w(1,0); /* Count slot B */ m_mcu_coins_b++; if (m_mcu_coins_b >= m_mcu_coinage[2]) { @@ -153,11 +153,11 @@ void tnzs_state::mcu_handle_coins( int coin ) if (m_mcu_credits >= 9) { m_mcu_credits = 9; - coin_lockout_global_w(machine(), 1); /* Lock all coin slots */ + machine().bookkeeping().coin_lockout_global_w(1); /* Lock all coin slots */ } else { - coin_lockout_global_w(machine(), 0); /* Unlock all coin slots */ + machine().bookkeeping().coin_lockout_global_w(0); /* Unlock all coin slots */ } } } @@ -173,7 +173,7 @@ void tnzs_state::mcu_handle_coins( int coin ) else { if (m_mcu_credits < 9) - coin_lockout_global_w(machine(), 0); /* Unlock all coin slots */ + machine().bookkeeping().coin_lockout_global_w(0); /* Unlock all coin slots */ m_mcu_reportcoin = 0; } @@ -702,22 +702,22 @@ WRITE8_MEMBER(tnzs_state::tnzs_bankswitch1_w) /* Coin count and lockout is handled by the i8742 */ break; case MCU_NONE_INSECTX: - coin_lockout_w(machine(), 0, (~data & 0x04)); - coin_lockout_w(machine(), 1, (~data & 0x08)); - coin_counter_w(machine(), 0, (data & 0x10)); - coin_counter_w(machine(), 1, (data & 0x20)); + machine().bookkeeping().coin_lockout_w(0, (~data & 0x04)); + machine().bookkeeping().coin_lockout_w(1, (~data & 0x08)); + machine().bookkeeping().coin_counter_w(0, (data & 0x10)); + machine().bookkeeping().coin_counter_w(1, (data & 0x20)); break; case MCU_NONE_TNZSB: case MCU_NONE_KABUKIZ: - coin_lockout_w(machine(), 0, (~data & 0x10)); - coin_lockout_w(machine(), 1, (~data & 0x20)); - coin_counter_w(machine(), 0, (data & 0x04)); - coin_counter_w(machine(), 1, (data & 0x08)); + machine().bookkeeping().coin_lockout_w(0, (~data & 0x10)); + machine().bookkeeping().coin_lockout_w(1, (~data & 0x20)); + machine().bookkeeping().coin_counter_w(0, (data & 0x04)); + machine().bookkeeping().coin_counter_w(1, (data & 0x08)); break; case MCU_NONE_KAGEKI: - coin_lockout_global_w(machine(), (~data & 0x20)); - coin_counter_w(machine(), 0, (data & 0x04)); - coin_counter_w(machine(), 1, (data & 0x08)); + machine().bookkeeping().coin_lockout_global_w((~data & 0x20)); + machine().bookkeeping().coin_counter_w(0, (data & 0x04)); + machine().bookkeeping().coin_counter_w(1, (data & 0x08)); break; case MCU_ARKANOID: case MCU_EXTRMATN: diff --git a/src/mame/machine/toaplan1.cpp b/src/mame/machine/toaplan1.cpp index de9342b4007..687b130b1ed 100644 --- a/src/mame/machine/toaplan1.cpp +++ b/src/mame/machine/toaplan1.cpp @@ -235,15 +235,15 @@ READ16_MEMBER(toaplan1_state::vimana_system_port_r) m_vimana_credits += toaplan1_credits_for_coin[reg][slot][dsw]; m_vimana_coins[slot] -= toaplan1_coins_for_credit[reg][slot][dsw]; } - coin_counter_w(machine(), slot, 1); - coin_counter_w(machine(), slot, 0); + machine().bookkeeping().coin_counter_w(slot, 1); + machine().bookkeeping().coin_counter_w(slot, 0); } if (m_vimana_credits >= 9) m_vimana_credits = 9; } - coin_lockout_global_w(machine(), (m_vimana_credits >= 9)); + machine().bookkeeping().coin_lockout_global_w((m_vimana_credits >= 9)); m_vimana_latch = p; @@ -276,7 +276,7 @@ WRITE16_MEMBER(toaplan1_state::vimana_mcu_w) if (ACCESSING_BITS_0_7) { m_vimana_credits = data & 0xff; - coin_lockout_global_w(machine(), (m_vimana_credits >= 9)); + machine().bookkeeping().coin_lockout_global_w((m_vimana_credits >= 9)); } break; } @@ -314,14 +314,14 @@ WRITE16_MEMBER(toaplan1_state::toaplan1_reset_sound_w) WRITE8_MEMBER(toaplan1_rallybik_state::rallybik_coin_w) { switch (data) { - case 0x08: if (m_coin_count) { coin_counter_w(machine(), 0, 1); coin_counter_w(machine(), 0, 0); } break; - case 0x09: if (m_coin_count) { coin_counter_w(machine(), 2, 1); coin_counter_w(machine(), 2, 0); } break; - case 0x0a: if (m_coin_count) { coin_counter_w(machine(), 1, 1); coin_counter_w(machine(), 1, 0); } break; - case 0x0b: if (m_coin_count) { coin_counter_w(machine(), 3, 1); coin_counter_w(machine(), 3, 0); } break; - case 0x0c: coin_lockout_w(machine(), 0, 1); coin_lockout_w(machine(), 2, 1); break; - case 0x0d: coin_lockout_w(machine(), 0, 0); coin_lockout_w(machine(), 2, 0); break; - case 0x0e: coin_lockout_w(machine(), 1, 1); coin_lockout_w(machine(), 3, 1); break; - case 0x0f: coin_lockout_w(machine(), 1, 0); coin_lockout_w(machine(), 3, 0); m_coin_count=1; break; + case 0x08: if (m_coin_count) { machine().bookkeeping().coin_counter_w(0, 1); machine().bookkeeping().coin_counter_w(0, 0); } break; + case 0x09: if (m_coin_count) { machine().bookkeeping().coin_counter_w(2, 1); machine().bookkeeping().coin_counter_w(2, 0); } break; + case 0x0a: if (m_coin_count) { machine().bookkeeping().coin_counter_w(1, 1); machine().bookkeeping().coin_counter_w(1, 0); } break; + case 0x0b: if (m_coin_count) { machine().bookkeeping().coin_counter_w(3, 1); machine().bookkeeping().coin_counter_w(3, 0); } break; + case 0x0c: machine().bookkeeping().coin_lockout_w(0, 1); machine().bookkeeping().coin_lockout_w(2, 1); break; + case 0x0d: machine().bookkeeping().coin_lockout_w(0, 0); machine().bookkeeping().coin_lockout_w(2, 0); break; + case 0x0e: machine().bookkeeping().coin_lockout_w(1, 1); machine().bookkeeping().coin_lockout_w(3, 1); break; + case 0x0f: machine().bookkeeping().coin_lockout_w(1, 0); machine().bookkeeping().coin_lockout_w(3, 0); m_coin_count=1; break; default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",space.device().safe_pcbase(),data); break; } } @@ -334,24 +334,24 @@ WRITE8_MEMBER(toaplan1_state::toaplan1_coin_w) /* Are some outputs for lights ? (no space on JAMMA for it though) */ switch (data) { - case 0xee: coin_counter_w(machine(), 1,1); coin_counter_w(machine(), 1,0); break; /* Count slot B */ - case 0xed: coin_counter_w(machine(), 0,1); coin_counter_w(machine(), 0,0); break; /* Count slot A */ + case 0xee: machine().bookkeeping().coin_counter_w(1,1); machine().bookkeeping().coin_counter_w(1,0); break; /* Count slot B */ + case 0xed: machine().bookkeeping().coin_counter_w(0,1); machine().bookkeeping().coin_counter_w(0,0); break; /* Count slot A */ /* The following are coin counts after coin-lock active (faulty coin-lock ?) */ - case 0xe2: coin_counter_w(machine(), 1,1); coin_counter_w(machine(), 1,0); coin_lockout_w(machine(), 1,1); break; - case 0xe1: coin_counter_w(machine(), 0,1); coin_counter_w(machine(), 0,0); coin_lockout_w(machine(), 0,1); break; + case 0xe2: machine().bookkeeping().coin_counter_w(1,1); machine().bookkeeping().coin_counter_w(1,0); machine().bookkeeping().coin_lockout_w(1,1); break; + case 0xe1: machine().bookkeeping().coin_counter_w(0,1); machine().bookkeeping().coin_counter_w(0,0); machine().bookkeeping().coin_lockout_w(0,1); break; - case 0xec: coin_lockout_global_w(machine(), 0); break; /* ??? count games played */ + case 0xec: machine().bookkeeping().coin_lockout_global_w(0); break; /* ??? count games played */ case 0xe8: break; /* ??? Maximum credits reached with coin/credit ratio */ case 0xe4: break; /* ??? Reset coin system */ - case 0x0c: coin_lockout_global_w(machine(), 0); break; /* Unlock all coin slots */ - case 0x08: coin_lockout_w(machine(), 2,0); break; /* Unlock coin slot C */ - case 0x09: coin_lockout_w(machine(), 0,0); break; /* Unlock coin slot A */ - case 0x0a: coin_lockout_w(machine(), 1,0); break; /* Unlock coin slot B */ + case 0x0c: machine().bookkeeping().coin_lockout_global_w(0); break; /* Unlock all coin slots */ + case 0x08: machine().bookkeeping().coin_lockout_w(2,0); break; /* Unlock coin slot C */ + case 0x09: machine().bookkeeping().coin_lockout_w(0,0); break; /* Unlock coin slot A */ + case 0x0a: machine().bookkeeping().coin_lockout_w(1,0); break; /* Unlock coin slot B */ - case 0x02: coin_lockout_w(machine(), 1,1); break; /* Lock coin slot B */ - case 0x01: coin_lockout_w(machine(), 0,1); break; /* Lock coin slot A */ - case 0x00: coin_lockout_global_w(machine(), 1); break; /* Lock all coin slots */ + case 0x02: machine().bookkeeping().coin_lockout_w(1,1); break; /* Lock coin slot B */ + case 0x01: machine().bookkeeping().coin_lockout_w(0,1); break; /* Lock coin slot A */ + case 0x00: machine().bookkeeping().coin_lockout_global_w(1); break; /* Lock all coin slots */ default: logerror("PC:%04x Writing unknown data (%04x) to coin count/lockout port\n",space.device().safe_pcbase(),data); break; } } @@ -377,7 +377,7 @@ MACHINE_RESET_MEMBER(toaplan1_state,toaplan1) { m_intenable = 0; m_coin_count = 0; - coin_lockout_global_w(machine(), 0); + machine().bookkeeping().coin_lockout_global_w(0); } /* zerowing, fireshrk, outzone */ diff --git a/src/mame/machine/twincobr.cpp b/src/mame/machine/twincobr.cpp index e727403cc24..26bf4cec699 100644 --- a/src/mame/machine/twincobr.cpp +++ b/src/mame/machine/twincobr.cpp @@ -256,14 +256,14 @@ void twincobr_state::toaplan0_coin_dsp_w(address_space &space, int offset, int d if (data > 1) LOG(("%s:Writing %08x to %08x.\n",machine().describe_context(),data,toaplan_port_type[m_toaplan_main_cpu] - offset)); switch (data) { - case 0x08: coin_counter_w(machine(), 0,0); break; - case 0x09: coin_counter_w(machine(), 0,1); break; - case 0x0a: coin_counter_w(machine(), 1,0); break; - case 0x0b: coin_counter_w(machine(), 1,1); break; - case 0x0c: coin_lockout_w(machine(), 0,1); break; - case 0x0d: coin_lockout_w(machine(), 0,0); break; - case 0x0e: coin_lockout_w(machine(), 1,1); break; - case 0x0f: coin_lockout_w(machine(), 1,0); break; + case 0x08: machine().bookkeeping().coin_counter_w(0,0); break; + case 0x09: machine().bookkeeping().coin_counter_w(0,1); break; + case 0x0a: machine().bookkeeping().coin_counter_w(1,0); break; + case 0x0b: machine().bookkeeping().coin_counter_w(1,1); break; + case 0x0c: machine().bookkeeping().coin_lockout_w(0,1); break; + case 0x0d: machine().bookkeeping().coin_lockout_w(0,0); break; + case 0x0e: machine().bookkeeping().coin_lockout_w(1,1); break; + case 0x0f: machine().bookkeeping().coin_lockout_w(1,0); break; /****** The following apply to Flying Shark/Wardner only ******/ case 0x00: /* This means assert the INT line to the DSP */ LOG(("Turning DSP on and main CPU off\n")); diff --git a/src/mame/machine/volfied.cpp b/src/mame/machine/volfied.cpp index 1835d285968..e6c42f13bfc 100644 --- a/src/mame/machine/volfied.cpp +++ b/src/mame/machine/volfied.cpp @@ -362,10 +362,10 @@ WRITE16_MEMBER(volfied_state::volfied_cchip_ram_w) { m_cc_port = data; - coin_lockout_w(machine(), 1, data & 0x80); - coin_lockout_w(machine(), 0, data & 0x40); - coin_counter_w(machine(), 1, data & 0x20); - coin_counter_w(machine(), 0, data & 0x10); + machine().bookkeeping().coin_lockout_w(1, data & 0x80); + machine().bookkeeping().coin_lockout_w(0, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); } if (offset == 0x3fe) diff --git a/src/mame/machine/williams.cpp b/src/mame/machine/williams.cpp index d0ce9f270de..699eaa41687 100644 --- a/src/mame/machine/williams.cpp +++ b/src/mame/machine/williams.cpp @@ -628,7 +628,7 @@ WRITE8_MEMBER(blaster_state::blaster_snd_cmd_w) WRITE_LINE_MEMBER(williams_state::lottofun_coin_lock_w) { - coin_lockout_global_w(machine(), state & 1); /* bit 5 of PIC control port A */ + machine().bookkeeping().coin_lockout_global_w(state & 1); /* bit 5 of PIC control port A */ } diff --git a/src/mame/machine/wpc_out.cpp b/src/mame/machine/wpc_out.cpp index d9d73f7b7b2..695513594c1 100644 --- a/src/mame/machine/wpc_out.cpp +++ b/src/mame/machine/wpc_out.cpp @@ -58,7 +58,7 @@ void wpc_out_device::send_output(int sid, int state) output_set_value(name, state); if(sid == 41) - coin_counter_w(machine(), 0, state); + machine().bookkeeping().coin_counter_w(0, state); } WRITE8_MEMBER(wpc_out_device::out_w) diff --git a/src/mame/machine/wrally.cpp b/src/mame/machine/wrally.cpp index 58f67225223..9ffe913e965 100644 --- a/src/mame/machine/wrally.cpp +++ b/src/mame/machine/wrally.cpp @@ -44,10 +44,10 @@ WRITE16_MEMBER(wrally_state::okim6295_bankswitch_w) WRITE16_MEMBER(wrally_state::wrally_coin_counter_w) { - coin_counter_w( machine(), (offset >> 3) & 0x01, data & 0x01); + machine().bookkeeping().coin_counter_w((offset >> 3) & 0x01, data & 0x01); } WRITE16_MEMBER(wrally_state::wrally_coin_lockout_w) { - coin_lockout_w( machine(), (offset >> 3) & 0x01, ~data & 0x01); + machine().bookkeeping().coin_lockout_w((offset >> 3) & 0x01, ~data & 0x01); } diff --git a/src/mame/machine/xevious.cpp b/src/mame/machine/xevious.cpp index ff98376498c..3202a713845 100644 --- a/src/mame/machine/xevious.cpp +++ b/src/mame/machine/xevious.cpp @@ -140,9 +140,9 @@ WRITE8_MEMBER( xevious_state::battles_CPU4_coin_w ) set_led_status(machine(), 0,data & 0x02); // Start 1 set_led_status(machine(), 1,data & 0x01); // Start 2 - coin_counter_w(machine(), 0,data & 0x20); - coin_counter_w(machine(), 1,data & 0x10); - coin_lockout_global_w(machine(), ~data & 0x04); + machine().bookkeeping().coin_counter_w(0,data & 0x20); + machine().bookkeeping().coin_counter_w(1,data & 0x10); + machine().bookkeeping().coin_lockout_global_w(~data & 0x04); } diff --git a/src/mame/video/1942.cpp b/src/mame/video/1942.cpp index bc4b168a6cf..89d715093b3 100644 --- a/src/mame/video/1942.cpp +++ b/src/mame/video/1942.cpp @@ -204,7 +204,7 @@ WRITE8_MEMBER(_1942_state::c1942_c804_w) bit 4: cpu B reset bit 0: coin counter */ - coin_counter_w(machine(), 0,data & 0x01); + machine().bookkeeping().coin_counter_w(0,data & 0x01); m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/video/1943.cpp b/src/mame/video/1943.cpp index ba99dcf6cb9..2cda7f6fa70 100644 --- a/src/mame/video/1943.cpp +++ b/src/mame/video/1943.cpp @@ -133,8 +133,8 @@ WRITE8_MEMBER(_1943_state::c1943_colorram_w) WRITE8_MEMBER(_1943_state::c1943_c804_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bits 2, 3 and 4 select the ROM bank */ membank("bank1")->set_entry((data & 0x1c) >> 2); diff --git a/src/mame/video/arkanoid.cpp b/src/mame/video/arkanoid.cpp index f85b0c9ee9f..b297ff562c3 100644 --- a/src/mame/video/arkanoid.cpp +++ b/src/mame/video/arkanoid.cpp @@ -30,8 +30,8 @@ WRITE8_MEMBER(arkanoid_state::arkanoid_d008_w) m_paddle_select = data & 0x04; /* bit 3 is coin lockout (but not the service coin) */ - coin_lockout_w(machine(), 0, !(data & 0x08)); - coin_lockout_w(machine(), 1, !(data & 0x08)); + machine().bookkeeping().coin_lockout_w(0, !(data & 0x08)); + machine().bookkeeping().coin_lockout_w(1, !(data & 0x08)); /* bit 4 is unknown */ @@ -136,8 +136,8 @@ WRITE8_MEMBER(arkanoid_state::tetrsark_d008_w) } /* bit 7 is coin lockout (but not the service coin) */ - coin_lockout_w(machine(), 0, !(data & 0x80)); - coin_lockout_w(machine(), 1, !(data & 0x80)); + machine().bookkeeping().coin_lockout_w(0, !(data & 0x80)); + machine().bookkeeping().coin_lockout_w(1, !(data & 0x80)); } diff --git a/src/mame/video/bionicc.cpp b/src/mame/video/bionicc.cpp index 9c6b38a053c..f016970b2f4 100644 --- a/src/mame/video/bionicc.cpp +++ b/src/mame/video/bionicc.cpp @@ -171,8 +171,8 @@ WRITE16_MEMBER(bionicc_state::bionicc_gfxctrl_w) m_bg_tilemap->enable(data & 0x2000); /* guess */ m_fg_tilemap->enable(data & 0x1000); /* guess */ - coin_counter_w(machine(), 0, data & 0x8000); - coin_counter_w(machine(), 1, data & 0x4000); + machine().bookkeeping().coin_counter_w(0, data & 0x8000); + machine().bookkeeping().coin_counter_w(1, data & 0x4000); } } diff --git a/src/mame/video/bking.cpp b/src/mame/video/bking.cpp index 87b0795ea05..ac3851e7217 100644 --- a/src/mame/video/bking.cpp +++ b/src/mame/video/bking.cpp @@ -124,7 +124,7 @@ WRITE8_MEMBER(bking_state::bking_cont1_w) /* D3 = Not Connected */ /* D4-D7 = CROW0-CROW3 (selects crow picture) */ - coin_lockout_global_w(machine(), ~data & 0x01); + machine().bookkeeping().coin_lockout_global_w(~data & 0x01); flip_screen_set(data & 0x04); diff --git a/src/mame/video/blktiger.cpp b/src/mame/video/blktiger.cpp index fe7363dbc2d..eb0e92a7596 100644 --- a/src/mame/video/blktiger.cpp +++ b/src/mame/video/blktiger.cpp @@ -147,8 +147,8 @@ WRITE8_MEMBER(blktiger_state::blktiger_scrollx_w) WRITE8_MEMBER(blktiger_state::blktiger_video_control_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 2); /* bit 5 resets the sound CPU */ m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x20) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/video/buggychl.cpp b/src/mame/video/buggychl.cpp index 898a85fa5cb..1194c200a59 100644 --- a/src/mame/video/buggychl.cpp +++ b/src/mame/video/buggychl.cpp @@ -63,7 +63,7 @@ WRITE8_MEMBER(buggychl_state::buggychl_ctrl_w) m_sprite_color_base = (data & 0x10) ? 1 * 16 : 3 * 16; - coin_lockout_global_w(machine(), (~data & 0x40) >> 6); + machine().bookkeeping().coin_lockout_global_w((~data & 0x40) >> 6); set_led_status(machine(), 0, ~data & 0x80); } diff --git a/src/mame/video/cischeat.cpp b/src/mame/video/cischeat.cpp index ffe21b504f9..de0e3a49b7e 100644 --- a/src/mame/video/cischeat.cpp +++ b/src/mame/video/cischeat.cpp @@ -329,8 +329,8 @@ WRITE16_MEMBER(cischeat_state::bigrun_vregs_w) case 0x0000/2 : // leds if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0,new_data & 0x01); - coin_counter_w(machine(), 1,new_data & 0x02); + machine().bookkeeping().coin_counter_w(0,new_data & 0x01); + machine().bookkeeping().coin_counter_w(1,new_data & 0x02); set_led_status(machine(), 0,new_data & 0x10); // start button set_led_status(machine(), 1,new_data & 0x20); // ? } @@ -422,8 +422,8 @@ WRITE16_MEMBER(cischeat_state::cischeat_vregs_w) case 0x0000/2 : // leds if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0,new_data & 0x01); - coin_counter_w(machine(), 1,new_data & 0x02); + machine().bookkeeping().coin_counter_w(0,new_data & 0x01); + machine().bookkeeping().coin_counter_w(1,new_data & 0x02); set_led_status(machine(), 0,new_data & 0x10); // start button set_led_status(machine(), 1,new_data & 0x20); // ? } @@ -563,8 +563,8 @@ CPU #0 PC 00235C : Warning, vreg 0006 <- 0000 case 0x0004/2 : if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0,new_data & 0x01); - coin_counter_w(machine(), 1,new_data & 0x02); + machine().bookkeeping().coin_counter_w(0,new_data & 0x01); + machine().bookkeeping().coin_counter_w(1,new_data & 0x02); set_led_status(machine(), 0,new_data & 0x04); // start button set_led_status(machine(), 1,new_data & 0x20); // ? // wheel | seat motor diff --git a/src/mame/video/commando.cpp b/src/mame/video/commando.cpp index 26a5ebeabb6..4280c867777 100644 --- a/src/mame/video/commando.cpp +++ b/src/mame/video/commando.cpp @@ -51,8 +51,8 @@ WRITE8_MEMBER(commando_state::commando_scrolly_w) WRITE8_MEMBER(commando_state::commando_c804_w) { // bits 0 and 1 are coin counters - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); // bit 4 resets the sound CPU m_audiocpu->set_input_line(INPUT_LINE_RESET, (data & 0x10) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/video/cop01.cpp b/src/mame/video/cop01.cpp index ca29e24db63..1ad3183a157 100644 --- a/src/mame/video/cop01.cpp +++ b/src/mame/video/cop01.cpp @@ -146,8 +146,8 @@ WRITE8_MEMBER(cop01_state::cop01_vreg_w) if (offset == 0) { - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); flip_screen_set(data & 4); } } diff --git a/src/mame/video/cps1.cpp b/src/mame/video/cps1.cpp index 41b23c3cf71..e6ea9d4aab7 100644 --- a/src/mame/video/cps1.cpp +++ b/src/mame/video/cps1.cpp @@ -1820,15 +1820,15 @@ WRITE16_MEMBER(cps_state::cps1_cps_b_w) { if (m_game_config->cpsb_value == 0x0402) // Mercs (CN2 connector) { - coin_lockout_w(machine(), 2, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x01); set_led_status(machine(), 0, data & 0x02); set_led_status(machine(), 1, data & 0x04); set_led_status(machine(), 2, data & 0x08); } else // kod, captcomm, knights { - coin_lockout_w(machine(), 2, ~data & 0x02); - coin_lockout_w(machine(), 3, ~data & 0x08); + machine().bookkeeping().coin_lockout_w(2, ~data & 0x02); + machine().bookkeeping().coin_lockout_w(3, ~data & 0x08); } } } diff --git a/src/mame/video/dday.cpp b/src/mame/video/dday.cpp index 738a5662a5b..a8088eb7b28 100644 --- a/src/mame/video/dday.cpp +++ b/src/mame/video/dday.cpp @@ -271,10 +271,10 @@ WRITE8_MEMBER(dday_state::dday_control_w) //if (data & 0xac) logerror("Control = %02X\n", data & 0xac); /* bit 0 is coin counter 1 */ - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* bit 1 is coin counter 2 */ - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 4 is sound enable */ if (!(data & 0x10) && (m_control & 0x10)) diff --git a/src/mame/video/deniam.cpp b/src/mame/video/deniam.cpp index e423402b8c6..20d29dcd2b0 100644 --- a/src/mame/video/deniam.cpp +++ b/src/mame/video/deniam.cpp @@ -159,7 +159,7 @@ WRITE16_MEMBER(deniam_state::deniam_coinctrl_w) COMBINE_DATA(&m_coinctrl); /* bit 0 is coin counter */ - coin_counter_w(machine(), 0, m_coinctrl & 0x01); + machine().bookkeeping().coin_counter_w(0, m_coinctrl & 0x01); /* bit 6 is display enable (0 freezes screen) */ m_display_enable = m_coinctrl & 0x20; diff --git a/src/mame/video/dogfgt.cpp b/src/mame/video/dogfgt.cpp index b925444b866..88d8a64d8e9 100644 --- a/src/mame/video/dogfgt.cpp +++ b/src/mame/video/dogfgt.cpp @@ -154,8 +154,8 @@ WRITE8_MEMBER(dogfgt_state::dogfgt_1800_w) m_pixcolor = ((data & 0x01) << 1) | ((data & 0x02) >> 1); /* bits 4 and 5 are coin counters */ - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* bit 7 is screen flip */ flip_screen_set(data & 0x80); diff --git a/src/mame/video/dooyong.cpp b/src/mame/video/dooyong.cpp index 51a4c04a427..3eb5900e000 100644 --- a/src/mame/video/dooyong.cpp +++ b/src/mame/video/dooyong.cpp @@ -87,8 +87,8 @@ WRITE8_MEMBER(dooyong_z80_state::txvideoram_w) WRITE8_MEMBER(dooyong_z80_ym2203_state::lastday_ctrl_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 3 is used but unknown */ @@ -107,8 +107,8 @@ WRITE8_MEMBER(dooyong_z80_ym2203_state::pollux_ctrl_w) flip_screen_set(data & 0x01); /* bits 6 and 7 are coin counters */ - coin_counter_w(machine(), 0, data & 0x80); - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x40); /* bit 1 is used but unknown - palette banking (both write and display based on pollux bombs) */ int last_palbank = m_palette_bank; diff --git a/src/mame/video/epos.cpp b/src/mame/video/epos.cpp index 5c2f2b70ab8..eeabb286365 100644 --- a/src/mame/video/epos.cpp +++ b/src/mame/video/epos.cpp @@ -67,7 +67,7 @@ WRITE8_MEMBER(epos_state::epos_port_1_w) set_led_status(machine(), 0, (data >> 0) & 0x01); set_led_status(machine(), 1, (data >> 1) & 0x01); - coin_counter_w(machine(), 0, (data >> 2) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 2) & 0x01); m_palette = (data >> 3) & 0x01; } diff --git a/src/mame/video/exedexes.cpp b/src/mame/video/exedexes.cpp index 1636908abd3..cfd06979ce3 100644 --- a/src/mame/video/exedexes.cpp +++ b/src/mame/video/exedexes.cpp @@ -95,11 +95,11 @@ WRITE8_MEMBER(exedexes_state::exedexes_colorram_w) WRITE8_MEMBER(exedexes_state::exedexes_c804_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); - coin_lockout_w(machine(), 0, data & 0x04); - coin_lockout_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, data & 0x04); + machine().bookkeeping().coin_lockout_w(1, data & 0x08); /* bit 7 is text enable */ m_chon = data & 0x80; diff --git a/src/mame/video/galivan.cpp b/src/mame/video/galivan.cpp index 1c427c02321..7b067829c9f 100644 --- a/src/mame/video/galivan.cpp +++ b/src/mame/video/galivan.cpp @@ -208,8 +208,8 @@ WRITE8_MEMBER(galivan_state::galivan_videoram_w) WRITE8_MEMBER(galivan_state::galivan_gfxbank_w) { /* bits 0 and 1 coin counters */ - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 2); /* bit 2 flip screen */ flip_screen_set(data & 0x04); @@ -223,8 +223,8 @@ WRITE8_MEMBER(galivan_state::galivan_gfxbank_w) WRITE8_MEMBER(galivan_state::ninjemak_gfxbank_w) { /* bits 0 and 1 coin counters */ - coin_counter_w(machine(), 0,data & 1); - coin_counter_w(machine(), 1,data & 2); + machine().bookkeeping().coin_counter_w(0,data & 1); + machine().bookkeeping().coin_counter_w(1,data & 2); /* bit 2 flip screen */ flip_screen_set(data & 0x04); diff --git a/src/mame/video/gunsmoke.cpp b/src/mame/video/gunsmoke.cpp index c9b3069cb89..1a87ff701bf 100644 --- a/src/mame/video/gunsmoke.cpp +++ b/src/mame/video/gunsmoke.cpp @@ -73,8 +73,8 @@ WRITE8_MEMBER(gunsmoke_state::gunsmoke_colorram_w) WRITE8_MEMBER(gunsmoke_state::gunsmoke_c804_w) { /* bits 0 and 1 are for coin counters */ - coin_counter_w(machine(), 1, data & 0x01); - coin_counter_w(machine(), 0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x02); /* bits 2 and 3 select the ROM bank */ membank("bank1")->set_entry((data & 0x0c) >> 2); diff --git a/src/mame/video/higemaru.cpp b/src/mame/video/higemaru.cpp index 0069eedbfd8..4cf0847d29b 100644 --- a/src/mame/video/higemaru.cpp +++ b/src/mame/video/higemaru.cpp @@ -77,8 +77,8 @@ WRITE8_MEMBER(higemaru_state::higemaru_c800_w) logerror("c800 = %02x\n",data); /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0,data & 2); - coin_counter_w(machine(), 1,data & 1); + machine().bookkeeping().coin_counter_w(0,data & 2); + machine().bookkeeping().coin_counter_w(1,data & 1); /* bit 7 flips screen */ if (flip_screen() != (data & 0x80)) diff --git a/src/mame/video/ironhors.cpp b/src/mame/video/ironhors.cpp index 8f68938ea6a..c10abdd1669 100644 --- a/src/mame/video/ironhors.cpp +++ b/src/mame/video/ironhors.cpp @@ -111,8 +111,8 @@ WRITE8_MEMBER(ironhors_state::palettebank_w) machine().tilemap().mark_all_dirty(); } - coin_counter_w(machine(), 0, data & 0x10); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x10); + machine().bookkeeping().coin_counter_w(1, data & 0x20); /* bit 6 unknown - set after game over */ diff --git a/src/mame/video/kncljoe.cpp b/src/mame/video/kncljoe.cpp index 9a3b8d74933..db6d953aa12 100644 --- a/src/mame/video/kncljoe.cpp +++ b/src/mame/video/kncljoe.cpp @@ -136,8 +136,8 @@ WRITE8_MEMBER(kncljoe_state::kncljoe_control_w) m_flipscreen = data & 0x01; machine().tilemap().set_flip_all(m_flipscreen ? TILEMAP_FLIPX : TILEMAP_FLIPY); - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x20); i = (data & 0x10) >> 4; if (m_tile_bank != i) diff --git a/src/mame/video/lastduel.cpp b/src/mame/video/lastduel.cpp index 22e74643cc4..60a3aafbf24 100644 --- a/src/mame/video/lastduel.cpp +++ b/src/mame/video/lastduel.cpp @@ -120,10 +120,10 @@ WRITE16_MEMBER(lastduel_state::lastduel_flip_w) { flip_screen_set(data & 0x01); - coin_lockout_w(machine(), 0, ~data & 0x10); - coin_lockout_w(machine(), 1, ~data & 0x20); - coin_counter_w(machine(), 0, data & 0x40); - coin_counter_w(machine(), 1, data & 0x80); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x10); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x80); } } diff --git a/src/mame/video/m52.cpp b/src/mame/video/m52.cpp index 6a30dac2809..aa4b6590828 100644 --- a/src/mame/video/m52.cpp +++ b/src/mame/video/m52.cpp @@ -273,8 +273,8 @@ WRITE8_MEMBER(m52_state::m52_flipscreen_w) /* screen flip is handled both by software and hardware */ flip_screen_set((data & 0x01) ^ (~ioport("DSW2")->read() & 0x01)); - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x20); } WRITE8_MEMBER(m52_state::alpha1v_flipscreen_w) diff --git a/src/mame/video/m57.cpp b/src/mame/video/m57.cpp index 60826394ff0..b75fdc9d8a5 100644 --- a/src/mame/video/m57.cpp +++ b/src/mame/video/m57.cpp @@ -159,8 +159,8 @@ WRITE8_MEMBER(m57_state::m57_flipscreen_w) m_flipscreen = (data & 0x01) ^ (~ioport("DSW2")->read() & 0x01); m_bg_tilemap->set_flip(m_flipscreen ? (TILEMAP_FLIPY | TILEMAP_FLIPX) : 0); - coin_counter_w(machine(), 0,data & 0x02); - coin_counter_w(machine(), 1,data & 0x20); + machine().bookkeeping().coin_counter_w(0,data & 0x02); + machine().bookkeeping().coin_counter_w(1,data & 0x20); } diff --git a/src/mame/video/m58.cpp b/src/mame/video/m58.cpp index 1d61628884b..4440491eb0a 100644 --- a/src/mame/video/m58.cpp +++ b/src/mame/video/m58.cpp @@ -200,8 +200,8 @@ WRITE8_MEMBER(m58_state::flipscreen_w) /* screen flip is handled both by software and hardware */ flip_screen_set((data & 0x01) ^ (~ioport("DSW2")->read() & 0x01)); - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x20); } diff --git a/src/mame/video/m62.cpp b/src/mame/video/m62.cpp index 50c8cd2356a..c9ca0846c43 100644 --- a/src/mame/video/m62.cpp +++ b/src/mame/video/m62.cpp @@ -300,8 +300,8 @@ WRITE8_MEMBER(m62_state::m62_flipscreen_w) else machine().tilemap().set_flip_all(0); - coin_counter_w(machine(), 0, data & 2); - coin_counter_w(machine(), 1, data & 4); + machine().bookkeeping().coin_counter_w(0, data & 2); + machine().bookkeeping().coin_counter_w(1, data & 4); /* Sound inhibit ... connected to D6 which is not present on any board */ if (m_audio->m_audio_SINH != NULL) diff --git a/src/mame/video/m72.cpp b/src/mame/video/m72.cpp index b4840baacd2..c06403c8ee4 100644 --- a/src/mame/video/m72.cpp +++ b/src/mame/video/m72.cpp @@ -386,8 +386,8 @@ WRITE16_MEMBER(m72_state::port02_w) if (data & 0xe0) logerror("write %02x to port 02\n",data); /* bits 0/1 are coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bit 2 is flip screen (handled both by software and hardware) */ flip_screen_set(((data & 0x04) >> 2) ^ ((~ioport("DSW")->read() >> 8) & 1)); @@ -412,8 +412,8 @@ WRITE16_MEMBER(m72_state::rtype2_port02_w) if (data & 0xe0) logerror("write %02x to port 02\n",data); /* bits 0/1 are coin counters */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bit 2 is flip screen (handled both by software and hardware) */ flip_screen_set(((data & 0x04) >> 2) ^ ((~ioport("DSW")->read() >> 8) & 1)); diff --git a/src/mame/video/mitchell.cpp b/src/mame/video/mitchell.cpp index 0498f1bda1f..c2f049c7a62 100644 --- a/src/mame/video/mitchell.cpp +++ b/src/mame/video/mitchell.cpp @@ -145,7 +145,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); /* bit 0 is unknown (used, maybe back color enable?) */ /* bit 1 is coin counter */ - coin_counter_w(space.machine(), 0, data & 2); + space.machine().bookkeeping().coin_counter_w(0, data & 2); /* bit 2 is flip screen */ if (m_flipscreen != (data & 0x04)) @@ -183,7 +183,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); /* bit 0 is unknown (used, maybe back color enable?) */ /* bit 1 is coin counter */ - coin_counter_w(machine(), 0, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 2); /* bit 2 is flip screen */ if (m_flipscreen != (data & 0x04)) @@ -217,7 +217,7 @@ logerror("PC %04x: pang_gfxctrl_w %02x\n",space.device().safe_pc(),data); /* bit 0 is unknown (used, maybe back color enable?) */ /* bit 1 is coin counter */ - coin_counter_w(machine(), 0, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 2); /* bit 2 is flip screen */ if (m_flipscreen != (data & 0x04)) diff --git a/src/mame/video/mjkjidai.cpp b/src/mame/video/mjkjidai.cpp index 995da96bf1a..eda3d248e74 100644 --- a/src/mame/video/mjkjidai.cpp +++ b/src/mame/video/mjkjidai.cpp @@ -59,7 +59,7 @@ WRITE8_MEMBER(mjkjidai_state::mjkjidai_ctrl_w) m_display_enable = data & 0x04; /* bit 5 = coin counter */ - coin_counter_w(machine(), 0,data & 0x20); + machine().bookkeeping().coin_counter_w(0,data & 0x20); /* bits 6-7 select ROM bank */ membank("bank1")->set_entry(data >> 6); diff --git a/src/mame/video/mystston.cpp b/src/mame/video/mystston.cpp index 8a72fc1f416..57b6d1e069b 100644 --- a/src/mame/video/mystston.cpp +++ b/src/mame/video/mystston.cpp @@ -133,8 +133,8 @@ WRITE8_MEMBER(mystston_state::mystston_video_control_w) /* D3 - unused */ /* D4-D5 - coin counters in flipped order */ - coin_counter_w(machine(), 0, data & 0x20); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x20); + machine().bookkeeping().coin_counter_w(1, data & 0x10); /* D6 - unused */ /* D7 - screen flip */ diff --git a/src/mame/video/nemesis.cpp b/src/mame/video/nemesis.cpp index 191f5e20d59..7e99b6d4407 100644 --- a/src/mame/video/nemesis.cpp +++ b/src/mame/video/nemesis.cpp @@ -158,8 +158,8 @@ WRITE16_MEMBER(nemesis_state::salamand_control_port_word_w) if (ACCESSING_BITS_8_15) { - coin_lockout_w(machine(), 0, data & 0x0200); - coin_lockout_w(machine(), 1, data & 0x0400); + machine().bookkeeping().coin_lockout_w(0, data & 0x0200); + machine().bookkeeping().coin_lockout_w(1, data & 0x0400); if (data & 0x0800) m_audiocpu->set_input_line(0, HOLD_LINE); diff --git a/src/mame/video/prehisle.cpp b/src/mame/video/prehisle.cpp index d0214607a6f..56f97d0516c 100644 --- a/src/mame/video/prehisle.cpp +++ b/src/mame/video/prehisle.cpp @@ -50,8 +50,8 @@ WRITE16_MEMBER(prehisle_state::control_w) case 0x10: m_bg_tilemap->set_scrolly(0, scroll); break; case 0x18: m_bg_tilemap->set_scrollx(0, scroll); break; case 0x23: m_invert_controls = data ? 0x00ff : 0x0000; break; - case 0x28: coin_counter_w(machine(), 0, data & 1); break; - case 0x29: coin_counter_w(machine(), 1, data & 1); break; + case 0x28: machine().bookkeeping().coin_counter_w(0, data & 1); break; + case 0x29: machine().bookkeeping().coin_counter_w(1, data & 1); break; case 0x30: flip_screen_set(data & 0x01); break; } } diff --git a/src/mame/video/quizdna.cpp b/src/mame/video/quizdna.cpp index 1c39b6b0156..02542d42985 100644 --- a/src/mame/video/quizdna.cpp +++ b/src/mame/video/quizdna.cpp @@ -110,7 +110,7 @@ WRITE8_MEMBER(quizdna_state::screen_ctrl_w) int tmp = (data & 0x10) >> 4; m_video_enable = data & 0x20; - coin_counter_w(machine(), 0, data & 1); + machine().bookkeeping().coin_counter_w(0, data & 1); if (m_flipscreen == tmp) return; diff --git a/src/mame/video/rastan.cpp b/src/mame/video/rastan.cpp index 3c9ef293e31..9c4438579f8 100644 --- a/src/mame/video/rastan.cpp +++ b/src/mame/video/rastan.cpp @@ -20,12 +20,12 @@ WRITE16_MEMBER(rastan_state::rastan_spritectrl_w) /* bit 4 unused */ /* bits 0 and 1 are coin lockout */ - coin_lockout_w(machine(), 1, ~data & 0x01); - coin_lockout_w(machine(), 0, ~data & 0x02); + machine().bookkeeping().coin_lockout_w(1, ~data & 0x01); + machine().bookkeeping().coin_lockout_w(0, ~data & 0x02); /* bits 2 and 3 are the coin counters */ - coin_counter_w(machine(), 1, data & 0x04); - coin_counter_w(machine(), 0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x04); + machine().bookkeeping().coin_counter_w(0, data & 0x08); } /***************************************************************************/ diff --git a/src/mame/video/realbrk.cpp b/src/mame/video/realbrk.cpp index c84ec9b5365..fb04194780f 100644 --- a/src/mame/video/realbrk.cpp +++ b/src/mame/video/realbrk.cpp @@ -29,8 +29,8 @@ WRITE16_MEMBER(realbrk_state::realbrk_flipscreen_w) { if (ACCESSING_BITS_0_7) { - coin_counter_w(machine(), 0, data & 0x0001); - coin_counter_w(machine(), 1, data & 0x0004); + machine().bookkeeping().coin_counter_w(0, data & 0x0001); + machine().bookkeeping().coin_counter_w(1, data & 0x0004); flip_screen_set( data & 0x0080); } diff --git a/src/mame/video/route16.cpp b/src/mame/video/route16.cpp index 42f19659281..76727e98c3b 100644 --- a/src/mame/video/route16.cpp +++ b/src/mame/video/route16.cpp @@ -28,7 +28,7 @@ WRITE8_MEMBER(route16_state::out0_w) { m_palette_1 = data & 0x1f; - coin_counter_w(machine(), 0, (data >> 5) & 0x01); + machine().bookkeeping().coin_counter_w(0, (data >> 5) & 0x01); } diff --git a/src/mame/video/scotrsht.cpp b/src/mame/video/scotrsht.cpp index 686b676e53b..fbf294c654b 100644 --- a/src/mame/video/scotrsht.cpp +++ b/src/mame/video/scotrsht.cpp @@ -67,8 +67,8 @@ WRITE8_MEMBER(scotrsht_state::palettebank_w) m_bg_tilemap->mark_all_dirty(); } - coin_counter_w(machine(), 0, data & 1); - coin_counter_w(machine(), 1, data & 2); + machine().bookkeeping().coin_counter_w(0, data & 1); + machine().bookkeeping().coin_counter_w(1, data & 2); // data & 4 unknown } diff --git a/src/mame/video/seta.cpp b/src/mame/video/seta.cpp index 349fc743f99..222129ea6eb 100644 --- a/src/mame/video/seta.cpp +++ b/src/mame/video/seta.cpp @@ -241,14 +241,14 @@ void seta_state::seta_coin_lockout_w(int data) } } - coin_counter_w (machine(), 0, (( data) >> 0) & 1 ); - coin_counter_w (machine(), 1, (( data) >> 1) & 1 ); + machine().bookkeeping().coin_counter_w(0, (( data) >> 0) & 1 ); + machine().bookkeeping().coin_counter_w(1, (( data) >> 1) & 1 ); /* some games haven't the coin lockout device */ if ( !m_coin_lockout ) return; - coin_lockout_w (machine(), 0, ((~data) >> 2) & 1 ); - coin_lockout_w (machine(), 1, ((~data) >> 3) & 1 ); + machine().bookkeeping().coin_lockout_w(0, ((~data) >> 2) & 1 ); + machine().bookkeeping().coin_lockout_w(1, ((~data) >> 3) & 1 ); } @@ -272,8 +272,8 @@ WRITE16_MEMBER(seta_state::seta_vregs_w) seta_coin_lockout_w (data & 0x0f); if (m_x1 != nullptr) m_x1->enable_w (data & 0x20); - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); } break; diff --git a/src/mame/video/sidearms.cpp b/src/mame/video/sidearms.cpp index ece733b23f2..68240151a57 100644 --- a/src/mame/video/sidearms.cpp +++ b/src/mame/video/sidearms.cpp @@ -26,19 +26,19 @@ WRITE8_MEMBER(sidearms_state::colorram_w) WRITE8_MEMBER(sidearms_state::c804_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 and 3 lock the coin chutes */ if (!m_gameid || m_gameid==3) { - coin_lockout_w(machine(), 0, !(data & 0x04)); - coin_lockout_w(machine(), 1, !(data & 0x08)); + machine().bookkeeping().coin_lockout_w(0, !(data & 0x04)); + machine().bookkeeping().coin_lockout_w(1, !(data & 0x08)); } else { - coin_lockout_w(machine(), 0, data & 0x04); - coin_lockout_w(machine(), 1, data & 0x08); + machine().bookkeeping().coin_lockout_w(0, data & 0x04); + machine().bookkeeping().coin_lockout_w(1, data & 0x08); } /* bit 4 resets the sound CPU */ diff --git a/src/mame/video/skydiver.cpp b/src/mame/video/skydiver.cpp index 435753450c1..87e9732f7b1 100644 --- a/src/mame/video/skydiver.cpp +++ b/src/mame/video/skydiver.cpp @@ -92,7 +92,7 @@ WRITE8_MEMBER(skydiver_state::width_w) WRITE8_MEMBER(skydiver_state::coin_lockout_w) { - coin_lockout_global_w(machine(), !offset); + machine().bookkeeping().coin_lockout_global_w(!offset); } diff --git a/src/mame/video/srumbler.cpp b/src/mame/video/srumbler.cpp index 540979757e1..d14288d39bc 100644 --- a/src/mame/video/srumbler.cpp +++ b/src/mame/video/srumbler.cpp @@ -87,8 +87,8 @@ WRITE8_MEMBER(srumbler_state::_4009_w) /* bits 4-5 used during attract mode, unknown */ /* bits 6-7 coin counters */ - coin_counter_w(machine(), 0,data & 0x40); - coin_counter_w(machine(), 1,data & 0x80); + machine().bookkeeping().coin_counter_w(0,data & 0x40); + machine().bookkeeping().coin_counter_w(1,data & 0x80); } diff --git a/src/mame/video/starcrus.cpp b/src/mame/video/starcrus.cpp index d40cca50a16..d98788e4e78 100644 --- a/src/mame/video/starcrus.cpp +++ b/src/mame/video/starcrus.cpp @@ -79,7 +79,7 @@ WRITE8_MEMBER(starcrus_state::ship_parm_2_w) { m_s2_sprite = data&0x1f; set_led_status(machine(), 2,~data & 0x80); /* game over lamp */ - coin_counter_w(machine(), 0, ((data&0x40)>>6)^0x01); /* coin counter */ + machine().bookkeeping().coin_counter_w(0, ((data&0x40)>>6)^0x01); /* coin counter */ m_engine2_on = ((data&0x20)>>5)^0x01; if (m_engine1_on || m_engine2_on) diff --git a/src/mame/video/superqix.cpp b/src/mame/video/superqix.cpp index 5ed5fa79ce8..042d1f77536 100644 --- a/src/mame/video/superqix.cpp +++ b/src/mame/video/superqix.cpp @@ -131,8 +131,8 @@ WRITE8_MEMBER(superqix_state::pbillian_0410_w) --5----- flip screen */ - coin_counter_w(machine(), 0,data & 0x02); - coin_counter_w(machine(), 1,data & 0x04); + machine().bookkeeping().coin_counter_w(0,data & 0x02); + machine().bookkeeping().coin_counter_w(1,data & 0x04); membank("bank1")->set_entry((data & 0x08) >> 3); diff --git a/src/mame/video/suprloco.cpp b/src/mame/video/suprloco.cpp index bb6496f07d8..e2614c70cc2 100644 --- a/src/mame/video/suprloco.cpp +++ b/src/mame/video/suprloco.cpp @@ -143,8 +143,8 @@ WRITE8_MEMBER(suprloco_state::control_w) /*logerror("Bit 4 = %d\n", (data >> 4) & 1); */ } - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); flip_screen_set(data & 0x80); diff --git a/src/mame/video/tagteam.cpp b/src/mame/video/tagteam.cpp index 6a6f7358d9a..d49788328fb 100644 --- a/src/mame/video/tagteam.cpp +++ b/src/mame/video/tagteam.cpp @@ -123,8 +123,8 @@ WRITE8_MEMBER(tagteam_state::flipscreen_w) } // d6/7: coin counters - coin_counter_w(machine(), 0, data & 0x80); - coin_counter_w(machine(), 1, data & 0x40); + machine().bookkeeping().coin_counter_w(0, data & 0x80); + machine().bookkeeping().coin_counter_w(1, data & 0x40); } TILE_GET_INFO_MEMBER(tagteam_state::get_bg_tile_info) diff --git a/src/mame/video/terracre.cpp b/src/mame/video/terracre.cpp index f29525a6312..326e5bf4b5b 100644 --- a/src/mame/video/terracre.cpp +++ b/src/mame/video/terracre.cpp @@ -161,8 +161,8 @@ WRITE16_MEMBER(terracre_state::amazon_flipscreen_w) { if( ACCESSING_BITS_0_7 ) { - coin_counter_w( machine(), 0, data&0x01 ); - coin_counter_w( machine(), 1, (data&0x02)>>1 ); + machine().bookkeeping().coin_counter_w(0, data&0x01 ); + machine().bookkeeping().coin_counter_w(1, (data&0x02)>>1 ); flip_screen_set(data&0x04); } } diff --git a/src/mame/video/tigeroad.cpp b/src/mame/video/tigeroad.cpp index 0b7f36c66d7..58047666e84 100644 --- a/src/mame/video/tigeroad.cpp +++ b/src/mame/video/tigeroad.cpp @@ -40,14 +40,14 @@ WRITE16_MEMBER(tigeroad_state::tigeroad_videoctrl_w) /* bits 4-5 are coin lockouts */ if (m_has_coinlock) { - coin_lockout_w(machine(), 0, !(data & 0x10)); - coin_lockout_w(machine(), 1, !(data & 0x20)); + machine().bookkeeping().coin_lockout_w(0, !(data & 0x10)); + machine().bookkeeping().coin_lockout_w(1, !(data & 0x20)); } /* bits 6-7 are coin counters */ - coin_counter_w(machine(), 0, data & 0x40); - coin_counter_w(machine(), 1, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x80); } } diff --git a/src/mame/video/tmnt.cpp b/src/mame/video/tmnt.cpp index 6718bd501ea..cc24f9c973b 100644 --- a/src/mame/video/tmnt.cpp +++ b/src/mame/video/tmnt.cpp @@ -292,8 +292,8 @@ WRITE16_MEMBER(tmnt_state::tmnt_0a0000_w) if (ACCESSING_BITS_0_7) { /* bit 0/1 = coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); /* 2 players version */ + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* 2 players version */ /* bit 3 high then low triggers irq on sound CPU */ if (m_last == 0x08 && (data & 0x08) == 0) @@ -316,7 +316,7 @@ WRITE16_MEMBER(tmnt_state::punkshot_0a0020_w) if (ACCESSING_BITS_0_7) { /* bit 0 = coin counter */ - coin_counter_w(machine(), 0, data & 0x01); + machine().bookkeeping().coin_counter_w(0, data & 0x01); /* bit 2 = trigger irq on sound CPU */ if (m_last == 0x04 && (data & 0x04) == 0) @@ -334,8 +334,8 @@ WRITE16_MEMBER(tmnt_state::lgtnfght_0a0018_w) if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 2 = trigger irq on sound CPU */ if (m_last == 0x00 && (data & 0x04) == 0x04) @@ -353,8 +353,8 @@ WRITE16_MEMBER(tmnt_state::blswhstl_700300_w) if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ - coin_counter_w(machine(), 0,data & 0x01); - coin_counter_w(machine(), 1,data & 0x02); + machine().bookkeeping().coin_counter_w(0,data & 0x01); + machine().bookkeeping().coin_counter_w(1,data & 0x02); /* bit 3 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); @@ -389,8 +389,8 @@ WRITE16_MEMBER(tmnt_state::glfgreat_122000_w) if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 4 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); @@ -439,8 +439,8 @@ WRITE16_MEMBER(tmnt_state::ssriders_1c0300_w) if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 3 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x08) ? ASSERT_LINE : CLEAR_LINE); @@ -455,8 +455,8 @@ WRITE16_MEMBER(tmnt_state::prmrsocr_122000_w) if (ACCESSING_BITS_0_7) { /* bit 0,1 = coin counter */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 4 = enable char ROM reading through the video RAM */ m_k052109->set_rmrd_line((data & 0x10) ? ASSERT_LINE : CLEAR_LINE); diff --git a/src/mame/video/travrusa.cpp b/src/mame/video/travrusa.cpp index 13bc6001f20..19b3f491e58 100644 --- a/src/mame/video/travrusa.cpp +++ b/src/mame/video/travrusa.cpp @@ -272,8 +272,8 @@ WRITE8_MEMBER(travrusa_state::travrusa_flipscreen_w) flip_screen_set(data & 1); - coin_counter_w(machine(), 0, data & 0x02); - coin_counter_w(machine(), 1, data & 0x20); + machine().bookkeeping().coin_counter_w(0, data & 0x02); + machine().bookkeeping().coin_counter_w(1, data & 0x20); } diff --git a/src/mame/video/ultraman.cpp b/src/mame/video/ultraman.cpp index ed969c5e21a..d68f1d86af0 100644 --- a/src/mame/video/ultraman.cpp +++ b/src/mame/video/ultraman.cpp @@ -93,8 +93,8 @@ WRITE16_MEMBER(ultraman_state::ultraman_gfxctrl_w) m_k051316_3->mark_tmap_dirty(); } - coin_counter_w(machine(), 0, data & 0x40); - coin_counter_w(machine(), 1, data & 0x80); + machine().bookkeeping().coin_counter_w(0, data & 0x40); + machine().bookkeeping().coin_counter_w(1, data & 0x80); } } diff --git a/src/mame/video/vulgus.cpp b/src/mame/video/vulgus.cpp index baaff6e7ae7..63e911f9d8a 100644 --- a/src/mame/video/vulgus.cpp +++ b/src/mame/video/vulgus.cpp @@ -142,8 +142,8 @@ WRITE8_MEMBER(vulgus_state::bgvideoram_w) WRITE8_MEMBER(vulgus_state::c804_w) { /* bits 0 and 1 are coin counters */ - coin_counter_w(machine(), 0, data & 0x01); - coin_counter_w(machine(), 1, data & 0x02); + machine().bookkeeping().coin_counter_w(0, data & 0x01); + machine().bookkeeping().coin_counter_w(1, data & 0x02); /* bit 7 flips screen */ flip_screen_set(data & 0x80); diff --git a/src/mame/video/yiear.cpp b/src/mame/video/yiear.cpp index 68d00cbcf47..5fa3cac6f7a 100644 --- a/src/mame/video/yiear.cpp +++ b/src/mame/video/yiear.cpp @@ -84,8 +84,8 @@ WRITE8_MEMBER(yiear_state::yiear_control_w) m_yiear_irq_enable = data & 0x04; /* bits 3 and 4 are coin counters */ - coin_counter_w(machine(), 0, data & 0x08); - coin_counter_w(machine(), 1, data & 0x10); + machine().bookkeeping().coin_counter_w(0, data & 0x08); + machine().bookkeeping().coin_counter_w(1, data & 0x10); } TILE_GET_INFO_MEMBER(yiear_state::get_bg_tile_info) |