summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2008-01-24 14:29:06 +0000
committer Aaron Giles <aaron@aarongiles.com>2008-01-24 14:29:06 +0000
commitae72e423a69584597c38147e8c878f037b95c739 (patch)
tree92bb4a0717306dcacf0fa290dbed35596b23cae7
parent444d77b838efcc392726d0db7651884140c20fff (diff)
From: Corrado Tomaselli [mailto:corrado.to@tiscali.it]
Subject: other frequencies verified Corrected Diet gogo h6280 clock so that it behaves correctly with Charles Macdonald fix to the cpu core. Verified anc corrected frequencies and pin 7 okim6295 on the following games: The new zealand story (3 z80 version), Trio The punch, Vandyke, paradise.c games, Downtown, Shaolin's Road and Twins. Updated Xtal.h with 1.056mhz resonator from Trio the punch
-rw-r--r--src/emu/drivers/xtal.h8
-rw-r--r--src/mame/drivers/actfancr.c12
-rw-r--r--src/mame/drivers/dec0.c4
-rw-r--r--src/mame/drivers/dietgo.c2
-rw-r--r--src/mame/drivers/gstriker.c2
-rw-r--r--src/mame/drivers/nmk16.c12
-rw-r--r--src/mame/drivers/paradise.c10
-rw-r--r--src/mame/drivers/rohga.c8
-rw-r--r--src/mame/drivers/seta.c6
-rw-r--r--src/mame/drivers/shaolins.c6
-rw-r--r--src/mame/drivers/tnzs.c36
-rw-r--r--src/mame/drivers/twins.c4
12 files changed, 56 insertions, 54 deletions
diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h
index 34809d96b6d..01138120c8e 100644
--- a/src/emu/drivers/xtal.h
+++ b/src/emu/drivers/xtal.h
@@ -83,7 +83,7 @@ enum
XTAL_19_968MHz = 19968000, /* Used mostly by Space Invaders games by Taito/Midway and clones */
XTAL_20MHz = 20000000,
XTAL_21_3MHz = 21300000,
- XTAL_21_4772MHz = 21477200, /* BMC bowling */
+ XTAL_21_4772MHz = 21477200, /* BMC bowling, some Data East 90's games */
XTAL_22MHz = 22000000,
XTAL_24MHz = 24000000, /* Mario, 80's Data East games, 80's Konami games */
XTAL_24_576MHz = 24576000, /* Pole Position h/w, Model 3 CPU board */
@@ -128,9 +128,9 @@ enum
/* Resonators (There are probably more. Almost always used for driving OKI sound chips) */
XTAL_384kHz = 384000,
- XTAL_400kHz = 400000, /* Used on Great Swordman h/w */
- XTAL_455kHz = 455000, /* Used on Gladiator h/w */
- XTAL_640kHz = 640000
+ XTAL_400kHz = 400000, /* Used on Great Swordman h/w */
+ XTAL_640kHz = 640000,
+ XTAL_1_056MHz = 1056000 /* used on Trio The Punch */
};
diff --git a/src/mame/drivers/actfancr.c b/src/mame/drivers/actfancr.c
index 7273cb26d6b..748bf9b7a8c 100644
--- a/src/mame/drivers/actfancr.c
+++ b/src/mame/drivers/actfancr.c
@@ -433,11 +433,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( triothep )
/* basic machine hardware */
- MDRV_CPU_ADD(H6280,21477200/3) /* Should be accurate */
+ MDRV_CPU_ADD(H6280,XTAL_21_4772MHz/3) /* XIN=21.4772Mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(triothep_readmem,triothep_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1) /* VBL */
- MDRV_CPU_ADD(M6502, 1500000)
+ MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* verified on pcb */
/* audio CPU */ /* Should be accurate */
MDRV_CPU_PROGRAM_MAP(dec0_s_readmem,dec0_s_writemem)
@@ -458,18 +458,18 @@ static MACHINE_DRIVER_START( triothep )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_ROUTE(0, "mono", 0.90)
MDRV_SOUND_ROUTE(1, "mono", 0.90)
MDRV_SOUND_ROUTE(2, "mono", 0.90)
MDRV_SOUND_ROUTE(3, "mono", 0.50)
- MDRV_SOUND_ADD(YM3812, 3000000)
+ MDRV_SOUND_ADD(YM3812, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym3812_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.90)
- MDRV_SOUND_ADD(OKIM6295, 1024188)
- MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified
+ MDRV_SOUND_ADD(OKIM6295, XTAL_1_056MHz) /* verified on pcb */
+ MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.85)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c
index 4731bf5326c..6076dfd626a 100644
--- a/src/mame/drivers/dec0.c
+++ b/src/mame/drivers/dec0.c
@@ -1198,7 +1198,7 @@ static MACHINE_DRIVER_START( slyspy )
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */
MDRV_CPU_ADD(H6280, XTAL_12MHz/2/3)
- /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, pin 14 (HSM) is high so XIN/3 */
+ /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
MDRV_CPU_PROGRAM_MAP(slyspy_s_readmem,slyspy_s_writemem)
MDRV_SCREEN_REFRESH_RATE(57.41)
@@ -1241,7 +1241,7 @@ static MACHINE_DRIVER_START( midres )
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */
MDRV_CPU_ADD(H6280, XTAL_24MHz/4/3)
- /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, pin 14 (HSM) is high so XIN/3 */
+ /* audio CPU */ /* verified on pcb (6Mhz is XIN on pin 10 of H6280, verified on pcb */
MDRV_CPU_PROGRAM_MAP(midres_s_readmem,midres_s_writemem)
MDRV_SCREEN_REFRESH_RATE(57.41)
diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c
index 17df3f28df2..2e154e1ef2a 100644
--- a/src/mame/drivers/dietgo.c
+++ b/src/mame/drivers/dietgo.c
@@ -206,7 +206,7 @@ static MACHINE_DRIVER_START( dietgo )
MDRV_CPU_PROGRAM_MAP(dietgo_map,0)
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)
- MDRV_CPU_ADD(H6280, XTAL_32_22MHz/4/12) /* Custom chip 45; XIN is 32.220MHZ/4, HSM pin is low so XIN/12 */
+ MDRV_CPU_ADD(H6280, XTAL_32_22MHz/4/3) /* Custom chip 45; XIN is 32.220MHZ/4, verified on pcb */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_SCREEN_REFRESH_RATE(58)
diff --git a/src/mame/drivers/gstriker.c b/src/mame/drivers/gstriker.c
index f6370aaf5d1..b4ad1920d77 100644
--- a/src/mame/drivers/gstriker.c
+++ b/src/mame/drivers/gstriker.c
@@ -172,6 +172,8 @@ VSIS-20V3
U17-20 ? YM2610
12 Z80
+Frequencies: 68k is XTAL_32MHZ/2
+ z80 is XTAL_20MHz/4
******************************************************************************/
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 3c65541e323..89a9498d1c9 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -3955,7 +3955,7 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( vandyke )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 10000000) /* 10 MHz ? */
+ MDRV_CPU_ADD(M68000, XTAL_10MHz) /* 68000p12 running at 10Mhz, verified on pcb */
MDRV_CPU_PROGRAM_MAP(vandyke_readmem,vandyke_writemem)
MDRV_CPU_VBLANK_INT(nmk_interrupt,2)
MDRV_CPU_PERIODIC_INT(irq1_line_hold,112)/* ???????? */
@@ -3979,19 +3979,19 @@ static MACHINE_DRIVER_START( vandyke )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 1500000)
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_nmk004_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.50)
MDRV_SOUND_ROUTE(1, "mono", 0.50)
MDRV_SOUND_ROUTE(2, "mono", 0.50)
MDRV_SOUND_ROUTE(3, "mono", 2.00)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low)
+ MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/3) /* verified on pcb */
+ MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
- MDRV_SOUND_ADD(OKIM6295, 16000000/4)
- MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low)
+ MDRV_SOUND_ADD(OKIM6295, XTAL_12MHz/3) /* verified on pcb */
+ MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.20)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/paradise.c b/src/mame/drivers/paradise.c
index 024a5db7412..6096e3acbc9 100644
--- a/src/mame/drivers/paradise.c
+++ b/src/mame/drivers/paradise.c
@@ -536,7 +536,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( paradise )
/* basic machine hardware */
- MDRV_CPU_ADD_TAG("main", Z80, 12000000/2) /* Z8400B - 6mhz Verified */
+ MDRV_CPU_ADD_TAG("main", Z80, XTAL_12MHz/2) /* Z8400B - 6mhz Verified */
MDRV_CPU_PROGRAM_MAP(paradise_map,0)
MDRV_CPU_IO_MAP(paradise_readport,paradise_writeport)
MDRV_CPU_VBLANK_INT(irq0_line_hold,4) /* No nmi routine */
@@ -558,12 +558,12 @@ static MACHINE_DRIVER_START( paradise )
/* 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_12MHz/12) /* verified on pcb */
+ MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
- MDRV_SOUND_ADD_TAG("oki2", OKIM6295, 1000000)
- MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high)
+ MDRV_SOUND_ADD_TAG("oki2", OKIM6295, XTAL_12MHz/12) /* verified on pcb */
+ MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7high) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/rohga.c b/src/mame/drivers/rohga.c
index 6cb873f3b42..7126ec982ce 100644
--- a/src/mame/drivers/rohga.c
+++ b/src/mame/drivers/rohga.c
@@ -818,7 +818,7 @@ static MACHINE_DRIVER_START( rohga )
MDRV_CPU_PROGRAM_MAP(rohga_readmem,rohga_writemem)
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)
- MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280, pin 14 (HSM) is high so XIN/3 */
+ MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_SCREEN_REFRESH_RATE(58)
@@ -861,7 +861,7 @@ static MACHINE_DRIVER_START( wizdfire )
MDRV_CPU_PROGRAM_MAP(wizdfire_readmem,wizdfire_writemem)
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)
- MDRV_CPU_ADD(H6280,32220000/4/3)
+ MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_SCREEN_REFRESH_RATE(58)
@@ -904,7 +904,7 @@ static MACHINE_DRIVER_START( nitrobal )
MDRV_CPU_PROGRAM_MAP(nitrobal_readmem,nitrobal_writemem)
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)
- MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280, pin 14 (HSM) is high so XIN/3 */
+ MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_SCREEN_REFRESH_RATE(58)
@@ -947,7 +947,7 @@ static MACHINE_DRIVER_START( schmeisr )
MDRV_CPU_PROGRAM_MAP(schmeisr_readmem,schmeisr_writemem)
MDRV_CPU_VBLANK_INT(irq6_line_hold,1)
- MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280, pin 14 (HSM) is high so XIN/3 */
+ MDRV_CPU_ADD(H6280,32220000/4/3) /* verified on pcb (8.050Mhz is XIN on pin 10 of H6280 */
MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem)
MDRV_SCREEN_REFRESH_RATE(58)
diff --git a/src/mame/drivers/seta.c b/src/mame/drivers/seta.c
index b6ad15a3ac1..2987170b3f7 100644
--- a/src/mame/drivers/seta.c
+++ b/src/mame/drivers/seta.c
@@ -23,7 +23,7 @@ Ordered by Board Year + Game Licensed To
-------------------------------------------------------------------------------
P0-029-A (M6100287A) 88 Thundercade / Twin Formation (1) Taito
? (M6100326A) 88 Twin Eagle Taito
-? 89 DownTown Taito / RomStar
+P0-045-A (M6100429A) 89 DownTown Taito / RomStar
? (M6100430A) 89 U.S. Classic(2) Taito / RomStar
? 88 Caliber 50 Taito / RomStar
? 89 Arbalester Taito / RomStar
@@ -6964,11 +6964,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( downtown )
/* basic machine hardware */
- MDRV_CPU_ADD(M68000, 16000000/2) /* 8 MHz */
+ MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(downtown_readmem,downtown_writemem)
MDRV_CPU_VBLANK_INT(seta_interrupt_1_and_2,SETA_INTERRUPTS_NUM)
- MDRV_CPU_ADD(M65C02, 16000000/8) /* 2 MHz */
+ MDRV_CPU_ADD(M65C02, XTAL_16MHz/8) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(downtown_sub_readmem,downtown_sub_writemem)
MDRV_CPU_VBLANK_INT(seta_sub_interrupt,SETA_SUB_INTERRUPTS_NUM)
diff --git a/src/mame/drivers/shaolins.c b/src/mame/drivers/shaolins.c
index 8a5b22f00e0..2f0e85ae3a6 100644
--- a/src/mame/drivers/shaolins.c
+++ b/src/mame/drivers/shaolins.c
@@ -217,7 +217,7 @@ GFXDECODE_END
static MACHINE_DRIVER_START( shaolins )
/* basic machine hardware */
- MDRV_CPU_ADD(M6809, 1250000) /* 1.25 MHz */
+ MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT(shaolins_interrupt,16) /* 1 IRQ + 8 NMI */
@@ -240,10 +240,10 @@ static MACHINE_DRIVER_START( shaolins )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(SN76496, 1536000)
+ MDRV_SOUND_ADD(SN76496, XTAL_18_432MHz/12) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
- MDRV_SOUND_ADD(SN76496, 3072000)
+ MDRV_SOUND_ADD(SN76496, XTAL_18_432MHz/6) /* verified on pcb */
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END
diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c
index 822784b9c40..6b8e61d4fe0 100644
--- a/src/mame/drivers/tnzs.c
+++ b/src/mame/drivers/tnzs.c
@@ -1293,7 +1293,7 @@ static MACHINE_DRIVER_START( arknoid2 )
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT(arknoid2_interrupt,1)
- MDRV_CPU_ADD(Z80, 12000000/2) /* verified on pcb */
+ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
@@ -1318,7 +1318,7 @@ static MACHINE_DRIVER_START( arknoid2 )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 12000000/4) /* verified on pcb */
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1327,11 +1327,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( drtoppel )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT(arknoid2_interrupt,1)
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
@@ -1356,7 +1356,7 @@ static MACHINE_DRIVER_START( drtoppel )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1365,11 +1365,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tnzs )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
- MDRV_CPU_ADD(Z80,12000000/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
+ MDRV_CPU_ADD(Z80,XTAL_12MHz/2) /* 6.0 MHz ??? - Main board Crystal is 12MHz */
MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
@@ -1397,7 +1397,7 @@ static MACHINE_DRIVER_START( tnzs )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 3000000)
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4)
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1406,11 +1406,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( insectx )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12000000/2) /* verified on pcb */
+ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
- MDRV_CPU_ADD(Z80, 12000000/2) /* verified on pcb */
+ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(sub_readmem,sub_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
@@ -1434,7 +1434,7 @@ static MACHINE_DRIVER_START( insectx )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 12000000/4) /* verified on pcb */
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30)
MACHINE_DRIVER_END
@@ -1443,11 +1443,11 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( kageki )
/* basic machine hardware */
- MDRV_CPU_ADD(Z80, 12000000/2) /* verified on pcb */
+ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(readmem,writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
- MDRV_CPU_ADD(Z80, 12000000/2) /* verified on pcb */
+ MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(kageki_sub_readmem,kageki_sub_writemem)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
@@ -1471,7 +1471,7 @@ static MACHINE_DRIVER_START( kageki )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(YM2203, 12000000/4) /* verified on pcb */
+ MDRV_SOUND_ADD(YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(kageki_ym2203_interface)
MDRV_SOUND_ROUTE(0, "mono", 0.15)
MDRV_SOUND_ROUTE(1, "mono", 0.15)
@@ -1487,15 +1487,15 @@ MACHINE_DRIVER_END
static MACHINE_DRIVER_START( tnzsb )
/* basic machine hardware */
- MDRV_CPU_ADD_TAG("cpu0", Z80, 6000000) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("cpu0", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(cpu0_type2,0)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
- MDRV_CPU_ADD_TAG("cpu1", Z80, 6000000) /* 6 MHz */
+ MDRV_CPU_ADD_TAG("cpu1", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(tnzsb_cpu1_map,0)
MDRV_CPU_VBLANK_INT(irq0_line_hold,1)
- MDRV_CPU_ADD_TAG("cpu2", Z80, 12000000/3) /* guessed but it makes sense since it's the sound z80 near the YM2203 */
+ MDRV_CPU_ADD_TAG("cpu2", Z80, XTAL_12MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(tnzsb_cpu2_map,0)
MDRV_CPU_IO_MAP(tnzsb_readport,tnzsb_writeport)
@@ -1519,7 +1519,7 @@ static MACHINE_DRIVER_START( tnzsb )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD_TAG("ym2203", YM2203, 3000000)
+ MDRV_SOUND_ADD_TAG("ym2203", YM2203, XTAL_12MHz/4) /* verified on pcb */
MDRV_SOUND_CONFIG(ym2203b_interface)
MDRV_SOUND_ROUTE(0, "mono", 1.0)
MDRV_SOUND_ROUTE(1, "mono", 1.0)
diff --git a/src/mame/drivers/twins.c b/src/mame/drivers/twins.c
index 6ff6f2b73ad..64e77b41f39 100644
--- a/src/mame/drivers/twins.c
+++ b/src/mame/drivers/twins.c
@@ -253,7 +253,7 @@ ADDRESS_MAP_END
static MACHINE_DRIVER_START( twinsa )
/* basic machine hardware */
- MDRV_CPU_ADD(V30, 8000000)
+ MDRV_CPU_ADD(V30, XTAL_16MHz/2) /* verified on pcb */
MDRV_CPU_PROGRAM_MAP(twins_map, 0)
MDRV_CPU_IO_MAP(twinsa_io,0)
MDRV_CPU_VBLANK_INT(nmi_line_pulse,1)
@@ -274,7 +274,7 @@ static MACHINE_DRIVER_START( twinsa )
/* sound hardware */
MDRV_SPEAKER_STANDARD_MONO("mono")
- MDRV_SOUND_ADD(AY8910, 2000000)
+ MDRV_SOUND_ADD(AY8910, XTAL_16MHz/8) /* verified on pcb */
MDRV_SOUND_CONFIG(ay8910_interface)
MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_DRIVER_END