summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/upscope.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/upscope.cpp')
-rw-r--r--src/mame/drivers/upscope.cpp29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/mame/drivers/upscope.cpp b/src/mame/drivers/upscope.cpp
index 0553e1cb805..d12d9d1eb09 100644
--- a/src/mame/drivers/upscope.cpp
+++ b/src/mame/drivers/upscope.cpp
@@ -265,11 +265,11 @@ INPUT_PORTS_END
*
*************************************/
-MACHINE_CONFIG_START(upscope_state::upscope)
-
+void upscope_state::upscope(machine_config &config)
+{
/* basic machine hardware */
- MCFG_DEVICE_ADD("maincpu", M68000, amiga_state::CLK_7M_NTSC)
- MCFG_DEVICE_PROGRAM_MAP(main_map)
+ M68000(config, m_maincpu, amiga_state::CLK_7M_NTSC);
+ m_maincpu->set_addrmap(AS_PROGRAM, &upscope_state::main_map);
ADDRESS_MAP_BANK(config, "overlay").set_map(&amiga_state::overlay_512kb_map).set_options(ENDIANNESS_BIG, 16, 22, 0x200000);
@@ -295,15 +295,16 @@ MACHINE_CONFIG_START(upscope_state::upscope)
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_OUTPUT_CALLBACK(WRITE8(*this, amiga_state, cia_0_port_a_write))
- MCFG_MOS6526_PB_INPUT_CALLBACK(READ8(*this, upscope_state, upscope_cia_0_portb_r))
- MCFG_MOS6526_PB_OUTPUT_CALLBACK(WRITE8(*this, upscope_state, upscope_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))
- MCFG_MOS6526_PA_INPUT_CALLBACK(READ8(*this, upscope_state, upscope_cia_1_porta_r))
- MCFG_MOS6526_PA_OUTPUT_CALLBACK(WRITE8(*this, upscope_state, upscope_cia_1_porta_w))
+ 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_wr_callback().set(FUNC(amiga_state::cia_0_port_a_write));
+ m_cia_0->pb_rd_callback().set(FUNC(upscope_state::upscope_cia_0_portb_r));
+ m_cia_0->pb_wr_callback().set(FUNC(upscope_state::upscope_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));
+ m_cia_1->pa_rd_callback().set(FUNC(upscope_state::upscope_cia_1_porta_r));
+ m_cia_1->pa_wr_callback().set(FUNC(upscope_state::upscope_cia_1_porta_w));
/* fdc */
AMIGA_FDC(config, m_fdc, amiga_state::CLK_7M_NTSC);
@@ -318,7 +319,7 @@ MACHINE_CONFIG_START(upscope_state::upscope)
m_ppi->in_pa_callback().set_ioport("IO0");
m_ppi->out_pb_callback().set(FUNC(upscope_state::lamps_w));
m_ppi->out_pc_callback().set(FUNC(upscope_state::coin_counter_w));
-MACHINE_CONFIG_END
+}