diff options
author | 2011-03-29 15:50:04 +0000 | |
---|---|---|
committer | 2011-03-29 15:50:04 +0000 | |
commit | 2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch) | |
tree | db21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/mame/drivers/skyraid.c | |
parent | b72cf3c5702b749c7bf26383ff05a9ab55022d31 (diff) |
BIG update.
Remove redundant machine items from address_space and device_t.
Neither machine nor m_machine are directly accessible anymore.
Instead a new getter machine() is available which returns a
machine reference. So:
space->machine->xxx ==> space->machine().xxx
device->machine->yyy ==> device->machine().yyy
Globally changed all running_machine pointers to running_machine
references. Any function/method that takes a running_machine takes
it as a required parameter (1 or 2 exceptions). Being consistent
here gets rid of a lot of odd &machine or *machine, but it does
mean a very large bulk change across the project.
Structs which have a running_machine * now have that variable
renamed to m_machine, and now have a shiny new machine() method
that works like the space and device methods above. Since most of
these are things that should eventually be devices anyway, consider
this a step in that direction.
98% of the update was done with regex searches. The changes are
architected such that the compiler will catch the remaining
errors:
// find things that use an embedded machine directly and replace
// with a machine() getter call
S: ->machine->
R: ->machine\(\)\.
// do the same if via a reference
S: \.machine->
R: \.machine\(\)\.
// convert function parameters to running_machine &
S: running_machine \*machine([^;])
R: running_machine \&machine\1
// replace machine-> with machine.
S: machine->
R: machine\.
// replace &machine() with machine()
S: \&([()->a-z0-9_]+machine\(\))
R: \1
// sanity check: look for this used as a cast
(running_machine &)
// and change to this:
*(running_machine *)
Diffstat (limited to 'src/mame/drivers/skyraid.c')
-rw-r--r-- | src/mame/drivers/skyraid.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/skyraid.c b/src/mame/drivers/skyraid.c index 96452a46dde..73c26fdf5fb 100644 --- a/src/mame/drivers/skyraid.c +++ b/src/mame/drivers/skyraid.c @@ -36,12 +36,12 @@ static PALETTE_INIT( skyraid ) static READ8_HANDLER( skyraid_port_0_r ) { - skyraid_state *state = space->machine->driver_data<skyraid_state>(); - UINT8 val = input_port_read(space->machine, "LANGUAGE"); + skyraid_state *state = space->machine().driver_data<skyraid_state>(); + UINT8 val = input_port_read(space->machine(), "LANGUAGE"); - if (input_port_read(space->machine, "STICKY") > state->analog_range) + if (input_port_read(space->machine(), "STICKY") > state->analog_range) val |= 0x40; - if (input_port_read(space->machine, "STICKX") > state->analog_range) + if (input_port_read(space->machine(), "STICKX") > state->analog_range) val |= 0x80; return val; @@ -50,7 +50,7 @@ static READ8_HANDLER( skyraid_port_0_r ) static WRITE8_HANDLER( skyraid_range_w ) { - skyraid_state *state = space->machine->driver_data<skyraid_state>(); + skyraid_state *state = space->machine().driver_data<skyraid_state>(); state->analog_range = data & 0x3f; } @@ -58,7 +58,7 @@ static WRITE8_HANDLER( skyraid_range_w ) static WRITE8_HANDLER( skyraid_offset_w ) { - skyraid_state *state = space->machine->driver_data<skyraid_state>(); + skyraid_state *state = space->machine().driver_data<skyraid_state>(); state->analog_offset = data & 0x3f; } @@ -66,7 +66,7 @@ static WRITE8_HANDLER( skyraid_offset_w ) static WRITE8_HANDLER( skyraid_scroll_w ) { - skyraid_state *state = space->machine->driver_data<skyraid_state>(); + skyraid_state *state = space->machine().driver_data<skyraid_state>(); state->scroll = data; } |