summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/magicfly.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/magicfly.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/magicfly.c')
-rw-r--r--src/mame/drivers/magicfly.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/src/mame/drivers/magicfly.c b/src/mame/drivers/magicfly.c
index 9752d6f84c8..5184a5fe6ea 100644
--- a/src/mame/drivers/magicfly.c
+++ b/src/mame/drivers/magicfly.c
@@ -422,21 +422,21 @@ public:
static WRITE8_HANDLER( magicfly_videoram_w )
{
- magicfly_state *state = space->machine->driver_data<magicfly_state>();
+ magicfly_state *state = space->machine().driver_data<magicfly_state>();
state->videoram[offset] = data;
tilemap_mark_tile_dirty(state->bg_tilemap, offset);
}
static WRITE8_HANDLER( magicfly_colorram_w )
{
- magicfly_state *state = space->machine->driver_data<magicfly_state>();
+ magicfly_state *state = space->machine().driver_data<magicfly_state>();
state->colorram[offset] = data;
tilemap_mark_tile_dirty(state->bg_tilemap, offset);
}
static TILE_GET_INFO( get_magicfly_tile_info )
{
- magicfly_state *state = machine->driver_data<magicfly_state>();
+ magicfly_state *state = machine.driver_data<magicfly_state>();
/* - bits -
7654 3210
---- -xxx Tiles color.
@@ -462,13 +462,13 @@ static TILE_GET_INFO( get_magicfly_tile_info )
static VIDEO_START(magicfly)
{
- magicfly_state *state = machine->driver_data<magicfly_state>();
+ magicfly_state *state = machine.driver_data<magicfly_state>();
state->bg_tilemap = tilemap_create(machine, get_magicfly_tile_info, tilemap_scan_rows, 8, 8, 32, 29);
}
static TILE_GET_INFO( get_7mezzo_tile_info )
{
- magicfly_state *state = machine->driver_data<magicfly_state>();
+ magicfly_state *state = machine.driver_data<magicfly_state>();
/* - bits -
7654 3210
---- -xxx Tiles color.
@@ -494,13 +494,13 @@ static TILE_GET_INFO( get_7mezzo_tile_info )
static VIDEO_START( 7mezzo )
{
- magicfly_state *state = machine->driver_data<magicfly_state>();
+ magicfly_state *state = machine.driver_data<magicfly_state>();
state->bg_tilemap = tilemap_create(machine, get_7mezzo_tile_info, tilemap_scan_rows, 8, 8, 32, 29);
}
static SCREEN_UPDATE( magicfly )
{
- magicfly_state *state = screen->machine->driver_data<magicfly_state>();
+ magicfly_state *state = screen->machine().driver_data<magicfly_state>();
tilemap_draw(bitmap, cliprect, state->bg_tilemap, 0, 0);
return 0;
}
@@ -535,21 +535,21 @@ static PALETTE_INIT( magicfly )
static READ8_HANDLER( mux_port_r )
{
- magicfly_state *state = space->machine->driver_data<magicfly_state>();
+ magicfly_state *state = space->machine().driver_data<magicfly_state>();
switch( state->input_selector )
{
- case 0x01: return input_port_read(space->machine, "IN0-0");
- case 0x02: return input_port_read(space->machine, "IN0-1");
- case 0x04: return input_port_read(space->machine, "IN0-2");
- case 0x08: return input_port_read(space->machine, "IN0-3");
- case 0x00: return input_port_read(space->machine, "DSW0");
+ case 0x01: return input_port_read(space->machine(), "IN0-0");
+ case 0x02: return input_port_read(space->machine(), "IN0-1");
+ case 0x04: return input_port_read(space->machine(), "IN0-2");
+ case 0x08: return input_port_read(space->machine(), "IN0-3");
+ case 0x00: return input_port_read(space->machine(), "DSW0");
}
return 0xff;
}
static WRITE8_HANDLER( mux_port_w )
{
- magicfly_state *state = space->machine->driver_data<magicfly_state>();
+ magicfly_state *state = space->machine().driver_data<magicfly_state>();
/* - bits -
7654 3210
---- xxxx Input selector.
@@ -561,11 +561,11 @@ static WRITE8_HANDLER( mux_port_w )
*/
state->input_selector = data & 0x0f; /* Input Selector */
- dac_data_w(space->machine->device("dac"), data & 0x80); /* Sound DAC */
+ dac_data_w(space->machine().device("dac"), data & 0x80); /* Sound DAC */
- coin_counter_w(space->machine, 0, data & 0x40); /* Coin1 */
- coin_counter_w(space->machine, 1, data & 0x10); /* Coin2 */
- coin_counter_w(space->machine, 2, data & 0x20); /* Payout */
+ coin_counter_w(space->machine(), 0, data & 0x40); /* Coin1 */
+ coin_counter_w(space->machine(), 1, data & 0x10); /* Coin2 */
+ coin_counter_w(space->machine(), 2, data & 0x20); /* Payout */
}