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/bionicc.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/bionicc.c')
-rw-r--r-- | src/mame/drivers/bionicc.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/bionicc.c b/src/mame/drivers/bionicc.c index b89cf4db002..e6c6cd40fff 100644 --- a/src/mame/drivers/bionicc.c +++ b/src/mame/drivers/bionicc.c @@ -73,7 +73,7 @@ static WRITE16_HANDLER( hacked_controls_w ) { - bionicc_state *state = space->machine->driver_data<bionicc_state>(); + bionicc_state *state = space->machine().driver_data<bionicc_state>(); logerror("%06x: hacked_controls_w %04x %02x\n", cpu_get_pc(space->cpu), offset, data); COMBINE_DATA(&state->inp[offset]); @@ -81,7 +81,7 @@ static WRITE16_HANDLER( hacked_controls_w ) static READ16_HANDLER( hacked_controls_r ) { - bionicc_state *state = space->machine->driver_data<bionicc_state>(); + bionicc_state *state = space->machine().driver_data<bionicc_state>(); logerror("%06x: hacked_controls_r %04x %04x\n", cpu_get_pc(space->cpu), offset, state->inp[offset]); return state->inp[offset]; @@ -89,22 +89,22 @@ static READ16_HANDLER( hacked_controls_r ) static WRITE16_HANDLER( bionicc_mpu_trigger_w ) { - bionicc_state *state = space->machine->driver_data<bionicc_state>(); + bionicc_state *state = space->machine().driver_data<bionicc_state>(); - data = input_port_read(space->machine, "SYSTEM") >> 12; + data = input_port_read(space->machine(), "SYSTEM") >> 12; state->inp[0] = data ^ 0x0f; - data = input_port_read(space->machine, "P2"); + data = input_port_read(space->machine(), "P2"); state->inp[1] = data ^ 0xff; - data = input_port_read(space->machine, "P1"); + data = input_port_read(space->machine(), "P1"); state->inp[2] = data ^ 0xff; } static WRITE16_HANDLER( hacked_soundcommand_w ) { - bionicc_state *state = space->machine->driver_data<bionicc_state>(); + bionicc_state *state = space->machine().driver_data<bionicc_state>(); COMBINE_DATA(&state->soundcommand); soundlatch_w(space, 0, state->soundcommand & 0xff); @@ -112,7 +112,7 @@ static WRITE16_HANDLER( hacked_soundcommand_w ) static READ16_HANDLER( hacked_soundcommand_r ) { - bionicc_state *state = space->machine->driver_data<bionicc_state>(); + bionicc_state *state = space->machine().driver_data<bionicc_state>(); return state->soundcommand; } @@ -335,7 +335,7 @@ GFXDECODE_END static MACHINE_START( bionicc ) { - bionicc_state *state = machine->driver_data<bionicc_state>(); + bionicc_state *state = machine.driver_data<bionicc_state>(); state->save_item(NAME(state->soundcommand)); state->save_item(NAME(state->inp)); @@ -344,7 +344,7 @@ static MACHINE_START( bionicc ) static MACHINE_RESET( bionicc ) { - bionicc_state *state = machine->driver_data<bionicc_state>(); + bionicc_state *state = machine.driver_data<bionicc_state>(); state->inp[0] = 0; state->inp[1] = 0; |