From 0bbb3c5489030601b0bae214d2936a1c2b76a3b1 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Wed, 20 Feb 2019 08:25:10 +0100 Subject: [PATCH] macs.cpp: revert my recent changes as they caused problems (nw) This needs an ad hoc constructor, since the ones in bus\generic.h always assume no default option. Don't have time to do it right now, will revisit later (nw) --- src/mame/drivers/macs.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mame/drivers/macs.cpp b/src/mame/drivers/macs.cpp index 880585d728f..1d4e6d487a1 100644 --- a/src/mame/drivers/macs.cpp +++ b/src/mame/drivers/macs.cpp @@ -2,7 +2,7 @@ // copyright-holders:David Haywood /* -macs.c - Multi Amenity Cassette System +macs.cpp - Multi Amenity Cassette System processor seems to be ST0016 (z80 based) from SETA @@ -501,8 +501,8 @@ uint8_t macs_state::dma_offset() return m_cart_bank; } -void macs_state::macs(machine_config &config) -{ + +MACHINE_CONFIG_START(macs_state::macs) /* basic machine hardware */ ST0016_CPU(config, m_maincpu, 8000000); // 8 MHz ? m_maincpu->set_memory_map(&macs_state::macs_mem); @@ -519,9 +519,12 @@ void macs_state::macs(machine_config &config) screen.set_palette("maincpu:palette"); screen.screen_vblank().set_inputline(m_maincpu, INPUT_LINE_IRQ0, HOLD_LINE); // FIXME: HOLD_LINE is bad juju - GENERIC_CARTSLOT(config, m_cart1, generic_plain_slot, "macs_cart", "rom").set_user_loadable(false); - GENERIC_CARTSLOT(config, m_cart2, generic_plain_slot, "macs_cart", "rom").set_user_loadable(false); -} + MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT("slot_a", generic_plain_slot, "macs_cart", "rom") + MCFG_SET_IMAGE_LOADABLE(false) + MCFG_GENERIC_CARTSLOT_ADD_WITH_DEFAULT("slot_b", generic_plain_slot, "macs_cart", "rom") + MCFG_SET_IMAGE_LOADABLE(false) + +MACHINE_CONFIG_END #define MACS_BIOS \