summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/bzone.c
diff options
context:
space:
mode:
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
commit2a88e54278acc526c11dba7961204f234f1f6e05 (patch)
tree1d78e932e47bb535e7e56ddac05232cdf551c3a1 /src/mame/drivers/bzone.c
parent605a48921b48e0127ff0330f1e895dcf16d084fb (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/bzone.c')
-rw-r--r--src/mame/drivers/bzone.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mame/drivers/bzone.c b/src/mame/drivers/bzone.c
index a5f2a462670..c2a34c7c15e 100644
--- a/src/mame/drivers/bzone.c
+++ b/src/mame/drivers/bzone.c
@@ -244,7 +244,7 @@ static MACHINE_START( redbaron )
static INTERRUPT_GEN( bzone_interrupt )
{
- if (input_port_read(device->machine(), "IN0") & 0x10)
+ if (device->machine().root_device().ioport("IN0")->read() & 0x10)
device_set_input_line(device, INPUT_LINE_NMI, PULSE_LINE);
}
@@ -278,7 +278,7 @@ WRITE8_MEMBER(bzone_state::bzone_coin_counter_w)
static READ8_DEVICE_HANDLER( redbaron_joy_r )
{
bzone_state *state = device->machine().driver_data<bzone_state>();
- return input_port_read(device->machine(), state->m_rb_input_select ? "FAKE1" : "FAKE2");
+ return state->ioport(state->m_rb_input_select ? "FAKE1" : "FAKE2")->read();
}
static WRITE8_DEVICE_HANDLER( redbaron_joysound_w )
@@ -789,7 +789,7 @@ WRITE8_MEMBER(bzone_state::analog_select_w)
static const char *const analog_port[] = { "AN0", "AN1", "AN2" };
if (offset <= 2)
- m_analog_data = input_port_read(machine(), analog_port[offset]);
+ m_analog_data = ioport(analog_port[offset])->read();
}