diff options
author | Aaron Giles <aaron@aarongiles.com> | 2012-05-03 09:00:08 +0000 |
---|---|---|
committer | Aaron Giles <aaron@aarongiles.com> | 2012-05-03 09:00:08 +0000 |
commit | 2a88e54278acc526c11dba7961204f234f1f6e05 (patch) | |
tree | 1d78e932e47bb535e7e56ddac05232cdf551c3a1 /src/mame/drivers/rltennis.c | |
parent | 605a48921b48e0127ff0330f1e895dcf16d084fb (diff) |
ioport.c C++ conversion. Mostly internal changes, with no
intended differences from previous behavior. For drivers,
the main change is that input_port_read() no longer exists.
Instead, the port must be fetched from the appropriate device,
and then read() is called.
For member functions, this is actually simpler/cleaner:
value = ioport("tag")->read()
For legacy functions which have a driver_data state, it goes:
value = state->ioport("tag")->read()
For other legacy functions, they need to fetch the root device:
value = machine.root_device().ioport("tag")->read()
The other big change for drivers is that IPT_VBLANK is gone.
Instead, it has been replaced by a device line callback on the
screen device. There's a new macro PORT_VBLANK("tag") which
automatically points things to the right spot.
Here's a set of imperfect search & replace strings to convert
the input_port_read calls and fix up IPT_VBLANK:
input_port_read( *\( *)(machine\(\)) *, *([^)]+ *\))
ioport\1\3->read\(\)
input_port_read( *\( *)(.*machine[()]*) *, *([^)]+ *\))
\2\.root_device\(\)\.ioport\1\3->read\(\)
(state = .*driver_data[^}]+)space->machine\(\)\.root_device\(\)\.
\1state->
(state = .*driver_data[^}]+)device->machine\(\)\.root_device\(\)\.
\1state->
input_port_read_safe( *\( *)(machine\(\)) *, *([^,]+), *([^)]+\))
ioport\1\3->read_safe\(\4\)
IPT_VBLANK( *\))
IPT_CUSTOM\1 PORT_VBLANK("screen")
Diffstat (limited to 'src/mame/drivers/rltennis.c')
-rw-r--r-- | src/mame/drivers/rltennis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/rltennis.c b/src/mame/drivers/rltennis.c index a6567fa8835..5d987bc769e 100644 --- a/src/mame/drivers/rltennis.c +++ b/src/mame/drivers/rltennis.c @@ -72,7 +72,7 @@ player - when there's nothing to play - first, empty 2k of ROMs are selected. READ16_MEMBER(rltennis_state::rlt_io_r) { - return (input_port_read(machine(), "P1" )&0x1fff) | (m_unk_counter<<13); /* top 3 bits controls smaple address update */ + return (ioport("P1" )->read()&0x1fff) | (m_unk_counter<<13); /* top 3 bits controls smaple address update */ } WRITE16_MEMBER(rltennis_state::rlt_snd1_w) @@ -162,8 +162,8 @@ static MACHINE_START( rltennis ) state->m_screen = machine.device( "screen"); state->m_dac_1 = machine.device("dac1"); state->m_dac_2 = machine.device("dac2"); - state->m_samples_1 = machine.root_device().memregion("samples1")->base(); - state->m_samples_2 = machine.root_device().memregion("samples2")->base(); + state->m_samples_1 = state->memregion("samples1")->base(); + state->m_samples_2 = state->memregion("samples2")->base(); state->m_gfx = state->memregion("gfx1")->base(); state->m_timer = machine.scheduler().timer_alloc(FUNC(sample_player)); } |