diff options
Diffstat (limited to 'src/mame/drivers/osbexec.cpp')
-rw-r--r-- | src/mame/drivers/osbexec.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mame/drivers/osbexec.cpp b/src/mame/drivers/osbexec.cpp index 0c2b1e31d79..09303009a4f 100644 --- a/src/mame/drivers/osbexec.cpp +++ b/src/mame/drivers/osbexec.cpp @@ -528,7 +528,8 @@ static const z80_daisy_config osbexec_daisy_config[] = }; -MACHINE_CONFIG_START(osbexec_state::osbexec) +void osbexec_state::osbexec(machine_config &config) +{ Z80(config, m_maincpu, MAIN_CLOCK/6); m_maincpu->set_addrmap(AS_PROGRAM, &osbexec_state::osbexec_mem); m_maincpu->set_addrmap(AS_IO, &osbexec_state::osbexec_io); @@ -545,8 +546,7 @@ MACHINE_CONFIG_START(osbexec_state::osbexec) PALETTE(config, "palette", palette_device::MONOCHROME_HIGHLIGHT); SPEAKER(config, "mono").front_center(); - MCFG_DEVICE_ADD(m_speaker, SPEAKER_SOUND) - MCFG_SOUND_ROUTE( ALL_OUTPUTS, "mono", 1.00 ) + SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00); PIA6821(config, m_pia[0], 0); m_pia[0]->readpa_handler().set(FUNC(osbexec_state::osbexec_pia0_a_r)); @@ -558,7 +558,7 @@ MACHINE_CONFIG_START(osbexec_state::osbexec) m_pia[0]->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<0>)); m_pia[0]->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<1>)); - MCFG_DEVICE_ADD(m_pia[1], PIA6821, 0) + PIA6821(config, m_pia[1], 0); m_pia[1]->irqa_handler().set("mainirq", FUNC(input_merger_device::in_w<2>)); m_pia[1]->irqb_handler().set("mainirq", FUNC(input_merger_device::in_w<3>)); @@ -601,15 +601,15 @@ MACHINE_CONFIG_START(osbexec_state::osbexec) MB8877(config, m_mb8877, MAIN_CLOCK/24); m_mb8877->intrq_wr_callback().set(m_pia[1], FUNC(pia6821_device::cb1_w)); - MCFG_FLOPPY_DRIVE_ADD("mb8877:0", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats) - MCFG_FLOPPY_DRIVE_ADD("mb8877:1", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats) + FLOPPY_CONNECTOR(config, "mb8877:0", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats); + FLOPPY_CONNECTOR(config, "mb8877:1", osborne2_floppies, "525ssdd", floppy_image_device::default_floppy_formats); /* internal ram */ RAM(config, RAM_TAG).set_default_size("136K"); /* 128KB Main RAM + RAM in ROM bank (8) */ /* software lists */ - MCFG_SOFTWARE_LIST_ADD("flop_list", "osborne2") -MACHINE_CONFIG_END + SOFTWARE_LIST(config, "flop_list").set_original("osborne2"); +} ROM_START( osbexec ) |