diff options
author | Aaron Giles <aaron@aarongiles.com> | 2012-09-12 06:07:51 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2012-09-12 06:07:51 +0000 |
commit | 17e66e39fd2aeb6e083a8567d281df9235b9f2f4 (patch) | |
tree | a34dfe5941829bc939167c207f65b5cf7f57078f /src/mame/drivers/m10.c | |
parent | 0ef1e6deb4923b27f4c1d95825e453f565b129a3 (diff) |
Clear out remaining global inlines in diexec.h.
Diffstat (limited to 'src/mame/drivers/m10.c')
-rw-r--r-- | src/mame/drivers/m10.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c index f32ea92fcbd..3a906a79e20 100644 --- a/src/mame/drivers/m10.c +++ b/src/mame/drivers/m10.c @@ -132,7 +132,7 @@ static WRITE8_DEVICE_HANDLER( ic8j1_output_changed ) { m10_state *state = device->machine().driver_data<m10_state>(); LOG(("ic8j1: %d %d\n", data, device->machine().primary_screen->vpos())); - device_set_input_line(state->m_maincpu, 0, !data ? CLEAR_LINE : ASSERT_LINE); + state->m_maincpu->set_input_line(0, !data ? CLEAR_LINE : ASSERT_LINE); } static WRITE8_DEVICE_HANDLER( ic8j2_output_changed ) @@ -196,7 +196,7 @@ static MACHINE_START( m10 ) { m10_state *state = machine.driver_data<m10_state>(); - state->m_maincpu = machine.device("maincpu"); + state->m_maincpu = machine.device<cpu_device>("maincpu"); state->m_ic8j1 = machine.device("ic8j1"); state->m_ic8j2 = machine.device("ic8j2"); state->m_samples = machine.device<samples_device>("samples"); @@ -486,7 +486,7 @@ READ8_MEMBER(m10_state::m10_a700_r) READ8_MEMBER(m10_state::m11_a700_r) { //LOG(("rd:%d\n",machine().primary_screen->vpos())); - //device_set_input_line(m_maincpu, 0, CLEAR_LINE); + //m_maincpu->set_input_line(0, CLEAR_LINE); LOG(("clear\n")); ttl74123_clear_w(m_ic8j1, 0, 0); ttl74123_clear_w(m_ic8j1, 0, 1); @@ -502,7 +502,7 @@ READ8_MEMBER(m10_state::m11_a700_r) INPUT_CHANGED_MEMBER(m10_state::coin_inserted) { /* coin insertion causes an NMI */ - device_set_input_line(m_maincpu, INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); + m_maincpu->set_input_line(INPUT_LINE_NMI, newval ? ASSERT_LINE : CLEAR_LINE); } @@ -511,35 +511,35 @@ static TIMER_CALLBACK( interrupt_callback ) m10_state *state = machine.driver_data<m10_state>(); if (param == 0) { - device_set_input_line(state->m_maincpu, 0, ASSERT_LINE); + state->m_maincpu->set_input_line(0, ASSERT_LINE); machine.scheduler().timer_set(machine.primary_screen->time_until_pos(IREMM10_VBSTART + 16), FUNC(interrupt_callback), 1); } if (param == 1) { - device_set_input_line(state->m_maincpu, 0, ASSERT_LINE); + state->m_maincpu->set_input_line(0, ASSERT_LINE); machine.scheduler().timer_set(machine.primary_screen->time_until_pos(IREMM10_VBSTART + 24), FUNC(interrupt_callback), 2); } if (param == -1) - device_set_input_line(state->m_maincpu, 0, CLEAR_LINE); + state->m_maincpu->set_input_line(0, CLEAR_LINE); } #if 0 static INTERRUPT_GEN( m11_interrupt ) { - device_set_input_line(device, 0, ASSERT_LINE); + device->execute().set_input_line(0, ASSERT_LINE); //device->machine().scheduler().timer_set(machine.primary_screen->time_until_pos(IREMM10_VBEND), FUNC(interrupt_callback), -1); } static INTERRUPT_GEN( m10_interrupt ) { - device_set_input_line(device, 0, ASSERT_LINE); + device->execute().set_input_line(0, ASSERT_LINE); } #endif static INTERRUPT_GEN( m15_interrupt ) { - device_set_input_line(device, 0, ASSERT_LINE); + device->execute().set_input_line(0, ASSERT_LINE); device->machine().scheduler().timer_set(device->machine().primary_screen->time_until_pos(IREMM10_VBSTART + 1, 80), FUNC(interrupt_callback), -1); } |