diff options
Diffstat (limited to 'src/mame/drivers/proteus.cpp')
-rw-r--r-- | src/mame/drivers/proteus.cpp | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/mame/drivers/proteus.cpp b/src/mame/drivers/proteus.cpp index fbdd9ecf67c..17d6ef67eff 100644 --- a/src/mame/drivers/proteus.cpp +++ b/src/mame/drivers/proteus.cpp @@ -162,12 +162,12 @@ WRITE_LINE_MEMBER(proteus_state::ptm_o3_callback) READ8_MEMBER(proteus_state::network_r) { - return m_adlc->read(offset >> 1); + return m_adlc->read(space, offset >> 1); } WRITE8_MEMBER(proteus_state::network_w) { - m_adlc->write(offset >> 1, data); + m_adlc->write(space, offset >> 1, data); } @@ -321,15 +321,14 @@ static void proteus_floppies(device_slot_interface &device) } -void proteus_state::proteus(machine_config &config) -{ +MACHINE_CONFIG_START(proteus_state::proteus) /* basic machine hardware */ - MC6809(config, m_maincpu, 4_MHz_XTAL); - m_maincpu->set_addrmap(AS_PROGRAM, &proteus_state::proteus_6809_mem); + MCFG_DEVICE_ADD("maincpu", MC6809, 4_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(proteus_6809_mem) - Z80(config, m_z80, 4_MHz_XTAL); - m_z80->set_addrmap(AS_PROGRAM, &proteus_state::proteus_z80_mem); - m_z80->set_addrmap(AS_IO, &proteus_state::proteus_z80_io); + MCFG_DEVICE_ADD("z80", Z80, 4_MHz_XTAL) + MCFG_DEVICE_PROGRAM_MAP(proteus_z80_mem) + MCFG_DEVICE_IO_MAP(proteus_z80_io) INPUT_MERGER_ANY_HIGH(config, m_irqs); m_irqs->output_handler().set_inputline(m_maincpu, M6809_IRQ_LINE); @@ -340,8 +339,10 @@ void proteus_state::proteus(machine_config &config) m_fdc->hld_wr_callback().set(FUNC(proteus_state::motor_w)); m_fdc->set_force_ready(true); - FLOPPY_CONNECTOR(config, "fdc:0", proteus_floppies, "8dssd", proteus_state::floppy_formats).enable_sound(true); - FLOPPY_CONNECTOR(config, "fdc:1", proteus_floppies, "8dssd", proteus_state::floppy_formats).enable_sound(true); + MCFG_FLOPPY_DRIVE_ADD("fdc:0", proteus_floppies, "8dssd", proteus_state::floppy_formats) + MCFG_FLOPPY_DRIVE_SOUND(true) + MCFG_FLOPPY_DRIVE_ADD("fdc:1", proteus_floppies, "8dssd", proteus_state::floppy_formats) + MCFG_FLOPPY_DRIVE_SOUND(true) /* ram */ RAM(config, RAM_TAG).set_default_size("64K"); @@ -365,10 +366,9 @@ void proteus_state::proteus(machine_config &config) m_pia->irqa_handler().set("irqs", FUNC(input_merger_device::in_w<2>)); m_pia->irqb_handler().set("irqs", FUNC(input_merger_device::in_w<3>)); - centronics_device ¶llel(CENTRONICS(config, "parallel", centronics_devices, "printer")); - parallel.ack_handler().set(m_pia, FUNC(pia6821_device::ca1_w)); - output_latch_device ¢_data_out(OUTPUT_LATCH(config, "cent_data_out")); - parallel.set_output_latch(cent_data_out); + MCFG_DEVICE_ADD("parallel", CENTRONICS, centronics_devices, "printer") + MCFG_CENTRONICS_ACK_HANDLER(WRITELINE("pia", pia6821_device, ca1_w)) + MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "parallel") /* terminal port */ ACIA6850(config, m_acia[0], 0); @@ -413,8 +413,9 @@ void proteus_state::proteus(machine_config &config) acia2_clock.signal_handler().append(m_acia[2], FUNC(acia6850_device::write_rxc)); /* software lists */ - SOFTWARE_LIST(config, "flop_list").set_original("poly_flop").set_filter("PROTEUS"); -} + MCFG_SOFTWARE_LIST_ADD("flop_list", "poly_flop") + MCFG_SOFTWARE_LIST_FILTER("flop_list", "PROTEUS") +MACHINE_CONFIG_END ROM_START(proteus) |