From e125272804a04d7e48997e48c0ab02f07968f326 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 24 Jan 2018 02:43:43 +1100 Subject: instantiate your static constexpr members, also more _MHz_XTAL (nw) --- src/mame/drivers/m68705prg.cpp | 8 ++++---- src/mame/includes/amiga.h | 18 +++++++++--------- src/mame/machine/amiga.cpp | 9 ++++++--- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp index 143ce5d47a1..631e4d11f22 100644 --- a/src/mame/drivers/m68705prg.cpp +++ b/src/mame/drivers/m68705prg.cpp @@ -240,28 +240,28 @@ MACHINE_CONFIG_START(m68705prg_state_base::m68705prg) MACHINE_CONFIG_END template<> MACHINE_CONFIG_DERIVED(p3prg_state::prg, m68705prg) - MCFG_CPU_ADD("mcu", M68705P3, XTAL(1'000'000)) + MCFG_CPU_ADD("mcu", M68705P3, 1.0_MHz_XTAL) MCFG_M68705_PORTB_W_CB(WRITE8(p3prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(p3prg_state, m68705prg) MACHINE_CONFIG_END template<> MACHINE_CONFIG_DERIVED(p5prg_state::prg, m68705prg) - MCFG_CPU_ADD("mcu", M68705P5, XTAL(1'000'000)) + MCFG_CPU_ADD("mcu", M68705P5, 1.0_MHz_XTAL) MCFG_M68705_PORTB_W_CB(WRITE8(p5prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(p5prg_state, m68705prg) MACHINE_CONFIG_END template<> MACHINE_CONFIG_DERIVED(r3prg_state::prg, m68705prg) - MCFG_CPU_ADD("mcu", M68705R3, XTAL(1'000'000)) + MCFG_CPU_ADD("mcu", M68705R3, 1.0_MHz_XTAL) MCFG_M68705_PORTB_W_CB(WRITE8(r3prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(r3prg_state, m68705prg) MACHINE_CONFIG_END template<> MACHINE_CONFIG_DERIVED(u3prg_state::prg, m68705prg) - MCFG_CPU_ADD("mcu", M68705U3, XTAL(1'000'000)) + MCFG_CPU_ADD("mcu", M68705U3, 1.0_MHz_XTAL) MCFG_M68705_PORTB_W_CB(WRITE8(u3prg_state, pb_w)) MCFG_MACHINE_RESET_OVERRIDE(u3prg_state, m68705prg) diff --git a/src/mame/includes/amiga.h b/src/mame/includes/amiga.h index 8efcea63582..81807781961 100644 --- a/src/mame/includes/amiga.h +++ b/src/mame/includes/amiga.h @@ -463,15 +463,15 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_dsksyn_w); // standard clocks - static constexpr auto CLK_28M_PAL = XTAL(28'375'160); - static constexpr auto CLK_7M_PAL = CLK_28M_PAL / 4; - static constexpr auto CLK_C1_PAL = CLK_28M_PAL / 8; - static constexpr auto CLK_E_PAL = CLK_7M_PAL / 10; - - static constexpr auto CLK_28M_NTSC = XTAL(28'636'363); - static constexpr auto CLK_7M_NTSC = CLK_28M_NTSC / 4; - static constexpr auto CLK_C1_NTSC = CLK_28M_NTSC / 8; - static constexpr auto CLK_E_NTSC = CLK_7M_NTSC / 10; + static constexpr XTAL CLK_28M_PAL = XTAL(28'375'160); + static constexpr XTAL CLK_7M_PAL = CLK_28M_PAL / 4; + static constexpr XTAL CLK_C1_PAL = CLK_28M_PAL / 8; + static constexpr XTAL CLK_E_PAL = CLK_7M_PAL / 10; + + static constexpr XTAL CLK_28M_NTSC = XTAL(28'636'363); + static constexpr XTAL CLK_7M_NTSC = CLK_28M_NTSC / 4; + static constexpr XTAL CLK_C1_NTSC = CLK_28M_NTSC / 8; + static constexpr XTAL CLK_E_NTSC = CLK_7M_NTSC / 10; // screen layout enum diff --git a/src/mame/machine/amiga.cpp b/src/mame/machine/amiga.cpp index f48180c1ace..fffa5566d0b 100644 --- a/src/mame/machine/amiga.cpp +++ b/src/mame/machine/amiga.cpp @@ -132,12 +132,15 @@ const char *const amiga_state::s_custom_reg_names[0x100] = "UNK1F8", "UNK1FA", "FMODE", "UNK1FE" }; -constexpr XTAL amiga_state::CLK_C1_NTSC; +constexpr XTAL amiga_state::CLK_28M_PAL; +constexpr XTAL amiga_state::CLK_7M_PAL; constexpr XTAL amiga_state::CLK_C1_PAL; -constexpr XTAL amiga_state::CLK_E_NTSC; constexpr XTAL amiga_state::CLK_E_PAL; + +constexpr XTAL amiga_state::CLK_28M_NTSC; constexpr XTAL amiga_state::CLK_7M_NTSC; -constexpr XTAL amiga_state::CLK_7M_PAL; +constexpr XTAL amiga_state::CLK_C1_NTSC; +constexpr XTAL amiga_state::CLK_E_NTSC; /************************************* -- cgit v1.2.3