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/kinst.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/kinst.c')
-rw-r--r-- | src/mame/drivers/kinst.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/kinst.c b/src/mame/drivers/kinst.c index 5be4212e064..a0ca431a24b 100644 --- a/src/mame/drivers/kinst.c +++ b/src/mame/drivers/kinst.c @@ -338,7 +338,7 @@ READ32_MEMBER(kinst_state::kinst_control_r) switch (offset) { case 2: /* $90 -- sound return */ - result = input_port_read(machine(), portnames[offset]); + result = ioport(portnames[offset])->read(); result &= ~0x0002; if (dcs_control_r(machine()) & 0x800) result |= 0x0002; @@ -347,11 +347,11 @@ READ32_MEMBER(kinst_state::kinst_control_r) case 0: /* $80 */ case 1: /* $88 */ case 3: /* $98 */ - result = input_port_read(machine(), portnames[offset]); + result = ioport(portnames[offset])->read(); break; case 4: /* $a0 */ - result = input_port_read(machine(), portnames[offset]); + result = ioport(portnames[offset])->read(); if (cpu_get_pc(&space.device()) == 0x802d428) device_spin_until_interrupt(&space.device()); break; |