diff options
author | Olivier Galibert <galibert@pobox.com> | 2018-01-07 22:20:14 +0100 |
---|---|---|
committer | Olivier Galibert <galibert@pobox.com> | 2018-01-17 16:11:18 +0100 |
commit | d469cc04bcace0f601802301caeddc5b473b75f2 (patch) | |
tree | a9d71540c9c69cee5ab3a533476b81833fa02f5f /src/mame/drivers/meritm.cpp | |
parent | 9f383f76ce6f00cc3320e5ba53dc323781e0077b (diff) |
API Change: Machine configs are now a method of the owner class, and the prototype is simplified [O. Galibert]
Beware, the device context does not follow in MCFG_FRAGMENT_ADD
anymore due to the prototype change. So creating a device then
configuring through a fragment doesn't work as-is. The simplest
solution is just to add a MCFG_DEVICE_MODIFY at the start of the
fragment with the correct tag.
Diffstat (limited to 'src/mame/drivers/meritm.cpp')
-rw-r--r-- | src/mame/drivers/meritm.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp index 41e5d05764f..dc5f4d850bb 100644 --- a/src/mame/drivers/meritm.cpp +++ b/src/mame/drivers/meritm.cpp @@ -267,6 +267,10 @@ public: uint8_t binary_to_BCD(uint8_t data); DECLARE_WRITE_LINE_MEMBER(meritm_vdp0_interrupt); DECLARE_WRITE_LINE_MEMBER(meritm_vdp1_interrupt); + void meritm_crt260(machine_config &config); + void meritm_crt250(machine_config &config); + void meritm_crt250_questions(machine_config &config); + void meritm_crt250_crt252_crt258(machine_config &config); }; @@ -1087,7 +1091,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(meritm_state::vblank_end_tick) m_z80pio_0->port_a_write(m_vint); } -static MACHINE_CONFIG_START( meritm_crt250 ) +MACHINE_CONFIG_START(meritm_state::meritm_crt250) MCFG_CPU_ADD("maincpu", Z80, SYSTEM_CLK/6) MCFG_CPU_PROGRAM_MAP(meritm_crt250_map) MCFG_CPU_IO_MAP(meritm_crt250_io_map) @@ -1135,13 +1139,13 @@ static MACHINE_CONFIG_START( meritm_crt250 ) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritm_crt250_questions, meritm_crt250 ) +MACHINE_CONFIG_DERIVED(meritm_state::meritm_crt250_questions, meritm_crt250) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(meritm_crt250_questions_map) MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_questions) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritm_crt250_crt252_crt258, meritm_crt250_questions ) +MACHINE_CONFIG_DERIVED(meritm_state::meritm_crt250_crt252_crt258, meritm_crt250_questions) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_IO_MAP(meritm_crt250_crt258_io_map) MCFG_MACHINE_START_OVERRIDE(meritm_state,meritm_crt250_crt252_crt258) @@ -1152,7 +1156,7 @@ static MACHINE_CONFIG_DERIVED( meritm_crt250_crt252_crt258, meritm_crt250_questi MCFG_MICROTOUCH_TOUCH_CB(meritm_state, meritm_touch_coord_transform) MACHINE_CONFIG_END -static MACHINE_CONFIG_DERIVED( meritm_crt260, meritm_crt250 ) +MACHINE_CONFIG_DERIVED(meritm_state::meritm_crt260, meritm_crt250) MCFG_CPU_MODIFY("maincpu") MCFG_CPU_PROGRAM_MAP(meritm_map) MCFG_CPU_IO_MAP(meritm_io_map) |