summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/atetris.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/atetris.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/atetris.c')
-rw-r--r--src/mame/drivers/atetris.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/mame/drivers/atetris.c b/src/mame/drivers/atetris.c
index 926142d8efd..971fa59d42d 100644
--- a/src/mame/drivers/atetris.c
+++ b/src/mame/drivers/atetris.c
@@ -68,7 +68,7 @@
static TIMER_CALLBACK( interrupt_gen )
{
- atetris_state *state = machine->driver_data<atetris_state>();
+ atetris_state *state = machine.driver_data<atetris_state>();
int scanline = param;
/* assert/deassert the interrupt */
@@ -78,13 +78,13 @@ static TIMER_CALLBACK( interrupt_gen )
scanline += 32;
if (scanline >= 256)
scanline -= 256;
- state->interrupt_timer->adjust(machine->primary_screen->time_until_pos(scanline), scanline);
+ state->interrupt_timer->adjust(machine.primary_screen->time_until_pos(scanline), scanline);
}
static WRITE8_HANDLER( irq_ack_w )
{
- cputag_set_input_line(space->machine, "maincpu", 0, CLEAR_LINE);
+ cputag_set_input_line(space->machine(), "maincpu", 0, CLEAR_LINE);
}
@@ -95,9 +95,9 @@ static WRITE8_HANDLER( irq_ack_w )
*
*************************************/
-static void reset_bank(running_machine *machine)
+static void reset_bank(running_machine &machine)
{
- atetris_state *state = machine->driver_data<atetris_state>();
+ atetris_state *state = machine.driver_data<atetris_state>();
memcpy(state->slapstic_base, &state->slapstic_source[state->current_bank * 0x4000], 0x4000);
}
@@ -111,21 +111,21 @@ static STATE_POSTLOAD( atetris_postload )
static MACHINE_START( atetris )
{
- atetris_state *state = machine->driver_data<atetris_state>();
+ atetris_state *state = machine.driver_data<atetris_state>();
/* Allocate interrupt timer */
- state->interrupt_timer = machine->scheduler().timer_alloc(FUNC(interrupt_gen));
+ state->interrupt_timer = machine.scheduler().timer_alloc(FUNC(interrupt_gen));
/* Set up save state */
state->save_item(NAME(state->current_bank));
state->save_item(NAME(state->nvram_write_enable));
- machine->state().register_postload(atetris_postload, NULL);
+ machine.state().register_postload(atetris_postload, NULL);
}
static MACHINE_RESET( atetris )
{
- atetris_state *state = machine->driver_data<atetris_state>();
+ atetris_state *state = machine.driver_data<atetris_state>();
/* reset the slapstic */
slapstic_reset();
@@ -133,7 +133,7 @@ static MACHINE_RESET( atetris )
reset_bank(machine);
/* start interrupts going (32V clocked by 16V) */
- state->interrupt_timer->adjust(machine->primary_screen->time_until_pos(48), 48);
+ state->interrupt_timer->adjust(machine.primary_screen->time_until_pos(48), 48);
}
@@ -146,7 +146,7 @@ static MACHINE_RESET( atetris )
static READ8_HANDLER( atetris_slapstic_r )
{
- atetris_state *state = space->machine->driver_data<atetris_state>();
+ atetris_state *state = space->machine().driver_data<atetris_state>();
int result = state->slapstic_base[0x2000 + offset];
int new_bank = slapstic_tweak(space, offset) & 1;
@@ -169,8 +169,8 @@ static READ8_HANDLER( atetris_slapstic_r )
static WRITE8_HANDLER( coincount_w )
{
- coin_counter_w(space->machine, 0, (data >> 5) & 1);
- coin_counter_w(space->machine, 1, (data >> 4) & 1);
+ coin_counter_w(space->machine(), 0, (data >> 5) & 1);
+ coin_counter_w(space->machine(), 1, (data >> 4) & 1);
}
@@ -183,7 +183,7 @@ static WRITE8_HANDLER( coincount_w )
static WRITE8_HANDLER( nvram_w )
{
- atetris_state *state = space->machine->driver_data<atetris_state>();
+ atetris_state *state = space->machine().driver_data<atetris_state>();
if (state->nvram_write_enable)
state->m_nvram[offset] = data;
@@ -193,7 +193,7 @@ static WRITE8_HANDLER( nvram_w )
static WRITE8_HANDLER( nvram_enable_w )
{
- atetris_state *state = space->machine->driver_data<atetris_state>();
+ atetris_state *state = space->machine().driver_data<atetris_state>();
state->nvram_write_enable = 1;
}
@@ -496,8 +496,8 @@ ROM_END
static DRIVER_INIT( atetris )
{
- atetris_state *state = machine->driver_data<atetris_state>();
- UINT8 *rgn = machine->region("maincpu")->base();
+ atetris_state *state = machine.driver_data<atetris_state>();
+ UINT8 *rgn = machine.region("maincpu")->base();
slapstic_init(machine, 101);
state->slapstic_source = &rgn[0x10000];