summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/m10.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/m10.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/m10.c')
-rw-r--r--src/mame/drivers/m10.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mame/drivers/m10.c b/src/mame/drivers/m10.c
index e0e7e6de8fe..605c6c737a8 100644
--- a/src/mame/drivers/m10.c
+++ b/src/mame/drivers/m10.c
@@ -251,10 +251,10 @@ WRITE8_MEMBER(m10_state::m10_ctrl_w)
/* I have NO IDEA if this is correct or not */
m_bottomline = ~data & 0x20;
- if (input_port_read(machine(), "CAB") & 0x01)
+ if (ioport("CAB")->read() & 0x01)
m_flip = ~data & 0x10;
- if (!(input_port_read(machine(), "CAB") & 0x02))
+ if (!(ioport("CAB")->read() & 0x02))
machine().sound().system_mute(data & 0x80);
/* sound command in lower 4 bytes */
@@ -326,10 +326,10 @@ WRITE8_MEMBER(m10_state::m11_ctrl_w)
m_bottomline = ~data & 0x20;
- if (input_port_read(machine(), "CAB") & 0x01)
+ if (ioport("CAB")->read() & 0x01)
m_flip = ~data & 0x10;
- if (!(input_port_read(machine(), "CAB") & 0x02))
+ if (!(ioport("CAB")->read() & 0x02))
machine().sound().system_mute(data & 0x80);
}
@@ -355,9 +355,9 @@ WRITE8_MEMBER(m10_state::m15_ctrl_w)
if (data & 0xf0)
popmessage("M15 ctrl: %02x",data);
#endif
- if (input_port_read(machine(), "CAB") & 0x01)
+ if (ioport("CAB")->read() & 0x01)
m_flip = ~data & 0x04;
- if (!(input_port_read(machine(), "CAB") & 0x02))
+ if (!(ioport("CAB")->read() & 0x02))
machine().sound().system_mute(data & 0x08);
}