diff options
author | kazblox <kazbloxmc@gmail.com> | 2015-10-08 18:56:18 -0400 |
---|---|---|
committer | kazblox <kazbloxmc@gmail.com> | 2015-10-10 08:41:48 -0400 |
commit | c020c87f77485c2bc11eb7c6d335f5f3d32b456c (patch) | |
tree | 105207a4a04262b4424eef095468d8129260931f /src/mame/drivers/1942.c | |
parent | 565b835ee137ef29e0650a3416d62719c858a07a (diff) |
Correct the clocks in 1942p; fix spcwarp boot procedure.
Diffstat (limited to 'src/mame/drivers/1942.c')
-rw-r--r-- | src/mame/drivers/1942.c | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/src/mame/drivers/1942.c b/src/mame/drivers/1942.c index 94168883301..b5856656097 100644 --- a/src/mame/drivers/1942.c +++ b/src/mame/drivers/1942.c @@ -61,9 +61,14 @@ correctly. ***************************************************************************/ -#define MAIN_CPU_CLOCK (XTAL_12MHz/3) /* 12MHz is the only OSC on the PCB */ -#define SOUND_CPU_CLOCK (XTAL_12MHz/4) /* 12MHz is the only OSC on the PCB */ -#define AUDIO_CLOCK (XTAL_12MHz/8) /* 12MHz is the only OSC on the PCB */ +/* 12mhz OSC */ +#define MAIN_CPU_CLOCK (XTAL_12MHz/3) +#define SOUND_CPU_CLOCK (XTAL_12MHz/4) +#define AUDIO_CLOCK (XTAL_12MHz/8) +/* 20mhz OSC - both Z80s are 4 MHz */ +#define MAIN_CPU_CLOCK_1942P (XTAL_20MHz/5) +#define SOUND_CPU_CLOCK_1942P (XTAL_20MHz/5) +#define AUDIO_CLOCK_1942P (XTAL_20MHz/16) #include "emu.h" #include "cpu/z80/z80.h" @@ -620,11 +625,11 @@ MACHINE_CONFIG_END static MACHINE_CONFIG_START( 1942p, _1942_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK) /* 4 MHz ??? */ + MCFG_CPU_ADD("maincpu", Z80, MAIN_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */ MCFG_CPU_PROGRAM_MAP(c1942p_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", _1942_state, irq0_line_hold) // note, powerups won't move down the screen with the original '1942' logic. - MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK) /* 3 MHz ??? */ + MCFG_CPU_ADD("audiocpu", Z80, SOUND_CPU_CLOCK_1942P) /* 4 MHz - verified on PCB */ MCFG_CPU_PROGRAM_MAP(c1942p_sound_map) MCFG_CPU_IO_MAP(c1942p_sound_io) MCFG_CPU_PERIODIC_INT_DRIVER(_1942_state, irq0_line_hold, 4*60) @@ -650,9 +655,9 @@ static MACHINE_CONFIG_START( 1942p, _1942_state ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK) /* 1.5 MHz */ + MCFG_SOUND_ADD("ay1", AY8910, AUDIO_CLOCK_1942P) /* 1.25 MHz - verified on PCB */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK) /* 1.5 MHz */ + MCFG_SOUND_ADD("ay2", AY8910, AUDIO_CLOCK_1942P) /* 1.25 MHz - verified on PCB */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_CONFIG_END |