diff options
author | 2017-12-13 21:31:27 -0700 | |
---|---|---|
committer | 2017-12-13 21:31:27 -0700 | |
commit | 9ece34eb218c5c1960468294c733fd00ac7fa696 (patch) | |
tree | 7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /src/mame/drivers/gaplus.cpp | |
parent | 54155441e9ba9941e85d80c4834a66376a11e791 (diff) |
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
Diffstat (limited to 'src/mame/drivers/gaplus.cpp')
-rw-r--r-- | src/mame/drivers/gaplus.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mame/drivers/gaplus.cpp b/src/mame/drivers/gaplus.cpp index 4646a889490..b9f839e7f98 100644 --- a/src/mame/drivers/gaplus.cpp +++ b/src/mame/drivers/gaplus.cpp @@ -515,15 +515,15 @@ void gaplus_state::machine_start() static MACHINE_CONFIG_START( gaplus ) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M6809, 24576000/16) /* 1.536 MHz */ + MCFG_CPU_ADD("maincpu", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */ MCFG_CPU_PROGRAM_MAP(cpu1_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_main_irq) - MCFG_CPU_ADD("sub", M6809, 24576000/16) /* 1.536 MHz */ + MCFG_CPU_ADD("sub", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_sub_irq) - MCFG_CPU_ADD("sub2", M6809, 24576000/16) /* 1.536 MHz */ + MCFG_CPU_ADD("sub2", MC6809E, XTAL_24_576MHz/16) /* 1.536 MHz */ MCFG_CPU_PROGRAM_MAP(cpu3_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gaplus_state, vblank_sub2_irq) @@ -571,7 +571,7 @@ static MACHINE_CONFIG_START( gaplus ) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("namco", NAMCO_15XX, 24576000/1024) + MCFG_SOUND_ADD("namco", NAMCO_15XX, XTAL_24_576MHz/1024) MCFG_NAMCO_AUDIO_VOICES(8) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) |