Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-19 23:12:11 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge pull request #324 from ValleyBell/valleybell

Browse Source 
fix for FM-Towns clock, minor fixes
This commit is contained in:
David Haywood 2015-09-14 02:11:26 +01:00
commit 7960d296ad
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emu/machine.c
View File

@ -341,7 +341,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");

2
src/emu/sound.c
View File

@ -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

7
src/mame/drivers/xorworld.c
View File

@ -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))

4
src/mess/drivers/fmtowns.c
View File

@ -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)