From 2a88e54278acc526c11dba7961204f234f1f6e05 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Thu, 3 May 2012 09:00:08 +0000 Subject: 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") --- src/mame/drivers/highvdeo.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mame/drivers/highvdeo.c') diff --git a/src/mame/drivers/highvdeo.c b/src/mame/drivers/highvdeo.c index 30d5b174b7c..74529300a6c 100644 --- a/src/mame/drivers/highvdeo.c +++ b/src/mame/drivers/highvdeo.c @@ -194,17 +194,17 @@ static SCREEN_UPDATE_RGB32(brasil) READ16_MEMBER(highvdeo_state::read1_r) { - return input_port_read(machine(), "IN0"); + return ioport("IN0")->read(); } READ16_MEMBER(highvdeo_state::read2_r) { - return input_port_read(machine(), "IN1"); + return ioport("IN1")->read(); } READ16_MEMBER(highvdeo_state::read3_r) { - return input_port_read(machine(), "IN2"); + return ioport("IN2")->read(); } WRITE16_MEMBER(highvdeo_state::tv_vcf_paletteram_w) @@ -322,7 +322,7 @@ READ16_MEMBER(highvdeo_state::tv_ncf_read2_r) // machine resets itself. resetpulse ^= 0x40; - return (input_port_read(machine(), "IN1") & 0xbf) | resetpulse; + return (ioport("IN1")->read() & 0xbf) | resetpulse; } static WRITE16_DEVICE_HANDLER( tv_ncf_oki6376_w ) -- cgit v1.2.3