From 06f98fe7c18c40114c26559528bd4ade6c3f4477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Banaan=20Ananas?= Date: Sun, 2 Jun 2013 16:40:49 +0000 Subject: [PATCH] (added xtals) --- src/mame/drivers/gticlub.c | 22 +++++++++++----------- src/mame/drivers/zr107.c | 18 +++++++++--------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/mame/drivers/gticlub.c b/src/mame/drivers/gticlub.c index 7eeef139181..cf1b9ad86e7 100644 --- a/src/mame/drivers/gticlub.c +++ b/src/mame/drivers/gticlub.c @@ -835,14 +835,14 @@ MACHINE_RESET_MEMBER(gticlub_state,gticlub) static MACHINE_CONFIG_START( gticlub, gticlub_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ MCFG_CPU_PROGRAM_MAP(gticlub_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gticlub_state, gticlub_vblank) - MCFG_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */ + MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/4) /* 16MHz */ MCFG_CPU_PROGRAM_MAP(sound_memmap) - MCFG_CPU_ADD("dsp", ADSP21062, 36000000) + MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz) MCFG_CPU_CONFIG(sharc_cfg) MCFG_CPU_DATA_MAP(sharc_map) @@ -870,11 +870,11 @@ static MACHINE_CONFIG_START( gticlub, gticlub_state ) MCFG_K001604_ADD("k001604_1", gticlub_k001604_intf) - MCFG_K056800_ADD("k056800", gticlub_k056800_interface, 64000000/4) + MCFG_K056800_ADD("k056800", gticlub_k056800_interface, XTAL_64MHz/4) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_RF5C400_ADD("rfsnd", 33868800/2) + MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -939,17 +939,17 @@ static const voodoo_config voodoo_r_intf = static MACHINE_CONFIG_START( hangplt, gticlub_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ MCFG_CPU_PROGRAM_MAP(gticlub_map) - MCFG_CPU_ADD("audiocpu", M68000, 64000000/4) /* 16MHz */ + MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/4) /* 16MHz */ MCFG_CPU_PROGRAM_MAP(sound_memmap) - MCFG_CPU_ADD("dsp", ADSP21062, 36000000) + MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz) MCFG_CPU_CONFIG(sharc_cfg) MCFG_CPU_DATA_MAP(hangplt_sharc0_map) - MCFG_CPU_ADD("dsp2", ADSP21062, 36000000) + MCFG_CPU_ADD("dsp2", ADSP21062, XTAL_36MHz) MCFG_CPU_CONFIG(sharc_cfg) MCFG_CPU_DATA_MAP(hangplt_sharc1_map) @@ -987,11 +987,11 @@ static MACHINE_CONFIG_START( hangplt, gticlub_state ) MCFG_K001604_ADD("k001604_1", hangplt_k001604_intf_l) MCFG_K001604_ADD("k001604_2", hangplt_k001604_intf_r) - MCFG_K056800_ADD("k056800", gticlub_k056800_interface, 64000000/4) + MCFG_K056800_ADD("k056800", gticlub_k056800_interface, XTAL_64MHz/4) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_RF5C400_ADD("rfsnd", 33868800/2) + MCFG_RF5C400_ADD("rfsnd", XTAL_33_8688MHz/2) MCFG_SOUND_ROUTE(0, "lspeaker", 1.0) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/zr107.c b/src/mame/drivers/zr107.c index 2be3c97f333..f22163fe349 100644 --- a/src/mame/drivers/zr107.c +++ b/src/mame/drivers/zr107.c @@ -10,7 +10,7 @@ ZR107 CPU board: ---------------- IBM PowerPC 403GA at 32MHz (main CPU) - Motorola MC68EC000 at 16MHz (sound CPU) + Motorola MC68EC000 at 8MHz (sound CPU) Konami K056800 (MIRAC), sound system interface Konami K056230 (LANC), LAN interface Konami K058141 sound chip (same as 2x K054539) @@ -751,14 +751,14 @@ void zr107_state::machine_reset() static MACHINE_CONFIG_START( zr107, zr107_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ MCFG_CPU_PROGRAM_MAP(zr107_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank) - MCFG_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */ + MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/8) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(sound_memmap) - MCFG_CPU_ADD("dsp", ADSP21062, 36000000) + MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz) MCFG_CPU_CONFIG(sharc_cfg) MCFG_CPU_DATA_MAP(sharc_map) @@ -781,7 +781,7 @@ static MACHINE_CONFIG_START( zr107, zr107_state ) MCFG_K056832_ADD("k056832", zr107_k056832_intf) - MCFG_K056800_ADD("k056800", zr107_k056800_interface, 64000000/4) + MCFG_K056800_ADD("k056800", zr107_k056800_interface, XTAL_64MHz/4) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") @@ -809,14 +809,14 @@ static const k001604_interface jetwave_k001604_intf = static MACHINE_CONFIG_START( jetwave, zr107_state ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", PPC403GA, 64000000/2) /* PowerPC 403GA 32MHz */ + MCFG_CPU_ADD("maincpu", PPC403GA, XTAL_64MHz/2) /* PowerPC 403GA 32MHz */ MCFG_CPU_PROGRAM_MAP(jetwave_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", zr107_state, zr107_vblank) - MCFG_CPU_ADD("audiocpu", M68000, 64000000/8) /* 8MHz */ + MCFG_CPU_ADD("audiocpu", M68000, XTAL_64MHz/8) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(sound_memmap) - MCFG_CPU_ADD("dsp", ADSP21062, 36000000) + MCFG_CPU_ADD("dsp", ADSP21062, XTAL_36MHz) MCFG_CPU_CONFIG(sharc_cfg) MCFG_CPU_DATA_MAP(sharc_map) @@ -839,7 +839,7 @@ static MACHINE_CONFIG_START( jetwave, zr107_state ) MCFG_K001604_ADD("k001604", jetwave_k001604_intf) - MCFG_K056800_ADD("k056800", zr107_k056800_interface, 64000000/4) + MCFG_K056800_ADD("k056800", zr107_k056800_interface, XTAL_64MHz/4) MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")