diff options
Diffstat (limited to 'src/mame/drivers/arsystems.cpp')
-rw-r--r-- | src/mame/drivers/arsystems.cpp | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/src/mame/drivers/arsystems.cpp b/src/mame/drivers/arsystems.cpp index 65fc15671c8..8fffdfb3f08 100644 --- a/src/mame/drivers/arsystems.cpp +++ b/src/mame/drivers/arsystems.cpp @@ -300,11 +300,11 @@ INPUT_PORTS_END * *************************************/ -MACHINE_CONFIG_START(arcadia_amiga_state::arcadia) - +void arcadia_amiga_state::arcadia(machine_config &config) +{ /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC) - MCFG_DEVICE_PROGRAM_MAP(arcadia_map) + M68000(config, m_maincpu, amiga_state::CLK_7M_NTSC); + m_maincpu->set_addrmap(AS_PROGRAM, &arcadia_amiga_state::arcadia_map); ADDRESS_MAP_BANK(config, "overlay").set_map(&amiga_state::overlay_512kb_map).set_options(ENDIANNESS_BIG, 16, 22, 0x200000); @@ -321,23 +321,24 @@ MACHINE_CONFIG_START(arcadia_amiga_state::arcadia) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - paula_8364_device &paula(PAULA_8364(config, "amiga", amiga_state::CLK_C1_NTSC)); - paula.add_route(0, "lspeaker", 0.50); - paula.add_route(1, "rspeaker", 0.50); - paula.add_route(2, "rspeaker", 0.50); - paula.add_route(3, "lspeaker", 0.50); - paula.mem_read_cb().set(FUNC(amiga_state::chip_ram_r)); - paula.int_cb().set(FUNC(amiga_state::paula_int_w)); + PAULA_8364(config, m_paula, amiga_state::CLK_C1_NTSC); + m_paula->add_route(0, "lspeaker", 0.50); + m_paula->add_route(1, "rspeaker", 0.50); + m_paula->add_route(2, "rspeaker", 0.50); + m_paula->add_route(3, "lspeaker", 0.50); + m_paula->mem_read_cb().set(FUNC(amiga_state::chip_ram_r)); + m_paula->int_cb().set(FUNC(amiga_state::paula_int_w)); /* cia */ - MCFG_DEVICE_ADD("cia_0", MOS8520, amiga_state::CLK_E_NTSC) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_0_irq)) - MCFG_MOS6526_PA_INPUT_CALLBACK(IOPORT("CIA0PORTA")) - MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write)) - MCFG_MOS6526_PB_INPUT_CALLBACK(IOPORT("CIA0PORTB")) - MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, arcadia_amiga_state,arcadia_cia_0_portb_w)) - MCFG_DEVICE_ADD("cia_1", MOS8520, amiga_state::CLK_E_NTSC) - MCFG_MOS6526_IRQ_CALLBACK(WRITELINE(*this, amiga_state, cia_1_irq)) + MOS8520(config, m_cia_0, amiga_state::CLK_E_NTSC); + m_cia_0->irq_wr_callback().set(FUNC(amiga_state::cia_0_irq)); + m_cia_0->pa_rd_callback().set_ioport("CIA0PORTA"); + m_cia_0->pa_wr_callback().set(FUNC(amiga_state::cia_0_port_a_write)); + m_cia_0->pb_rd_callback().set_ioport("CIA0PORTB"); + m_cia_0->pb_wr_callback().set(FUNC(arcadia_amiga_state::arcadia_cia_0_portb_w)); + + MOS8520(config, m_cia_1, amiga_state::CLK_E_NTSC); + m_cia_1->irq_wr_callback().set(FUNC(amiga_state::cia_1_irq)); /* fdc */ AMIGA_FDC(config, m_fdc, amiga_state::CLK_7M_NTSC); @@ -346,15 +347,15 @@ MACHINE_CONFIG_START(arcadia_amiga_state::arcadia) m_fdc->write_dma_callback().set(FUNC(amiga_state::chip_ram_w)); m_fdc->dskblk_callback().set(FUNC(amiga_state::fdc_dskblk_w)); m_fdc->dsksyn_callback().set(FUNC(amiga_state::fdc_dsksyn_w)); -MACHINE_CONFIG_END +} -MACHINE_CONFIG_START(arcadia_amiga_state::argh) +void arcadia_amiga_state::argh(machine_config &config) +{ arcadia(config); /* basic machine hardware */ - MCFG_DEVICE_MODIFY("maincpu") - MCFG_DEVICE_PROGRAM_MAP(argh_map) -MACHINE_CONFIG_END + m_maincpu->set_addrmap(AS_PROGRAM, &arcadia_amiga_state::argh_map); +} /************************************* |