From 34ff81062c2ba5cb5f9d574a19ee20287a899b1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Mon, 19 Sep 2011 22:16:38 +0000 Subject: [PATCH] changed c352 internal clockdivider after latests guru measurements --- src/emu/sound/c352.c | 4 ++-- src/mame/drivers/namcofl.c | 2 +- src/mame/drivers/namconb1.c | 4 ++-- src/mame/drivers/namcond1.c | 2 +- src/mame/drivers/namcos11.c | 4 ++-- src/mame/drivers/namcos12.c | 2 +- src/mame/drivers/namcos22.c | 4 ++-- src/mame/drivers/namcos23.c | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/emu/sound/c352.c b/src/emu/sound/c352.c index 6204be0b4a2..752e8b24cef 100644 --- a/src/emu/sound/c352.c +++ b/src/emu/sound/c352.c @@ -10,7 +10,7 @@ 32 voices Supports 8-bit linear and 8-bit muLaw samples Output: digital, 16 bit, 4 channels - Output sample rate is the input clock / 384. + Output sample rate is the input clock / (288 * 2). */ #include "emu.h" @@ -463,7 +463,7 @@ void c352_device::device_start() // find our direct access m_direct = &space()->direct(); - m_sample_rate_base = clock() / 192; + m_sample_rate_base = clock() / 288; m_stream = machine().sound().stream_alloc(*this, 0, 4, m_sample_rate_base, this); diff --git a/src/mame/drivers/namcofl.c b/src/mame/drivers/namcofl.c index 5bcc7c4a01d..8663b28e35c 100644 --- a/src/mame/drivers/namcofl.c +++ b/src/mame/drivers/namcofl.c @@ -617,7 +617,7 @@ static MACHINE_CONFIG_START( namcofl, namcofl_state ) MCFG_VIDEO_START(namcofl) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", 48384000/3) + MCFG_C352_ADD("c352", 48384000/2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) diff --git a/src/mame/drivers/namconb1.c b/src/mame/drivers/namconb1.c index 0a17776513c..1e36ac4d0c8 100644 --- a/src/mame/drivers/namconb1.c +++ b/src/mame/drivers/namconb1.c @@ -1045,7 +1045,7 @@ static MACHINE_CONFIG_START( namconb1, namconb1_state ) MCFG_VIDEO_START(namconb1) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", MASTER_CLOCK_HZ/3) + MCFG_C352_ADD("c352", MASTER_CLOCK_HZ/2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) @@ -1078,7 +1078,7 @@ static MACHINE_CONFIG_START( namconb2, namconb1_state ) MCFG_VIDEO_START(namconb2) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", MASTER_CLOCK_HZ/3) + MCFG_C352_ADD("c352", MASTER_CLOCK_HZ/2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) diff --git a/src/mame/drivers/namcond1.c b/src/mame/drivers/namcond1.c index d771485f67e..2fab8f38f29 100644 --- a/src/mame/drivers/namcond1.c +++ b/src/mame/drivers/namcond1.c @@ -325,7 +325,7 @@ static MACHINE_CONFIG_START( namcond1, namcond1_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", XTAL_49_152MHz/3) // NOTE: should be XTAL_49_152MHz/2, but that's currently incompatible with c352.c internal divider + MCFG_C352_ADD("c352", XTAL_49_152MHz/2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) diff --git a/src/mame/drivers/namcos11.c b/src/mame/drivers/namcos11.c index ed91339428a..27eda514ecd 100644 --- a/src/mame/drivers/namcos11.c +++ b/src/mame/drivers/namcos11.c @@ -996,9 +996,9 @@ static MACHINE_CONFIG_START( coh100, namcos11_state ) MCFG_PSXGPU_ADD( "maincpu", "gpu", CXD8538Q, 0x200000, XTAL_53_693175MHz ) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - // note: C352 internal divider is currently set to 192, but that sounds wrong with an input clock of 20MHz. + // note: C352 internal divider is currently set to 288, but that sounds wrong with an input clock of 20MHz. // 228.0 here is a guess, estimated from PCB recordings sound/music pitch. - MCFG_C352_ADD("c352", 20000000 / (228.0/192.0)) + MCFG_C352_ADD("c352", 20000000 / (228.0/288.0)) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) diff --git a/src/mame/drivers/namcos12.c b/src/mame/drivers/namcos12.c index bbc2f8b7a32..05947145048 100644 --- a/src/mame/drivers/namcos12.c +++ b/src/mame/drivers/namcos12.c @@ -1672,7 +1672,7 @@ static MACHINE_CONFIG_START( coh700, namcos12_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", 16737350) + MCFG_C352_ADD("c352", 16737350*1.5 ) // ? MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) diff --git a/src/mame/drivers/namcos22.c b/src/mame/drivers/namcos22.c index fb8d4795224..4735ce97638 100644 --- a/src/mame/drivers/namcos22.c +++ b/src/mame/drivers/namcos22.c @@ -2883,7 +2883,7 @@ static MACHINE_CONFIG_START( namcos22s, namcos22_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/3) // should be SS22_MASTER_CLOCK/2, but relies on c352.c clockdivider implementation + MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) @@ -3292,7 +3292,7 @@ static MACHINE_CONFIG_START( namcos22, namcos22_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/3) + MCFG_C352_ADD("c352", SS22_MASTER_CLOCK/2) MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) diff --git a/src/mame/drivers/namcos23.c b/src/mame/drivers/namcos23.c index 250e86113f1..73c1625d4bb 100644 --- a/src/mame/drivers/namcos23.c +++ b/src/mame/drivers/namcos23.c @@ -2878,7 +2878,7 @@ static MACHINE_CONFIG_START( gorgon, namcos23_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", 14745600) + MCFG_C352_ADD("c352", 14745600*1.5) // ? MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) @@ -2924,7 +2924,7 @@ static MACHINE_CONFIG_START( s23, namcos23_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", 14745600) + MCFG_C352_ADD("c352", 14745600*1.5) // ? MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00) @@ -2966,7 +2966,7 @@ static MACHINE_CONFIG_START( ss23, namcos23_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_C352_ADD("c352", 14745600) + MCFG_C352_ADD("c352", 14745600*1.5) // ? MCFG_SOUND_ROUTE(0, "rspeaker", 1.00) MCFG_SOUND_ROUTE(1, "lspeaker", 1.00) MCFG_SOUND_ROUTE(2, "rspeaker", 1.00)