From eaae2dbb4c5468d8d8961bf96a6ead79a9d3ad10 Mon Sep 17 00:00:00 2001 From: Valley Bell Date: Tue, 11 Aug 2015 10:39:21 +0200 Subject: [PATCH 1/2] fix FM-Towns RF5C68 clock, fix game/music speed of Xor World --- src/mame/drivers/xorworld.c | 7 +++++-- src/mess/drivers/fmtowns.c | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/xorworld.c b/src/mame/drivers/xorworld.c index 486b5da9b01..13d254bbcba 100644 --- a/src/mame/drivers/xorworld.c +++ b/src/mame/drivers/xorworld.c @@ -171,8 +171,11 @@ static MACHINE_CONFIG_START( xorworld, xorworld_state ) // basic machine hardware MCFG_CPU_ADD("maincpu", M68000, 10000000) // 10 MHz MCFG_CPU_PROGRAM_MAP(xorworld_map) - MCFG_CPU_VBLANK_INT_DRIVER("screen", xorworld_state, irq6_line_assert) // irq 4 or 6 - MCFG_CPU_PERIODIC_INT_DRIVER(xorworld_state, irq2_line_assert, 3*60) //timed irq, unknown timing + //MCFG_CPU_VBLANK_INT_DRIVER("screen", xorworld_state, irq6_line_assert) // irq 4 or 6 + //MCFG_CPU_PERIODIC_INT_DRIVER(xorworld_state, irq2_line_assert, 3*60) //timed irq, unknown timing + // Simple fix - but this sounds good!! -Valley Bell + MCFG_CPU_VBLANK_INT_DRIVER("screen", xorworld_state, irq2_line_assert) // irq 4 or 6 + MCFG_CPU_PERIODIC_INT_DRIVER(xorworld_state, irq6_line_assert, 3*60) //timed irq, unknown timing MCFG_QUANTUM_TIME(attotime::from_hz(60)) diff --git a/src/mess/drivers/fmtowns.c b/src/mess/drivers/fmtowns.c index fa6235e04d2..b901bae842e 100644 --- a/src/mess/drivers/fmtowns.c +++ b/src/mess/drivers/fmtowns.c @@ -2696,11 +2696,11 @@ static MACHINE_CONFIG_FRAGMENT( towns_base ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("fm", YM3438, 53693100 / 7) // actual clock speed unknown + MCFG_SOUND_ADD("fm", YM3438, 16000000 / 2) // actual clock speed unknown MCFG_YM2612_IRQ_HANDLER(WRITELINE(towns_state, towns_fm_irq)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_RF5C68_ADD("pcm", 53693100 / 7) // actual clock speed unknown + MCFG_RF5C68_ADD("pcm", 16000000 / 2) // actual clock speed unknown MCFG_RF5C68_SAMPLE_END_CB(towns_state, towns_pcm_irq) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.50) MCFG_SOUND_ADD("cdda",CDDA,0) From 1068a0115394c815f5624a6018a2a18142f5b583 Mon Sep 17 00:00:00 2001 From: Valley Bell Date: Tue, 11 Aug 2015 21:12:45 +0200 Subject: [PATCH 2/2] prevent main menu from overwriting error.log and wavelog --- src/emu/machine.c | 2 +- src/emu/sound.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emu/machine.c b/src/emu/machine.c index c5da99961d4..602fb0b5e3c 100644 --- a/src/emu/machine.c +++ b/src/emu/machine.c @@ -339,7 +339,7 @@ int running_machine::run(bool firstrun) m_current_phase = MACHINE_PHASE_INIT; // if we have a logfile, set up the callback - if (options().log()) + if (options().log() && &system() != &GAME_NAME(___empty)) { m_logfile.reset(global_alloc(emu_file(OPEN_FLAG_WRITE | OPEN_FLAG_CREATE | OPEN_FLAG_CREATE_PATHS))); file_error filerr = m_logfile->open("error.log"); diff --git a/src/emu/sound.c b/src/emu/sound.c index d2543154bf6..fa2a75a7535 100644 --- a/src/emu/sound.c +++ b/src/emu/sound.c @@ -835,7 +835,7 @@ sound_manager::sound_manager(running_machine &machine) #endif // open the output WAV file if specified - if (wavfile[0] != 0) + if (wavfile[0] != 0 && &machine.system() != &GAME_NAME(___empty)) m_wavfile = wav_open(wavfile, machine.sample_rate(), 2); // register callbacks