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/pastelg.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/pastelg.c')
-rw-r--r-- | src/mame/drivers/pastelg.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/pastelg.c b/src/mame/drivers/pastelg.c index 8aba35434de..28102bd52d5 100644 --- a/src/mame/drivers/pastelg.c +++ b/src/mame/drivers/pastelg.c @@ -82,11 +82,11 @@ READ8_MEMBER(pastelg_state::threeds_inputport1_r) { switch(m_mux_data) { - case 0x01: return input_port_read(machine(),"KEY0_PL1"); - case 0x02: return input_port_read(machine(),"KEY1_PL1"); - case 0x04: return input_port_read(machine(),"KEY2_PL1"); - case 0x08: return input_port_read(machine(),"KEY3_PL1"); - case 0x10: return input_port_read(machine(),"KEY4_PL1"); + case 0x01: return ioport("KEY0_PL1")->read(); + case 0x02: return ioport("KEY1_PL1")->read(); + case 0x04: return ioport("KEY2_PL1")->read(); + case 0x08: return ioport("KEY3_PL1")->read(); + case 0x10: return ioport("KEY4_PL1")->read(); } return 0xff; @@ -96,11 +96,11 @@ READ8_MEMBER(pastelg_state::threeds_inputport2_r) { switch(m_mux_data) { - case 0x01: return input_port_read(machine(),"KEY0_PL2"); - case 0x02: return input_port_read(machine(),"KEY1_PL2"); - case 0x04: return input_port_read(machine(),"KEY2_PL2"); - case 0x08: return input_port_read(machine(),"KEY3_PL2"); - case 0x10: return input_port_read(machine(),"KEY4_PL2"); + case 0x01: return ioport("KEY0_PL2")->read(); + case 0x02: return ioport("KEY1_PL2")->read(); + case 0x04: return ioport("KEY2_PL2")->read(); + case 0x08: return ioport("KEY3_PL2")->read(); + case 0x10: return ioport("KEY4_PL2")->read(); } return 0xff; |