diff options
Diffstat (limited to 'src/mame/audio/seibu.h')
-rw-r--r-- | src/mame/audio/seibu.h | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index 2894ecee996..452211419f8 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -115,33 +115,26 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; #define SEIBU_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu_sound_map) #define SEIBU2_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu2_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu2_sound_map) #define SEIBU2_AIRRAID_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu2_airraid_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu2_airraid_sound_map) #define SEIBU2_RAIDEN2_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu2_raiden2_sound_map) #define SEIBU_NEWZEROTEAM_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu_newzeroteam_sound_map) #define SEIBU3_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu3_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu3_sound_map) #define SEIBU3A_SOUND_SYSTEM_CPU(freq) \ MCFG_CPU_ADD("audiocpu", Z80, freq) \ - MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) \ - + MCFG_CPU_PROGRAM_MAP(seibu3_adpcm_sound_map) #define SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(freq1,freq2) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ @@ -150,8 +143,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) #define SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(freq1,freq2) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ @@ -160,8 +152,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_HIGH) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) #define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ @@ -171,17 +162,14 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(1, "mono", 0.50) \ \ MCFG_OKIM6295_ADD("oki", freq2, OKIM6295_PIN7_LOW) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) #define SEIBU_AIRRAID_SOUND_SYSTEM_YM2151_INTERFACE(freq1) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ \ MCFG_YM2151_ADD("ymsnd", freq1) \ MCFG_YM2151_IRQ_HANDLER(WRITELINE(driver_device, member_wrapper_line<seibu_ym2151_irqhandler>)) \ MCFG_SOUND_ROUTE(0, "mono", 0.50) \ - MCFG_SOUND_ROUTE(1, "mono", 0.50) \ - \ - + MCFG_SOUND_ROUTE(1, "mono", 0.50) #define SEIBU_SOUND_SYSTEM_YM2151_RAIDEN2_INTERFACE(freq1,freq2,regiona, regionb) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ @@ -195,8 +183,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ \ MCFG_OKIM6295_ADD("oki2", freq2, OKIM6295_PIN7_HIGH) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) #define SEIBU_SOUND_SYSTEM_YM2203_INTERFACE(freq) \ MCFG_SPEAKER_STANDARD_MONO("mono") \ @@ -206,8 +193,7 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \ \ MCFG_SOUND_ADD("ym2", YM2203, freq) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) #define SEIBU_SOUND_SYSTEM_ADPCM_INTERFACE \ MCFG_SOUND_ADD("adpcm1", SEIBU_ADPCM, 8000) \ MCFG_SOUND_CONFIG(seibu_adpcm1_intf) \ @@ -215,7 +201,6 @@ extern const seibu_adpcm_interface seibu_adpcm2_intf; \ MCFG_SOUND_ADD("adpcm2", SEIBU_ADPCM, 8000) \ MCFG_SOUND_CONFIG(seibu_adpcm2_intf) \ - MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) \ - + MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) /**************************************************************************/ |