diff options
Diffstat (limited to 'src/mame/drivers/queen.c')
-rw-r--r-- | src/mame/drivers/queen.c | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/src/mame/drivers/queen.c b/src/mame/drivers/queen.c index a2a363506b7..81aabc6722b 100644 --- a/src/mame/drivers/queen.c +++ b/src/mame/drivers/queen.c @@ -108,6 +108,8 @@ public: DECLARE_WRITE_LINE_MEMBER(pc_dack2_w); DECLARE_WRITE_LINE_MEMBER(pc_dack3_w); DECLARE_WRITE_LINE_MEMBER(queen_pic8259_1_set_int_line); + virtual void machine_start(); + virtual void machine_reset(); }; @@ -636,37 +638,36 @@ static void ide_interrupt(device_t *device, int state) static READ8_HANDLER( vga_setting ) { return 0xff; } // hard-code to color -static MACHINE_START( queen ) +void queen_state::machine_start() { - queen_state *state = machine.driver_data<queen_state>(); - state->m_bios_ram = auto_alloc_array(machine, UINT32, 0x10000/4); - state->m_bios_ext1_ram = auto_alloc_array(machine, UINT32, 0x4000/4); - state->m_bios_ext2_ram = auto_alloc_array(machine, UINT32, 0x4000/4); - state->m_bios_ext3_ram = auto_alloc_array(machine, UINT32, 0x4000/4); - state->m_bios_ext4_ram = auto_alloc_array(machine, UINT32, 0x4000/4); - state->m_isa_ram1 = auto_alloc_array(machine, UINT32, 0x4000/4); - state->m_isa_ram2 = auto_alloc_array(machine, UINT32, 0x4000/4); + m_bios_ram = auto_alloc_array(machine(), UINT32, 0x10000/4); + m_bios_ext1_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); + m_bios_ext2_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); + m_bios_ext3_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); + m_bios_ext4_ram = auto_alloc_array(machine(), UINT32, 0x4000/4); + m_isa_ram1 = auto_alloc_array(machine(), UINT32, 0x4000/4); + m_isa_ram2 = auto_alloc_array(machine(), UINT32, 0x4000/4); - init_pc_common(machine, PCCOMMON_KEYBOARD_AT, queen_set_keyb_int); + init_pc_common(machine(), PCCOMMON_KEYBOARD_AT, queen_set_keyb_int); - state->m_maincpu->set_irq_acknowledge_callback(irq_callback); - intel82439tx_init(machine); + m_maincpu->set_irq_acknowledge_callback(irq_callback); + intel82439tx_init(machine()); - kbdc8042_init(machine, &at8042); - pc_vga_init(machine, vga_setting, NULL); - pc_vga_io_init(machine, machine.device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine.device("maincpu")->memory().space(AS_IO), 0x0000); + kbdc8042_init(machine(), &at8042); + pc_vga_init(machine(), ::vga_setting, NULL); + pc_vga_io_init(machine(), machine().device("maincpu")->memory().space(AS_PROGRAM), 0xa0000, machine().device("maincpu")->memory().space(AS_IO), 0x0000); } -static MACHINE_RESET( queen ) +void queen_state::machine_reset() { - machine.root_device().membank("bios_bank")->set_base(machine.root_device().memregion("bios")->base() + 0x30000); - machine.root_device().membank("bios_ext1")->set_base(machine.root_device().memregion("bios")->base() + 0x20000); - machine.root_device().membank("bios_ext2")->set_base(machine.root_device().memregion("bios")->base() + 0x24000); - machine.root_device().membank("bios_ext3")->set_base(machine.root_device().memregion("bios")->base() + 0x28000); - machine.root_device().membank("bios_ext4")->set_base(machine.root_device().memregion("bios")->base() + 0x2c000); - machine.root_device().membank("video_bank1")->set_base(machine.root_device().memregion("video_bios")->base() + 0); - machine.root_device().membank("video_bank2")->set_base(machine.root_device().memregion("video_bios")->base() + 0x4000); + machine().root_device().membank("bios_bank")->set_base(machine().root_device().memregion("bios")->base() + 0x30000); + machine().root_device().membank("bios_ext1")->set_base(machine().root_device().memregion("bios")->base() + 0x20000); + machine().root_device().membank("bios_ext2")->set_base(machine().root_device().memregion("bios")->base() + 0x24000); + machine().root_device().membank("bios_ext3")->set_base(machine().root_device().memregion("bios")->base() + 0x28000); + machine().root_device().membank("bios_ext4")->set_base(machine().root_device().memregion("bios")->base() + 0x2c000); + machine().root_device().membank("video_bank1")->set_base(machine().root_device().memregion("video_bios")->base() + 0); + machine().root_device().membank("video_bank2")->set_base(machine().root_device().memregion("video_bios")->base() + 0x4000); } @@ -683,8 +684,6 @@ static MACHINE_CONFIG_START( queen, queen_state ) MCFG_CPU_PROGRAM_MAP(queen_map) MCFG_CPU_IO_MAP(queen_io) - MCFG_MACHINE_START(queen) - MCFG_MACHINE_RESET(queen) MCFG_PIT8254_ADD( "pit8254", queen_pit8254_config ) MCFG_I8237_ADD( "dma8237_1", XTAL_14_31818MHz/3, dma8237_1_config ) |