diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index 5b78ebcedcd..ea7ff0299a4 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -90,7 +90,7 @@ enum XTAL_18MHz = 18000000, /* S.A.R, Ikari Warriors 3 */ XTAL_18_432MHz = 18432000, /* Extremely common, used on 100's of PCBs */ XTAL_19_923MHz = 19923000, /* Cinematronics vectors */ - XTAL_19_968MHz = 19968000, /* Used mostly by Space Invaders games by Taito/Midway and clones */ + XTAL_19_968MHz = 19968000, /* Used mostly by some Taito games */ XTAL_20MHz = 20000000, XTAL_21MHz = 21000000, /* Lock-On pixel clock */ XTAL_21_3MHz = 21300000, @@ -106,7 +106,7 @@ enum 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 */ - XTAL_28_63636MHz = 28636360, /* later Leland games and Atari GT, Amiga NTSC */ + XTAL_28_63636MHz = 28636360, /* later Leland games and Atari GT, Amiga NTSC , Raiden2 h/w */ XTAL_30_4761MHz = 30476100, /* Taito JC */ XTAL_32MHz = 32000000, XTAL_32_22MHz = 32220000, /* Typically used on 90's Data East PCBs */ diff --git a/src/mame/drivers/1943.c b/src/mame/drivers/1943.c index 5eeb97397bc..15d8a48a623 100644 --- a/src/mame/drivers/1943.c +++ b/src/mame/drivers/1943.c @@ -277,13 +277,13 @@ static MACHINE_DRIVER_START( 1943 ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2203, 1500000) + MDRV_SOUND_ADD(YM2203, XTAL_24MHz/16) /* verified on pcb */ MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) MDRV_SOUND_ROUTE(2, "mono", 0.15) MDRV_SOUND_ROUTE(3, "mono", 0.10) - MDRV_SOUND_ADD(YM2203, 1500000) + MDRV_SOUND_ADD(YM2203, XTAL_24MHz/16) /* verified on pcb */ MDRV_SOUND_ROUTE(0, "mono", 0.15) MDRV_SOUND_ROUTE(1, "mono", 0.15) MDRV_SOUND_ROUTE(2, "mono", 0.15) diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c index 6d70938697c..f9accee4dff 100644 --- a/src/mame/drivers/arkanoid.c +++ b/src/mame/drivers/arkanoid.c @@ -774,7 +774,7 @@ static MACHINE_DRIVER_START( arkanoid ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_12MHz/4/2) /* YM2149 clock is 3mhz, pin 26 is low so 3mhz/2 */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.33) MACHINE_DRIVER_END diff --git a/src/mame/drivers/galpanic.c b/src/mame/drivers/galpanic.c index 551304b35f0..fd1b5916b7a 100644 --- a/src/mame/drivers/galpanic.c +++ b/src/mame/drivers/galpanic.c @@ -930,7 +930,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( galpanic ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main", M68000, 8000000) + MDRV_CPU_ADD_TAG("main", M68000, XTAL_12MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(galpanic,0) MDRV_CPU_VBLANK_INT_HACK(galpanic_interrupt,2) @@ -953,8 +953,8 @@ static MACHINE_DRIVER_START( galpanic ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD_TAG("oki", OKIM6295, 1584000) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified + MDRV_SOUND_ADD_TAG("oki", OKIM6295, XTAL_12MHz/6) /* 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 diff --git a/src/mame/drivers/halleys.c b/src/mame/drivers/halleys.c index 9ad16cfc2ae..95427f0e09a 100644 --- a/src/mame/drivers/halleys.c +++ b/src/mame/drivers/halleys.c @@ -1977,16 +1977,16 @@ static MACHINE_DRIVER_START( halleys ) // sound hardware MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 6000000/4) /* (verified on pcb) */ + MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - MDRV_SOUND_ADD(AY8910, 6000000/4) + MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - MDRV_SOUND_ADD(AY8910, 6000000/4) + MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) - MDRV_SOUND_ADD(AY8910, 6000000/4) + MDRV_SOUND_ADD(AY8910, XTAL_6MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.15) MACHINE_DRIVER_END diff --git a/src/mame/drivers/kaneko16.c b/src/mame/drivers/kaneko16.c index 5c3a6fb4af5..61e0f399646 100644 --- a/src/mame/drivers/kaneko16.c +++ b/src/mame/drivers/kaneko16.c @@ -1834,7 +1834,7 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( gtmr ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("gtmr", M68000, 16000000) /* ? Most likely a 68000-HC16 */ + MDRV_CPU_ADD_TAG("gtmr", M68000, XTAL_16MHz) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(gtmr_readmem,gtmr_writemem) MDRV_CPU_VBLANK_INT_HACK(kaneko16_interrupt,KANEKO16_INTERRUPTS_NUM) @@ -1859,12 +1859,12 @@ static MACHINE_DRIVER_START( gtmr ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(OKIM6295, 1980000) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) // clock frequency & pin 7 not verified + MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/8) /* verified on pcb */ + MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) - MDRV_SOUND_ADD(OKIM6295, 1980000) - MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) // clock frequency & pin 7 not verified + MDRV_SOUND_ADD(OKIM6295, XTAL_16MHz/8) /* verified on pcb */ + MDRV_SOUND_CONFIG(okim6295_interface_region_2_pin7low) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MACHINE_DRIVER_END diff --git a/src/mame/drivers/kickgoal.c b/src/mame/drivers/kickgoal.c index 6bc50aa4861..004465eb8a4 100644 --- a/src/mame/drivers/kickgoal.c +++ b/src/mame/drivers/kickgoal.c @@ -728,8 +728,8 @@ static MACHINE_DRIVER_START( actionhw ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(OKIM6295, 12000000/8) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7low) + 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 diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c index 668edb1f5d3..9485f3e47b1 100644 --- a/src/mame/drivers/nmk16.c +++ b/src/mame/drivers/nmk16.c @@ -5047,13 +5047,13 @@ static MACHINE_DRIVER_START( stagger1 ) /* sound hardware */ MDRV_SPEAKER_STANDARD_STEREO("left", "right") - MDRV_SOUND_ADD(YM2151, 4000000) + MDRV_SOUND_ADD(YM2151, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(afega_ym2151_intf) MDRV_SOUND_ROUTE(0, "left", 0.30) MDRV_SOUND_ROUTE(1, "right", 0.30) - MDRV_SOUND_ADD(OKIM6295, 1000000) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) + MDRV_SOUND_ADD(OKIM6295, XTAL_4MHz/4) /* verified on pcb */ + MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "left", 0.70) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "right", 0.70) MACHINE_DRIVER_END diff --git a/src/mame/drivers/pitnrun.c b/src/mame/drivers/pitnrun.c index b3b63705177..40b2030199f 100644 --- a/src/mame/drivers/pitnrun.c +++ b/src/mame/drivers/pitnrun.c @@ -319,11 +319,11 @@ static MACHINE_DRIVER_START( pitnrun ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 18432000/12) + MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MDRV_SOUND_ADD(AY8910, 18432000/12) + MDRV_SOUND_ADD(AY8910, XTAL_18_432MHz/12) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) MACHINE_DRIVER_END diff --git a/src/mame/drivers/playmark.c b/src/mame/drivers/playmark.c index 2b6b789f193..6590771d5d1 100644 --- a/src/mame/drivers/playmark.c +++ b/src/mame/drivers/playmark.c @@ -1129,8 +1129,8 @@ static MACHINE_DRIVER_START( hrdtimes ) /* 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 diff --git a/src/mame/drivers/prehisle.c b/src/mame/drivers/prehisle.c index f985f326ea7..49a02f25453 100644 --- a/src/mame/drivers/prehisle.c +++ b/src/mame/drivers/prehisle.c @@ -261,7 +261,7 @@ static MACHINE_DRIVER_START( prehisle ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM3812, 4000000) + MDRV_SOUND_ADD(YM3812, XTAL_4MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym3812_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/rastan.c b/src/mame/drivers/rastan.c index 428efaae0ac..f373c9e96a8 100644 --- a/src/mame/drivers/rastan.c +++ b/src/mame/drivers/rastan.c @@ -407,12 +407,12 @@ static MACHINE_DRIVER_START( rastan ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2151, 4000000) + MDRV_SOUND_ADD(YM2151, XTAL_16MHz/4) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2151_interface) MDRV_SOUND_ROUTE(0, "mono", 0.50) MDRV_SOUND_ROUTE(1, "mono", 0.50) - 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.60) MACHINE_DRIVER_END diff --git a/src/mame/drivers/tigeroad.c b/src/mame/drivers/tigeroad.c index 8e506a21606..fab6e6aa61c 100644 --- a/src/mame/drivers/tigeroad.c +++ b/src/mame/drivers/tigeroad.c @@ -577,11 +577,11 @@ static MACHINE_DRIVER_START( tigeroad ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(YM2203, 3579545) + MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_CONFIG(ym2203_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MDRV_SOUND_ADD(YM2203, 3579545) + MDRV_SOUND_ADD(YM2203, XTAL_3_579545MHz) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/wrally.c b/src/mame/drivers/wrally.c index 14cf08b8971..cfb55cbf943 100644 --- a/src/mame/drivers/wrally.c +++ b/src/mame/drivers/wrally.c @@ -229,7 +229,7 @@ GFXDECODE_END static MACHINE_DRIVER_START( wrally ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000,24000000/2) /* 12 MHz */ + MDRV_CPU_ADD(M68000,XTAL_24MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(wrally_readmem,wrally_writemem) MDRV_CPU_VBLANK_INT("main", irq6_line_hold) @@ -251,13 +251,12 @@ static MACHINE_DRIVER_START( wrally ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(OKIM6295, 1056000) - MDRV_SOUND_CONFIG(okim6295_interface_region_1_pin7high) // clock frequency & pin 7 not verified + 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 - ROM_START( wrally ) ROM_REGION( 0x100000, REGION_CPU1, 0 ) /* 68000 code */ ROM_LOAD16_BYTE( "worldr17.c23", 0x000000, 0x080000, CRC(050f5629) SHA1(74fc2cd5114f3bc4b2429f1d8d7eeb1658f9f179) )