diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-13 11:15:32 +0000 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2012-09-13 11:15:32 +0000 |
commit | 219e664785890f52079bae7e74543920d638796a (patch) | |
tree | 774d1ab1e7d87ae4d2c1ef335dcef24a28a7d7e8 /src/mame/drivers/voyager.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/mame/drivers/voyager.c')
-rw-r--r-- | src/mame/drivers/voyager.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mame/drivers/voyager.c b/src/mame/drivers/voyager.c index f0a761c41a5..4ba086990b4 100644 --- a/src/mame/drivers/voyager.c +++ b/src/mame/drivers/voyager.c @@ -67,6 +67,8 @@ public: DECLARE_WRITE_LINE_MEMBER(voyager_pic8259_1_set_int_line); DECLARE_READ8_MEMBER(get_slave_ack); DECLARE_DRIVER_INIT(voyager); + virtual void machine_start(); + virtual void machine_reset(); }; @@ -650,16 +652,15 @@ static IRQ_CALLBACK(irq_callback) static READ8_HANDLER( vga_setting ) { return 0xff; } // hard-code to color -static MACHINE_START(voyager) +void voyager_state::machine_start() { - voyager_state *state = machine.driver_data<voyager_state>(); - machine.device("maincpu")->execute().set_irq_acknowledge_callback(irq_callback); + machine().device("maincpu")->execute().set_irq_acknowledge_callback(irq_callback); - state->m_pit8254 = machine.device( "pit8254" ); - state->m_pic8259_1 = machine.device( "pic8259_1" ); - state->m_pic8259_2 = machine.device( "pic8259_2" ); - state->m_dma8237_1 = machine.device( "dma8237_1" ); - state->m_dma8237_2 = machine.device( "dma8237_2" ); + m_pit8254 = machine().device( "pit8254" ); + m_pic8259_1 = machine().device( "pic8259_1" ); + m_pic8259_2 = machine().device( "pic8259_2" ); + m_dma8237_1 = machine().device( "dma8237_1" ); + m_dma8237_2 = machine().device( "dma8237_2" ); } /************************************************************* @@ -723,10 +724,10 @@ static const struct pit8253_config voyager_pit8254_config = } }; -static MACHINE_RESET(voyager) +void voyager_state::machine_reset() { - //machine.root_device().membank("bank1")->set_base(machine.root_device().memregion("bios")->base() + 0x10000); - machine.root_device().membank("bank1")->set_base(machine.root_device().memregion("bios")->base()); + //machine().root_device().membank("bank1")->set_base(machine().root_device().memregion("bios")->base() + 0x10000); + machine().root_device().membank("bank1")->set_base(machine().root_device().memregion("bios")->base()); } static void set_gate_a20(running_machine &machine, int a20) @@ -775,8 +776,6 @@ static MACHINE_CONFIG_START( voyager, voyager_state ) MCFG_CPU_PROGRAM_MAP(voyager_map) MCFG_CPU_IO_MAP(voyager_io) - MCFG_MACHINE_START(voyager) - MCFG_MACHINE_RESET(voyager) MCFG_PIT8254_ADD( "pit8254", voyager_pit8254_config ) MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config ) |