From 4eb5f07a9c7406c2174f4be38386a2971ab905c8 Mon Sep 17 00:00:00 2001 From: Scott Stone Date: Wed, 18 Nov 2009 19:02:03 +0000 Subject: [PATCH] Verified/changed clocks and vsyncs on the following games: Aerofighters (only vsync), Power Spikes, Turbo Force (only vsync), Guzzler/Swimmer (same pcb), Exerion and Karate Champs Vs. [Corrado Tomaselli] --- src/mame/drivers/aerofgt.c | 14 +++++++------- src/mame/drivers/cclimber.c | 10 +++++----- src/mame/drivers/kchamp.c | 12 ++++++------ src/mame/includes/exerion.h | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/mame/drivers/aerofgt.c b/src/mame/drivers/aerofgt.c index 8fa6d1d3d6f..788bfb6cb5e 100644 --- a/src/mame/drivers/aerofgt.c +++ b/src/mame/drivers/aerofgt.c @@ -1307,11 +1307,11 @@ static const ym3812_interface ym3812_config = static MACHINE_DRIVER_START( pspikes ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu",M68000,20000000/2) /* 10 MHz (?) */ + MDRV_CPU_ADD("maincpu",M68000,XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(pspikes_map) MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD("audiocpu",Z80,8000000/2) /* 4 MHz ??? */ + MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map) MDRV_CPU_IO_MAP(turbofrc_sound_portmap) /* IRQs are triggered by the YM2610 */ @@ -1321,7 +1321,7 @@ static MACHINE_DRIVER_START( pspikes ) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_REFRESH_RATE(60) + MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */ MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(64*8, 32*8) @@ -1462,7 +1462,7 @@ static MACHINE_DRIVER_START( karatblz ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MDRV_SOUND_ADD("ymsnd", YM2610, 8000000) + MDRV_SOUND_ADD("ymsnd", YM2610, XTAL_8MHz ) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_config) MDRV_SOUND_ROUTE(0, "lspeaker", 0.25) MDRV_SOUND_ROUTE(0, "rspeaker", 0.25) @@ -1526,7 +1526,7 @@ static MACHINE_DRIVER_START( turbofrc ) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_REFRESH_RATE(60) + MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */ MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(64*8, 32*8) @@ -1595,7 +1595,7 @@ static MACHINE_DRIVER_START( aerofgt ) MDRV_CPU_PROGRAM_MAP(aerofgt_map) MDRV_CPU_VBLANK_INT("screen", irq1_line_hold)/* all irq vectors are the same */ - MDRV_CPU_ADD("audiocpu",Z80,5000000) /* 5 MHz (verified on pcb) */ + MDRV_CPU_ADD("audiocpu",Z80,XTAL_20MHz/4) /* 5 MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_map) MDRV_CPU_IO_MAP(aerofgt_sound_portmap) /* IRQs are triggered by the YM2610 */ @@ -1605,7 +1605,7 @@ static MACHINE_DRIVER_START( aerofgt ) /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_REFRESH_RATE(60) + MDRV_SCREEN_REFRESH_RATE(61.31) /* verified on pcb */ MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(400)) /* wrong but improves sprite-background synchronization */ MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) diff --git a/src/mame/drivers/cclimber.c b/src/mame/drivers/cclimber.c index f19e51f7af0..f1efaafc42d 100644 --- a/src/mame/drivers/cclimber.c +++ b/src/mame/drivers/cclimber.c @@ -1079,18 +1079,18 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( swimmer ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", Z80, 3072000) /* 3.072 MHz */ + MDRV_CPU_ADD("maincpu", Z80, XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(swimmer_map) MDRV_CPU_VBLANK_INT("screen", nmi_line_pulse) - MDRV_CPU_ADD("audiocpu", Z80,4000000/2) + MDRV_CPU_ADD("audiocpu", Z80,XTAL_4MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(swimmer_audio_map) MDRV_CPU_IO_MAP(swimmer_audio_portmap) MDRV_CPU_PERIODIC_INT(nmi_line_pulse, (double)4000000/16384) /* IRQs are triggered by the main CPU */ /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_REFRESH_RATE(60) + MDRV_SCREEN_REFRESH_RATE(60.57) /* verified on pcb */ MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(32*8, 32*8) @@ -1105,10 +1105,10 @@ static MACHINE_DRIVER_START( swimmer ) /* audio hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay1", AY8910, 4000000/2) + MDRV_SOUND_ADD("ay1", AY8910, XTAL_4MHz/2) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MDRV_SOUND_ADD("ay2", AY8910, 4000000/2) + MDRV_SOUND_ADD("ay2", AY8910, XTAL_4MHz/2) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/kchamp.c b/src/mame/drivers/kchamp.c index 5479711f559..450f4e87d64 100644 --- a/src/mame/drivers/kchamp.c +++ b/src/mame/drivers/kchamp.c @@ -401,19 +401,19 @@ static INTERRUPT_GEN( sound_int ) static MACHINE_DRIVER_START( kchampvs ) /* basic machine hardware */ - MDRV_CPU_ADD("maincpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ + MDRV_CPU_ADD("maincpu", Z80, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kchampvs_map) MDRV_CPU_IO_MAP(kchampvs_io_map) MDRV_CPU_VBLANK_INT("screen", kc_interrupt) - MDRV_CPU_ADD("audiocpu", Z80, 3000000) /* 12MHz / 4 = 3.0 MHz */ + MDRV_CPU_ADD("audiocpu", Z80, XTAL_12MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(kchampvs_sound_map) MDRV_CPU_IO_MAP(kchampvs_sound_io_map) /* irq's triggered from main cpu */ /* nmi's from msm5205 */ /* video hardware */ MDRV_SCREEN_ADD("screen", RASTER) - MDRV_SCREEN_REFRESH_RATE(60) + MDRV_SCREEN_REFRESH_RATE(59.10) /* verified on pcb */ MDRV_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MDRV_SCREEN_FORMAT(BITMAP_FORMAT_INDEXED16) MDRV_SCREEN_SIZE(32*8, 32*8) @@ -429,13 +429,13 @@ static MACHINE_DRIVER_START( kchampvs ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD("ay1", AY8910, 1500000) + MDRV_SOUND_ADD("ay1", AY8910, XTAL_12MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MDRV_SOUND_ADD("ay2", AY8910, 1500000) + MDRV_SOUND_ADD("ay2", AY8910, XTAL_12MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MDRV_SOUND_ADD("msm", MSM5205, 375000) + MDRV_SOUND_ADD("msm", MSM5205, 375000) /* verified on pcb, discrete circuit clock */ MDRV_SOUND_CONFIG(msm_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/includes/exerion.h b/src/mame/includes/exerion.h index 30a23d02657..ca6518bdf96 100644 --- a/src/mame/includes/exerion.h +++ b/src/mame/includes/exerion.h @@ -5,7 +5,7 @@ *************************************************************************/ -#define EXERION_MASTER_CLOCK (20000000) +#define EXERION_MASTER_CLOCK (XTAL_19_968MHz) /* verified on pcb */ #define EXERION_CPU_CLOCK (EXERION_MASTER_CLOCK / 6) #define EXERION_AY8910_CLOCK (EXERION_CPU_CLOCK / 2) #define EXERION_PIXEL_CLOCK (EXERION_MASTER_CLOCK / 3)