summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/commando.c
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2011-03-29 15:50:04 +0000
committer Aaron Giles <aaron@aarongiles.com>2011-03-29 15:50:04 +0000
commit2ad50720237fdd19cf5ab45b8cb6bb21119c00b8 (patch)
treedb21eee69668a06abc3f310ebbd51f5dbadf2de7 /src/mame/drivers/commando.c
parentb72cf3c5702b749c7bf26383ff05a9ab55022d31 (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/commando.c')
-rw-r--r--src/mame/drivers/commando.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/drivers/commando.c b/src/mame/drivers/commando.c
index 2e6cad05f92..815dc908065 100644
--- a/src/mame/drivers/commando.c
+++ b/src/mame/drivers/commando.c
@@ -226,9 +226,9 @@ static INTERRUPT_GEN( commando_interrupt )
static MACHINE_START( commando )
{
- commando_state *state = machine->driver_data<commando_state>();
+ commando_state *state = machine.driver_data<commando_state>();
- state->audiocpu = machine->device("audiocpu");
+ state->audiocpu = machine.device("audiocpu");
state->save_item(NAME(state->scroll_x));
state->save_item(NAME(state->scroll_y));
@@ -236,7 +236,7 @@ static MACHINE_START( commando )
static MACHINE_RESET( commando )
{
- commando_state *state = machine->driver_data<commando_state>();
+ commando_state *state = machine.driver_data<commando_state>();
state->scroll_x[0] = 0;
state->scroll_x[1] = 0;
@@ -518,8 +518,8 @@ ROM_END
static DRIVER_INIT( commando )
{
- address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
- UINT8 *rom = machine->region("maincpu")->base();
+ address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ UINT8 *rom = machine.region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0xc000);
int A;
@@ -538,8 +538,8 @@ static DRIVER_INIT( commando )
static DRIVER_INIT( spaceinv )
{
- address_space *space = machine->device("maincpu")->memory().space(AS_PROGRAM);
- UINT8 *rom = machine->region("maincpu")->base();
+ address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM);
+ UINT8 *rom = machine.region("maincpu")->base();
UINT8 *decrypt = auto_alloc_array(machine, UINT8, 0xc000);
int A;