summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-03-13 15:20:41 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-03-13 15:20:41 +0000
commit0277103558e751c2addce39da114b30f817a0286 (patch)
tree6bb6930639bbb330a2af78155757f788d9a0d79d
parente426f9e0b62f8c9ec57ad18c4e8db07788583e7e (diff)
Added some pieces that got missed when applying this patch.
From: Corrado Tomaselli Subject: Frequencies diff Changed/verified clocks on the following pcbs: 1943, Arkanoid, Action Holliwood GalsPanic, Ben Bero Beh, 1000 Miglia, Pit and Run, Prehistoric Isle, Rastan, Hotmind, Hardtimes, Stagger1 and Tiger Road Changed/verified Oki pin 7 on the following pcbs: 1000 miglia, Galspanic, Action Holliwood, Hotmind, HardTimes, World Rally, Stagger1
-rw-r--r--src/mame/drivers/1943.c5
-rw-r--r--src/mame/drivers/arkanoid.c4
-rw-r--r--src/mame/drivers/halleys.c7
-rw-r--r--src/mame/drivers/kickgoal.c4
-rw-r--r--src/mame/drivers/nmk16.c5
-rw-r--r--src/mame/drivers/pitnrun.c7
-rw-r--r--src/mame/drivers/playmark.c12
-rw-r--r--src/mame/drivers/prehisle.c5
-rw-r--r--src/mame/drivers/rastan.c4
-rw-r--r--src/mame/drivers/tigeroad.c5
10 files changed, 26 insertions, 32 deletions
diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c
index 15d8a48a623..bf605e97dfb 100644
--- a/src/mame/drivers/1943.c
+++ b/src/mame/drivers/1943.c
@@ -250,12 +250,11 @@ GFXDECODE_END
static MACHINE_DRIVER_START( 1943 )
// basic machine hardware
- MDRV_CPU_ADD(Z80, 6000000) // 6 MHz
+ MDRV_CPU_ADD(Z80, XTAL_24MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(c1943_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(Z80, 3000000) // 3 MHz
- /* audio CPU */
+ MDRV_CPU_ADD(Z80, XTAL_24MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_map, 0)
MDRV_CPU_VBLANK_INT_HACK(irq0_line_hold, 4)
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index ec75d58dede..e3c885dbb10 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -744,11 +744,11 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( arkanoid )
// basic machine hardware
- MDRV_CPU_ADD_TAG("main", Z80, 6000000) /* 6 Mhz */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(arkanoid_map, 0)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD_TAG("mcu", M68705, 3000000) /* 3 Mhz */
+ MDRV_CPU_ADD_TAG("mcu", M68705, XTAL_12MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(mcu_map, 0)
MDRV_INTERLEAVE(100) // 100 CPU slices per second to synchronize between the MCU and the main CPU
diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c
index 981160e059d..31b0c871a54 100644
--- a/src/mame/drivers/halleys.c
+++ b/src/mame/drivers/halleys.c
@@ -1948,12 +1948,11 @@ static const struct AY8910interface ay8910_interface =
static MACHINE_DRIVER_START( halleys )
- MDRV_CPU_ADD_TAG("main", M6809, 1664000) /* 19968000/12 (verified on pcb) */
+ MDRV_CPU_ADD_TAG("main", M6809, XTAL_19_968MHz/12) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem, writemem)
MDRV_CPU_VBLANK_INT_HACK(halleys_interrupt, 4)
- MDRV_CPU_ADD(Z80, 6000000/2) /* (verified on pcb) */
- /* audio CPU */
+ MDRV_CPU_ADD(Z80, XTAL_6MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_readmem, sound_writemem)
MDRV_CPU_PERIODIC_INT(irq0_line_hold, (double)6000000/(4*16*16*10*16))
@@ -1994,7 +1993,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( benberob )
MDRV_IMPORT_FROM(halleys)
- MDRV_CPU_REPLACE("main", M6809, 1000000) // 19.968MHz/20? (CAUTION: timing critical)
+ MDRV_CPU_REPLACE("main", M6809, XTAL_19_968MHz/12) /* not verified but pcb identical to halley's comet */
MDRV_CPU_VBLANK_INT_HACK(benberob_interrupt, 4)
MDRV_VIDEO_UPDATE(benberob)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c
index b03c0ec5bd4..114c4bb569c 100644
--- a/src/mame/drivers/kickgoal.c
+++ b/src/mame/drivers/kickgoal.c
@@ -701,11 +701,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( actionhw )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD(M68000, XTAL_12MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(kickgoal_program_map, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
- MDRV_CPU_ADD(PIC16C57, 12000000/4) /* 3MHz ? */
+ MDRV_CPU_ADD(PIC16C57, XTAL_12MHz/3) /* verified on pcb */
MDRV_CPU_FLAGS(CPU_DISABLE) /* Disables since the internal rom isn't dumped */
/* Program and Data Maps are internal to the MCU */
MDRV_CPU_IO_MAP(actionhw_io_map, 0)
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 79b0b59a068..724fa83f62f 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -5021,12 +5021,11 @@ static const struct YM2151interface afega_ym2151_intf =
static MACHINE_DRIVER_START( stagger1 )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000,12000000)
+ MDRV_CPU_ADD(M68000,XTAL_12MHz) /* 68000p10 running at 12mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(afega,0)
MDRV_CPU_VBLANK_INT_HACK(nmk_interrupt,2)
- MDRV_CPU_ADD(Z80, 4000000)
- /* audio CPU */ /* ? */
+ MDRV_CPU_ADD(Z80, XTAL_4MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(afega_sound_cpu,0)
/* video hardware */
diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c
index 15997643f11..8136328a522 100644
--- a/src/mame/drivers/pitnrun.c
+++ b/src/mame/drivers/pitnrun.c
@@ -284,18 +284,17 @@ static GFXDECODE_START( pitnrun )
GFXDECODE_END
static MACHINE_DRIVER_START( pitnrun )
- MDRV_CPU_ADD(Z80,8000000/2) /* ? MHz */
+ MDRV_CPU_ADD(Z80,XTAL_18_432MHz/12) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", pitnrun_nmi_source)
- MDRV_CPU_ADD(Z80, 10000000/4) /* 2.5 MHz */
+ MDRV_CPU_ADD(Z80, XTAL_5MHz/2) /* verified on pcb */
- /* audio CPU */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_CPU_IO_MAP(sound_readport,sound_writeport)
MDRV_CPU_VBLANK_INT("main", irq0_line_hold)
- MDRV_CPU_ADD(M68705,3000000)
+ MDRV_CPU_ADD(M68705,XTAL_18_432MHz/12) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(mcu_readmem,mcu_writemem)
MDRV_MACHINE_RESET(pitnrun)
diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c
index c1eb1168bba..a723d830d73 100644
--- a/src/mame/drivers/playmark.c
+++ b/src/mame/drivers/playmark.c
@@ -1069,11 +1069,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hotmind )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(hotmind_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
- MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */
+ MDRV_CPU_ADD(PIC16C57, XTAL_24MHz/2) /* verified on pcb */
/* Program and Data Maps are internal to the MCU */
MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
@@ -1096,19 +1096,19 @@ static MACHINE_DRIVER_START( hotmind )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(OKIM6295, 1000000)
- MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high)
+ MDRV_SOUND_ADD(OKIM6295, XTAL_1MHz) /* verified on pcb */
+ MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
static MACHINE_DRIVER_START( hrdtimes )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000) /* 12 MHz */
+ MDRV_CPU_ADD(M68000, XTAL_24MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(hrdtimes_main_map, 0)
MDRV_CPU_VBLANK_INT("main", irq6_line_hold)
-// MDRV_CPU_ADD(PIC16C57, 12000000) /* 3MHz */
+// MDRV_CPU_ADD(PIC16C57, XTAL_24MHz/2) /* verified on pcb */
/* Program and Data Maps are internal to the MCU */
// MDRV_CPU_IO_MAP(playmark_sound_io_map, 0)
diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c
index 9f1d48dac8b..4e4d3ff134c 100644
--- a/src/mame/drivers/prehisle.c
+++ b/src/mame/drivers/prehisle.c
@@ -235,12 +235,11 @@ static const struct upd7759_interface upd7759_interface =
static MACHINE_DRIVER_START( prehisle )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 12000000)
+ MDRV_CPU_ADD(M68000, XTAL_18MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(prehisle_readmem,prehisle_writemem)
MDRV_CPU_VBLANK_INT("main", irq4_line_hold)
- MDRV_CPU_ADD(Z80, 4000000)
- /* audio CPU */
+ MDRV_CPU_ADD(Z80, XTAL_4MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(prehisle_sound_readmem,prehisle_sound_writemem)
MDRV_CPU_IO_MAP(prehisle_sound_readport,prehisle_sound_writeport)
diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c
index 8f4f1a8c8c4..65ee9a14b12 100644
--- a/src/mame/drivers/rastan.c
+++ b/src/mame/drivers/rastan.c
@@ -381,11 +381,11 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( rastan )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */
+ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(rastan_map,0)
MDRV_CPU_VBLANK_INT("main", irq5_line_hold)
- MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz */
+ MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(rastan_s_map,0)
MDRV_INTERLEAVE(10) /* 10 CPU slices per frame - enough for the sound CPU to read all commands */
diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c
index e61758a4ed5..59622564939 100644
--- a/src/mame/drivers/tigeroad.c
+++ b/src/mame/drivers/tigeroad.c
@@ -547,12 +547,11 @@ static const struct MSM5205interface msm5205_interface =
static MACHINE_DRIVER_START( tigeroad )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 6000000) /* ? Main clock is 24MHz */
+ MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT("main", irq2_line_hold)
- MDRV_CPU_ADD(Z80, 4000000)
- /* audio CPU */ /* 4 MHz ??? */
+ MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_CPU_IO_MAP(0,sound_writeport)
/* IRQs are triggered by the YM2203 */