From d06339169480fae8b40767b1ddab932887d8906e Mon Sep 17 00:00:00 2001 From: Barry Harris <44396066+barry65536@users.noreply.github.com> Date: Wed, 9 May 2012 18:44:27 +0000 Subject: [PATCH] small tidy-up of fcrash_snd.cpp and sf2mdt_snd.cpp --- src/burn/drv/capcom/fcrash_snd.cpp | 2 +- src/burn/drv/capcom/sf2mdt_snd.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/burn/drv/capcom/fcrash_snd.cpp b/src/burn/drv/capcom/fcrash_snd.cpp index 482fee155..ae59f01ca 100644 --- a/src/burn/drv/capcom/fcrash_snd.cpp +++ b/src/burn/drv/capcom/fcrash_snd.cpp @@ -175,7 +175,7 @@ INT32 FcrashSoundReset() ZetReset(); BurnYM2203Reset(); MSM5205Reset(); - FcrashZ80BankAddress = 2; + FcrashZ80BankAddress = 0x8000; ZetMapArea(0x8000, 0xbfff, 0, CpsZRom + FcrashZ80BankAddress); ZetMapArea(0x8000, 0xbfff, 2, CpsZRom + FcrashZ80BankAddress); ZetClose(); diff --git a/src/burn/drv/capcom/sf2mdt_snd.cpp b/src/burn/drv/capcom/sf2mdt_snd.cpp index a20a2e3f2..22ecd7472 100644 --- a/src/burn/drv/capcom/sf2mdt_snd.cpp +++ b/src/burn/drv/capcom/sf2mdt_snd.cpp @@ -16,19 +16,19 @@ static INT32 Sf2mdtSampleSelect1 = 0; static INT32 Sf2mdtSampleSelect2 = 0; static INT32 Sf2mdtSoundPos = 0; static INT32 Sf2mdtCyclesPerSegment = 0; -static INT32 Sf2NumZ80Banks = 0; +static INT32 Sf2mdtNumZ80Banks = 0; void Sf2mdtSoundCommand(UINT16 d) { INT32 nCyclesToDo = ((INT64)SekTotalCycles() * nCpsZ80Cycles / nCpsCycles) - ZetTotalCycles(); INT32 nEnd = Sf2mdtSoundPos + (INT64)Sf2mdtMSM5205Interleave * nCyclesToDo / nCpsZ80Cycles; - + for (INT32 i = Sf2mdtSoundPos; i < nEnd; i++) { ZetRun(Sf2mdtCyclesPerSegment); MSM5205Update(); Sf2mdtSoundPos = i; } - + Sf2mdtSoundLatch = d & 0xff; ZetSetIRQLine(0, ZET_IRQSTATUS_ACK); } @@ -70,7 +70,7 @@ void __fastcall Sf2mdtZ80Write(UINT16 a, UINT8 d) MSM5205SetVolume(0, (d & 0x20) ? 0 : 20); MSM5205SetVolume(1, (d & 0x10) ? 0 : 20); - Sf2mdtZ80BankAddress = (d & Sf2NumZ80Banks) * 0x4000; + Sf2mdtZ80BankAddress = (d & Sf2mdtNumZ80Banks) * 0x4000; ZetMapArea(0x8000, 0xbfff, 0, CpsZRom + Sf2mdtZ80BankAddress); ZetMapArea(0x8000, 0xbfff, 2, CpsZRom + Sf2mdtZ80BankAddress); return; @@ -139,7 +139,7 @@ INT32 Sf2mdtSoundInit() nCpsZ80Cycles = 3579540 * 100 / nBurnFPS; - Sf2NumZ80Banks = (nCpsZRomLen / 0x4000) - 1; + Sf2mdtNumZ80Banks = (nCpsZRomLen / 0x4000) - 1; return 0; } @@ -150,7 +150,7 @@ INT32 Sf2mdtSoundReset() ZetReset(); BurnYM2151Reset(); MSM5205Reset(); - Sf2mdtZ80BankAddress = 2; + Sf2mdtZ80BankAddress = 0x8000; ZetMapArea(0x8000, 0xbfff, 0, CpsZRom + Sf2mdtZ80BankAddress); ZetMapArea(0x8000, 0xbfff, 2, CpsZRom + Sf2mdtZ80BankAddress); ZetClose(); @@ -180,7 +180,7 @@ INT32 Sf2mdtSoundExit() Sf2mdtSampleSelect1 = 0; Sf2mdtSampleSelect2 = 0; Sf2mdtCyclesPerSegment = 0; - Sf2NumZ80Banks = 0; + Sf2mdtNumZ80Banks = 0; nCpsZ80Cycles = 0;