diff --git a/src/emu/drivers/xtal.h b/src/emu/drivers/xtal.h index db4d67e10d6..f35f5d179c8 100644 --- a/src/emu/drivers/xtal.h +++ b/src/emu/drivers/xtal.h @@ -54,7 +54,8 @@ enum XTAL_5MHz = 5000000, /* Mutant Night */ XTAL_6MHz = 6000000, XTAL_6_144MHz = 6144000, /* Used on Alpha Denshi early 80's games sound board */ - XTAL_7_3728MHz = 7372800, + XTAL_7_15909MHz = 7159090, /* Blood Bros */ + XTAL_7_3728MHz = 7372800, XTAL_8MHz = 8000000, XTAL_9_987MHz = 9987000, /* Crazy Balloon */ XTAL_10MHz = 10000000, diff --git a/src/mame/drivers/aeroboto.c b/src/mame/drivers/aeroboto.c index 9661d34c330..6f787cfff54 100644 --- a/src/mame/drivers/aeroboto.c +++ b/src/mame/drivers/aeroboto.c @@ -2,8 +2,9 @@ Formation Z / Aeroboto -Driver by Carlos A. Lozano +PCB ID: JALECO FZ-8420 +Driver by Carlos A. Lozano TODO: - star field @@ -253,11 +254,11 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( formatz ) /* basic machine hardware */ - MDRV_CPU_ADD(M6809, 1250000) // 1.25MHz + MDRV_CPU_ADD(M6809, XTAL_10MHz/8) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_VBLANK_INT(aeroboto_interrupt,1) - MDRV_CPU_ADD(M6809, 640000) + MDRV_CPU_ADD(M6809, XTAL_10MHz/16) /* verified on pcb */ /* audio CPU */ MDRV_CPU_PROGRAM_MAP(readmem_sound,writemem_sound) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) @@ -281,11 +282,11 @@ static MACHINE_DRIVER_START( formatz ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_10MHz/8) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_10MHz/16) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/bloodbro.c b/src/mame/drivers/bloodbro.c index 95ff6d9751b..804288d1785 100644 --- a/src/mame/drivers/bloodbro.c +++ b/src/mame/drivers/bloodbro.c @@ -526,11 +526,11 @@ GFXDECODE_END static MACHINE_DRIVER_START( bloodbro ) // basic machine hardware - MDRV_CPU_ADD_TAG("main", M68000, 10000000) // 10 MHz + MDRV_CPU_ADD_TAG("main", M68000, XTAL_20MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(bloodbro_map, 0) MDRV_CPU_VBLANK_INT(irq4_line_hold, 1) - SEIBU_SOUND_SYSTEM_CPU(14318180/4) + SEIBU_SOUND_SYSTEM_CPU(XTAL_7_15909MHz/2) /* verified on pcb */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_SCREEN_VBLANK_TIME(DEFAULT_REAL_60HZ_VBLANK_DURATION) @@ -549,7 +549,7 @@ static MACHINE_DRIVER_START( bloodbro ) MDRV_VIDEO_UPDATE(bloodbro) // sound hardware - SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4, 1320000, 1) + SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_7_15909MHz/2, XTAL_12MHz/12, 1) MACHINE_DRIVER_END static MACHINE_DRIVER_START( weststry ) diff --git a/src/mame/drivers/magmax.c b/src/mame/drivers/magmax.c index b8ceecf3989..b4940454cd1 100644 --- a/src/mame/drivers/magmax.c +++ b/src/mame/drivers/magmax.c @@ -363,12 +363,12 @@ static const struct AY8910interface ay8910_interface = static MACHINE_DRIVER_START( magmax ) /* basic machine hardware */ - MDRV_CPU_ADD(M68000, 8000000) /* 8 MHz */ + MDRV_CPU_ADD(M68000, XTAL_16MHz/2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(magmax_readmem,magmax_writemem) MDRV_CPU_VBLANK_INT(irq1_line_hold,1) - MDRV_CPU_ADD(Z80,10000000/4) - /* audio CPU */ /* 2.5 MHz */ + MDRV_CPU_ADD(Z80,XTAL_20MHz/8) /* verified on pcb */ + /* audio CPU */ MDRV_CPU_PROGRAM_MAP(magmax_soundreadmem,magmax_soundwritemem) MDRV_CPU_IO_MAP(magmax_soundreadport,magmax_soundwriteport) @@ -394,14 +394,14 @@ static MACHINE_DRIVER_START( magmax ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 10000000/8) + MDRV_SOUND_ADD(AY8910, XTAL_20MHz/16) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MDRV_SOUND_ADD(AY8910, 10000000/8) + MDRV_SOUND_ADD(AY8910, XTAL_20MHz/16) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MDRV_SOUND_ADD(AY8910, 10000000/8) + MDRV_SOUND_ADD(AY8910, XTAL_20MHz/16) /* verified on pcb */ MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MACHINE_DRIVER_END diff --git a/src/mame/drivers/slapfght.c b/src/mame/drivers/slapfght.c index 6eded86d174..f865223b5eb 100644 --- a/src/mame/drivers/slapfght.c +++ b/src/mame/drivers/slapfght.c @@ -936,16 +936,16 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( tigerh ) /* basic machine hardware */ - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD(Z80, XTAL_36MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(tigerh_readmem,writemem) MDRV_CPU_IO_MAP(tigerh_readport,tigerh_writeport) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD(Z80, XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT(nmi_line_pulse,6) /* ??? */ - MDRV_CPU_ADD(M68705,4000000) + MDRV_CPU_ADD(M68705,XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(m68705_readmem,m68705_writemem) MDRV_SCREEN_REFRESH_RATE(60) @@ -970,11 +970,11 @@ static MACHINE_DRIVER_START( tigerh ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface_1) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface_2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END @@ -982,12 +982,12 @@ MACHINE_DRIVER_END static MACHINE_DRIVER_START( slapfigh ) /* basic machine hardware */ - MDRV_CPU_ADD_TAG("main",Z80, 6000000) + MDRV_CPU_ADD_TAG("main",Z80, XTAL_36MHz/6) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(readmem,writemem) MDRV_CPU_IO_MAP(readport,writeport) MDRV_CPU_VBLANK_INT(irq0_line_hold,1) - MDRV_CPU_ADD(Z80, 6000000) + MDRV_CPU_ADD(Z80, XTAL_36MHz/12) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(sound_readmem,sound_writemem) MDRV_CPU_VBLANK_INT(getstar_interrupt, 3) @@ -1013,11 +1013,11 @@ static MACHINE_DRIVER_START( slapfigh ) /* sound hardware */ MDRV_SPEAKER_STANDARD_MONO("mono") - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface_1) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) - MDRV_SOUND_ADD(AY8910, 1500000) + MDRV_SOUND_ADD(AY8910, XTAL_36MHz/24) /* verified on pcb */ MDRV_SOUND_CONFIG(ay8910_interface_2) MDRV_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MACHINE_DRIVER_END diff --git a/src/mame/drivers/toki.c b/src/mame/drivers/toki.c index 5c36c1eeaef..cd45f418e59 100644 --- a/src/mame/drivers/toki.c +++ b/src/mame/drivers/toki.c @@ -436,11 +436,11 @@ static const struct MSM5205interface msm5205_interface = static MACHINE_DRIVER_START( toki ) /* KOYO 20.000MHz near the cpu */ /* basic machine hardware */ - MDRV_CPU_ADD(M68000,20000000/2) /* verified on pcb */ + MDRV_CPU_ADD(M68000,XTAL_20MHz /2) /* verified on pcb */ MDRV_CPU_PROGRAM_MAP(toki_map,0) MDRV_CPU_VBLANK_INT(irq1_line_hold,1)/* VBL */ - SEIBU_SOUND_SYSTEM_CPU(14318180/4) /* verifed on pcb */ + SEIBU_SOUND_SYSTEM_CPU(XTAL_14_31818MHz/4) /* verifed on pcb */ MDRV_SCREEN_REFRESH_RATE(60) MDRV_MACHINE_RESET(seibu_sound_1) @@ -458,7 +458,7 @@ static MACHINE_DRIVER_START( toki ) /* KOYO 20.000MHz near the cpu */ MDRV_VIDEO_UPDATE(toki) /* sound hardware */ - SEIBU_SOUND_SYSTEM_YM3812_INTERFACE(14318180/4,1000000,1) /* verifed on pcb */ + SEIBU_SOUND_SYSTEM_YM3812_RAIDEN_INTERFACE(XTAL_14_31818MHz/4,XTAL_12MHz/12 ,1) /* verifed on pcb */ MACHINE_DRIVER_END