diff options
Diffstat (limited to 'src/mame/machine/mpu4.cpp')
-rw-r--r-- | src/mame/machine/mpu4.cpp | 76 |
1 files changed, 41 insertions, 35 deletions
diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp index 316f9fe9ad6..51d4f860742 100644 --- a/src/mame/machine/mpu4.cpp +++ b/src/mame/machine/mpu4.cpp @@ -3067,12 +3067,12 @@ void mpu4_state::mpu4_common2(machine_config &config) } /* machine driver for MOD 2 board */ -MACHINE_CONFIG_START(mpu4_state::mpu4base) - +void mpu4_state::mpu4base(machine_config &config) +{ MCFG_MACHINE_START_OVERRIDE(mpu4_state,mod2 ) MCFG_MACHINE_RESET_OVERRIDE(mpu4_state,mpu4) - MCFG_DEVICE_ADD("maincpu", MC6809, MPU4_MASTER_CLOCK) // MC68B09P - MCFG_DEVICE_PROGRAM_MAP(mpu4_memmap) + MC6809(config, m_maincpu, MPU4_MASTER_CLOCK); // MC68B09P + m_maincpu->set_addrmap(AS_PROGRAM, &mpu4_state::mpu4_memmap); mpu4_common(config); @@ -3082,7 +3082,7 @@ MACHINE_CONFIG_START(mpu4_state::mpu4base) NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_0); config.set_default_layout(layout_mpu4); -MACHINE_CONFIG_END +} void mpu4_state::mod2(machine_config &config) @@ -3109,71 +3109,77 @@ void mpu4_state::mod2_alt(machine_config &config) -MACHINE_CONFIG_START(mpu4_state::mod4yam) +void mpu4_state::mod4yam(machine_config &config) +{ mpu4base(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4yam) mpu4_std_6reel(config); - MCFG_DEVICE_ADD("ym2413", YM2413, MPU4_MASTER_CLOCK/4) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + YM2413(config, m_ym2413, MPU4_MASTER_CLOCK/4); + m_ym2413->add_route(ALL_OUTPUTS, "lspeaker", 1.0); + m_ym2413->add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} -MACHINE_CONFIG_START(mpu4_state::mod4oki) +void mpu4_state::mod4oki(machine_config &config) +{ mpu4base(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) mpu4_common2(config); mpu4_std_6reel(config); - MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + OKIM6376(config, m_msm6376, 128000); //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0); + m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} -MACHINE_CONFIG_START(mpu4_state::mod4oki_alt) +void mpu4_state::mod4oki_alt(machine_config &config) +{ mpu4base(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) mpu4_common2(config); mpu4_type2_6reel(config); - MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + OKIM6376(config, m_msm6376, 128000); //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0); + m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} -MACHINE_CONFIG_START(mpu4_state::mod4oki_5r) +void mpu4_state::mod4oki_5r(machine_config &config) +{ mpu4base(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4oki) mpu4_common2(config); mpu4_std_5reel(config); - MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + OKIM6376(config, m_msm6376, 128000); //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0); + m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} -MACHINE_CONFIG_START(mpu4_state::bwboki) +void mpu4_state::bwboki(machine_config &config) +{ mpu4base(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4bwb) mpu4_common2(config); mpu4_bwb_5reel(config); - MCFG_DEVICE_ADD("msm6376", OKIM6376, 128000) //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + OKIM6376(config, m_msm6376, 128000); //16KHz sample Can also be 85430 at 10.5KHz and 64000 at 8KHz + m_msm6376->add_route(ALL_OUTPUTS, "lspeaker", 1.0); + m_msm6376->add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} -MACHINE_CONFIG_START(mpu4_state::mpu4crys) +void mpu4_state::mpu4crys(machine_config &config) +{ mod2(config); MCFG_MACHINE_START_OVERRIDE(mpu4_state,mpu4cry) - MCFG_DEVICE_ADD("upd", UPD7759) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) -MACHINE_CONFIG_END + upd7759_device &upd(UPD7759(config, "upd")); + upd.add_route(ALL_OUTPUTS, "lspeaker", 1.0); + upd.add_route(ALL_OUTPUTS, "rspeaker", 1.0); +} #define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL) |