diff options
author | 2012-09-13 11:15:32 +0000 | |
---|---|---|
committer | 2012-09-13 11:15:32 +0000 | |
commit | 219e664785890f52079bae7e74543920d638796a (patch) | |
tree | 774d1ab1e7d87ae4d2c1ef335dcef24a28a7d7e8 /src/mess/drivers/pentagon.c | |
parent | af9a5e817d3eefdda79e801056b29167ecbcdef9 (diff) |
Massive change, MACHINE_START\RESET, VIDEO_START\RESET and PALETTE_INIT changed to be members of state classes (no whatsnew)
Diffstat (limited to 'src/mess/drivers/pentagon.c')
-rw-r--r-- | src/mess/drivers/pentagon.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/mess/drivers/pentagon.c b/src/mess/drivers/pentagon.c index b04f339ab7f..a447a6a5ba8 100644 --- a/src/mess/drivers/pentagon.c +++ b/src/mess/drivers/pentagon.c @@ -17,6 +17,7 @@ public: DECLARE_DIRECT_UPDATE_MEMBER(pentagon_direct); DECLARE_WRITE8_MEMBER(pentagon_port_7ffd_w); + DECLARE_MACHINE_RESET(pentagon); }; DIRECT_UPDATE_MEMBER(pentagon_state::pentagon_direct) @@ -107,12 +108,11 @@ static ADDRESS_MAP_START (pentagon_io, AS_IO, 8, pentagon_state ) AM_RANGE(0xc000, 0xc000) AM_DEVREADWRITE_LEGACY("ay8912", ay8910_r, ay8910_address_w) AM_MIRROR(0x3ffd) ADDRESS_MAP_END -static MACHINE_RESET( pentagon ) +MACHINE_RESET_MEMBER(pentagon_state,pentagon) { - pentagon_state *state = machine.driver_data<pentagon_state>(); - UINT8 *messram = machine.device<ram_device>(RAM_TAG)->pointer(); - device_t *beta = machine.device(BETA_DISK_TAG); - address_space *space = machine.device("maincpu")->memory().space(AS_PROGRAM); + UINT8 *messram = machine().device<ram_device>(RAM_TAG)->pointer(); + device_t *beta = machine().device(BETA_DISK_TAG); + address_space *space = machine().device("maincpu")->memory().space(AS_PROGRAM); space->install_read_bank(0x0000, 0x3fff, "bank1"); space->unmap_write(0x0000, 0x3fff); @@ -121,19 +121,19 @@ static MACHINE_RESET( pentagon ) betadisk_enable(beta); betadisk_clear_status(beta); } - space->set_direct_update_handler(direct_update_delegate(FUNC(pentagon_state::pentagon_direct), state)); + space->set_direct_update_handler(direct_update_delegate(FUNC(pentagon_state::pentagon_direct), this)); memset(messram,0,128*1024); /* Bank 5 is always in 0x4000 - 0x7fff */ - state->membank("bank2")->set_base(messram + (5<<14)); + membank("bank2")->set_base(messram + (5<<14)); /* Bank 2 is always in 0x8000 - 0xbfff */ - state->membank("bank3")->set_base(messram + (2<<14)); + membank("bank3")->set_base(messram + (2<<14)); - state->m_port_7ffd_data = 0; - state->m_port_1ffd_data = -1; - pentagon_update_memory(machine); + m_port_7ffd_data = 0; + m_port_1ffd_data = -1; + pentagon_update_memory(machine()); } /* F4 Character Displayer */ @@ -157,7 +157,7 @@ GFXDECODE_END static MACHINE_CONFIG_DERIVED_CLASS( pentagon, spectrum_128, pentagon_state ) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(pentagon_io) - MCFG_MACHINE_RESET( pentagon ) + MCFG_MACHINE_RESET_OVERRIDE(pentagon_state, pentagon ) MCFG_BETA_DISK_ADD(BETA_DISK_TAG) MCFG_GFXDECODE(pentagon) |