diff options
35 files changed, 232 insertions, 226 deletions
diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index bb177f4c1e6..2b7e5e169a4 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -2099,7 +2099,7 @@ MACHINE_RESET_MEMBER(cave_state,cave) MACHINE_CONFIG_START(cave_state::dfeveron) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(dfeveron_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2126,7 +2126,7 @@ MACHINE_CONFIG_START(cave_state::dfeveron) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2140,7 +2140,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::ddonpach) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(ddonpach_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2167,7 +2167,7 @@ MACHINE_CONFIG_START(cave_state::ddonpach) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2180,7 +2180,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::donpachi) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(donpachi_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2207,10 +2207,10 @@ MACHINE_CONFIG_START(cave_state::donpachi) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_OKIM6295_ADD("oki1", XTAL(4'224'000)/4, PIN7_HIGH) // pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 4.224_MHz_XTAL/4, PIN7_HIGH) // pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.60) - MCFG_OKIM6295_ADD("oki2", XTAL(4'224'000)/2, PIN7_HIGH) // pin 7 not verified + MCFG_OKIM6295_ADD("oki2", 4.224_MHz_XTAL/2, PIN7_HIGH) // pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_DEVICE_ADD("nmk112", NMK112, 0) @@ -2227,7 +2227,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::esprade) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(esprade_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2254,7 +2254,7 @@ MACHINE_CONFIG_START(cave_state::esprade) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2267,7 +2267,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::gaia) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(gaia_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2295,7 +2295,7 @@ MACHINE_CONFIG_START(cave_state::gaia) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2308,7 +2308,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::guwange) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(guwange_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2335,7 +2335,7 @@ MACHINE_CONFIG_START(cave_state::guwange) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2347,11 +2347,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::hotdogst) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) + MCFG_CPU_ADD("maincpu", M68000, 32.0_MHz_XTAL/2) MCFG_CPU_PROGRAM_MAP(hotdogst_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000)/8) + MCFG_CPU_ADD("audiocpu", Z80, 32.0_MHz_XTAL/8) MCFG_CPU_PROGRAM_MAP(hotdogst_sound_map) MCFG_CPU_IO_MAP(hotdogst_sound_portmap) @@ -2380,14 +2380,14 @@ MACHINE_CONFIG_START(cave_state::hotdogst) MCFG_GENERIC_LATCH_16_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(32'000'000)/8) + MCFG_SOUND_ADD("ymsnd", YM2203, 32.0_MHz_XTAL/8) MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) MCFG_SOUND_ROUTE(3, "mono", 0.80) - MCFG_OKIM6295_ADD("oki", XTAL(32'000'000)/16, PIN7_HIGH) // pin 7 not verified + MCFG_OKIM6295_ADD("oki", 32.0_MHz_XTAL/16, PIN7_HIGH) // pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END @@ -2400,7 +2400,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::korokoro) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(korokoro_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2427,7 +2427,7 @@ MACHINE_CONFIG_START(cave_state::korokoro) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -2445,11 +2445,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::mazinger) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(mazinger_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(4'000'000)) // Bidirectional communication + MCFG_CPU_ADD("audiocpu", Z80, 4.0_MHz_XTAL) // Bidirectional communication MCFG_CPU_PROGRAM_MAP(mazinger_sound_map) MCFG_CPU_IO_MAP(mazinger_sound_portmap) @@ -2481,14 +2481,14 @@ MACHINE_CONFIG_START(cave_state::mazinger) MCFG_GENERIC_LATCH_16_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(4'000'000)) + MCFG_SOUND_ADD("ymsnd", YM2203, 4.0_MHz_XTAL) MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) MCFG_SOUND_ROUTE(3, "mono", 0.60) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 2.0) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) MACHINE_CONFIG_END @@ -2501,11 +2501,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::metmqstr) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000) / 2) + MCFG_CPU_ADD("maincpu", M68000, 32.0_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(metmqstr_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(32'000'000) / 4) + MCFG_CPU_ADD("audiocpu", Z80, 32.0_MHz_XTAL / 4) MCFG_CPU_PROGRAM_MAP(metmqstr_sound_map) MCFG_CPU_IO_MAP(metmqstr_sound_portmap) @@ -2537,15 +2537,15 @@ MACHINE_CONFIG_START(cave_state::metmqstr) MCFG_GENERIC_LATCH_16_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000) / 4) + MCFG_YM2151_ADD("ymsnd", 16.0_MHz_XTAL / 4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.6) - MCFG_OKIM6295_ADD("oki1", XTAL(32'000'000) / 16 , PIN7_HIGH) + MCFG_OKIM6295_ADD("oki1", 32.0_MHz_XTAL / 16 , PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_DEVICE_ADDRESS_MAP(0, oki_map) - MCFG_OKIM6295_ADD("oki2", XTAL(32'000'000) / 16 , PIN7_HIGH) + MCFG_OKIM6295_ADD("oki2", 32.0_MHz_XTAL / 16 , PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.5) MCFG_DEVICE_ADDRESS_MAP(0, oki2_map) MACHINE_CONFIG_END @@ -2560,7 +2560,7 @@ MACHINE_CONFIG_START(cave_state::pacslot) MCFG_NVRAM_ADD_0FILL("nvram") /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2) + MCFG_CPU_ADD("maincpu", M68000, 28.0_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(pacslot_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2592,12 +2592,12 @@ MACHINE_CONFIG_START(cave_state::pacslot) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_OKIM6295_ADD("oki1", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) // oki2 chip is present but its rom socket is unpopulated - MCFG_OKIM6295_ADD("oki2", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki2", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) MACHINE_CONFIG_END @@ -2618,7 +2618,7 @@ TIMER_DEVICE_CALLBACK_MEMBER( cave_state::timer_lev2_cb ) MACHINE_CONFIG_START(cave_state::ppsatan) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(ppsatan_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt_ppsatan) @@ -2666,7 +2666,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 2.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 2.0) MACHINE_CONFIG_END @@ -2681,11 +2681,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::pwrinst2) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) /* 16 MHz */ + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) /* 16 MHz */ MCFG_CPU_PROGRAM_MAP(pwrinst2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) - MCFG_CPU_ADD("audiocpu", Z80,XTAL(16'000'000) / 2) /* 8 MHz */ + MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL / 2) /* 8 MHz */ MCFG_CPU_PROGRAM_MAP(pwrinst2_sound_map) MCFG_CPU_IO_MAP(pwrinst2_sound_portmap) @@ -2714,17 +2714,17 @@ MACHINE_CONFIG_START(cave_state::pwrinst2) MCFG_GENERIC_LATCH_16_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(16'000'000) / 4) + MCFG_SOUND_ADD("ymsnd", YM2203, 16.0_MHz_XTAL / 4) MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.40) MCFG_SOUND_ROUTE(1, "mono", 0.40) MCFG_SOUND_ROUTE(2, "mono", 0.40) MCFG_SOUND_ROUTE(3, "mono", 0.80) - MCFG_OKIM6295_ADD("oki1", XTAL(3'000'000) , PIN7_LOW) + MCFG_OKIM6295_ADD("oki1", 3.0_MHz_XTAL, PIN7_LOW) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_OKIM6295_ADD("oki2", XTAL(3'000'000) , PIN7_LOW) + MCFG_OKIM6295_ADD("oki2", 3.0_MHz_XTAL, PIN7_LOW) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) MCFG_DEVICE_ADD("nmk112", NMK112, 0) @@ -2752,14 +2752,14 @@ MACHINE_RESET_MEMBER(cave_state,sailormn) MACHINE_CONFIG_START(cave_state::sailormn) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(sailormn_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) // could be a wachdog, but if it is then our watchdog address is incorrect as there are periods where the game doesn't write it. MCFG_TIMER_DRIVER_ADD("startup", cave_state, sailormn_startup) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)) // Bidirectional Communication + MCFG_CPU_ADD("audiocpu", Z80, 8.0_MHz_XTAL) // Bidirectional Communication MCFG_CPU_PROGRAM_MAP(sailormn_sound_map) MCFG_CPU_IO_MAP(sailormn_sound_portmap) @@ -2790,7 +2790,7 @@ MACHINE_CONFIG_START(cave_state::sailormn) MCFG_GENERIC_LATCH_16_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) + MCFG_YM2151_ADD("ymsnd", 16.0_MHz_XTAL/4) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) @@ -2815,7 +2815,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw) MCFG_NVRAM_ADD_0FILL("nvram") /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2) + MCFG_CPU_ADD("maincpu", M68000, 28.0_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(tekkencw_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2847,7 +2847,7 @@ MACHINE_CONFIG_START(cave_state::tekkencw) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_OKIM6295_ADD("oki1", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -2869,7 +2869,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman) MCFG_NVRAM_ADD_0FILL("nvram") /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(28'000'000) / 2) + MCFG_CPU_ADD("maincpu", M68000, 28.0_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(tjumpman_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2901,7 +2901,7 @@ MACHINE_CONFIG_START(cave_state::tjumpman) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker") - MCFG_OKIM6295_ADD("oki1", XTAL(28'000'000) / 28, PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki1", 28.0_MHz_XTAL / 28, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.0) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.0) @@ -2916,7 +2916,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(cave_state::uopoko) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(16'000'000)) + MCFG_CPU_ADD("maincpu", M68000, 16.0_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(uopoko_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", cave_state, cave_interrupt) @@ -2942,7 +2942,7 @@ MACHINE_CONFIG_START(cave_state::uopoko) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymz", YMZ280B, XTAL(16'934'400)) + MCFG_SOUND_ADD("ymz", YMZ280B, 16.9344_MHz_XTAL) MCFG_YMZ280B_IRQ_HANDLER(WRITELINE(cave_state, sound_irq_gen)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/chance32.cpp b/src/mame/drivers/chance32.cpp index 8337a7ad05a..4d173e469e6 100644 --- a/src/mame/drivers/chance32.cpp +++ b/src/mame/drivers/chance32.cpp @@ -475,7 +475,7 @@ MACHINE_CONFIG_START(chance32_state::chance32) MCFG_SPEAKER_STANDARD_MONO("mono") /* clock at 1050 kHz match the 8000 Hz samples stored inside the ROM */ - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/compis.cpp b/src/mame/drivers/compis.cpp index a1f6f4e568e..5d27949e331 100644 --- a/src/mame/drivers/compis.cpp +++ b/src/mame/drivers/compis.cpp @@ -747,7 +747,7 @@ void compis_state::machine_reset() MACHINE_CONFIG_START(compis_state::compis) // basic machine hardware - MCFG_CPU_ADD(I80186_TAG, I80186, XTAL(15'360'000)) + MCFG_CPU_ADD(I80186_TAG, I80186, 15.36_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(compis_mem) MCFG_CPU_IO_MAP(compis_io) MCFG_80186_IRQ_SLAVE_ACK(DEVREAD8(DEVICE_SELF, compis_state, compis_irq_callback)) @@ -755,17 +755,17 @@ MACHINE_CONFIG_START(compis_state::compis) MCFG_80186_TMROUT1_HANDLER(DEVWRITELINE(DEVICE_SELF, compis_state, tmr1_w)) // devices - MCFG_DEVICE_ADD(I80130_TAG, I80130, XTAL(15'360'000)/2) + MCFG_DEVICE_ADD(I80130_TAG, I80130, 15.36_MHz_XTAL/2) MCFG_I80130_IRQ_CALLBACK(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int0_w)) MCFG_I80130_SYSTICK_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir3_w)) MCFG_I80130_DELAY_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir7_w)) MCFG_I80130_BAUD_CALLBACK(WRITELINE(compis_state, tmr2_w)) MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(15'360'000)/8) + MCFG_PIT8253_CLK0(15.36_MHz_XTAL/8) MCFG_PIT8253_OUT0_HANDLER(DEVWRITELINE(I8274_TAG, i8274_device, rxtxcb_w)) - MCFG_PIT8253_CLK1(XTAL(15'360'000)/8) - MCFG_PIT8253_CLK2(XTAL(15'360'000)/8) + MCFG_PIT8253_CLK1(15.36_MHz_XTAL/8) + MCFG_PIT8253_CLK2(15.36_MHz_XTAL/8) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(compis_state, tmr5_w)) MCFG_DEVICE_ADD(I8255_TAG, I8255, 0) @@ -781,7 +781,7 @@ MACHINE_CONFIG_START(compis_state::compis) MCFG_DEVICE_ADD(COMPIS_KEYBOARD_TAG, COMPIS_KEYBOARD, 0) MCFG_COMPIS_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE(I8251A_TAG, i8251_device, write_rxd)) - MCFG_DEVICE_ADD(I8274_TAG, I8274, XTAL(15'360'000)/4) + MCFG_DEVICE_ADD(I8274_TAG, I8274, 15.36_MHz_XTAL/4) MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -790,7 +790,7 @@ MACHINE_CONFIG_START(compis_state::compis) MCFG_Z80DART_OUT_RTSB_CB(DEVWRITELINE(RS232_B_TAG, rs232_port_device, write_rts)) MCFG_Z80DART_OUT_INT_CB(DEVWRITELINE(I80186_TAG, i80186_cpu_device, int3_w)) - MCFG_DEVICE_ADD(MM58174A_TAG, MM58274C, XTAL(32'768)) + MCFG_DEVICE_ADD(MM58174A_TAG, MM58274C, 32.768_kHz_XTAL) MCFG_MM58274C_MODE24(1) // 24 hour MCFG_MM58274C_DAY1(1) // monday @@ -814,7 +814,7 @@ MACHINE_CONFIG_START(compis_state::compis) MCFG_CENTRONICS_SELECT_HANDLER(WRITELINE(compis_state, write_centronics_select)) MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", CENTRONICS_TAG) - MCFG_COMPIS_GRAPHICS_SLOT_ADD(GRAPHICS_TAG, XTAL(15'360'000)/2, compis_graphics_cards, "hrg") + MCFG_COMPIS_GRAPHICS_SLOT_ADD(GRAPHICS_TAG, 15.36_MHz_XTAL/2, compis_graphics_cards, "hrg") MCFG_ISBX_SLOT_ADD(ISBX_0_TAG, 0, isbx_cards, "fdc") MCFG_ISBX_SLOT_MINTR0_CALLBACK(DEVWRITELINE(I80130_TAG, i80130_device, ir1_w)) diff --git a/src/mame/drivers/cv1k.cpp b/src/mame/drivers/cv1k.cpp index c73b60d453c..b133f6bdf53 100644 --- a/src/mame/drivers/cv1k.cpp +++ b/src/mame/drivers/cv1k.cpp @@ -454,7 +454,7 @@ void cv1k_state::machine_reset() MACHINE_CONFIG_START(cv1k_state::cv1k) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", SH3BE, XTAL(12'800'000)*8) // 102.4MHz + MCFG_CPU_ADD("maincpu", SH3BE, 12.8_MHz_XTAL*8) // 102.4MHz MCFG_SH4_MD0(0) // none of this is verified MCFG_SH4_MD1(0) // (the sh3 is different to the sh4 anyway, should be changed) MCFG_SH4_MD2(0) @@ -464,7 +464,7 @@ MACHINE_CONFIG_START(cv1k_state::cv1k) MCFG_SH4_MD6(0) MCFG_SH4_MD7(1) MCFG_SH4_MD8(0) - MCFG_SH4_CLOCK(XTAL(12'800'000)*8) // 102.4MHz + MCFG_SH4_CLOCK(12.8_MHz_XTAL*8) // 102.4MHz MCFG_CPU_PROGRAM_MAP(cv1k_map) MCFG_CPU_IO_MAP(cv1k_port) MCFG_CPU_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold) @@ -483,7 +483,7 @@ MACHINE_CONFIG_START(cv1k_state::cv1k) MCFG_PALETTE_ADD("palette", 0x10000) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_YMZ770_ADD("ymz770", XTAL(16'384'000)) + MCFG_YMZ770_ADD("ymz770", 16.384_MHz_XTAL) MCFG_SOUND_ROUTE(1, "mono", 1.0) // only Right output used, Left is not connected MCFG_EPIC12_ADD("blitter") @@ -495,7 +495,7 @@ MACHINE_CONFIG_DERIVED(cv1k_state::cv1k_d, cv1k) /* basic machine hardware */ MCFG_DEVICE_REMOVE("maincpu") - MCFG_CPU_ADD("maincpu", SH3BE, XTAL(12'800'000)*8) // 102.4MHz + MCFG_CPU_ADD("maincpu", SH3BE, 12.8_MHz_XTAL*8) // 102.4MHz MCFG_SH4_MD0(0) // none of this is verified MCFG_SH4_MD1(0) // (the sh3 is different to the sh4 anyway, should be changed) MCFG_SH4_MD2(0) @@ -505,7 +505,7 @@ MACHINE_CONFIG_DERIVED(cv1k_state::cv1k_d, cv1k) MCFG_SH4_MD6(0) MCFG_SH4_MD7(1) MCFG_SH4_MD8(0) - MCFG_SH4_CLOCK(XTAL(12'800'000)*8) // 102.4MHz + MCFG_SH4_CLOCK(12.8_MHz_XTAL*8) // 102.4MHz MCFG_CPU_PROGRAM_MAP(cv1k_d_map) MCFG_CPU_IO_MAP(cv1k_port) MCFG_CPU_VBLANK_INT_DRIVER("screen", cv1k_state, irq2_line_hold) diff --git a/src/mame/drivers/ddragon3.cpp b/src/mame/drivers/ddragon3.cpp index 370e1a6e49a..9c6368cee9b 100644 --- a/src/mame/drivers/ddragon3.cpp +++ b/src/mame/drivers/ddragon3.cpp @@ -817,7 +817,7 @@ void ddragon3_state::machine_reset() MACHINE_CONFIG_START(ddragon3_state::ddragon3) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000) / 2) + MCFG_CPU_ADD("maincpu", M68000, 20.0_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(ddragon3_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1) @@ -826,7 +826,7 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3) /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_RAW_PARAMS(28.0_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ MCFG_SCREEN_UPDATE_DRIVER(ddragon3_state, screen_update_ddragon3) MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") @@ -848,7 +848,7 @@ MACHINE_CONFIG_START(ddragon3_state::ddragon3) MCFG_SOUND_ROUTE(0, "lspeaker", 0.50) MCFG_SOUND_ROUTE(1, "rspeaker", 0.50) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.50) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 1.50) MACHINE_CONFIG_END @@ -892,7 +892,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) /* 24 crystal, 12 rated chip */ + MCFG_CPU_ADD("maincpu", M68000, 24.0_MHz_XTAL / 2) /* 24 crystal, 12 rated chip */ MCFG_CPU_PROGRAM_MAP(main_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", ddragon3_state, ddragon3_scanline, "screen", 0, 1) @@ -903,7 +903,7 @@ MACHINE_CONFIG_START(wwfwfest_state::wwfwfest) MCFG_BUFFERED_SPRITERAM16_ADD("spriteram") MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(28'000'000) / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ + MCFG_SCREEN_RAW_PARAMS(28.0_MHz_XTAL / 4, 448, 0, 320, 272, 8, 248) /* HTOTAL and VTOTAL are guessed */ MCFG_SCREEN_UPDATE_DRIVER(wwfwfest_state, screen_update_wwfwfest) MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("spriteram", buffered_spriteram16_device, vblank_copy_rising)) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/dooyong.cpp b/src/mame/drivers/dooyong.cpp index 7b34db290cb..06df86b137a 100644 --- a/src/mame/drivers/dooyong.cpp +++ b/src/mame/drivers/dooyong.cpp @@ -1449,12 +1449,12 @@ MACHINE_CONFIG_START(dooyong_z80_state::sound_2151) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(3'579'545) ) + MCFG_YM2151_ADD("ymsnd", 3.579'545_MHz_XTAL) MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - MCFG_OKIM6295_ADD("oki", XTAL(1'000'000), PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", 1.0_MHz_XTAL, PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END @@ -1463,23 +1463,23 @@ MACHINE_CONFIG_START(dooyong_state::sound_2151_4mhz ) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_YM2151_ADD("ymsnd", XTAL(16'000'000)/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */ + MCFG_YM2151_ADD("ymsnd", 16.0_MHz_XTAL/4) /* 4MHz (16MHz/4 for most, 8Mhz/2 for Super-X) */ MCFG_YM2151_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.50) MCFG_SOUND_ROUTE(1, "mono", 0.50) - MCFG_OKIM6295_ADD("oki", XTAL(16'000'000)/16, PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */ + MCFG_OKIM6295_ADD("oki", 16.0_MHz_XTAL/16, PIN7_HIGH) /* 1MHz (16MHz/16 for most, 8Mhz/8 for Super-X) */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8MHz verified for Last Day / D-day */ + MCFG_CPU_ADD("maincpu", Z80, 16.0_MHz_XTAL/2) /* 8MHz verified for Last Day / D-day */ MCFG_CPU_PROGRAM_MAP(lastday_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz verified for Last Day / D-day */ + MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ MCFG_CPU_PROGRAM_MAP(lastday_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1513,12 +1513,12 @@ MACHINE_CONFIG_START(dooyong_z80_ym2203_state::lastday) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, XTAL(16'000'000)/4) /* 4MHz verified for Last Day / D-day */ + MCFG_SOUND_ADD("ym1", YM2203, 16.0_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_1)) MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MCFG_SOUND_ADD("ym2", YM2203, XTAL(16'000'000)/4) /* 4MHz verified for Last Day / D-day */ + MCFG_SOUND_ADD("ym2", YM2203, 16.0_MHz_XTAL/4) /* 4MHz verified for Last Day / D-day */ MCFG_YM2203_IRQ_HANDLER(WRITELINE(dooyong_z80_ym2203_state, irqhandler_2203_2)) MCFG_AY8910_PORT_A_READ_CB(READ8(dooyong_z80_ym2203_state, unk_r)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) @@ -1567,11 +1567,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_ym2203_state::pollux) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8Mhz */ + MCFG_CPU_ADD("maincpu", Z80, 16.0_MHz_XTAL/2) /* 8Mhz */ MCFG_CPU_PROGRAM_MAP(pollux_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4Mhz */ + MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4Mhz */ MCFG_CPU_PROGRAM_MAP(pollux_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1646,11 +1646,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_state::flytiger) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8MHz */ + MCFG_CPU_ADD("maincpu", Z80, 16.0_MHz_XTAL/2) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(flytiger_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4Mhz */ + MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4Mhz */ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1685,11 +1685,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(dooyong_z80_state::primella) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000)/2) /* 8MHz */ + MCFG_CPU_ADD("maincpu", Z80, 16.0_MHz_XTAL/2) /* 8MHz */ MCFG_CPU_PROGRAM_MAP(primella_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", dooyong_state, irq0_line_hold) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) /* 4MHz */ + MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) /* 4MHz */ MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) MCFG_MACHINE_START_OVERRIDE(dooyong_z80_state, cpu_z80) @@ -1735,10 +1735,10 @@ TIMER_DEVICE_CALLBACK_MEMBER(dooyong_68k_state::scanline) MACHINE_CONFIG_START(rshark_state::dooyong_68k) // basic machine hardware - MCFG_CPU_ADD("maincpu", M68000, XTAL(8'000'000)) // 8MHz measured on Super-X + MCFG_CPU_ADD("maincpu", M68000, 8.0_MHz_XTAL) // 8MHz measured on Super-X MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(8'000'000)/2) // 4MHz measured on Super-X + MCFG_CPU_ADD("audiocpu", Z80, 8.0_MHz_XTAL/2) // 4MHz measured on Super-X MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) // video hardware @@ -1784,11 +1784,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(popbingo_state::popbingo) // basic machine hardware - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) // 10MHz measured + MCFG_CPU_ADD("maincpu", M68000, 20.0_MHz_XTAL/2) // 10MHz measured MCFG_CPU_PROGRAM_MAP(popbingo_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", dooyong_68k_state, scanline, "screen", 0, 1) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(16'000'000)/4) // 4MHz measured + MCFG_CPU_ADD("audiocpu", Z80, 16.0_MHz_XTAL/4) // 4MHz measured MCFG_CPU_PROGRAM_MAP(bluehawk_sound_map) // video hardware diff --git a/src/mame/drivers/equites.cpp b/src/mame/drivers/equites.cpp index bc9d738a669..92fdeafaa2e 100644 --- a/src/mame/drivers/equites.cpp +++ b/src/mame/drivers/equites.cpp @@ -1030,7 +1030,7 @@ static const char *const alphamc07_sample_names[] = // the sound board is the same in all games MACHINE_CONFIG_START(equites_state::common_sound) - MCFG_CPU_ADD("audiocpu", I8085A, XTAL(6'144'000)) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", I8085A, 6.144_MHz_XTAL) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(sound_map) MCFG_CPU_IO_MAP(sound_portmap) MCFG_I8085A_CLK_OUT_DEVICE("audio8155") @@ -1061,7 +1061,7 @@ MACHINE_CONFIG_START(equites_state::common_sound) MCFG_SOUND_ROUTE(9, "speaker", 1.0) // pin 2 SOLO 16' (this actually feeds an analog section) MCFG_SOUND_ROUTE(10,"speaker", 0.12) // pin 22 Noise Output (this actually feeds an analog section) - MCFG_SOUND_ADD("aysnd", AY8910, XTAL(6'144'000)/4) /* verified on pcb */ + MCFG_SOUND_ADD("aysnd", AY8910, 6.144_MHz_XTAL/4) /* verified on pcb */ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(equites_state, equites_8910porta_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(equites_state, equites_8910portb_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 0.15) @@ -1130,7 +1130,7 @@ void equites_state::machine_reset() MACHINE_CONFIG_START(equites_state::equites) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(12'000'000)/4) /* 68000P8 running at 3mhz! verified on pcb */ + MCFG_CPU_ADD("maincpu", M68000, 12.0_MHz_XTAL/4) /* 68000P8 running at 3mhz! verified on pcb */ MCFG_CPU_PROGRAM_MAP(equites_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", equites_state, equites_scanline, "screen", 0, 1) @@ -1180,7 +1180,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(equites_state::splndrbt) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000)/4) /* 68000P8 running at 6mhz, verified on pcb */ + MCFG_CPU_ADD("maincpu", M68000, 24.0_MHz_XTAL/4) /* 68000P8 running at 6mhz, verified on pcb */ MCFG_CPU_PROGRAM_MAP(splndrbt_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", equites_state, splndrbt_scanline, "screen", 0, 1) diff --git a/src/mame/drivers/exp85.cpp b/src/mame/drivers/exp85.cpp index c4c677508da..ba672d31845 100644 --- a/src/mame/drivers/exp85.cpp +++ b/src/mame/drivers/exp85.cpp @@ -180,7 +180,7 @@ void exp85_state::machine_start() MACHINE_CONFIG_START(exp85_state::exp85) /* basic machine hardware */ - MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL(6'144'000)) + MCFG_CPU_ADD(I8085A_TAG, I8085A, 6.144_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(exp85_mem) MCFG_CPU_IO_MAP(exp85_io) MCFG_I8085A_SID(READLINE(exp85_state, sid_r)) @@ -192,9 +192,9 @@ MACHINE_CONFIG_START(exp85_state::exp85) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) /* devices */ - MCFG_DEVICE_ADD(I8155_TAG, I8155, XTAL(6'144'000)/2) + MCFG_DEVICE_ADD(I8155_TAG, I8155, 6.144_MHz_XTAL/2) - MCFG_DEVICE_ADD(I8355_TAG, I8355, XTAL(6'144'000)/2) + MCFG_DEVICE_ADD(I8355_TAG, I8355, 6.144_MHz_XTAL/2) MCFG_I8355_IN_PA_CB(READ8(exp85_state, i8355_a_r)) MCFG_I8355_OUT_PA_CB(WRITE8(exp85_state, i8355_a_w)) MCFG_CASSETTE_ADD("cassette") diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index 7b2b99b97b1..e7a92d09318 100644 --- a/src/mame/drivers/flicker.cpp +++ b/src/mame/drivers/flicker.cpp @@ -382,7 +382,7 @@ void flicker_state::driver_start() MACHINE_CONFIG_START(flicker_state::flicker) // basic machine hardware - MCFG_CPU_ADD("maincpu", I4004, XTAL(5'000'000) / 8) + MCFG_CPU_ADD("maincpu", I4004, 5.0_MHz_XTAL / 8) MCFG_I4004_ROM_MAP(flicker_rom) MCFG_I4004_RAM_MEMORY_MAP(flicker_memory) MCFG_I4004_ROM_PORTS_MAP(flicker_rom_ports) diff --git a/src/mame/drivers/fp200.cpp b/src/mame/drivers/fp200.cpp index 1e271163505..8aaba390daa 100644 --- a/src/mame/drivers/fp200.cpp +++ b/src/mame/drivers/fp200.cpp @@ -25,7 +25,7 @@ #include "screen.h" #include "speaker.h" -#define MAIN_CLOCK XTAL(6'144'000) +static constexpr XTAL MAIN_CLOCK = 6.144_MHz_XTAL; class fp200_state : public driver_device { diff --git a/src/mame/drivers/gcpinbal.cpp b/src/mame/drivers/gcpinbal.cpp index 4c7f25bdc46..419adf3062d 100644 --- a/src/mame/drivers/gcpinbal.cpp +++ b/src/mame/drivers/gcpinbal.cpp @@ -452,7 +452,7 @@ void gcpinbal_state::machine_reset() MACHINE_CONFIG_START(gcpinbal_state::gcpinbal) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(32'000'000)/2) /* 16 MHz */ + MCFG_CPU_ADD("maincpu", M68000, 32.0_MHz_XTAL/2) /* 16 MHz */ MCFG_CPU_PROGRAM_MAP(gcpinbal_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", gcpinbal_state, gcpinbal_interrupt) @@ -479,13 +479,13 @@ MACHINE_CONFIG_START(gcpinbal_state::gcpinbal) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) MCFG_DEVICE_ADD("adpcm_select", HCT157, 0) MCFG_74157_OUT_CB(DEVWRITE8("msm", msm6585_device, data_w)) - MCFG_SOUND_ADD("msm", MSM6585, XTAL(640'000)) + MCFG_SOUND_ADD("msm", MSM6585, 640.0_kHz_XTAL) MCFG_MSM6585_VCK_CALLBACK(WRITELINE(gcpinbal_state, gcp_adpcm_int)) MCFG_MSM6585_PRESCALER_SELECTOR(S40) /* 16 kHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/gladiatr.cpp b/src/mame/drivers/gladiatr.cpp index f0be0658d77..decc2fc92a2 100644 --- a/src/mame/drivers/gladiatr.cpp +++ b/src/mame/drivers/gladiatr.cpp @@ -936,17 +936,17 @@ GFXDECODE_END MACHINE_CONFIG_START(ppking_state::ppking) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */ + MCFG_CPU_ADD("maincpu", Z80, 12.0_MHz_XTAL/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(ppking_cpu1_map) MCFG_CPU_IO_MAP(ppking_cpu1_io) MCFG_CPU_VBLANK_INT_DRIVER("screen", ppking_state, irq0_line_hold) - MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_CPU_ADD("sub", Z80, 12.0_MHz_XTAL/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_IO_MAP(ppking_cpu2_io) MCFG_CPU_PERIODIC_INT_DRIVER(ppking_state, irq0_line_assert, 60) - MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", MC6809, 12.0_MHz_XTAL/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(ppking_cpu3_map) MCFG_QUANTUM_TIME(attotime::from_hz(6000)) @@ -969,7 +969,7 @@ MACHINE_CONFIG_START(ppking_state::ppking) // MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) // MCFG_SCREEN_SIZE(32*8, 32*8) // MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) - MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000)/2,384,0,256,264,16,240) // assume same as Arkanoid + MCFG_SCREEN_RAW_PARAMS(12.0_MHz_XTAL/2,384,0,256,264,16,240) // assume same as Arkanoid MCFG_SCREEN_UPDATE_DRIVER(ppking_state, screen_update_ppking) MCFG_SCREEN_PALETTE("palette") @@ -984,7 +984,7 @@ MACHINE_CONFIG_START(ppking_state::ppking) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_8_ADD("soundlatch2") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12.0_MHz_XTAL/8) /* verified on pcb */ MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state_base, ym_irq)) MCFG_AY8910_PORT_A_READ_CB(READ8(ppking_state, ppking_f1_r)) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) /* port B read */ @@ -993,7 +993,7 @@ MACHINE_CONFIG_START(ppking_state::ppking) MCFG_SOUND_ROUTE(2, "mono", 0.60) MCFG_SOUND_ROUTE(3, "mono", 0.50) - MCFG_SOUND_ADD("msm", MSM5205, XTAL(455'000)) /* verified on pcb */ + MCFG_SOUND_ADD("msm", MSM5205, 455.0_kHz_XTAL) /* verified on pcb */ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) MACHINE_CONFIG_END @@ -1001,16 +1001,16 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(gladiatr_state::gladiatr) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000)/2) /* verified on pcb */ + MCFG_CPU_ADD("maincpu", Z80, 12.0_MHz_XTAL/2) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(gladiatr_cpu1_map) MCFG_CPU_IO_MAP(gladiatr_cpu1_io) MCFG_CPU_VBLANK_INT_DRIVER("screen", gladiatr_state, irq0_line_hold) - MCFG_CPU_ADD("sub", Z80, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_CPU_ADD("sub", Z80, 12.0_MHz_XTAL/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(cpu2_map) MCFG_CPU_IO_MAP(gladiatr_cpu2_io) - MCFG_CPU_ADD("audiocpu", MC6809, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", MC6809, 12.0_MHz_XTAL/4) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(gladiatr_cpu3_map) MCFG_MACHINE_RESET_OVERRIDE(gladiatr_state,gladiator) @@ -1023,27 +1023,27 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) MCFG_ADDRESSABLE_LATCH_Q4_OUT_CB(INPUTLINE("sub", INPUT_LINE_RESET)) // shadowed by aforementioned hack MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(gladiatr_state, flipscreen_w)) - MCFG_DEVICE_ADD("cctl", I8741, XTAL(12'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("cctl", I8741, 12.0_MHz_XTAL/2) /* verified on pcb */ MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(3) MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(2) MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, cctl_p1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, cctl_p2_r)) - MCFG_DEVICE_ADD("ccpu", I8741, XTAL(12'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ccpu", I8741, 12.0_MHz_XTAL/2) /* verified on pcb */ MCFG_MCS48_PORT_P1_IN_CB(IOPORT("IN0")) MCFG_MCS48_PORT_P2_IN_CB(IOPORT("IN1")) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(gladiatr_state, ccpu_p2_w)) MCFG_MCS48_PORT_T0_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(1) MCFG_MCS48_PORT_T1_IN_CB(IOPORT("COINS")) MCFG_DEVCB_RSHIFT(0) - MCFG_DEVICE_ADD("ucpu", I8741, XTAL(12'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("ucpu", I8741, 12.0_MHz_XTAL/2) /* verified on pcb */ MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, ucpu_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gladiatr_state, ucpu_p1_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, ucpu_p2_r)) MCFG_MCS48_PORT_T0_IN_CB(READLINE(gladiatr_state, tclk_r)) MCFG_MCS48_PORT_T1_IN_CB(READLINE(gladiatr_state, ucpu_t1_r)) - MCFG_DEVICE_ADD("csnd", I8741, XTAL(12'000'000)/2) /* verified on pcb */ + MCFG_DEVICE_ADD("csnd", I8741, 12.0_MHz_XTAL/2) /* verified on pcb */ MCFG_MCS48_PORT_P1_IN_CB(READ8(gladiatr_state, csnd_p1_r)) MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(gladiatr_state, csnd_p1_w)) MCFG_MCS48_PORT_P2_IN_CB(READ8(gladiatr_state, csnd_p2_r)) @@ -1053,7 +1053,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) /* lazy way to make polled serial between MCUs work */ MCFG_QUANTUM_PERFECT_CPU("ucpu") - MCFG_CLOCK_ADD("tclk", XTAL(12'000'000)/8/128/2) /* verified on pcb */ + MCFG_CLOCK_ADD("tclk", 12.0_MHz_XTAL/8/128/2) /* verified on pcb */ MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(gladiatr_state, tclk_w)); /* video hardware */ @@ -1075,7 +1075,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/8) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12.0_MHz_XTAL/8) /* verified on pcb */ MCFG_YM2203_IRQ_HANDLER(WRITELINE(gladiatr_state_base, ym_irq)) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) /* port B read */ MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(gladiatr_state, gladiator_int_control_w)) /* port A write */ @@ -1084,7 +1084,7 @@ MACHINE_CONFIG_START(gladiatr_state::gladiatr) MCFG_SOUND_ROUTE(2, "mono", 0.60) MCFG_SOUND_ROUTE(3, "mono", 0.50) - MCFG_SOUND_ADD("msm", MSM5205, XTAL(455'000)) /* verified on pcb */ + MCFG_SOUND_ADD("msm", MSM5205, 455.0_kHz_XTAL) /* verified on pcb */ MCFG_MSM5205_PRESCALER_SELECTOR(SEX_4B) /* vclk input mode */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.60) diff --git a/src/mame/drivers/goldstar.cpp b/src/mame/drivers/goldstar.cpp index 64cb3e2446e..f4c48587a93 100644 --- a/src/mame/drivers/goldstar.cpp +++ b/src/mame/drivers/goldstar.cpp @@ -212,12 +212,6 @@ ***************************************************************************/ -#define MASTER_CLOCK XTAL(12'000'000) -#define CPU_CLOCK MASTER_CLOCK / 4 -#define PSG_CLOCK MASTER_CLOCK / 4 -#define AY_CLOCK MASTER_CLOCK / 8 -#define OKI_CLOCK 1056000 /* unverified resonator */ - #include "emu.h" #include "includes/goldstar.h" @@ -254,6 +248,17 @@ #include "tonypok.lh" #include "unkch.lh" +namespace { + +constexpr XTAL MASTER_CLOCK = 12.0_MHz_XTAL; +constexpr XTAL CPU_CLOCK = MASTER_CLOCK / 4; +constexpr XTAL PSG_CLOCK = MASTER_CLOCK / 4; +constexpr XTAL AY_CLOCK = MASTER_CLOCK / 8; +#define OKI_CLOCK 1056000 /* unverified resonator */ + +} + + WRITE8_MEMBER(goldstar_state::protection_w) { @@ -9108,12 +9113,12 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(unkch_state::bonusch) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(12'000'000) / 2) + MCFG_CPU_ADD("maincpu", Z80, 12.0_MHz_XTAL / 2) MCFG_CPU_PROGRAM_MAP(bonusch_map) MCFG_CPU_IO_MAP(bonusch_portmap) MCFG_CPU_VBLANK_INT_DRIVER("screen", goldstar_state, nmi_line_pulse) - MCFG_CPU_ADD("mcu", I80C51, XTAL(12'000'000)) + MCFG_CPU_ADD("mcu", I80C51, 12.0_MHz_XTAL) MCFG_DEVICE_DISABLE() /* video hardware */ diff --git a/src/mame/drivers/kaypro.cpp b/src/mame/drivers/kaypro.cpp index eeef8d1315a..87f8787a4e6 100644 --- a/src/mame/drivers/kaypro.cpp +++ b/src/mame/drivers/kaypro.cpp @@ -193,7 +193,7 @@ SLOT_INTERFACE_END MACHINE_CONFIG_START(kaypro_state::kayproii) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(20'000'000) / 8) + MCFG_CPU_ADD("maincpu", Z80, 20.0_MHz_XTAL / 8) MCFG_CPU_PROGRAM_MAP(kaypro_map) MCFG_CPU_IO_MAP(kayproii_io) MCFG_Z80_DAISY_CHAIN(kayproii_daisy_chain) @@ -242,23 +242,23 @@ MACHINE_CONFIG_START(kaypro_state::kayproii) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio", z80sio_device, txca_w)) MCFG_COM8116_FT_HANDLER(DEVWRITELINE("sio", z80sio_device, rxtxcb_w)) - MCFG_DEVICE_ADD("z80pio_g", Z80PIO, XTAL(20'000'000) / 8) + MCFG_DEVICE_ADD("z80pio_g", Z80PIO, 20.0_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_OUT_PA_CB(DEVWRITE8("cent_data_out", output_latch_device, write)) - MCFG_DEVICE_ADD("z80pio_s", Z80PIO, XTAL(20'000'000) / 8) + MCFG_DEVICE_ADD("z80pio_s", Z80PIO, 20.0_MHz_XTAL / 8) MCFG_Z80PIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80PIO_IN_PA_CB(READ8(kaypro_state, pio_system_r)) MCFG_Z80PIO_OUT_PA_CB(WRITE8(kaypro_state, kayproii_pio_system_w)) - MCFG_DEVICE_ADD("sio", Z80SIO, XTAL(20'000'000) / 8) + MCFG_DEVICE_ADD("sio", Z80SIO, 20.0_MHz_XTAL / 8) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serial", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("serial", rs232_port_device, write_rts)) MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("serial", rs232_port_device, write_dtr)) MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", kaypro_10_keyboard_device, txd_w)) - MCFG_FD1793_ADD("fdc", XTAL(20'000'000) / 20) + MCFG_FD1793_ADD("fdc", 20.0_MHz_XTAL / 20) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY @@ -284,7 +284,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(kaypro_state::kaypro484) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", Z80, XTAL(16'000'000) / 4) + MCFG_CPU_ADD("maincpu", Z80, 16.0_MHz_XTAL / 4) MCFG_CPU_PROGRAM_MAP(kaypro_map) MCFG_CPU_IO_MAP(kaypro484_io) MCFG_Z80_DAISY_CHAIN(kaypro484_daisy_chain) @@ -340,14 +340,14 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_2", z80sio_device, synca_w)) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("sio_2", z80sio_device, ctsa_w)) - MCFG_DEVICE_ADD("sio_1", Z80SIO, XTAL(16'000'000) / 4) + MCFG_DEVICE_ADD("sio_1", Z80SIO, 16.0_MHz_XTAL / 4) MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // FIXME: use a combiner MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("modem", rs232_port_device, write_txd)) MCFG_Z80SIO_OUT_RTSA_CB(DEVWRITELINE("modem", rs232_port_device, write_rts)) MCFG_Z80SIO_OUT_DTRA_CB(DEVWRITELINE("modem", rs232_port_device, write_dtr)) MCFG_Z80SIO_OUT_TXDB_CB(DEVWRITELINE("kbd", kaypro_10_keyboard_device, txd_w)) - MCFG_DEVICE_ADD("sio_2", Z80SIO, XTAL(16'000'000) / 4) /* extra sio for modem and printer */ + MCFG_DEVICE_ADD("sio_2", Z80SIO, 16.0_MHz_XTAL / 4) /* extra sio for modem and printer */ MCFG_Z80SIO_OUT_INT_CB(INPUTLINE("maincpu", INPUT_LINE_IRQ0)) // FIXME: use a combiner MCFG_Z80SIO_OUT_TXDA_CB(DEVWRITELINE("serprn", rs232_port_device, write_txd)) @@ -357,7 +357,7 @@ MACHINE_CONFIG_START(kaypro_state::kaypro484) MCFG_COM8116_FT_HANDLER(DEVWRITELINE("sio_2", z80sio_device, rxca_w)) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("sio_2", z80sio_device, txca_w)) - MCFG_FD1793_ADD("fdc", XTAL(16'000'000) / 16) + MCFG_FD1793_ADD("fdc", 16.0_MHz_XTAL / 16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(kaypro_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(kaypro_state, fdc_drq_w)) MCFG_WD_FDC_FORCE_READY diff --git a/src/mame/drivers/laserbat.cpp b/src/mame/drivers/laserbat.cpp index be4394784b8..414c25a7cef 100644 --- a/src/mame/drivers/laserbat.cpp +++ b/src/mame/drivers/laserbat.cpp @@ -518,10 +518,10 @@ MACHINE_CONFIG_DERIVED(laserbat_state::laserbat, laserbat_base) MCFG_SN76477_ENVELOPE_PARAMS(0, 1) // GND, Vreg MCFG_SN76477_ENABLE(0) // AB SOUND - MCFG_TMS3615_ADD("synth_low", XTAL(4'000'000)/16/2) // from the other one's /2 clock output + MCFG_TMS3615_ADD("synth_low", 4.0_MHz_XTAL/16/2) // from the other one's /2 clock output MCFG_SOUND_ROUTE(tms3615_device::FOOTAGE_8, "speaker", 1.0) - MCFG_TMS3615_ADD("synth_high", XTAL(4'000'000)/16) // 4MHz divided down with a 74LS161 + MCFG_TMS3615_ADD("synth_high", 4.0_MHz_XTAL/16) // 4MHz divided down with a 74LS161 MCFG_SOUND_ROUTE(tms3615_device::FOOTAGE_8, "speaker", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mice.cpp b/src/mame/drivers/mice.cpp index 1a47b5f37f8..47766367754 100644 --- a/src/mame/drivers/mice.cpp +++ b/src/mame/drivers/mice.cpp @@ -155,11 +155,11 @@ DEVICE_INPUT_DEFAULTS_END MACHINE_CONFIG_START(mice_state::mice) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) + MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(mice_mem) MCFG_CPU_IO_MAP(mice_io) - MCFG_DEVICE_ADD("uart", I8251, XTAL(6'144'000) / 2) + MCFG_DEVICE_ADD("uart", I8251, 6.144_MHz_XTAL / 2) MCFG_I8251_TXD_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_txd)) MCFG_I8251_DTR_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE("rs232", rs232_port_device, write_rts)) @@ -172,7 +172,7 @@ MACHINE_CONFIG_START(mice_state::mice) MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", i8251_device, write_cts)) MCFG_DEVICE_CARD_DEVICE_INPUT_DEFAULTS("terminal", mice_terminal) - MCFG_DEVICE_ADD("rpt", I8155, XTAL(6'144'000) / 2) + MCFG_DEVICE_ADD("rpt", I8155, 6.144_MHz_XTAL / 2) MCFG_I8155_IN_PORTC_CB(IOPORT("BAUD")) MCFG_I8155_OUT_TIMEROUT_CB(DEVWRITELINE("uart", i8251_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart", i8251_device, write_rxc)) diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index 49b438e45dc..a62054f629b 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -457,7 +457,7 @@ void mm1_state::machine_reset() MACHINE_CONFIG_START(mm1_state::mm1) // basic system hardware - MCFG_CPU_ADD(I8085A_TAG, I8085A, XTAL(6'144'000)) + MCFG_CPU_ADD(I8085A_TAG, I8085A, 6.144_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(mm1_map) MCFG_I8085A_SID(READLINE(mm1_state, dsra_r)) MCFG_I8085A_SOD(DEVWRITELINE(KB_TAG, mm1_keyboard_device, bell_w)) @@ -468,7 +468,7 @@ MACHINE_CONFIG_START(mm1_state::mm1) MCFG_I8212_INT_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST65_LINE)) MCFG_I8212_DI_CALLBACK(DEVREAD8(KB_TAG, mm1_keyboard_device, read)) - MCFG_DEVICE_ADD(I8237_TAG, AM9517A, XTAL(6'144'000)/2) + MCFG_DEVICE_ADD(I8237_TAG, AM9517A, 6.144_MHz_XTAL/2) MCFG_I8237_OUT_HREQ_CB(WRITELINE(mm1_state, dma_hrq_w)) MCFG_I8237_OUT_EOP_CB(WRITELINE(mm1_state, dma_eop_w)) MCFG_I8237_IN_MEMR_CB(READ8(mm1_state, read)) @@ -481,14 +481,14 @@ MACHINE_CONFIG_START(mm1_state::mm1) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(mm1_state, dack3_w)) MCFG_DEVICE_ADD(I8253_TAG, PIT8253, 0) - MCFG_PIT8253_CLK0(XTAL(6'144'000)/2/2) + MCFG_PIT8253_CLK0(6.144_MHz_XTAL/2/2) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(mm1_state, itxc_w)) - MCFG_PIT8253_CLK1(XTAL(6'144'000)/2/2) + MCFG_PIT8253_CLK1(6.144_MHz_XTAL/2/2) MCFG_PIT8253_OUT1_HANDLER(WRITELINE(mm1_state, irxc_w)) - MCFG_PIT8253_CLK2(XTAL(6'144'000)/2/2) + MCFG_PIT8253_CLK2(6.144_MHz_XTAL/2/2) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(mm1_state, auxc_w)) - MCFG_UPD765A_ADD(UPD765_TAG, /* XTAL(16'000'000)/2/2 */ true, true) + MCFG_UPD765A_ADD(UPD765_TAG, /* 16.0_MHz_XTAL/2/2 */ true, true) MCFG_UPD765_INTRQ_CALLBACK(INPUTLINE(I8085A_TAG, I8085_RST55_LINE)) MCFG_UPD765_DRQ_CALLBACK(DEVWRITELINE(I8237_TAG, am9517a_device, dreq3_w)) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":0", mm1_floppies, "525qd", mm1_state::floppy_formats) @@ -496,7 +496,7 @@ MACHINE_CONFIG_START(mm1_state::mm1) MCFG_FLOPPY_DRIVE_ADD(UPD765_TAG ":1", mm1_floppies, "525qd", mm1_state::floppy_formats) MCFG_FLOPPY_DRIVE_SOUND(true) - MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, XTAL(6'144'000)/2) + MCFG_DEVICE_ADD(UPD7201_TAG, UPD7201, 6.144_MHz_XTAL/2) MCFG_Z80DART_OUT_TXDA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd)) MCFG_Z80DART_OUT_DTRA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_dtr)) MCFG_Z80DART_OUT_RTSA_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_rts)) @@ -509,7 +509,7 @@ MACHINE_CONFIG_START(mm1_state::mm1) MCFG_RS232_PORT_ADD(RS232_C_TAG, default_rs232_devices, nullptr) MCFG_RS232_CTS_HANDLER(DEVWRITELINE(UPD7201_TAG, z80dart_device, ctsb_w)) - MCFG_DEVICE_ADD(KB_TAG, MM1_KEYBOARD, 2500) // actual KBCLK is XTAL(6'144'000)/2/16 + MCFG_DEVICE_ADD(KB_TAG, MM1_KEYBOARD, 2500) // actual KBCLK is 6.144_MHz_XTAL/2/16 MCFG_MM1_KEYBOARD_KBST_CALLBACK(DEVWRITELINE(I8212_TAG, i8212_device, stb_w)) // internal ram diff --git a/src/mame/drivers/mmagic.cpp b/src/mame/drivers/mmagic.cpp index 644a80a3005..4f730a5b5a8 100644 --- a/src/mame/drivers/mmagic.cpp +++ b/src/mame/drivers/mmagic.cpp @@ -302,13 +302,13 @@ void mmagic_state::machine_start() MACHINE_CONFIG_START(mmagic_state::mmagic) // basic machine hardware - MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) // NEC D8085A + MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) // NEC D8085A MCFG_CPU_PROGRAM_MAP(mmagic_mem) MCFG_CPU_IO_MAP(mmagic_io) // video hardware MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(6'144'000), 384, 0, 256, 264, 0, 192) + MCFG_SCREEN_RAW_PARAMS(6.144_MHz_XTAL, 384, 0, 256, 264, 0, 192) MCFG_SCREEN_UPDATE_DRIVER(mmagic_state, screen_update) MCFG_PALETTE_ADD_3BIT_RGB("palette") diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index c48aefb6a4c..330c8478c94 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -821,17 +821,17 @@ void ngp_state::nvram_write(emu_file &file) MACHINE_CONFIG_START(ngp_state::ngp_common) - MCFG_CPU_ADD( "maincpu", TMP95C061, XTAL(6'144'000) ) + MCFG_CPU_ADD( "maincpu", TMP95C061, 6.144_MHz_XTAL ) MCFG_TLCS900H_AM8_16(1) MCFG_CPU_PROGRAM_MAP( ngp_mem) MCFG_TMP95C061_PORTA_WRITE(WRITE8(ngp_state,ngp_tlcs900_porta)) - MCFG_CPU_ADD( "soundcpu", Z80, XTAL(6'144'000)/2 ) + MCFG_CPU_ADD( "soundcpu", Z80, 6.144_MHz_XTAL/2 ) MCFG_CPU_PROGRAM_MAP( z80_mem) MCFG_CPU_IO_MAP( z80_io) MCFG_SCREEN_ADD( "screen", LCD ) - MCFG_SCREEN_RAW_PARAMS( XTAL(6'144'000), 515, 0, 160 /*480*/, 199, 0, 152 ) + MCFG_SCREEN_RAW_PARAMS( 6.144_MHz_XTAL, 515, 0, 160 /*480*/, 199, 0, 152 ) MCFG_SCREEN_UPDATE_DRIVER(ngp_state, screen_update_ngp) MCFG_DEFAULT_LAYOUT(layout_lcd) @@ -839,7 +839,7 @@ MACHINE_CONFIG_START(ngp_state::ngp_common) /* sound hardware */ MCFG_SPEAKER_STANDARD_STEREO( "lspeaker","rspeaker" ) - MCFG_SOUND_ADD( "t6w28", T6W28, XTAL(6'144'000)/2 ) + MCFG_SOUND_ADD( "t6w28", T6W28, 6.144_MHz_XTAL/2 ) MCFG_SOUND_ROUTE( 0, "lspeaker", 0.50 ) MCFG_SOUND_ROUTE( 1, "rspeaker", 0.50 ) @@ -853,7 +853,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(ngp_state::ngp, ngp_common) - MCFG_K1GE_ADD( "k1ge", XTAL(6'144'000), "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) ) + MCFG_K1GE_ADD( "k1ge", 6.144_MHz_XTAL, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_PALETTE("k1ge:palette") @@ -870,7 +870,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(ngp_state::ngpc, ngp_common) - MCFG_K2GE_ADD( "k1ge", XTAL(6'144'000), "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) ) + MCFG_K2GE_ADD( "k1ge", 6.144_MHz_XTAL, "screen", WRITELINE( ngp_state, ngp_vblank_pin_w ), WRITELINE( ngp_state, ngp_hblank_pin_w ) ) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_PALETTE("k1ge:palette") diff --git a/src/mame/drivers/sderby.cpp b/src/mame/drivers/sderby.cpp index 53bcd35032b..664a78e8134 100644 --- a/src/mame/drivers/sderby.cpp +++ b/src/mame/drivers/sderby.cpp @@ -695,7 +695,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(sderby_state::shinygld) - MCFG_CPU_ADD("maincpu", M68000, XTAL(24'000'000) / 2) // verified + MCFG_CPU_ADD("maincpu", M68000, 24.0_MHz_XTAL / 2) // verified MCFG_CPU_PROGRAM_MAP(shinygld_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", sderby_state, irq4_line_hold) @@ -714,7 +714,7 @@ MACHINE_CONFIG_START(sderby_state::shinygld) MCFG_PALETTE_FORMAT(RRRRRGGGGGBBBBBx) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) /* clock frequency & pin 7 verified */ + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) /* clock frequency & pin 7 verified */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp index fb774272355..88582fd451e 100644 --- a/src/mame/drivers/sdk85.cpp +++ b/src/mame/drivers/sdk85.cpp @@ -52,13 +52,14 @@ public: : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_keyboard(*this, "X%u", 0) - { } + { } DECLARE_WRITE8_MEMBER(scanlines_w); DECLARE_WRITE8_MEMBER(digit_w); DECLARE_READ8_MEMBER(kbd_r); void sdk85(machine_config &config); + protected: virtual void machine_reset() override; @@ -144,24 +145,24 @@ READ8_MEMBER( sdk85_state::kbd_r ) MACHINE_CONFIG_START(sdk85_state::sdk85) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) + MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(sdk85_mem) MCFG_CPU_IO_MAP(sdk85_io) - MCFG_DEVICE_ADD("romio", I8355, XTAL(6'144'000) / 2) // Monitor ROM (A14) + MCFG_DEVICE_ADD("romio", I8355, 6.144_MHz_XTAL / 2) // Monitor ROM (A14) - MCFG_DEVICE_ADD("expromio", I8355, XTAL(6'144'000) / 2) // Expansion ROM (A15) + MCFG_DEVICE_ADD("expromio", I8355, 6.144_MHz_XTAL / 2) // Expansion ROM (A15) - MCFG_DEVICE_ADD("ramio", I8155, XTAL(6'144'000) / 2) // Basic RAM (A16) + MCFG_DEVICE_ADD("ramio", I8155, 6.144_MHz_XTAL / 2) // Basic RAM (A16) MCFG_I8155_OUT_TIMEROUT_CB(INPUTLINE("maincpu", I8085_TRAP_LINE)) - MCFG_DEVICE_ADD("expramio", I8155, XTAL(6'144'000) / 2) // Expansion RAM (A17) + MCFG_DEVICE_ADD("expramio", I8155, 6.144_MHz_XTAL / 2) // Expansion RAM (A17) /* video hardware */ MCFG_DEFAULT_LAYOUT(layout_sdk85) /* Devices */ - MCFG_DEVICE_ADD("kdc", I8279, XTAL(6'144'000) / 2) // Keyboard/Display Controller (A13) + MCFG_DEVICE_ADD("kdc", I8279, 6.144_MHz_XTAL / 2) // Keyboard/Display Controller (A13) MCFG_I8279_OUT_IRQ_CB(INPUTLINE("maincpu", I8085_RST55_LINE)) // irq MCFG_I8279_OUT_SL_CB(WRITE8(sdk85_state, scanlines_w)) // scan SL lines MCFG_I8279_OUT_DISP_CB(WRITE8(sdk85_state, digit_w)) // display A&B diff --git a/src/mame/drivers/shangha3.cpp b/src/mame/drivers/shangha3.cpp index bdd042740ff..1470241bb86 100644 --- a/src/mame/drivers/shangha3.cpp +++ b/src/mame/drivers/shangha3.cpp @@ -446,7 +446,7 @@ GFXDECODE_END MACHINE_CONFIG_START(shangha3_state::shangha3) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/3) // TMP68HC000N-16 + MCFG_CPU_ADD("maincpu", M68000, 48.0_MHz_XTAL/3) // TMP68HC000N-16 MCFG_CPU_PROGRAM_MAP(shangha3_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert) @@ -456,7 +456,7 @@ MACHINE_CONFIG_START(shangha3_state::shangha3) // MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // MCFG_SCREEN_SIZE(24*16, 16*16) // MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) - MCFG_SCREEN_RAW_PARAMS(XTAL(48'000'000)/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ + MCFG_SCREEN_RAW_PARAMS(48.0_MHz_XTAL/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update) MCFG_SCREEN_PALETTE("palette") @@ -470,12 +470,12 @@ MACHINE_CONFIG_START(shangha3_state::shangha3) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("aysnd", YM2149, XTAL(48'000'000)/32) // 1.5MHz + MCFG_SOUND_ADD("aysnd", YM2149, 48.0_MHz_XTAL/32) // 1.5MHz MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1")) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2")) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.30) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) // pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -483,11 +483,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(shangha3_state::heberpop) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/3) // TMP68HC000N-16 like the others?? + MCFG_CPU_ADD("maincpu", M68000, 48.0_MHz_XTAL/3) // TMP68HC000N-16 like the others?? MCFG_CPU_PROGRAM_MAP(heberpop_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(48'000'000)/8) /* 6 MHz ??? */ + MCFG_CPU_ADD("audiocpu", Z80, 48.0_MHz_XTAL/8) /* 6 MHz ??? */ MCFG_CPU_PROGRAM_MAP(heberpop_sound_map) MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */ @@ -497,7 +497,7 @@ MACHINE_CONFIG_START(shangha3_state::heberpop) // MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // MCFG_SCREEN_SIZE(24*16, 16*16) // MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) - MCFG_SCREEN_RAW_PARAMS(XTAL(48'000'000)/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ + MCFG_SCREEN_RAW_PARAMS(48.0_MHz_XTAL/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update) MCFG_SCREEN_PALETTE("palette") @@ -514,12 +514,12 @@ MACHINE_CONFIG_START(shangha3_state::heberpop) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_SOUND_ADD("ymsnd", YM3438, XTAL(48'000'000)/6) /* 8 MHz? */ + MCFG_SOUND_ADD("ymsnd", YM3438, 48.0_MHz_XTAL/6) /* 8 MHz? */ MCFG_YM2612_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_SOUND_ROUTE(0, "mono", 0.40) MCFG_SOUND_ROUTE(1, "mono", 0.40) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // pin 7 not verified + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) // pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END @@ -527,11 +527,11 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(shangha3_state::blocken) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(48'000'000)/3) // TMP68HC000N-16 + MCFG_CPU_ADD("maincpu", M68000, 48.0_MHz_XTAL/3) // TMP68HC000N-16 MCFG_CPU_PROGRAM_MAP(blocken_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", shangha3_state, irq4_line_assert) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(48'000'000)/8) /* 6 MHz? */ + MCFG_CPU_ADD("audiocpu", Z80, 48.0_MHz_XTAL/8) /* 6 MHz? */ MCFG_CPU_PROGRAM_MAP(heberpop_sound_map) MCFG_CPU_IO_MAP(heberpop_sound_io_map) /* NMI triggered by YM3438 */ @@ -541,7 +541,7 @@ MACHINE_CONFIG_START(shangha3_state::blocken) // MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500) /* not accurate */) // MCFG_SCREEN_SIZE(24*16, 16*16) // MCFG_SCREEN_VISIBLE_AREA(0*16, 24*16-1, 1*16, 15*16-1) - MCFG_SCREEN_RAW_PARAMS(XTAL(48'000'000)/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ + MCFG_SCREEN_RAW_PARAMS(48.0_MHz_XTAL/6,512,0,24*16,263,1*16,15*16) /* refresh rate is unknown */ MCFG_SCREEN_UPDATE_DRIVER(shangha3_state, screen_update) MCFG_SCREEN_PALETTE("palette") @@ -558,12 +558,12 @@ MACHINE_CONFIG_START(shangha3_state::blocken) MCFG_GENERIC_LATCH_8_ADD("soundlatch") MCFG_GENERIC_LATCH_DATA_PENDING_CB(INPUTLINE("audiocpu", 0)) - MCFG_SOUND_ADD("ymsnd", YM3438, XTAL(48'000'000)/6) /* 8 MHz? */ + MCFG_SOUND_ADD("ymsnd", YM3438, 48.0_MHz_XTAL/6) /* 8 MHz? */ MCFG_YM2612_IRQ_HANDLER(INPUTLINE("audiocpu", INPUT_LINE_NMI)) MCFG_SOUND_ROUTE(0, "mono", 0.40) MCFG_SOUND_ROUTE(1, "mono", 0.40) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) // clock frequency & pin 7 not verified + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) // clock frequency & pin 7 not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp index 6941d73a214..59af4682f35 100644 --- a/src/mame/drivers/sitcom.cpp +++ b/src/mame/drivers/sitcom.cpp @@ -333,7 +333,7 @@ void sitcom_timer_state::update_dac(uint8_t value) MACHINE_CONFIG_START(sitcom_state::sitcom) // basic machine hardware - MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) // 3.072MHz can be used for an old slow 8085 + MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) // 3.072MHz can be used for an old slow 8085 MCFG_CPU_PROGRAM_MAP(sitcom_mem) MCFG_CPU_IO_MAP(sitcom_io) MCFG_I8085A_SID(READLINE(sitcom_state, sid_line)) diff --git a/src/mame/drivers/sm7238.cpp b/src/mame/drivers/sm7238.cpp index 809825bbf6a..33946a46922 100644 --- a/src/mame/drivers/sm7238.cpp +++ b/src/mame/drivers/sm7238.cpp @@ -220,11 +220,11 @@ void sm7238_state::recompute_parameters() if (m_video.stride == 80) { - refresh = HZ_TO_ATTOSECONDS(XTAL(12'500'000)) * m_video.stride * 10 * KSM_TOTAL_VERT; + refresh = HZ_TO_ATTOSECONDS(12.5_MHz_XTAL) * m_video.stride * 10 * KSM_TOTAL_VERT; } else { - refresh = HZ_TO_ATTOSECONDS(XTAL(20'625'000)) * m_video.stride * 10 * KSM_TOTAL_VERT; + refresh = HZ_TO_ATTOSECONDS(20.625_MHz_XTAL) * m_video.stride * 10 * KSM_TOTAL_VERT; } machine().first_screen()->configure(m_video.stride * 10, KSM_TOTAL_VERT, visarea, refresh); @@ -355,7 +355,7 @@ PALETTE_INIT_MEMBER(sm7238_state, sm7238) } MACHINE_CONFIG_START(sm7238_state::sm7238) - MCFG_CPU_ADD("maincpu", I8080, XTAL(16'588'800)/9) + MCFG_CPU_ADD("maincpu", I8080, 16.5888_MHz_XTAL/9) MCFG_CPU_PROGRAM_MAP(sm7238_mem) MCFG_CPU_IO_MAP(sm7238_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DEVICE("pic8259", pic8259_device, inta_cb) @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(sm7238_state::sm7238) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_SCREEN_ADD("screen", RASTER) - MCFG_SCREEN_RAW_PARAMS(XTAL(20'625'000), KSM_TOTAL_HORZ, 0, KSM_DISP_HORZ, KSM_TOTAL_VERT, 0, KSM_DISP_VERT); + MCFG_SCREEN_RAW_PARAMS(20.625_MHz_XTAL, KSM_TOTAL_HORZ, 0, KSM_DISP_HORZ, KSM_TOTAL_VERT, 0, KSM_DISP_VERT); MCFG_SCREEN_UPDATE_DRIVER(sm7238_state, screen_update) MCFG_SCREEN_VBLANK_CALLBACK(DEVWRITELINE("pic8259", pic8259_device, ir2_w)) MCFG_SCREEN_PALETTE("palette") @@ -382,19 +382,19 @@ MACHINE_CONFIG_START(sm7238_state::sm7238) MCFG_PIC8259_OUT_INT_CB(INPUTLINE("maincpu", 0)) MCFG_DEVICE_ADD("t_hblank", PIT8253, 0) - MCFG_PIT8253_CLK1(XTAL(16'384'000)/9) // XXX workaround -- keyboard is slower and doesn't sync otherwise + MCFG_PIT8253_CLK1(16.384_MHz_XTAL/9) // XXX workaround -- keyboard is slower and doesn't sync otherwise MCFG_PIT8253_OUT1_HANDLER(WRITELINE(sm7238_state, write_keyboard_clock)) MCFG_DEVICE_ADD("t_vblank", PIT8253, 0) - MCFG_PIT8253_CLK2(XTAL(16'588'800)/9) + MCFG_PIT8253_CLK2(16.5888_MHz_XTAL/9) MCFG_PIT8253_OUT2_HANDLER(WRITELINE(sm7238_state, write_printer_clock)) MCFG_DEVICE_ADD("t_color", PIT8253, 0) MCFG_DEVICE_ADD("t_iface", PIT8253, 0) - MCFG_PIT8253_CLK1(XTAL(16'588'800)/9) + MCFG_PIT8253_CLK1(16.5888_MHz_XTAL/9) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_txc)) - MCFG_PIT8253_CLK2(XTAL(16'588'800)/9) + MCFG_PIT8253_CLK2(16.5888_MHz_XTAL/9) MCFG_PIT8253_OUT2_HANDLER(DEVWRITELINE("i8251line", i8251_device, write_rxc)) // serial connection to host diff --git a/src/mame/drivers/stadhero.cpp b/src/mame/drivers/stadhero.cpp index 0952f14d5b4..18cb205dede 100644 --- a/src/mame/drivers/stadhero.cpp +++ b/src/mame/drivers/stadhero.cpp @@ -202,11 +202,11 @@ GFXDECODE_END MACHINE_CONFIG_START(stadhero_state::stadhero) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", M68000, XTAL(20'000'000)/2) + MCFG_CPU_ADD("maincpu", M68000, 20.0_MHz_XTAL/2) MCFG_CPU_PROGRAM_MAP(main_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", stadhero_state, irq5_line_hold) - MCFG_CPU_ADD("audiocpu", M6502, XTAL(24'000'000)/16) + MCFG_CPU_ADD("audiocpu", M6502, 24.0_MHz_XTAL/16) MCFG_CPU_PROGRAM_MAP(audio_map) /* video hardware */ @@ -236,17 +236,17 @@ MACHINE_CONFIG_START(stadhero_state::stadhero) MCFG_GENERIC_LATCH_8_ADD("soundlatch") - MCFG_SOUND_ADD("ym1", YM2203, XTAL(24'000'000)/16) + MCFG_SOUND_ADD("ym1", YM2203, 24.0_MHz_XTAL/16) MCFG_SOUND_ROUTE(0, "mono", 0.95) MCFG_SOUND_ROUTE(1, "mono", 0.95) MCFG_SOUND_ROUTE(2, "mono", 0.95) MCFG_SOUND_ROUTE(3, "mono", 0.40) - MCFG_SOUND_ADD("ym2", YM3812, XTAL(24'000'000)/8) + MCFG_SOUND_ADD("ym2", YM3812, 24.0_MHz_XTAL/8) MCFG_YM3812_IRQ_HANDLER(INPUTLINE("audiocpu", M6502_IRQ_LINE)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) MACHINE_CONFIG_END diff --git a/src/mame/drivers/taito_l.cpp b/src/mame/drivers/taito_l.cpp index 31b7758ee1f..41832057ecb 100644 --- a/src/mame/drivers/taito_l.cpp +++ b/src/mame/drivers/taito_l.cpp @@ -1546,10 +1546,10 @@ MACHINE_CONFIG_START(fhawk_state::fhawk) MCFG_CPU_PROGRAM_MAP(fhawk_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/3) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", Z80, 12.0_MHz_XTAL/3) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(fhawk_3_map) - MCFG_CPU_ADD("slave", Z80, XTAL(12'000'000)/3) /* verified on pcb */ + MCFG_CPU_ADD("slave", Z80, 12.0_MHz_XTAL/3) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(fhawk_2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) @@ -1572,7 +1572,7 @@ MACHINE_CONFIG_START(fhawk_state::fhawk) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12.0_MHz_XTAL/4) /* verified on pcb */ MCFG_YM2203_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(fhawk_state, portA_w)) MCFG_SOUND_ROUTE(0, "mono", 0.20) @@ -1604,7 +1604,7 @@ MACHINE_CONFIG_DERIVED(champwr_state::champwr, fhawk) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(champwr_state, portA_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(champwr_state, msm5205_volume_w)) - MCFG_SOUND_ADD("msm", MSM5205, XTAL(384'000)) + MCFG_SOUND_ADD("msm", MSM5205, 384.0_kHz_XTAL) MCFG_MSM5205_VCLK_CB(WRITELINE(champwr_state, msm5205_vck)) /* VCK function */ MCFG_MSM5205_PRESCALER_SELECTOR(S48_4B) /* 8 kHz */ MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.80) @@ -1646,7 +1646,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::raimais) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2610, XTAL(8'000'000)) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ + MCFG_SOUND_ADD("ymsnd", YM2610, 8.0_MHz_XTAL) /* verified on pcb (8Mhz OSC is also for the 2nd z80) */ MCFG_YM2610_IRQ_HANDLER(INPUTLINE("audiocpu", 0)) MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 1.0) @@ -1665,7 +1665,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) MCFG_CPU_PROGRAM_MAP(kurikint_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/3) /* verified on pcb */ + MCFG_CPU_ADD("audiocpu", Z80, 12.0_MHz_XTAL/3) /* verified on pcb */ MCFG_CPU_PROGRAM_MAP(kurikint_2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) @@ -1690,7 +1690,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::kurikint) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* verified on pcb */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12.0_MHz_XTAL/4) /* verified on pcb */ MCFG_SOUND_ROUTE(0, "mono", 0.20) MCFG_SOUND_ROUTE(1, "mono", 0.20) MCFG_SOUND_ROUTE(2, "mono", 0.20) @@ -1738,7 +1738,7 @@ MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznic, plotting) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(puzznic_map) - MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, XTAL(3'000'000)) + MCFG_DEVICE_ADD("mcu", ARKANOID_68705P3, 3.0_MHz_XTAL) MACHINE_CONFIG_END MACHINE_CONFIG_DERIVED(taitol_1cpu_state::puzznici, plotting) @@ -1807,7 +1807,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston) MCFG_CPU_PROGRAM_MAP(evilston_map) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(taitol_state, irq_callback) - MCFG_CPU_ADD("audiocpu", Z80, XTAL(12'000'000)/3) /* not verified */ + MCFG_CPU_ADD("audiocpu", Z80, 12.0_MHz_XTAL/3) /* not verified */ MCFG_CPU_PROGRAM_MAP(evilston_2_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", taitol_state, irq0_line_hold) @@ -1833,7 +1833,7 @@ MACHINE_CONFIG_START(taitol_2cpu_state::evilston) /* sound hardware */ MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_SOUND_ADD("ymsnd", YM2203, XTAL(12'000'000)/4) /* not verified */ + MCFG_SOUND_ADD("ymsnd", YM2203, 12.0_MHz_XTAL/4) /* not verified */ MCFG_SOUND_ROUTE(0, "mono", 0.25) MCFG_SOUND_ROUTE(1, "mono", 0.25) MCFG_SOUND_ROUTE(2, "mono", 0.25) diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp index aad59a89ebc..ffa8d403d34 100644 --- a/src/mame/drivers/testconsole.cpp +++ b/src/mame/drivers/testconsole.cpp @@ -167,11 +167,11 @@ INPUT_PORTS_END MACHINE_CONFIG_START(whouse_testcons_state::whousetc) - MCFG_CPU_ADD("maincpu", I8085A, XTAL(6'144'000)) + MCFG_CPU_ADD("maincpu", I8085A, 6.144_MHz_XTAL) MCFG_CPU_PROGRAM_MAP(program_map) MCFG_CPU_IO_MAP(io_map) - MCFG_DEVICE_ADD("i8155", I8155, XTAL(6'144'000)) + MCFG_DEVICE_ADD("i8155", I8155, 6.144_MHz_XTAL) MCFG_DEVICE_ADD("i8255", I8255, 0) diff --git a/src/mame/drivers/v1050.cpp b/src/mame/drivers/v1050.cpp index a48254c5962..c192aaad2a0 100644 --- a/src/mame/drivers/v1050.cpp +++ b/src/mame/drivers/v1050.cpp @@ -1022,14 +1022,14 @@ void v1050_state::machine_reset() MACHINE_CONFIG_START(v1050_state::v1050) // basic machine hardware - MCFG_CPU_ADD(Z80_TAG, Z80, XTAL(16'000'000)/4) + MCFG_CPU_ADD(Z80_TAG, Z80, 16.0_MHz_XTAL/4) MCFG_CPU_PROGRAM_MAP(v1050_mem) MCFG_CPU_IO_MAP(v1050_io) MCFG_CPU_IRQ_ACKNOWLEDGE_DRIVER(v1050_state,v1050_int_ack) MCFG_QUANTUM_PERFECT_CPU(Z80_TAG) - MCFG_CPU_ADD(M6502_TAG, M6502, XTAL(15'360'000)/16) + MCFG_CPU_ADD(M6502_TAG, M6502, 15.36_MHz_XTAL/16) MCFG_CPU_PROGRAM_MAP(v1050_crt_mem) MCFG_QUANTUM_PERFECT_CPU(M6502_TAG) @@ -1040,10 +1040,10 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_FRAGMENT_ADD(v1050_video) // devices - MCFG_DEVICE_ADD(UPB8214_TAG, I8214, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(UPB8214_TAG, I8214, 16.0_MHz_XTAL/4) MCFG_I8214_INT_CALLBACK(WRITELINE(v1050_state, pic_int_w)) - MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, XTAL(32'768)) + MCFG_DEVICE_ADD(MSM58321RS_TAG, MSM58321, 32.768_kHz_XTAL) MCFG_MSM58321_D0_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_0_w)) MCFG_MSM58321_D1_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_1_w)) MCFG_MSM58321_D2_HANDLER(WRITELINE(v1050_state, rtc_ppi_pa_2_w)) @@ -1071,18 +1071,18 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_I8255_IN_PORTA_CB(DEVREAD8(I8255A_DISP_TAG, i8255_device, pb_r)) MCFG_I8255_OUT_PORTC_CB(WRITE8(v1050_state, m6502_ppi_pc_w)) - MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0/*XTAL(16'000'000)/8,*/) + MCFG_DEVICE_ADD(I8251A_KB_TAG, I8251, 0/*16.0_MHz_XTAL/8,*/) MCFG_I8251_TXD_HANDLER(DEVWRITELINE(V1050_KEYBOARD_TAG, v1050_keyboard_device, si_w)) MCFG_I8251_RXRDY_HANDLER(WRITELINE(v1050_state, kb_rxrdy_w)) - MCFG_DEVICE_ADD(CLOCK_KB_TAG, CLOCK, XTAL(16'000'000)/4/13/8) + MCFG_DEVICE_ADD(CLOCK_KB_TAG, CLOCK, 16.0_MHz_XTAL/4/13/8) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_keyboard_clock)) // keyboard MCFG_DEVICE_ADD(V1050_KEYBOARD_TAG, V1050_KEYBOARD, 0) MCFG_V1050_KEYBOARD_OUT_TX_HANDLER(DEVWRITELINE(I8251A_KB_TAG, i8251_device, write_rxd)) - MCFG_DEVICE_ADD(I8251A_SIO_TAG, I8251, 0/*XTAL(16'000'000)/8,*/) + MCFG_DEVICE_ADD(I8251A_SIO_TAG, I8251, 0/*16.0_MHz_XTAL/8,*/) MCFG_I8251_TXD_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_txd)) MCFG_I8251_DTR_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_dtr)) MCFG_I8251_RTS_HANDLER(DEVWRITELINE(RS232_TAG, rs232_port_device, write_rts)) @@ -1093,10 +1093,10 @@ MACHINE_CONFIG_START(v1050_state::v1050) MCFG_RS232_RXD_HANDLER(DEVWRITELINE(I8251A_SIO_TAG, i8251_device, write_rxd)) MCFG_RS232_DSR_HANDLER(DEVWRITELINE(I8251A_SIO_TAG, i8251_device, write_dsr)) - MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, XTAL(16'000'000)/4) + MCFG_DEVICE_ADD(CLOCK_SIO_TAG, CLOCK, 16.0_MHz_XTAL/4) MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(v1050_state, write_sio_clock)) - MCFG_MB8877_ADD(MB8877_TAG, XTAL(16'000'000)/16) + MCFG_MB8877_ADD(MB8877_TAG, 16.0_MHz_XTAL/16) MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(v1050_state, fdc_intrq_w)) MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(v1050_state, fdc_drq_w)) MCFG_FLOPPY_DRIVE_ADD(MB8877_TAG":0", v1050_floppies, "525qd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/drivers/wwfsstar.cpp b/src/mame/drivers/wwfsstar.cpp index 3a4adbb8379..acd7cfc2315 100644 --- a/src/mame/drivers/wwfsstar.cpp +++ b/src/mame/drivers/wwfsstar.cpp @@ -163,9 +163,9 @@ Notes: #include "speaker.h" -#define MASTER_CLOCK XTAL(20'000'000) -#define CPU_CLOCK MASTER_CLOCK / 2 -#define PIXEL_CLOCK MASTER_CLOCK / 4 +static constexpr XTAL MASTER_CLOCK = 20.0_MHz_XTAL; +static constexpr XTAL CPU_CLOCK = MASTER_CLOCK / 2; +static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK / 4; /******************************************************************************* @@ -442,7 +442,7 @@ MACHINE_CONFIG_START(wwfsstar_state::wwfsstar) MCFG_SOUND_ROUTE(0, "lspeaker", 0.45) MCFG_SOUND_ROUTE(1, "rspeaker", 0.45) - MCFG_OKIM6295_ADD("oki", XTAL(1'056'000), PIN7_HIGH) + MCFG_OKIM6295_ADD("oki", 1.056_MHz_XTAL, PIN7_HIGH) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.47) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.47) MACHINE_CONFIG_END diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index 6cdf80c98b6..5c2561e3a19 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1480,7 +1480,7 @@ void x07_state::machine_reset() MACHINE_CONFIG_START(x07_state::x07) /* basic machine hardware */ - MCFG_CPU_ADD("maincpu", NSC800, XTAL(15'360'000) / 4) + MCFG_CPU_ADD("maincpu", NSC800, 15.36_MHz_XTAL / 4) MCFG_CPU_PROGRAM_MAP(x07_mem) MCFG_CPU_IO_MAP(x07_io) diff --git a/src/mame/drivers/zaxxon.cpp b/src/mame/drivers/zaxxon.cpp index 64572f1e190..c92f2f68e6c 100644 --- a/src/mame/drivers/zaxxon.cpp +++ b/src/mame/drivers/zaxxon.cpp @@ -274,10 +274,10 @@ * *************************************/ -#define MASTER_CLOCK XTAL(48'660'000) -#define SOUND_CLOCK XTAL(4'000'000) +static constexpr XTAL MASTER_CLOCK = 48.66_MHz_XTAL; +static constexpr XTAL SOUND_CLOCK = 4.0_MHz_XTAL; -#define PIXEL_CLOCK (MASTER_CLOCK/8) +static constexpr XTAL PIXEL_CLOCK = MASTER_CLOCK/8; #define HTOTAL (384) #define HBEND (0) diff --git a/src/mame/drivers/zorba.cpp b/src/mame/drivers/zorba.cpp index aff82fb8fbb..637092927ac 100644 --- a/src/mame/drivers/zorba.cpp +++ b/src/mame/drivers/zorba.cpp @@ -135,7 +135,7 @@ GFXDECODE_END MACHINE_CONFIG_START(zorba_state::zorba) // basic machine hardware - MCFG_CPU_ADD("maincpu", Z80, XTAL(24'000'000) / 6) + MCFG_CPU_ADD("maincpu", Z80, 24.0_MHz_XTAL / 6) MCFG_CPU_PROGRAM_MAP(zorba_mem) MCFG_CPU_IO_MAP(zorba_io) MCFG_MACHINE_RESET_OVERRIDE(zorba_state, zorba) @@ -160,7 +160,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE(zorba_state, irq_w<2>)) /* devices */ - MCFG_DEVICE_ADD("dma", Z80DMA, XTAL(24'000'000)/6) + MCFG_DEVICE_ADD("dma", Z80DMA, 24.0_MHz_XTAL / 6) // busack on cpu connects to bai pin MCFG_Z80DMA_OUT_BUSREQ_CB(WRITELINE(zorba_state, busreq_w)) //connects to busreq on cpu MCFG_Z80DMA_OUT_INT_CB(DEVWRITELINE("irq0", input_merger_device, in_w<0>)) @@ -208,9 +208,9 @@ MACHINE_CONFIG_START(zorba_state::zorba) // PIT MCFG_DEVICE_ADD("pit", PIT8254, 0) - MCFG_PIT8253_CLK0(XTAL(24'000'000) / 3) - MCFG_PIT8253_CLK1(XTAL(24'000'000) / 3) - MCFG_PIT8253_CLK2(XTAL(24'000'000) / 3) + MCFG_PIT8253_CLK0(24.0_MHz_XTAL / 3) + MCFG_PIT8253_CLK1(24.0_MHz_XTAL / 3) + MCFG_PIT8253_CLK2(24.0_MHz_XTAL / 3) MCFG_PIT8253_OUT0_HANDLER(WRITELINE(zorba_state, br1_w)) MCFG_PIT8253_OUT1_HANDLER(DEVWRITELINE("uart1", i8251_device, write_txc)) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart1", i8251_device, write_rxc)) @@ -218,7 +218,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) MCFG_DEVCB_CHAIN_OUTPUT(DEVWRITELINE("uart2", i8251_device, write_rxc)) // CRTC - MCFG_DEVICE_ADD("crtc", I8275, XTAL(14'318'181)/7) + MCFG_DEVICE_ADD("crtc", I8275, 14.318'181_MHz_XTAL / 7) MCFG_I8275_CHARACTER_WIDTH(8) MCFG_I8275_DRAW_CHARACTER_CALLBACK_OWNER(zorba_state, zorba_update_chr) MCFG_I8275_DRQ_CALLBACK(DEVWRITELINE("dma", z80dma_device, rdy_w)) @@ -226,7 +226,7 @@ MACHINE_CONFIG_START(zorba_state::zorba) MCFG_VIDEO_SET_SCREEN("screen") // Floppies - MCFG_FD1793_ADD("fdc", XTAL(24'000'000) / 24) + MCFG_FD1793_ADD("fdc", 24.0_MHz_XTAL / 24) MCFG_WD_FDC_INTRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<0>)) MCFG_WD_FDC_DRQ_CALLBACK(DEVWRITELINE("irq2", input_merger_device, in_w<1>)) MCFG_FLOPPY_DRIVE_ADD("fdc:0", zorba_floppies, "525dd", floppy_image_device::default_floppy_formats) diff --git a/src/mame/machine/kay_kbd.cpp b/src/mame/machine/kay_kbd.cpp index 9f44f40cbd7..20b2cbc3b8d 100644 --- a/src/mame/machine/kay_kbd.cpp +++ b/src/mame/machine/kay_kbd.cpp @@ -350,7 +350,7 @@ tiny_rom_entry const *kaypro_10_keyboard_device::device_rom_region() const } MACHINE_CONFIG_START(kaypro_10_keyboard_device::device_add_mconfig) - MCFG_CPU_ADD("mcu", I8049, XTAL(6'000'000)) + MCFG_CPU_ADD("mcu", I8049, 6.0_MHz_XTAL) MCFG_MCS48_PORT_P1_IN_CB(READ8(kaypro_10_keyboard_device, p1_r)) MCFG_MCS48_PORT_P2_IN_CB(READ8(kaypro_10_keyboard_device, p2_r)) MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(kaypro_10_keyboard_device, p2_w)) diff --git a/src/mame/machine/zorbakbd.cpp b/src/mame/machine/zorbakbd.cpp index 499ea769d42..aa9c63027ad 100644 --- a/src/mame/machine/zorbakbd.cpp +++ b/src/mame/machine/zorbakbd.cpp @@ -311,7 +311,7 @@ void zorba_keyboard_device::device_start() MACHINE_CONFIG_START(zorba_keyboard_device::device_add_mconfig) // MC68705P3S - MCFG_CPU_ADD("mcu", M68705P3, XTAL(3'579'545)) + MCFG_CPU_ADD("mcu", M68705P3, 3.579'545_MHz_XTAL) MCFG_M68705_PORTA_R_CB(READ8(zorba_keyboard_device, mcu_pa_r)); MCFG_M68705_PORTB_R_CB(READ8(zorba_keyboard_device, mcu_pb_r)); MCFG_M68705_PORTB_W_CB(WRITE8(zorba_keyboard_device, mcu_pb_w)); diff --git a/src/mame/video/v1050.cpp b/src/mame/video/v1050.cpp index 8e5c2dc38eb..de6d3139138 100644 --- a/src/mame/video/v1050.cpp +++ b/src/mame/video/v1050.cpp @@ -110,7 +110,7 @@ void v1050_state::video_start() /* Machine Drivers */ MACHINE_CONFIG_START(v1050_state::v1050_video) - MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, XTAL(15'360'000)/8) + MCFG_MC6845_ADD(H46505_TAG, H46505, SCREEN_TAG, 15.36_MHz_XTAL/8) MCFG_MC6845_SHOW_BORDER_AREA(true) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(v1050_state, crtc_update_row) |