From 90e0297191749acf4abc52dd4203a187edde6d54 Mon Sep 17 00:00:00 2001 From: Aaron Giles Date: Wed, 9 Jan 2008 05:27:45 +0000 Subject: [PATCH] (From Corrado Tomaselli) Changed and verified frequencies on Ikari Warriors h/w, Tnk3, Hyper Sports, Jackal and S.A.R Updated xtal.h to support the 13.4mhz crystal found on Ikari warriors and TNK3 h/w Verified and corrected a lot of frequencies and oki6295 pin 7 on pcbs: Double Dribble, Chequered Flag, Diet gogo, Boulderdash, Sly Spy, Psycho Nics Oscar, Captain Silver, Magical Cat Adventure, Raiden, Superman, Twin Hawk, Vimana, Ghox, Dogyunn, truxton2, Pipi and Bibis, Fix Eight and Money Money They were all verified with frequency counter, even the strangest ones are right. --- src/emu/drivers/xtal.h | 17 +++++++------ src/mame/audio/seibu.h | 2 +- src/mame/drivers/chqflag.c | 15 ++++------- src/mame/drivers/ddrible.c | 12 ++++----- src/mame/drivers/dec0.c | 24 +++++++++--------- src/mame/drivers/dec8.c | 24 +++++++++--------- src/mame/drivers/dietgo.c | 12 ++++----- src/mame/drivers/hyperspt.c | 10 ++++---- src/mame/drivers/jackal.c | 6 ++--- src/mame/drivers/mcatadv.c | 6 ++--- src/mame/drivers/raiden.c | 16 ++++++------ src/mame/drivers/snk.c | 46 +++++++++++++++++----------------- src/mame/drivers/snk68.c | 6 ++--- src/mame/drivers/taito_x.c | 12 ++++----- src/mame/drivers/tnzs.c | 3 +-- src/mame/drivers/toaplan1.c | 4 +-- src/mame/drivers/toaplan2.c | 50 ++++++++++++++++++------------------- src/mame/drivers/zaccaria.c | 17 +++++++------ 18 files changed, 139 insertions(+), 143 deletions(-) diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index 13bd422dccb..43dd28fb790 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -42,10 +42,10 @@ enum Name = Frequency Examples ------------------ ------------ ------------------------------------------------------------ */ XTAL_32_768kHz = 327680, /* 32.768kHz, used to drive RTC chips */ - XTAL_1MHz = 1000000, + XTAL_1MHz = 1000000, /* Used to drive OKI M6295 chips */ XTAL_2MHz = 2000000, XTAL_3MHz = 3000000, /* Probably only used to drive 68705 or similar MCUs on 80's Taito PCBs */ - XTAL_3_579545MHz = 3579545, + XTAL_3_579545MHz = 3579545, /* 80's Konami games */ XTAL_3_6864MHz = 3686400, /* CPS3 */ XTAL_4MHz = 4000000, XTAL_4_224MHz = 4224000, /* Used to drive OKI M6295 chips, usually with /4 divider */ @@ -56,13 +56,14 @@ enum XTAL_8MHz = 8000000, XTAL_10MHz = 10000000, XTAL_10_595MHz = 10595000, /* Mad Alien */ - XTAL_11MHz = 11000000, /* Mario I8039 sound */ + XTAL_11MHz = 11000000, /* Mario I8039 sound */ XTAL_11_289MHz = 11289000, /* Vanguard */ XTAL_12MHz = 12000000, - XTAL_12_096MHz = 12096000, + XTAL_12_096MHz = 12096000, /* Some early 80's Atari games */ XTAL_12_288MHz = 12288000, /* Sega Model 3 digital audio board */ XTAL_13_3MHz = 13300000, /* BMC bowling */ XTAL_13_33056MHz = 13330560, /* Taito L */ + XTAL_13_4MHz = 13400000, /* TNK3, Ikari Warriors h/w */ XTAL_14MHz = 14000000, XTAL_14_31818MHz = 14318180, XTAL_14_705882MHz = 14705882, /* Aleck64 */ @@ -71,20 +72,20 @@ enum XTAL_16MHz = 16000000, XTAL_16_9344MHz = 16934400, /* Usually used to drive 90's Yamaha OPL/FM chips */ XTAL_17_73447MHz = 17734470, /* 4 times the PAL subcarrier */ - XTAL_18MHz = 18000000, + XTAL_18MHz = 18000000, /* S.A.R, Ikari Warriors 3 */ XTAL_18_432MHz = 18432000, 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_22MHz = 22000000, - XTAL_24MHz = 24000000, /* Mario */ + 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 */ - XTAL_25MHz = 25000000, /* Namco System 22, Taito GNET */ + XTAL_25MHz = 25000000, /* Namco System 22, Taito GNET, Dogyuun h/w */ XTAL_25_1748MHz = 25174800, /* Sega S16A, S16B */ XTAL_26_66666MHz = 26666660, /* Irem M92 but most use 27MHz */ XTAL_26_686MHz = 26686000, /* Typically used on 90's Taito PCBs to drive the custom chips */ - XTAL_27MHz = 27000000, /* Some Banpresto games macrossp and Irem M92 */ + XTAL_27MHz = 27000000, /* Some Banpresto games macrossp, Irem M92 and 90's Toaplan games */ XTAL_27_164MHz = 27164000, /* Typically used on 90's Taito PCBs to drive the custom chips */ XTAL_28MHz = 28000000, XTAL_28_37516MHz = 28375160, /* Amiga PAL systems */ diff --git a/src/mame/audio/seibu.h b/src/mame/audio/seibu.h index cf45f6caf47..5e8cfb363cb 100644 --- a/src/mame/audio/seibu.h +++ b/src/mame/audio/seibu.h @@ -142,7 +142,7 @@ static const struct YM2203interface ym2203_interface = \ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ \ MDRV_SOUND_ADD(OKIM6295, freq2) \ - MDRV_SOUND_CONFIG(okim6295_interface_region_##region##_pin7low) \ + MDRV_SOUND_CONFIG(okim6295_interface_region_##region##_pin7high) \ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) \ #define SEIBU_SOUND_SYSTEM_YM2151_INTERFACE(freq1,freq2,region) \ diff --git a/src/mame/drivers/chqflag.c b/src/mame/drivers/chqflag.c index 06919d4f729..ff489c8859e 100644 --- a/src/mame/drivers/chqflag.c +++ b/src/mame/drivers/chqflag.c @@ -5,9 +5,6 @@ Chequered Flag / Checkered Flag (GX717) (c) Konami 1988 Notes: - Position counter doesn't behave correctly because of the K051733 protection. - 007232 volume & panning control is almost certainly wrong. -- I've modified the YM2151 clock with an xtal of 2,on what I recall the - music at the title screen should end when the words "Chequered Flag" - flashes.Needs a comparison with a real PCB however. -AS ***************************************************************************/ @@ -366,11 +363,11 @@ static const struct K007232_interface k007232_interface_2 = static MACHINE_DRIVER_START( chqflag ) /* basic machine hardware */ - MDRV_CPU_ADD(KONAMI,3000000) /* 052001 */ + MDRV_CPU_ADD(KONAMI,XTAL_24MHz/8) /* 052001 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(chqflag_readmem,chqflag_writemem) MDRV_CPU_VBLANK_INT(chqflag_interrupt,16) /* ? */ - MDRV_CPU_ADD(Z80, 3579545) + MDRV_CPU_ADD(Z80, XTAL_3_579545MHz) /* verified on pcb */ /* audio CPU */ /* ? */ MDRV_CPU_PROGRAM_MAP(chqflag_readmem_sound,chqflag_writemem_sound) @@ -391,26 +388,24 @@ static MACHINE_DRIVER_START( chqflag ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD(YM2151, 3579545/2) + MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_interface) MDRV_SOUND_ROUTE(0, "left", 0.80) MDRV_SOUND_ROUTE(1, "right", 0.80) - MDRV_SOUND_ADD(K007232, 3579545) + MDRV_SOUND_ADD(K007232, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(k007232_interface_1) MDRV_SOUND_ROUTE(0, "left", 0.20) MDRV_SOUND_ROUTE(0, "right", 0.20) MDRV_SOUND_ROUTE(1, "left", 0.20) MDRV_SOUND_ROUTE(1, "right", 0.20) - MDRV_SOUND_ADD(K007232, 3579545) + MDRV_SOUND_ADD(K007232, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(k007232_interface_2) MDRV_SOUND_ROUTE(0, "left", 0.20) MDRV_SOUND_ROUTE(1, "right", 0.20) MACHINE_DRIVER_END - - ROM_START( chqflag ) ROM_REGION( 0x58800, REGION_CPU1, 0 ) /* 052001 code */ ROM_LOAD( "717h02", 0x050000, 0x008000, CRC(f5bd4e78) SHA1(7bab02152d055a6c3a322c88e7ee0b85a39d8ef2) ) /* banked ROM */ diff --git a/src/mame/drivers/ddrible.c b/src/mame/drivers/ddrible.c index f2d16de5bfb..f7a41aa5be2 100644 --- a/src/mame/drivers/ddrible.c +++ b/src/mame/drivers/ddrible.c @@ -339,15 +339,15 @@ static const struct VLM5030interface vlm5030_interface = static MACHINE_DRIVER_START( ddribble ) /* basic machine hardware */ - MDRV_CPU_ADD(M6809, 1536000) /* 18432000/12 MHz? */ + MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu0,writemem_cpu0) MDRV_CPU_VBLANK_INT(ddrible_interrupt_0,1) - MDRV_CPU_ADD(M6809, 1536000) /* 18432000/12 MHz? */ + MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu1,writemem_cpu1) MDRV_CPU_VBLANK_INT(ddrible_interrupt_1,1) - MDRV_CPU_ADD(M6809, 1536000) /* 18432000/12 MHz? */ + MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem_cpu2,writemem_cpu2) MDRV_SCREEN_REFRESH_RATE(60) @@ -371,15 +371,15 @@ static MACHINE_DRIVER_START( ddribble ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - - MDRV_SOUND_ADD(YM2203, 3580000) + + MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_interface) MDRV_SOUND_ROUTE(0, "filter1", 0.25) MDRV_SOUND_ROUTE(1, "filter2", 0.25) MDRV_SOUND_ROUTE(2, "filter3", 0.25) MDRV_SOUND_ROUTE(3, "mono", 0.25) - MDRV_SOUND_ADD(VLM5030, 3580000) + MDRV_SOUND_ADD(VLM5030, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(vlm5030_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/dec0.c b/src/mame/drivers/dec0.c index 7cf6aa13286..5a9b0e7d830 100644 --- a/src/mame/drivers/dec0.c +++ b/src/mame/drivers/dec0.c @@ -1193,12 +1193,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( slyspy ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ MDRV_CPU_PROGRAM_MAP(slyspy_readmem,slyspy_writemem) MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ - MDRV_CPU_ADD(H6280, 3000000) - /* audio CPU */ + 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 */ MDRV_CPU_PROGRAM_MAP(slyspy_s_readmem,slyspy_s_writemem) MDRV_SCREEN_REFRESH_RATE(57.41) @@ -1218,29 +1218,29 @@ static MACHINE_DRIVER_START( slyspy ) /* 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.35) - MDRV_SOUND_ADD(YM3812, 3000000) + MDRV_SOUND_ADD(YM3812, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812b_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD(OKIM6295, 1023924) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified + 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.80) MACHINE_DRIVER_END static MACHINE_DRIVER_START( midres ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 20000000/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ + MDRV_CPU_ADD(M68000, XTAL_20MHz/2) /* verified on pcb (20MHZ OSC) 68000P12 running at 10Mhz */ MDRV_CPU_PROGRAM_MAP(midres_readmem,midres_writemem) MDRV_CPU_VBLANK_INT(irq6_line_hold,1)/* VBL */ - MDRV_CPU_ADD(H6280, 24000000/4/3) + 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 */ MDRV_CPU_PROGRAM_MAP(midres_s_readmem,midres_s_writemem) @@ -1261,17 +1261,17 @@ static MACHINE_DRIVER_START( midres ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2203, 1500000) /* verified on pcb */ + MDRV_SOUND_ADD(YM2203, XTAL_24MHz/16) /* 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.35) - MDRV_SOUND_ADD(YM3812, 3000000) /* verified on pcb */ + MDRV_SOUND_ADD(YM3812, XTAL_24MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812b_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD(OKIM6295, 1000000) /* verified on pcb (1mhz crystal) */ + MDRV_SOUND_ADD(OKIM6295, XTAL_1MHz) /* verified on pcb (1mhz crystal) */ MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // pin 7 verified on pcb MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dec8.c b/src/mame/drivers/dec8.c index 5fc27b43253..8fc8f336c0e 100644 --- a/src/mame/drivers/dec8.c +++ b/src/mame/drivers/dec8.c @@ -2243,14 +2243,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( oscar ) /* basic machine hardware */ - MDRV_CPU_ADD(HD6309, 2000000) + MDRV_CPU_ADD(HD6309, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(oscar_readmem,oscar_writemem) MDRV_CPU_VBLANK_INT(oscar_interrupt,1) - MDRV_CPU_ADD(HD6309, 2000000) + MDRV_CPU_ADD(HD6309, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(oscar_sub_readmem,oscar_sub_writemem) - MDRV_CPU_ADD(M6502, 1500000) + MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* audio CPU */ MDRV_CPU_PROGRAM_MAP(dec8_s_readmem,oscar_s_writemem) /* NMIs are caused by the main CPU */ @@ -2272,13 +2272,13 @@ static MACHINE_DRIVER_START( oscar ) /* 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.23) MDRV_SOUND_ROUTE(1, "mono", 0.23) MDRV_SOUND_ROUTE(2, "mono", 0.23) MDRV_SOUND_ROUTE(3, "mono", 0.20) - MDRV_SOUND_ADD(YM3526, 3000000) + MDRV_SOUND_ADD(YM3526, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(oscar_ym3526_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) MACHINE_DRIVER_END @@ -2370,14 +2370,14 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( csilver ) /* basic machine hardware */ - MDRV_CPU_ADD(M6809, 2000000) + MDRV_CPU_ADD(M6809, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(csilver_readmem,csilver_writemem) - MDRV_CPU_ADD(M6809, 2000000) + MDRV_CPU_ADD(M6809, XTAL_12MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(csilver_sub_readmem,csilver_sub_writemem) MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) - MDRV_CPU_ADD(M6502, 1500000) + MDRV_CPU_ADD(M6502, XTAL_12MHz/8) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(csilver_s_readmem,csilver_s_writemem) /* NMIs are caused by the main CPU */ @@ -2399,17 +2399,17 @@ static MACHINE_DRIVER_START( csilver ) /* 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.23) MDRV_SOUND_ROUTE(1, "mono", 0.23) MDRV_SOUND_ROUTE(2, "mono", 0.23) MDRV_SOUND_ROUTE(3, "mono", 0.20) - - MDRV_SOUND_ADD(YM3526, 3000000) + + MDRV_SOUND_ADD(YM3526, XTAL_12MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(oscar_ym3526_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70) - MDRV_SOUND_ADD(MSM5205, 384000) + MDRV_SOUND_ADD(MSM5205, XTAL_384kHz) /* verified on pcb */ MDRV_SOUND_CONFIG(msm5205_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.88) MACHINE_DRIVER_END diff --git a/src/mame/drivers/dietgo.c b/src/mame/drivers/dietgo.c index ebf825788ee..c5915311129 100644 --- a/src/mame/drivers/dietgo.c +++ b/src/mame/drivers/dietgo.c @@ -202,11 +202,11 @@ static const struct YM2151interface ym2151_interface = static MACHINE_DRIVER_START( dietgo ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 14000000) /* DE102 */ + MDRV_CPU_ADD(M68000, XTAL_28MHz/2) /* DE102 (verified on pcb) */ MDRV_CPU_PROGRAM_MAP(dietgo_map,0) MDRV_CPU_VBLANK_INT(irq6_line_hold,1) - MDRV_CPU_ADD(H6280, 32220000/4) /* Custom chip 45; Audio section crystal is 32.220 MHz */ + 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_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_SCREEN_REFRESH_RATE(58) @@ -226,12 +226,12 @@ static MACHINE_DRIVER_START( dietgo ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2151, 32220000/9) + MDRV_SOUND_ADD(YM2151, XTAL_32_22MHz/9) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45) - - MDRV_SOUND_ADD(OKIM6295, 32220000/32) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) + + MDRV_SOUND_ADD(OKIM6295, XTAL_32_22MHz/32) /* verified on pcb */ + MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/hyperspt.c b/src/mame/drivers/hyperspt.c index b2af9c08a83..b49140ed590 100644 --- a/src/mame/drivers/hyperspt.c +++ b/src/mame/drivers/hyperspt.c @@ -460,12 +460,12 @@ static const struct VLM5030interface hyperspt_vlm5030_interface = static MACHINE_DRIVER_START( hyperspt ) /* basic machine hardware */ - MDRV_CPU_ADD(M6809, 2048000) /* 1.400 MHz ??? */ + MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(hyperspt_readmem,writemem) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80,14318180/4) - /* audio CPU */ /* Z80 Clock is derived from a 14.31818 MHz crystal */ + MDRV_CPU_ADD(Z80,XTAL_14_31818MHz/4) /* verified on pcb */ + /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_SCREEN_REFRESH_RATE(60) @@ -492,10 +492,10 @@ static MACHINE_DRIVER_START( hyperspt ) MDRV_SOUND_ADD(DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD(SN76496, 14318180/8) + MDRV_SOUND_ADD(SN76496, XTAL_14_31818MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD(VLM5030, 3580000) + MDRV_SOUND_ADD(VLM5030, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(hyperspt_vlm5030_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/jackal.c b/src/mame/drivers/jackal.c index 049e85ac6d7..d10c707d972 100644 --- a/src/mame/drivers/jackal.c +++ b/src/mame/drivers/jackal.c @@ -253,11 +253,11 @@ static INTERRUPT_GEN( jackal_interrupt ) static MACHINE_DRIVER_START( jackal ) // basic machine hardware - MDRV_CPU_ADD(M6809, 2000000) // ??? + MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) // verified on pcb MDRV_CPU_PROGRAM_MAP(master_map, 0) MDRV_CPU_VBLANK_INT(jackal_interrupt, 1) - MDRV_CPU_ADD(M6809, 2000000) // ??? + MDRV_CPU_ADD(M6809, XTAL_18_432MHz/12) // verified on pcb MDRV_CPU_PROGRAM_MAP(slave_map, 0) MDRV_SCREEN_REFRESH_RATE(60) @@ -282,7 +282,7 @@ static MACHINE_DRIVER_START( jackal ) // sound hardware MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD(YM2151, 3580000) + MDRV_SOUND_ADD(YM2151, XTAL_3_579545MHz) // verified on pcb MDRV_SOUND_ROUTE(0, "left", 0.50) MDRV_SOUND_ROUTE(1, "right", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/mcatadv.c b/src/mame/drivers/mcatadv.c index ca5b51f218a..d5821df45fd 100644 --- a/src/mame/drivers/mcatadv.c +++ b/src/mame/drivers/mcatadv.c @@ -492,11 +492,11 @@ static const struct YM2610interface mcatadv_ym2610_interface = static MACHINE_DRIVER_START( mcatadv ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 16000000) + MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcatadv_readmem,mcatadv_writemem) MDRV_CPU_VBLANK_INT(irq1_line_hold,1) - MDRV_CPU_ADD_TAG("sound", Z80, 28000000/4) // Guess, 3.5MHz is too slow and CPU comms fail reporting U9 bad. + MDRV_CPU_ADD_TAG("sound", Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(mcatadv_sound_readmem,mcatadv_sound_writemem) MDRV_CPU_IO_MAP(mcatadv_sound_readport,mcatadv_sound_writeport) @@ -520,7 +520,7 @@ static MACHINE_DRIVER_START( mcatadv ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD(YM2610, 16000000/2) + MDRV_SOUND_ADD(YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(mcatadv_ym2610_interface) MDRV_SOUND_ROUTE(0, "left", 0.32) MDRV_SOUND_ROUTE(0, "right", 0.32) diff --git a/src/mame/drivers/raiden.c b/src/mame/drivers/raiden.c index ca548d50582..3487f66deba 100644 --- a/src/mame/drivers/raiden.c +++ b/src/mame/drivers/raiden.c @@ -237,15 +237,15 @@ static VIDEO_EOF( raiden ) static MACHINE_DRIVER_START( raiden ) /* basic machine hardware */ - MDRV_CPU_ADD(V30,20000000/2) /* NEC V30 CPU, 20MHz */ + MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(main_map,0) MDRV_CPU_VBLANK_INT(raiden_interrupt,1) - MDRV_CPU_ADD(V30,20000000/2) /* NEC V30 CPU, 20MHz */ + MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT(raiden_interrupt,1) - SEIBU_SOUND_SYSTEM_CPU(14318180/4) + SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -266,22 +266,22 @@ static MACHINE_DRIVER_START( raiden ) MDRV_VIDEO_UPDATE(raiden) /* sound hardware */ - SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(14318180/4,1320000,1) // frequency and pin 7 not verified (pin set in audio\seibu.h) + SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12,1) // frequency and pin 7 verified (pin set in audio\seibu.h) MACHINE_DRIVER_END static MACHINE_DRIVER_START( raidena ) /* basic machine hardware */ - MDRV_CPU_ADD(V30,20000000/2) /* NEC V30 CPU, 20MHz */ + MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(alt_map,0) MDRV_CPU_VBLANK_INT(raiden_interrupt,1) - MDRV_CPU_ADD(V30,20000000/2) /* NEC V30 CPU, 20MHz */ + MDRV_CPU_ADD(V30,XTAL_20MHz/2) /* NEC V30 CPU, 20MHz verified on pcb */ MDRV_CPU_PROGRAM_MAP(sub_map,0) MDRV_CPU_VBLANK_INT(raiden_interrupt,1) - SEIBU_SOUND_SYSTEM_CPU(14318180/4) + SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verified on pcb */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -302,7 +302,7 @@ static MACHINE_DRIVER_START( raidena ) MDRV_VIDEO_UPDATE(raiden) /* sound hardware */ - SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(14318180/4,1320000,1) + SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12,1) /* frequency and pin 7 verified on pcb */ MACHINE_DRIVER_END /***************************************************************************/ diff --git a/src/mame/drivers/snk.c b/src/mame/drivers/snk.c index 352454a83d0..b352b2ef95a 100644 --- a/src/mame/drivers/snk.c +++ b/src/mame/drivers/snk.c @@ -814,15 +814,15 @@ GFXDECODE_END static MACHINE_DRIVER_START( tnk3 ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnk3_cpuA_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tnk3_cpuB_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_sound_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,4) @@ -846,7 +846,7 @@ static MACHINE_DRIVER_START( tnk3 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3526, 4000000) + MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3526_interface_0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -900,15 +900,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ikari ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_YM3526_sound_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) @@ -932,11 +932,11 @@ static MACHINE_DRIVER_START( ikari ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3526, 4000000) + MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3526_interface_0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD(YM3526, 4000000) + MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3526_interface_1) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -945,15 +945,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( victroad ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_13_4MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) @@ -977,11 +977,11 @@ static MACHINE_DRIVER_START( victroad ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3526, 4000000) + MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3526_interface_0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD(Y8950, 4000000) + MDRV_SOUND_ADD(Y8950, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(y8950_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -990,15 +990,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gwar ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(YM3526_Y8950_sound_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) @@ -1022,11 +1022,11 @@ static MACHINE_DRIVER_START( gwar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3526, 4000000) + MDRV_SOUND_ADD(YM3526, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3526_interface_0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD(Y8950, 4000000) + MDRV_SOUND_ADD(Y8950, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(y8950_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -1261,15 +1261,15 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fsoccer ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuA_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(cpuB_map,0) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(Y8950_sound_map, 0) MDRV_CPU_VBLANK_INT(irq0_line_hold,2) @@ -1293,7 +1293,7 @@ static MACHINE_DRIVER_START( fsoccer ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(Y8950, 4000000) + MDRV_SOUND_ADD(Y8950, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(y8950_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/snk68.c b/src/mame/drivers/snk68.c index f4a4f8d2a59..f8a4a54247f 100644 --- a/src/mame/drivers/snk68.c +++ b/src/mame/drivers/snk68.c @@ -775,11 +775,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( searchar ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 12000000) + MDRV_CPU_ADD(M68000, XTAL_18MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(searchar_readmem,searchar_writemem) MDRV_CPU_VBLANK_INT(irq1_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) + MDRV_CPU_ADD(Z80, XTAL_8MHz/2) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_IO_MAP(sound_readport,sound_writeport) @@ -801,7 +801,7 @@ static MACHINE_DRIVER_START( searchar ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3812, 4000000) + MDRV_SOUND_ADD(YM3812, XTAL_8MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/taito_x.c b/src/mame/drivers/taito_x.c index 0d74f48d58d..871d61fe1f5 100644 --- a/src/mame/drivers/taito_x.c +++ b/src/mame/drivers/taito_x.c @@ -1006,11 +1006,11 @@ static MACHINE_START( taitox ) static MACHINE_DRIVER_START( superman ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz? */ + MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(superman_readmem,superman_writemem) MDRV_CPU_VBLANK_INT(irq6_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_SCREEN_REFRESH_RATE(57.43) @@ -1034,7 +1034,7 @@ static MACHINE_DRIVER_START( superman ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD(YM2610, 8000000) + MDRV_SOUND_ADD(YM2610, XTAL_16MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2610_interface) MDRV_SOUND_ROUTE(0, "left", 0.25) MDRV_SOUND_ROUTE(0, "right", 0.25) @@ -1045,11 +1045,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( daisenpu ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz? */ + MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(daisenpu_readmem,daisenpu_writemem) MDRV_CPU_VBLANK_INT(irq2_line_hold,1) - MDRV_CPU_ADD(Z80, 4000000) /* 4 MHz ??? */ + MDRV_CPU_ADD(Z80, XTAL_16MHz/4) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(daisenpu_sound_readmem,daisenpu_sound_writemem) MDRV_SCREEN_REFRESH_RATE(60) @@ -1072,7 +1072,7 @@ static MACHINE_DRIVER_START( daisenpu ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD(YM2151, 4000000) + MDRV_SOUND_ADD(YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_interface) MDRV_SOUND_ROUTE(0, "left", 0.45) MDRV_SOUND_ROUTE(1, "right", 0.45) diff --git a/src/mame/drivers/tnzs.c b/src/mame/drivers/tnzs.c index c5f1447c837..00b6c951d32 100644 --- a/src/mame/drivers/tnzs.c +++ b/src/mame/drivers/tnzs.c @@ -1289,8 +1289,7 @@ static const struct Samplesinterface samples_interface = static MACHINE_DRIVER_START( arknoid2 ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 12000000/2) /* verified on pcb */ - /* 8MHz is wrong, but extrmatn doesn't work properly at 6MHz */ + MDRV_CPU_ADD(Z80, XTAL_12MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT(arknoid2_interrupt,1) diff --git a/src/mame/drivers/toaplan1.c b/src/mame/drivers/toaplan1.c index 83009685ba5..c810d6ea65a 100644 --- a/src/mame/drivers/toaplan1.c +++ b/src/mame/drivers/toaplan1.c @@ -1840,7 +1840,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( vimana ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 10000000) + MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(vimana_main_map, 0) MDRV_CPU_VBLANK_INT(toaplan1_interrupt,1) @@ -1863,7 +1863,7 @@ static MACHINE_DRIVER_START( vimana ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3812, 28000000/8) + MDRV_SOUND_ADD(YM3812, XTAL_28MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c index 6ed6219157f..27bd26f7ed2 100644 --- a/src/mame/drivers/toaplan2.c +++ b/src/mame/drivers/toaplan2.c @@ -3332,12 +3332,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( ghox ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(ghox_68k_mem, 0) MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) #if HD64x180 - MDRV_CPU_ADD(Z180, 10000000) /* HD647180 CPU actually */ + MDRV_CPU_ADD(Z180, XTAL_10MHz) /* HD647180 CPU actually */ MDRV_CPU_PROGRAM_MAP(hd647180_mem, 0) #endif @@ -3360,7 +3360,7 @@ static MACHINE_DRIVER_START( ghox ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2151, 27000000/8) + MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3368,17 +3368,17 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( dogyuun ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */ + MDRV_CPU_ADD(M68000, XTAL_25MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(dogyuun_68k_mem, 0) MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) #if V25 - MDRV_CPU_ADD(Z180, 16000000) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD(Z180, XTAL_25MHz/2) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_mem, 0) MDRV_CPU_IO_MAP(V25_port, 0) #endif - MDRV_SCREEN_REFRESH_RATE( (27000000.0 / 4) / (432 * 263) ) + MDRV_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) MDRV_MACHINE_RESET(dogyuun) @@ -3397,11 +3397,11 @@ static MACHINE_DRIVER_START( dogyuun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2151, 27000000/8) + MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD(OKIM6295, 27000000/10) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) + MDRV_SOUND_ADD(OKIM6295, XTAL_25MHz/24) /* 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 @@ -3485,11 +3485,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( truxton2 ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */ + MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(truxton2_68k_mem, 0) MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq2,1) - MDRV_SCREEN_REFRESH_RATE( (27000000.0 / 4) / (432 * 263) ) + MDRV_SCREEN_REFRESH_RATE( (XTAL_28MHz / 4) / (432 * 263) ) /* 28MHz Oscillator */ MDRV_MACHINE_RESET(toaplan2) @@ -3508,11 +3508,11 @@ static MACHINE_DRIVER_START( truxton2 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2151, 27000000/8) + MDRV_SOUND_ADD(YM2151, XTAL_28MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - - MDRV_SOUND_ADD(OKIM6295, 27000000/10) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) + + MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/4) /* verified on pcb */ + MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3520,11 +3520,11 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( pipibibs ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 10000000) /* 10MHz Oscillator */ + MDRV_CPU_ADD(M68000, XTAL_10MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(pipibibs_68k_mem, 0) MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) - MDRV_CPU_ADD(Z80,27000000/8) /* ??? 3.37MHz , 27MHz Oscillator */ + MDRV_CPU_ADD(Z80,XTAL_27MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_z80_mem, 0) MDRV_SCREEN_REFRESH_RATE(60) @@ -3547,7 +3547,7 @@ static MACHINE_DRIVER_START( pipibibs ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3812, 27000000/8) + MDRV_SOUND_ADD(YM3812, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_DRIVER_END @@ -3629,17 +3629,17 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( fixeight ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 16000000) /* 16MHz Oscillator */ + MDRV_CPU_ADD(M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(fixeight_68k_mem, 0) MDRV_CPU_VBLANK_INT(toaplan2_vblank_irq4,1) #if V25 - MDRV_CPU_ADD(Z180, 16000000) /* NEC V25+ type Toaplan marked CPU ??? */ + MDRV_CPU_ADD(Z180, XTAL_16MHz) /* NEC V25+ type Toaplan marked CPU ??? */ MDRV_CPU_PROGRAM_MAP(V25_mem, 0) MDRV_CPU_IO_MAP(V25_port, 0) #endif - MDRV_SCREEN_REFRESH_RATE( (27000000.0 / 4) / (432 * 263) ) + MDRV_SCREEN_REFRESH_RATE( (XTAL_27MHz / 4) / (432 * 263) ) MDRV_MACHINE_RESET(toaplan2) // MDRV_NVRAM_HANDLER(fixeight) /* See 37B6 code */ @@ -3659,11 +3659,11 @@ static MACHINE_DRIVER_START( fixeight ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2151, 27000000/8) + MDRV_SOUND_ADD(YM2151, XTAL_27MHz/8) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) - MDRV_SOUND_ADD(OKIM6295, 32000000/32) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) + MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/16) /* 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 @@ -4722,7 +4722,7 @@ GAME( 1992, dogyuun, 0, dogyuun, dogyuun, T2_V25, ROT270, "Toaplan", GAME( 1993, kbash, 0, kbash, kbash, T2_V25, ROT0, "Toaplan", "Knuckle Bash", GAME_IMPERFECT_SOUND ) GAME( 1999, kbash2, 0, kbash2, kbash2, T2_noZ80, ROT0, "bootleg", "Knuckle Bash 2 (bootleg)", 0 ) GAME( 1992, truxton2, 0, truxton2, truxton2, T2_noZ80, ROT270, "Toaplan", "Truxton II / Tatsujin Oh", 0 ) -GAME( 1991, pipibibs, 0, pipibibs, pipibibs, T2_Z80, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!!", 0 ) +GAME( 1991, pipibibs, 0, pipibibs, pipibibs, T2_Z80, ROT0, "Toaplan", "Pipi & Bibis / Whoopee!! (Z80 sound cpu)", 0 ) GAME( 1991, whoopee, pipibibs, whoopee, whoopee, T2_Z80, ROT0, "Toaplan", "Whoopee!! / Pipi & Bibis", 0 ) GAME( 1991, pipibibi, pipibibs, pipibibi, pipibibi, pipibibi, ROT0, "[Toaplan] Ryouta Kikaku", "Pipi & Bibis / Whoopee!! (bootleg ?)", 0 ) GAME( 1992, fixeight, 0, fixeight, fixeight, fixeight, ROT270, "Toaplan", "FixEight", GAME_IMPERFECT_SOUND | GAME_IMPERFECT_GRAPHICS | GAME_NOT_WORKING ) diff --git a/src/mame/drivers/zaccaria.c b/src/mame/drivers/zaccaria.c index 0072135545b..cd2a3b4bffd 100644 --- a/src/mame/drivers/zaccaria.c +++ b/src/mame/drivers/zaccaria.c @@ -659,17 +659,17 @@ static const struct TMS5220interface tms5220_interface = static MACHINE_DRIVER_START( zaccaria ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80,18432000/6) /* 3.072 MHz */ + MDRV_CPU_ADD(Z80,XTAL_18_432MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT(nmi_line_pulse,1) - MDRV_CPU_ADD(M6802,3580000/4) - /* audio CPU */ /* 895 kHz */ + MDRV_CPU_ADD(M6802,XTAL_3_579545MHz/4) /* verified on pcb */ + /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem1,sound_writemem1) MDRV_CPU_PERIODIC_INT(zaccaria_cb1_toggle,(double)3580000/4096) - MDRV_CPU_ADD(M6802,3580000/4) - /* audio CPU */ /* 895 kHz */ + MDRV_CPU_ADD(M6802,XTAL_3_579545MHz/4) /* verified on pcb */ + /* audio CPU */ MDRV_CPU_PROGRAM_MAP(sound_readmem2,sound_writemem2) MDRV_SCREEN_REFRESH_RATE(60) @@ -694,11 +694,11 @@ static MACHINE_DRIVER_START( zaccaria ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 3580000/2) + MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/2) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - MDRV_SOUND_ADD(AY8910, 3580000/2) + MDRV_SOUND_ADD(AY8910, XTAL_3_579545MHz/2) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MDRV_SOUND_ADD(DAC, 0) @@ -707,7 +707,8 @@ static MACHINE_DRIVER_START( zaccaria ) MDRV_SOUND_ADD(DAC, 0) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MDRV_SOUND_ADD(TMS5220, 640000) + MDRV_SOUND_ADD(TMS5220, XTAL_640kHz) +/* not right, frequency measured is 560khz. There is no resonator, the clock is obtained from discrete components. We wait for schematics */ MDRV_SOUND_CONFIG(tms5220_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_DRIVER_END