summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/meritm.cpp
diff options
context:
space:
mode:
author Ivan Vangelista <mesgnet@yahoo.it>2019-02-26 19:32:59 +0100
committer Ivan Vangelista <mesgnet@yahoo.it>2019-02-26 19:32:59 +0100
commit684e5c4d57596de1427c840ad7495c0823edd96b (patch)
tree3bc88632d408564a985997826e9e023effe6a17a /src/mame/drivers/meritm.cpp
parent0f60932bf53aaff8a2a9a2f2ce821f094f97b32f (diff)
mame\drivers: removed most MCFG and MACHINE_CONFIG macros from drivers starting with m, n and o (nw)
Diffstat (limited to 'src/mame/drivers/meritm.cpp')
-rw-r--r--src/mame/drivers/meritm.cpp15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/mame/drivers/meritm.cpp b/src/mame/drivers/meritm.cpp
index 26505250c94..34aae5bd85a 100644
--- a/src/mame/drivers/meritm.cpp
+++ b/src/mame/drivers/meritm.cpp
@@ -1154,15 +1154,17 @@ void meritm_state::crt250(machine_config &config)
aysnd.add_route(ALL_OUTPUTS, "mono", 1.0);
}
-MACHINE_CONFIG_START(meritm_state::crt250_questions)
+void meritm_state::crt250_questions(machine_config &config)
+{
crt250(config);
m_maincpu->set_addrmap(AS_PROGRAM, &meritm_state::crt250_questions_map);
MCFG_MACHINE_START_OVERRIDE(meritm_state, crt250_questions)
-MACHINE_CONFIG_END
+}
-MACHINE_CONFIG_START(meritm_state::crt250_crt252_crt258)
+void meritm_state::crt250_crt252_crt258(machine_config &config)
+{
crt250_questions(config);
m_maincpu->set_addrmap(AS_IO, &meritm_state::crt250_crt258_io_map);
@@ -1174,9 +1176,10 @@ MACHINE_CONFIG_START(meritm_state::crt250_crt252_crt258)
MICROTOUCH(config, m_microtouch, 9600).stx().set(m_uart, FUNC(ins8250_uart_device::rx_w));
m_microtouch->set_touch_callback(FUNC(meritm_state::touch_coord_transform), this);
-MACHINE_CONFIG_END
+}
-MACHINE_CONFIG_START(meritm_state::crt260)
+void meritm_state::crt260(machine_config &config)
+{
crt250(config);
m_maincpu->set_addrmap(AS_PROGRAM, &meritm_state::map);
@@ -1192,7 +1195,7 @@ MACHINE_CONFIG_START(meritm_state::crt260)
MICROTOUCH(config, m_microtouch, 9600).stx().set(m_uart, FUNC(ins8250_uart_device::rx_w));
m_microtouch->set_touch_callback(FUNC(meritm_state::touch_coord_transform), this);
-MACHINE_CONFIG_END
+}
/*