From 97ba97762adbbf4c0d71c416104bcb664bb13f35 Mon Sep 17 00:00:00 2001 From: superctr Date: Wed, 17 Aug 2016 09:59:06 +0200 Subject: [PATCH] Rearrange C352 channels, remove rear channels for systems without second DAC Also fixed incorrect clock frequency in namcos11. --- src/devices/sound/c352.cpp | 8 ++++---- src/mame/drivers/namcofl.cpp | 8 ++++---- src/mame/drivers/namconb1.cpp | 8 ++++---- src/mame/drivers/namcond1.cpp | 8 ++++---- src/mame/drivers/namcos11.cpp | 10 +++++----- src/mame/drivers/namcos12.cpp | 8 ++++---- src/mame/drivers/namcos22.cpp | 16 ++++++++-------- src/mame/drivers/namcos23.cpp | 8 ++++---- 8 files changed, 37 insertions(+), 37 deletions(-) diff --git a/src/devices/sound/c352.cpp b/src/devices/sound/c352.cpp index ead7678520c..dcece238151 100644 --- a/src/devices/sound/c352.cpp +++ b/src/devices/sound/c352.cpp @@ -115,10 +115,10 @@ void c352_device::sound_stream_update(sound_stream &stream, stream_sample_t **in int i,j; short s; - stream_sample_t *buffer_fl = outputs[1]; - stream_sample_t *buffer_fr = outputs[0]; - stream_sample_t *buffer_rl = outputs[3]; - stream_sample_t *buffer_rr = outputs[2]; + stream_sample_t *buffer_fl = outputs[0]; + stream_sample_t *buffer_fr = outputs[1]; + stream_sample_t *buffer_rl = outputs[2]; + stream_sample_t *buffer_rr = outputs[3]; c352_voice_t* v; long out[4]; diff --git a/src/mame/drivers/namcofl.cpp b/src/mame/drivers/namcofl.cpp index ece0a205a75..0ab2074e09f 100644 --- a/src/mame/drivers/namcofl.cpp +++ b/src/mame/drivers/namcofl.cpp @@ -611,10 +611,10 @@ static MACHINE_CONFIG_START( namcofl, namcofl_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", 48384000/2, 288) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + //MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present. + //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END ROM_START( speedrcr ) diff --git a/src/mame/drivers/namconb1.cpp b/src/mame/drivers/namconb1.cpp index 32a698289dd..8566bdc0a94 100644 --- a/src/mame/drivers/namconb1.cpp +++ b/src/mame/drivers/namconb1.cpp @@ -1146,10 +1146,10 @@ static MACHINE_CONFIG_START( namconb1, namconb1_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", MASTER_CLOCK/2, 288) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + //MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present. + //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END static MACHINE_CONFIG_START( namconb2, namconb1_state ) diff --git a/src/mame/drivers/namcond1.cpp b/src/mame/drivers/namcond1.cpp index 1a4022c495f..5a08b3b8f2c 100644 --- a/src/mame/drivers/namcond1.cpp +++ b/src/mame/drivers/namcond1.cpp @@ -209,10 +209,10 @@ static MACHINE_CONFIG_START( namcond1, namcond1_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", XTAL_49_152MHz/2, 288) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + //MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present. + //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MCFG_AT28C16_ADD( "at28c16", nullptr ) diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index 1c36939e343..7886c5e7bbc 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -593,11 +593,11 @@ static MACHINE_CONFIG_START( coh110, namcos11_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", 20013200, 228) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_C352_ADD("c352", 25401600, 288) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + //MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present. + //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MCFG_AT28C16_ADD( "at28c16", nullptr ) MACHINE_CONFIG_END diff --git a/src/mame/drivers/namcos12.cpp b/src/mame/drivers/namcos12.cpp index b0cdebf113c..80edc04f403 100644 --- a/src/mame/drivers/namcos12.cpp +++ b/src/mame/drivers/namcos12.cpp @@ -1692,10 +1692,10 @@ static MACHINE_CONFIG_START( coh700, namcos12_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", 25401600, 288) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + //MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) // Second DAC not present. + //MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( ptblank2, coh700 ) diff --git a/src/mame/drivers/namcos22.cpp b/src/mame/drivers/namcos22.cpp index 33e43c44051..bb72042a459 100644 --- a/src/mame/drivers/namcos22.cpp +++ b/src/mame/drivers/namcos22.cpp @@ -3781,10 +3781,10 @@ static MACHINE_CONFIG_START( namcos22, namcos22_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/2, 288) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END @@ -3840,10 +3840,10 @@ static MACHINE_CONFIG_START( namcos22s, namcos22_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/2, 288) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END static MACHINE_CONFIG_DERIVED( alpine, namcos22s ) diff --git a/src/mame/drivers/namcos23.cpp b/src/mame/drivers/namcos23.cpp index 9f353125ea5..6493eeb41f2 100644 --- a/src/mame/drivers/namcos23.cpp +++ b/src/mame/drivers/namcos23.cpp @@ -3594,10 +3594,10 @@ static MACHINE_CONFIG_START( gorgon, namcos23_state ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") MCFG_C352_ADD("c352", C352CLOCK, C352DIV) - MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) - MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) - MCFG_SOUND_ROUTE(3, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(0, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(1, "rspeaker", 1.00) + MCFG_SOUND_ROUTE(2, "lspeaker", 1.00) + MCFG_SOUND_ROUTE(3, "rspeaker", 1.00) MACHINE_CONFIG_END