diff options
author | 2016-11-26 08:49:17 +1100 | |
---|---|---|
committer | 2016-11-26 08:49:17 +1100 | |
commit | 0b1a51a9d1700d8b22d65602b9f2a4dfb1a701ea (patch) | |
tree | 4a8b4935070429aace58b1ea0149a835b9609af9 /src/mame/drivers/raiden.cpp | |
parent | a68cefdb4f220455e9a29e98d3b270958078d5ea (diff) | |
parent | 7ad15e78260f5dc28912cc700fc87838ca75f198 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/mame/drivers/raiden.cpp')
-rw-r--r-- | src/mame/drivers/raiden.cpp | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/src/mame/drivers/raiden.cpp b/src/mame/drivers/raiden.cpp index b98ac455aae..25285f95408 100644 --- a/src/mame/drivers/raiden.cpp +++ b/src/mame/drivers/raiden.cpp @@ -276,7 +276,8 @@ static MACHINE_CONFIG_START( raiden, raiden_state ) MCFG_CPU_PROGRAM_MAP(sub_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", raiden_state, raiden_interrupt) - SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", Z80, XTAL_14_31818MHz/4) /* verified on pcb */ + MCFG_CPU_PROGRAM_MAP(seibu_sound_map) MCFG_QUANTUM_TIME(attotime::from_hz(12000)) @@ -297,11 +298,27 @@ static MACHINE_CONFIG_START( raiden, raiden_state ) MCFG_PALETTE_FORMAT(xxxxBBBBGGGGRRRR) /* sound hardware */ - SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12) // frequency and pin 7 verified (pin set in audio\seibu.h) + MCFG_SPEAKER_STANDARD_MONO("mono") + + MCFG_SOUND_ADD("ymsnd", YM3812, XTAL_14_31818MHz/4) + MCFG_YM3812_IRQ_HANDLER(DEVWRITELINE("seibu_sound", seibu_sound_device, fm_irqhandler)) + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_OKIM6295_ADD("oki", XTAL_12MHz/12, OKIM6295_PIN7_HIGH) // frequency and pin 7 verified + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) + + MCFG_DEVICE_ADD("seibu_sound", SEIBU_SOUND, 0) + MCFG_SEIBU_SOUND_CPU("audiocpu") + MCFG_SEIBU_SOUND_YM_READ_CB(DEVREAD8("ymsnd", ym3812_device, read)) + MCFG_SEIBU_SOUND_YM_WRITE_CB(DEVWRITE8("ymsnd", ym3812_device, write)) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( raidene, raiden ) - SEIBU_SOUND_SYSTEM_ENCRYPTED_FULL() + MCFG_DEVICE_MODIFY("seibu_sound") + MCFG_SEIBU_SOUND_CPU_ENCRYPTED_FULL("audiocpu") + + MCFG_DEVICE_MODIFY("audiocpu") + MCFG_CPU_DECRYPTED_OPCODES_MAP(seibu_sound_decrypted_opcodes_map) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( raidenu, raidene ) |