diff --git a/scripts/build/complay.py b/scripts/build/complay.py index ff60a19158f17..9932c604cb487 100644 --- a/scripts/build/complay.py +++ b/scripts/build/complay.py @@ -166,37 +166,49 @@ def checkColorChannel(self, attrs, name): except: self.handleError('Element color attribute %s "%s" is not numeric' % (name, attrs[name])) + def checkTag(self, tag, element, attr): + if '' == tag: + self.handleError('Element %s attribute %s is empty', (element, attr)) + else: + if tag.find('^') >= 0: + self.handleError('Element %s attribute %s "%s" contains parent device reference' % (element, attr, tag)) + if ':' == tag[-1]: + self.handleError('Element %s attribute %s "%s" ends with separator' % (element, attr, tag)) + if tag.find('::') >= 0: + self.handleError('Element %s attribute %s "%s" contains double separator' % (element, attr, tag)) + def checkGroupViewItem(self, name, attrs): if name in self.OBJECTS: if 'element' not in attrs: self.handleError('Element %s missing attribute element', (name, )) elif attrs['element'] not in self.referenced_elements: self.referenced_elements[attrs['element']] = self.formatLocation() + if 'inputtag' in attrs: + if 'inputmask' not in attrs: + self.handleError('Element %s has inputtag without inputmask attribute' % (name, )) + self.checkTag(attrs['inputtag'], name, 'inputtag') + if 'inputmask' in attrs: + try: + int(attrs['inputmask'], 0) + except: + self.handleError('Element %s attribute inputmask "%s" is not an integer' % (name, attrs['inputmask'])) self.in_object = True self.have_bounds.append(False) elif 'screen' == name: if 'index' in attrs: try: - index = long(attrs['index']) + index = long(attrs['index'], 0) if 0 > index: self.handleError('Element screen attribute index "%s" is negative' % (attrs['index'], )) except: self.handleError('Element screen attribute index "%s" is not an integer' % (attrs['index'], )) if 'tag' in attrs: - self.handleError('Element screen has both index and tag attributes'); + self.handleError('Element screen has both index and tag attributes') if 'tag' in attrs: tag = attrs['tag'] - if '' == tag: - self.handleError('Element screen attribute tag is empty') - else: - if self.BADTAGPATTERN.search(tag): - self.handleError('Element screen attribute tag "%s" contains invalid characters' % (tag, )); - if tag.find('^') >= 0: - self.handleError('Element screen attribute tag "%s" contains parent device reference' % (tag, )); - if ':' == tag[-1]: - self.handleError('Element screen attribute tag "%s" ends with separator' % (tag, )); - if tag.find('::') >= 0: - self.handleError('Element screen attribute tag "%s" contains double separator' % (tag, )); + self.checkTag(tag, name, 'tag') + if self.BADTAGPATTERN.search(tag): + self.handleError('Element screen attribute tag "%s" contains invalid characters' % (tag, )) self.in_object = True self.have_bounds.append(False) elif 'group' == name: diff --git a/src/devices/bus/centronics/epson_ex800.cpp b/src/devices/bus/centronics/epson_ex800.cpp index 20a65795d27f2..aceb03873c714 100644 --- a/src/devices/bus/centronics/epson_ex800.cpp +++ b/src/devices/bus/centronics/epson_ex800.cpp @@ -227,7 +227,7 @@ void epson_ex800_device::device_add_mconfig(machine_config &config) upd.pc_in_cb().set(FUNC(epson_ex800_device::portc_r)); upd.pc_out_cb().set(FUNC(epson_ex800_device::portc_w)); - config.m_default_layout = &layout_ex800; + config.set_default_layout(layout_ex800); /* audio hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/devices/bus/centronics/epson_lx800.cpp b/src/devices/bus/centronics/epson_lx800.cpp index d9f9a056e3354..f0b4dd4a96867 100644 --- a/src/devices/bus/centronics/epson_lx800.cpp +++ b/src/devices/bus/centronics/epson_lx800.cpp @@ -66,7 +66,8 @@ void epson_lx800_device::lx800_mem(address_map &map) // device_add_mconfig - add device configuration //------------------------------------------------- -MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig) +void epson_lx800_device::device_add_mconfig(machine_config &config) +{ /* basic machine hardware */ upd7810_device &upd(UPD7810(config, m_maincpu, 14.7456_MHz_XTAL)); upd.set_addrmap(AS_PROGRAM, &epson_lx800_device::lx800_mem); @@ -82,7 +83,7 @@ MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig) upd.an4_func().set(FUNC(epson_lx800_device::an4_r)); upd.an5_func().set(FUNC(epson_lx800_device::an5_r)); - MCFG_DEFAULT_LAYOUT(layout_lx800) + config.set_default_layout(layout_lx800); /* audio hardware */ SPEAKER(config, "mono").front_center(); @@ -90,12 +91,12 @@ MACHINE_CONFIG_START(epson_lx800_device::device_add_mconfig) m_beep->add_route(ALL_OUTPUTS, "mono", 0.05); /* gate array */ - MCFG_DEVICE_ADD("ic3b", E05A03, 0) - MCFG_E05A03_PE_LP_CALLBACK(WRITELINE(*this, epson_lx800_device, paperempty_led_w)) - MCFG_E05A03_RESO_CALLBACK(WRITELINE(*this, epson_lx800_device, reset_w)) - MCFG_E05A03_PE_CALLBACK(WRITELINE(*this, epson_lx800_device, centronics_pe_w)) - MCFG_E05A03_DATA_CALLBACK(READ8(*this, epson_lx800_device, centronics_data_r)) -MACHINE_CONFIG_END + e05a03_device &ic3b(E05A03(config, "ic3b", 0)); + ic3b.pe_lp_wr_callback().set(FUNC(epson_lx800_device::paperempty_led_w)); + ic3b.reso_wr_callback().set(FUNC(epson_lx800_device::reset_w)); + ic3b.pe_wr_callback().set(FUNC(epson_lx800_device::centronics_pe_w)); + ic3b.data_rd_callback().set(FUNC(epson_lx800_device::centronics_data_r)); +} //------------------------------------------------- @@ -184,10 +185,7 @@ ioport_constructor epson_lx800_device::device_input_ports() const //------------------------------------------------- epson_lx800_device::epson_lx800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, EPSON_LX800, tag, owner, clock), - device_centronics_peripheral_interface(mconfig, *this), - m_maincpu(*this, "maincpu"), - m_beep(*this, "beeper") + epson_lx800_device(mconfig, EPSON_LX800, tag, owner, clock) { } diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h index 9d6d5329eca4d..6ee7a6af85280 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -71,6 +71,4 @@ class epson_lx800_device : public device_t, public device_centronics_peripheral // device type definition DECLARE_DEVICE_TYPE(EPSON_LX800, epson_lx800_device) - - #endif // MAME_BUS_CENTRONICS_EPSON_LX800_H diff --git a/src/devices/bus/centronics/epson_lx810l.cpp b/src/devices/bus/centronics/epson_lx810l.cpp index 48a7a975540e9..0316d5c6dcf5b 100644 --- a/src/devices/bus/centronics/epson_lx810l.cpp +++ b/src/devices/bus/centronics/epson_lx810l.cpp @@ -127,7 +127,7 @@ MACHINE_CONFIG_START(epson_lx810l_device::device_add_mconfig) upd.co0_func().set(FUNC(epson_lx810l_device::co0_w)); upd.co1_func().set("dac", FUNC(dac_bit_interface::write)); -// MCFG_DEFAULT_LAYOUT(layout_lx800) +// config.set_default_layout(layout_lx800); /* video hardware (simulates paper) */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h index 73cc2a10fe455..47687115ecb37 100644 --- a/src/devices/cpu/mcs40/mcs40.h +++ b/src/devices/cpu/mcs40/mcs40.h @@ -24,80 +24,6 @@ enum -/*********************************************************************** - CONFIGURATION MACROS -***********************************************************************/ - -#define MCS40CB_BUSCYCLE(cls, fnc) \ - mcs40_cpu_device_base::bus_cycle_delegate((&cls::fnc), (#cls "::" #fnc), DEVICE_SELF, (cls *)nullptr) - - -#define MCFG_I4004_BUS_CYCLE_CB(obj) \ - downcast(*device).set_bus_cycle_cb((MCS40CB_##obj)); - -#define MCFG_I4004_SYNC_CB(obj) \ - downcast(*device).set_sync_cb(DEVCB_##obj); - -#define MCFG_I4004_CM_ROM_CB(obj) \ - downcast(*device).set_cm_rom_cb(DEVCB_##obj); - -#define MCFG_I4004_CM_RAM0_CB(obj) \ - downcast(*device).set_cm_ram_cb<0>(DEVCB_##obj); - -#define MCFG_I4004_CM_RAM1_CB(obj) \ - downcast(*device).set_cm_ram_cb<1>(DEVCB_##obj); - -#define MCFG_I4004_CM_RAM2_CB(obj) \ - downcast(*device).set_cm_ram_cb<2>(DEVCB_##obj); - -#define MCFG_I4004_CM_RAM3_CB(obj) \ - downcast(*device).set_cm_ram_cb<3>(DEVCB_##obj); - -#define MCFG_I4004_4289_PM_CB(obj) \ - downcast(*device).set_4289_pm_cb(DEVCB_##obj); - -#define MCFG_I4004_4289_F_L_CB(obj) \ - downcast(*device).set_4289_f_l_cb(DEVCB_##obj); - - -#define MCFG_I4040_BUS_CYCLE_CB(obj) \ - downcast(*device).set_bus_cycle_cb((MCS40CB_##obj)); - -#define MCFG_I4040_SYNC_CB(obj) \ - downcast(*device).set_sync_cb(DEVCB_##obj); - -#define MCFG_I4040_CM_ROM0_CB(obj) \ - downcast(*device).set_cm_rom_cb<0>(DEVCB_##obj); - -#define MCFG_I4040_CM_ROM1_CB(obj) \ - downcast(*device).set_cm_rom_cb<1>(DEVCB_##obj); - -#define MCFG_I4040_CM_RAM0_CB(obj) \ - downcast(*device).set_cm_ram_cb<0>(DEVCB_##obj); - -#define MCFG_I4040_CM_RAM1_CB(obj) \ - downcast(*device).set_cm_ram_cb<1>(DEVCB_##obj); - -#define MCFG_I4040_CM_RAM2_CB(obj) \ - downcast(*device).set_cm_ram_cb<2>(DEVCB_##obj); - -#define MCFG_I4040_CM_RAM3_CB(obj) \ - downcast(*device).set_cm_ram_cb<3>(DEVCB_##obj); - -#define MCFG_I4040_CY_CB(obj) \ - downcast(*device).set_cy_cb(DEVCB_##obj); - -#define MCFG_I4040_STP_ACK_CB(obj) \ - downcast(*device).set_stp_ack_cb(DEVCB_##obj); - -#define MCFG_I4040_4289_PM_CB(obj) \ - downcast(*device).set_4289_pm_cb(DEVCB_##obj); - -#define MCFG_I4040_4289_F_L_CB(obj) \ - downcast(*device).set_4289_f_l_cb(DEVCB_##obj); - - - /*********************************************************************** TYPE DEFINITIONS ***********************************************************************/ @@ -125,9 +51,9 @@ class mcs40_cpu_device_base : public cpu_device template void set_ram_status_map(T &&... args) { set_addrmap(AS_RAM_STATUS, std::forward(args)...); } template void set_ram_ports_map(T &&... args) { set_addrmap(AS_RAM_PORTS, std::forward(args)...); } template void set_program_memory_map(T &&... args) { set_addrmap(AS_PROGRAM_MEMORY, std::forward(args)...); } - template void set_bus_cycle_cb(Obj &&cb) { m_bus_cycle_cb = std::forward(cb); } - template devcb_base &set_4289_pm_cb(Obj &&cb) { return m_4289_pm_cb.set_callback(std::forward(cb)); } - template devcb_base &set_4289_f_l_cb(Obj &&cb) { return m_4289_f_l_cb.set_callback(std::forward(cb)); } + template void set_bus_cycle_cb(T &&... args) { m_bus_cycle_cb = bus_cycle_delegate(std::forward(args)...); } + auto i4289_pm_cb() { return m_4289_pm_cb.bind(); } + auto i4289_f_l_cb() { return m_4289_f_l_cb.bind(); } // chip select outputs u8 get_cm_rom() const { return m_cm_rom; } @@ -211,11 +137,11 @@ class mcs40_cpu_device_base : public cpu_device void set_stp(int state); // configuration helpers - template devcb_base &set_sync_cb(Obj &&cb) { return m_sync_cb.set_callback(std::forward(cb)); } - template devcb_base &set_cm_rom_cb(Obj &&cb) { return m_cm_rom_cb[N].set_callback(std::forward(cb)); } - template devcb_base &set_cm_ram_cb(Obj &&cb) { return m_cm_ram_cb[N].set_callback(std::forward(cb)); } - template devcb_base &set_cy_cb(Obj &&cb) { return m_cy_cb.set_callback(std::forward(cb)); } - template devcb_base &set_stp_ack_cb(Obj &&cb) { return m_stp_ack_cb.set_callback(std::forward(cb)); } + auto sync_cb() { return m_sync_cb.bind(); } + template auto cm_rom_cb() { return m_cm_rom_cb[N].bind(); } + template auto cm_ram_cb() { return m_cm_ram_cb[N].bind(); } + auto cy_cb() { return m_cy_cb.bind(); } + auto stp_ack_cb() { return m_stp_ack_cb.bind(); } private: enum @@ -322,9 +248,9 @@ class i4004_cpu_device : public mcs40_cpu_device_base { public: // configuration helpers - template devcb_base &set_sync_cb(Obj &&cb) { return mcs40_cpu_device_base::set_sync_cb(std::forward(cb)); } - template devcb_base &set_cm_rom_cb(Obj &&cb) { return set_cm_rom_cb<0>(std::forward(cb)); } - template devcb_base &set_cm_ram_cb(Obj &&cb) { return mcs40_cpu_device_base::set_cm_ram_cb(std::forward(cb)); } + auto sync_cb() { return mcs40_cpu_device_base::sync_cb(); } + auto cm_rom_cb() { return cm_rom_cb<0>(); } + template auto cm_ram_cb() { return mcs40_cpu_device_base::cm_ram_cb(); } i4004_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); @@ -345,9 +271,9 @@ class i4004_cpu_device : public mcs40_cpu_device_base virtual u8 do_io(u8 opr, u8 opa) override; // configuration helpers - using mcs40_cpu_device_base::set_sync_cb; - using mcs40_cpu_device_base::set_cm_rom_cb; - using mcs40_cpu_device_base::set_cm_ram_cb; + using mcs40_cpu_device_base::sync_cb; + using mcs40_cpu_device_base::cm_rom_cb; + using mcs40_cpu_device_base::cm_ram_cb; }; @@ -355,11 +281,11 @@ class i4040_cpu_device : public i4004_cpu_device { public: // configuration helpers - template devcb_base &set_sync_cb(Obj &&cb) { return i4004_cpu_device::set_sync_cb(std::forward(cb)); } - template devcb_base &set_cm_rom_cb(Obj &&cb) { return set_cm_rom_cb(std::forward(cb)); } - template devcb_base &set_cm_ram_cb(Obj &&cb) { return set_cm_ram_cb(std::forward(cb)); } - template devcb_base &set_cy_cb(Obj &&cb) { return i4004_cpu_device::set_cy_cb(std::forward(cb)); } - template devcb_base &set_stp_ack_cb(Obj &&cb) { return i4004_cpu_device::set_stp_ack_cb(std::forward(cb)); } + auto sync_cb() { return i4004_cpu_device::sync_cb(); } + template auto cm_rom_cb() { return cm_rom_cb(); } + template auto cm_ram_cb() { return cm_ram_cb(); } + auto cy_cb() { return i4004_cpu_device::cy_cb(); } + auto stp_ack_cb() { return i4004_cpu_device::stp_ack_cb(); } i4040_cpu_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); @@ -375,11 +301,11 @@ class i4040_cpu_device : public i4004_cpu_device virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override; // configuration helpers - using mcs40_cpu_device_base::set_sync_cb; - using mcs40_cpu_device_base::set_cm_rom_cb; - using mcs40_cpu_device_base::set_cm_ram_cb; - using mcs40_cpu_device_base::set_cy_cb; - using mcs40_cpu_device_base::set_stp_ack_cb; + using mcs40_cpu_device_base::sync_cb; + using mcs40_cpu_device_base::cm_rom_cb; + using mcs40_cpu_device_base::cm_ram_cb; + using mcs40_cpu_device_base::cy_cb; + using mcs40_cpu_device_base::stp_ack_cb; }; diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h index 6623c7e4c5309..dc855c2cd67aa 100644 --- a/src/devices/machine/e05a03.h +++ b/src/devices/machine/e05a03.h @@ -11,26 +11,6 @@ #pragma once -/*************************************************************************** - DEVICE CONFIGURATION MACROS -***************************************************************************/ - -#define MCFG_E05A03_NLQ_LP_CALLBACK(_write) \ - downcast(*device).set_nlq_lp_wr_callback(DEVCB_##_write); - -#define MCFG_E05A03_PE_LP_CALLBACK(_write) \ - downcast(*device).set_pe_lp_wr_callback(DEVCB_##_write); - -#define MCFG_E05A03_RESO_CALLBACK(_write) \ - downcast(*device).set_reso_wr_callback(DEVCB_##_write); - -#define MCFG_E05A03_PE_CALLBACK(_write) \ - downcast(*device).set_pe_wr_callback(DEVCB_##_write); - -#define MCFG_E05A03_DATA_CALLBACK(_read) \ - downcast(*device).set_data_rd_callback(DEVCB_##_read); - - /*************************************************************************** TYPE DEFINITIONS ***************************************************************************/ @@ -40,11 +20,11 @@ class e05a03_device : public device_t public: e05a03_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template devcb_base &set_nlq_lp_wr_callback(Object &&cb) { return m_write_nlq_lp.set_callback(std::forward(cb)); } - template devcb_base &set_pe_lp_wr_callback(Object &&cb) { return m_write_pe_lp.set_callback(std::forward(cb)); } - template devcb_base &set_reso_wr_callback(Object &&cb) { return m_write_reso.set_callback(std::forward(cb)); } - template devcb_base &set_pe_wr_callback(Object &&cb) { return m_write_pe.set_callback(std::forward(cb)); } - template devcb_base &set_data_rd_callback(Object &&cb) { return m_read_data.set_callback(std::forward(cb)); } + auto nlq_lp_wr_callback() { return m_write_nlq_lp.bind(); } + auto pe_lp_wr_callback() { return m_write_pe_lp.bind(); } + auto reso_wr_callback() { return m_write_reso.bind(); } + auto pe_wr_callback() { return m_write_pe.bind(); } + auto data_rd_callback() { return m_read_data.bind(); } DECLARE_WRITE8_MEMBER( write ); DECLARE_READ8_MEMBER( read ); diff --git a/src/devices/machine/ie15.cpp b/src/devices/machine/ie15.cpp index c6b7d5b28ae6b..308c059de3808 100644 --- a/src/devices/machine/ie15.cpp +++ b/src/devices/machine/ie15.cpp @@ -574,7 +574,7 @@ MACHINE_CONFIG_START(ie15_device::ie15core) MCFG_DEVICE_PROGRAM_MAP(ie15_mem) MCFG_DEVICE_IO_MAP(ie15_io) - MCFG_DEFAULT_LAYOUT(layout_ie15) + config.set_default_layout(layout_ie15); /* Devices */ MCFG_DEVICE_ADD("keyboard", IE15_KEYBOARD, 0) diff --git a/src/devices/video/gba_lcd.cpp b/src/devices/video/gba_lcd.cpp index f72bef022f5ba..098499b1af51c 100644 --- a/src/devices/video/gba_lcd.cpp +++ b/src/devices/video/gba_lcd.cpp @@ -1810,7 +1810,7 @@ MACHINE_CONFIG_START(gba_lcd_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, gba_lcd_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 32768) MCFG_PALETTE_INIT_OWNER(gba_lcd_device, gba) MACHINE_CONFIG_END diff --git a/src/devices/video/hlcd0538.h b/src/devices/video/hlcd0538.h index 8751020860ff9..187523e107661 100644 --- a/src/devices/video/hlcd0538.h +++ b/src/devices/video/hlcd0538.h @@ -40,23 +40,14 @@ */ -// C/R pins (0538: d0-d7 for rows) -#define MCFG_HLCD0538_WRITE_COLS_CB(_devcb) \ - downcast(*device).set_write_cols_callback(DEVCB_##_devcb); - -// INTERRUPT pin -#define MCFG_HLCD0538_INTERRUPT_CB(_devcb) \ - downcast(*device).set_write_interrupt_callback(DEVCB_##_devcb); - - class hlcd0538_device : public device_t { public: hlcd0538_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); // configuration helpers - template devcb_base &set_write_cols_callback(Object &&cb) { return m_write_cols.set_callback(std::forward(cb)); } - template devcb_base &set_write_interrupt_callback(Object &&cb) { return m_write_interrupt.set_callback(std::forward(cb)); } + auto write_cols_callback() { return m_write_cols.bind(); } // C/R pins (0538: d0-d7 for rows) + auto write_interrupt_callback() { return m_write_interrupt.bind(); } // INTERRUPT pin DECLARE_WRITE_LINE_MEMBER(write_clk); DECLARE_WRITE_LINE_MEMBER(write_lcd); diff --git a/src/emu/devcb.h b/src/emu/devcb.h index 0cea3c6d31701..beaba73859216 100644 --- a/src/emu/devcb.h +++ b/src/emu/devcb.h @@ -32,13 +32,11 @@ #define DEVCB_READ8(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_READ16(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_READ32(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) -#define DEVCB_READ64(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_READLINE(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_WRITE8(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_WRITE16(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_WRITE32(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) -#define DEVCB_WRITE64(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) #define DEVCB_WRITELINE(tag, _class, _func) (std::forward_as_tuple((tag), &_class::_func, #_class "::" #_func)) template struct devcb_constant_t { T m_value; }; diff --git a/src/emu/layout/ie15.lay b/src/emu/layout/ie15.lay index 38b829ba317d8..96cc316f22f9e 100644 --- a/src/emu/layout/ie15.lay +++ b/src/emu/layout/ie15.lay @@ -117,7 +117,7 @@ --> - + diff --git a/src/emu/mconfig.cpp b/src/emu/mconfig.cpp index 342651818bc0c..e9533aff7d87b 100644 --- a/src/emu/mconfig.cpp +++ b/src/emu/mconfig.cpp @@ -13,6 +13,7 @@ #include "screen.h" #include +#include //************************************************************************** @@ -37,10 +38,10 @@ class machine_config::current_device_stack machine_config::machine_config(const game_driver &gamedrv, emu_options &options) : m_minimum_quantum(attotime::zero) - , m_default_layout(nullptr) , m_gamedrv(gamedrv) , m_options(options) , m_root_device() + , m_default_layouts([] (char const *a, char const *b) { return 0 > std::strcmp(a, b); }) , m_current_device(nullptr) { // add the root device @@ -115,6 +116,19 @@ machine_config::~machine_config() } +//------------------------------------------------- +// set_default_layout - set layout for current +// device +//------------------------------------------------- + +void machine_config::set_default_layout(internal_layout const &layout) +{ + std::pair const ins(m_default_layouts.emplace(current_device().tag(), &layout)); + if (!ins.second) + ins.first->second = &layout; +} + + //------------------------------------------------- // device_add - configuration helper to add a // new device @@ -296,9 +310,21 @@ device_t *machine_config::device_find(device_t *owner, const char *tag) // to a device about to be removed from the tree //------------------------------------------------- -void machine_config::remove_references(ATTR_UNUSED device_t &device) +void machine_config::remove_references(device_t &device) { + // remove default layouts for subdevices + char const *const tag(device.tag()); + std::size_t const taglen(std::strlen(tag)); + default_layout_map::iterator it(m_default_layouts.lower_bound(tag)); + while ((m_default_layouts.end() != it) && !std::strncmp(tag, it->first, taglen)) + { + if (!it->first[taglen] || (':' == it->first[taglen])) + it = m_default_layouts.erase(it); + else + ++it; + } + // iterate over all devices and remove any references for (device_t &scan : device_iterator(root_device())) - scan.subdevices().m_tagmap.clear(); //remove(&device); + scan.subdevices().m_tagmap.clear(); } diff --git a/src/emu/mconfig.h b/src/emu/mconfig.h index 6bcaec2b02eb1..787c2411fc70f 100644 --- a/src/emu/mconfig.h +++ b/src/emu/mconfig.h @@ -19,6 +19,7 @@ #define MAME_EMU_MCONFIG_H #include +#include #include #include #include @@ -100,15 +101,20 @@ class machine_config device_t &root_device() const { assert(m_root_device); return *m_root_device; } device_t ¤t_device() const { assert(m_current_device); return *m_current_device; } emu_options &options() const { return m_options; } - inline device_t *device(const char *tag) const { return root_device().subdevice(tag); } - template inline DeviceClass *device(const char *tag) const { return downcast(device(tag)); } + device_t *device(const char *tag) const { return root_device().subdevice(tag); } + template DeviceClass *device(const char *tag) const { return downcast(device(tag)); } + template void apply_default_layouts(T &&op) const + { + for (std::pair const &lay : m_default_layouts) + op(*device(lay.first), *lay.second); + } // public state attotime m_minimum_quantum; // minimum scheduling quantum std::string m_perfect_cpu_quantum; // tag of CPU to use for "perfect" scheduling - // other parameters - const internal_layout * m_default_layout; // default layout for this machine + // configuration methods + void set_default_layout(internal_layout const &layout); // helpers during configuration; not for general use token begin_configuration(device_t &device) @@ -167,18 +173,20 @@ class machine_config private: class current_device_stack; + typedef std::map default_layout_map; // internal helpers std::pair resolve_owner(const char *tag) const; std::tuple prepare_replace(const char *tag); device_t &add_device(std::unique_ptr &&device, device_t *owner); device_t &replace_device(std::unique_ptr &&device, device_t &owner, device_t *existing); - void remove_references(ATTR_UNUSED device_t &device); + void remove_references(device_t &device); // internal state game_driver const & m_gamedrv; emu_options & m_options; std::unique_ptr m_root_device; + default_layout_map m_default_layouts; device_t * m_current_device; }; @@ -243,10 +251,6 @@ Ends a machine_config. #define MCFG_QUANTUM_PERFECT_CPU(_cputag) \ config.m_perfect_cpu_quantum = subtag(_cputag); -// core video parameters -#define MCFG_DEFAULT_LAYOUT(_layout) \ - config.m_default_layout = &(_layout); - // add/remove devices #define MCFG_DEVICE_ADD(_tag, ...) \ device = emu::detail::device_add_impl(config, _tag, __VA_ARGS__); diff --git a/src/emu/render.cpp b/src/emu/render.cpp index c5f4418f447cc..316fa05dd9910 100644 --- a/src/emu/render.cpp +++ b/src/emu/render.cpp @@ -1589,7 +1589,7 @@ void render_target::load_layout_files(const internal_layout *layoutfile, bool si // if there's an explicit file, load that first const char *basename = m_manager.machine().basename(); if (layoutfile) - have_artwork |= load_layout_file(basename, layoutfile); + have_artwork |= load_layout_file(basename, *layoutfile); // if we're only loading this file, we know our final result if (!singlefile) @@ -1602,7 +1602,7 @@ void render_target::load_layout_files(util::xml::data_node const &rootnode, bool // if there's an explicit file, load that first const char *basename = m_manager.machine().basename(); - have_artwork |= load_layout_file(basename, rootnode); + have_artwork |= load_layout_file(m_manager.machine().root_device(), basename, rootnode); // if we're only loading this file, we know our final result if (!singlefile) @@ -1637,9 +1637,10 @@ void render_target::load_additional_layout_files(const char *basename, bool have // if a default view has been specified, use that as a fallback if (system.default_layout != nullptr) - have_default |= load_layout_file(nullptr, system.default_layout); - if (m_manager.machine().config().m_default_layout != nullptr) - have_default |= load_layout_file(nullptr, m_manager.machine().config().m_default_layout); + have_default |= load_layout_file(nullptr, *system.default_layout); + m_manager.machine().config().apply_default_layouts( + [this, &have_default] (device_t &dev, internal_layout const &layout) + { have_default |= load_layout_file(nullptr, layout, &dev); }); // try to load another file based on the parent driver name int cloneof = driver_list::clone(system); @@ -1682,9 +1683,9 @@ void render_target::load_additional_layout_files(const char *basename, bool have if (screens == 1) { if (system.flags & ORIENTATION_SWAP_XY) - load_layout_file(nullptr, &layout_vertical); + load_layout_file(nullptr, layout_vertical); else - load_layout_file(nullptr, &layout_horizont); + load_layout_file(nullptr, layout_horizont); if (m_filelist.empty()) throw emu_fatalerror("Couldn't parse default layout??"); } @@ -1693,7 +1694,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have { if (screens == 2) { - load_layout_file(nullptr, &layout_dualhsxs); + load_layout_file(nullptr, layout_dualhsxs); if (m_filelist.empty()) throw emu_fatalerror("Couldn't parse default layout??"); } @@ -1703,7 +1704,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have { if (!view_by_index(0)) { - load_layout_file(nullptr, &layout_noscreens); + load_layout_file(nullptr, layout_noscreens); if (m_filelist.empty()) throw emu_fatalerror("Couldn't parse default layout??"); } @@ -1854,7 +1855,7 @@ void render_target::load_additional_layout_files(const char *basename, bool have } // try to parse it - if (!load_layout_file(nullptr, *root)) + if (!load_layout_file(m_manager.machine().root_device(), nullptr, *root)) throw emu_fatalerror("Couldn't parse generated layout??"); } } @@ -1865,11 +1866,10 @@ void render_target::load_additional_layout_files(const char *basename, bool have // and append it to our list //------------------------------------------------- - -bool render_target::load_layout_file(const char *dirname, const internal_layout *layout_data) +bool render_target::load_layout_file(const char *dirname, const internal_layout &layout_data, device_t *device) { // +1 to ensure data is terminated for XML parser - auto tempout = make_unique_clear(layout_data->decompressed_size+1); + auto tempout = make_unique_clear(layout_data.decompressed_size + 1); z_stream stream; int zerr; @@ -1877,7 +1877,7 @@ bool render_target::load_layout_file(const char *dirname, const internal_layout /* initialize the stream */ memset(&stream, 0, sizeof(stream)); stream.next_out = tempout.get(); - stream.avail_out = layout_data->decompressed_size; + stream.avail_out = layout_data.decompressed_size; zerr = inflateInit(&stream); @@ -1888,8 +1888,8 @@ bool render_target::load_layout_file(const char *dirname, const internal_layout } /* decompress this chunk */ - stream.next_in = (unsigned char*)layout_data->data; - stream.avail_in = layout_data->compressed_size; + stream.next_in = (unsigned char *)layout_data.data; + stream.avail_in = layout_data.compressed_size; zerr = inflate(&stream, Z_NO_FLUSH); /* stop at the end of the stream */ @@ -1911,55 +1911,55 @@ bool render_target::load_layout_file(const char *dirname, const internal_layout return false; } - return load_layout_file(dirname, (const char*)tempout.get()); -} + util::xml::file::ptr rootnode(util::xml::file::string_read(reinterpret_cast(tempout.get()), nullptr)); + tempout.reset(); -bool render_target::load_layout_file(const char *dirname, const char *filename) -{ - util::xml::file::ptr rootnode; - if (filename[0] == '<') + // if we didn't get a properly-formatted XML file, record a warning and exit + if (!load_layout_file(device ? *device : m_manager.machine().root_device(), dirname, *rootnode)) { - // if the first character of the "file" is an open brace, assume it is an XML string - rootnode = util::xml::file::string_read(filename, nullptr); + osd_printf_warning("Improperly formatted XML string, ignoring\n"); + return false; } else { - // otherwise, assume it is a file + return true; + } +} - // build the path and optionally prepend the directory - std::string fname = std::string(filename).append(".lay"); - if (dirname != nullptr) - fname.insert(0, PATH_SEPARATOR).insert(0, dirname); +bool render_target::load_layout_file(const char *dirname, const char *filename) +{ + // build the path and optionally prepend the directory + std::string fname = std::string(filename).append(".lay"); + if (dirname) + fname.insert(0, PATH_SEPARATOR).insert(0, dirname); - // attempt to open the file; bail if we can't - emu_file layoutfile(m_manager.machine().options().art_path(), OPEN_FLAG_READ); - osd_file::error filerr = layoutfile.open(fname.c_str()); - if (filerr != osd_file::error::NONE) - return false; + // attempt to open the file; bail if we can't + emu_file layoutfile(m_manager.machine().options().art_path(), OPEN_FLAG_READ); + osd_file::error const filerr(layoutfile.open(fname.c_str())); + if (filerr != osd_file::error::NONE) + return false; - // read the file - rootnode = util::xml::file::read(layoutfile, nullptr); - } + // read the file + util::xml::file::ptr rootnode(util::xml::file::read(layoutfile, nullptr)); // if we didn't get a properly-formatted XML file, record a warning and exit - if (!load_layout_file(dirname, *rootnode)) + if (!load_layout_file(m_manager.machine().root_device(), dirname, *rootnode)) { - if (filename[0] != '<') - osd_printf_warning("Improperly formatted XML file '%s', ignoring\n", filename); - else - osd_printf_warning("Improperly formatted XML string, ignoring\n"); + osd_printf_warning("Improperly formatted XML file '%s', ignoring\n", filename); return false; } - - return true; + else + { + return true; + } } -bool render_target::load_layout_file(const char *dirname, util::xml::data_node const &rootnode) +bool render_target::load_layout_file(device_t &device, const char *dirname, util::xml::data_node const &rootnode) { // parse and catch any errors try { - m_filelist.emplace_back(m_manager.machine(), rootnode, dirname); + m_filelist.emplace_back(device, rootnode, dirname); } catch (emu_fatalerror &) { diff --git a/src/emu/render.h b/src/emu/render.h index c68c4e04e2373..66c885a4c78a8 100644 --- a/src/emu/render.h +++ b/src/emu/render.h @@ -806,7 +806,7 @@ class layout_view public: // construction/destruction item( - running_machine &machine, + device_t &device, util::xml::data_node const &itemnode, element_map &elemmap, render_bounds const &transform); @@ -846,7 +846,7 @@ class layout_view // construction/destruction layout_view( - running_machine &machine, + device_t &device, util::xml::data_node const &viewnode, element_map &elemmap, group_map const &groupmap); @@ -873,12 +873,14 @@ class layout_view private: // add items, recursing for groups void add_items( - running_machine &machine, + device_t &device, util::xml::data_node const &parentnode, element_map &elemmap, group_map const &groupmap, render_bounds const &transform); + static std::string make_name(device_t &device, util::xml::data_node const &viewnode); + // internal state std::string m_name; // name of the layout float m_aspect; // X/Y of the layout @@ -909,7 +911,7 @@ class layout_file using view_list = std::list; // construction/destruction - layout_file(running_machine &machine, util::xml::data_node const &rootnode, char const *dirname); + layout_file(device_t &device, util::xml::data_node const &rootnode, char const *dirname); ~layout_file(); // getters @@ -1020,8 +1022,8 @@ class render_target void load_layout_files(util::xml::data_node const &rootnode, bool singlefile); void load_additional_layout_files(const char *basename, bool have_artwork); bool load_layout_file(const char *dirname, const char *filename); - bool load_layout_file(const char *dirname, const internal_layout *layout_data); - bool load_layout_file(const char *dirname, util::xml::data_node const &rootnode); + bool load_layout_file(const char *dirname, const internal_layout &layout_data, device_t *device = nullptr); + bool load_layout_file(device_t &device, const char *dirname, util::xml::data_node const &rootnode); void add_container_primitives(render_primitive_list &list, const object_transform &root_xform, const object_transform &xform, render_container &container, int blendmode); void add_element_primitives(render_primitive_list &list, const object_transform &xform, layout_element &element, int state, int blendmode); bool map_point_internal(s32 target_x, s32 target_y, render_container *container, float &mapped_x, float &mapped_y, ioport_port *&mapped_input_port, ioport_value &mapped_input_mask); diff --git a/src/emu/rendlay.cpp b/src/emu/rendlay.cpp index df5bc6e6c2901..e245aebf2ddb2 100644 --- a/src/emu/rendlay.cpp +++ b/src/emu/rendlay.cpp @@ -2389,11 +2389,11 @@ void layout_element::component::apply_skew(bitmap_argb32 &dest, int skewwidth) //------------------------------------------------- layout_view::layout_view( - running_machine &machine, + device_t &device, util::xml::data_node const &viewnode, element_map &elemmap, group_map const &groupmap) - : m_name(xml_get_attribute_string_with_subst(machine, viewnode, "name", "")) + : m_name(make_name(device, viewnode)) , m_aspect(1.0f) , m_scraspect(1.0f) { @@ -2401,10 +2401,10 @@ layout_view::layout_view( util::xml::data_node const *const boundsnode = viewnode.get_child("bounds"); m_expbounds.x0 = m_expbounds.y0 = m_expbounds.x1 = m_expbounds.y1 = 0; if (boundsnode) - parse_bounds(machine, boundsnode, m_expbounds); + parse_bounds(device.machine(), boundsnode, m_expbounds); // load items - add_items(machine, viewnode, elemmap, groupmap, render_bounds{ 0.0f, 0.0f, 1.0f, 1.0f }); + add_items(device, viewnode, elemmap, groupmap, render_bounds{ 0.0f, 0.0f, 1.0f, 1.0f }); // recompute the data for the view based on a default layer config recompute(render_layer_config()); @@ -2561,7 +2561,7 @@ void layout_view::resolve_tags() //------------------------------------------------- void layout_view::add_items( - running_machine &machine, + device_t &device, util::xml::data_node const &parentnode, element_map &elemmap, group_map const &groupmap, @@ -2571,31 +2571,31 @@ void layout_view::add_items( { if (!strcmp(itemnode->get_name(), "backdrop")) { - m_backdrop_list.emplace_back(machine, *itemnode, elemmap, transform); + m_backdrop_list.emplace_back(device, *itemnode, elemmap, transform); } else if (!strcmp(itemnode->get_name(), "screen")) { - m_screen_list.emplace_back(machine, *itemnode, elemmap, transform); + m_screen_list.emplace_back(device, *itemnode, elemmap, transform); } else if (!strcmp(itemnode->get_name(), "overlay")) { - m_overlay_list.emplace_back(machine, *itemnode, elemmap, transform); + m_overlay_list.emplace_back(device, *itemnode, elemmap, transform); } else if (!strcmp(itemnode->get_name(), "bezel")) { - m_bezel_list.emplace_back(machine, *itemnode, elemmap, transform); + m_bezel_list.emplace_back(device, *itemnode, elemmap, transform); } else if (!strcmp(itemnode->get_name(), "cpanel")) { - m_cpanel_list.emplace_back(machine, *itemnode, elemmap, transform); + m_cpanel_list.emplace_back(device, *itemnode, elemmap, transform); } else if (!strcmp(itemnode->get_name(), "marquee")) { - m_marquee_list.emplace_back(machine, *itemnode, elemmap, transform); + m_marquee_list.emplace_back(device, *itemnode, elemmap, transform); } else if (!strcmp(itemnode->get_name(), "group")) { - char const *ref(xml_get_attribute_string_with_subst(machine, *itemnode, "ref", nullptr)); + char const *ref(xml_get_attribute_string_with_subst(device.machine(), *itemnode, "ref", nullptr)); if (!ref) throw layout_syntax_error("nested group must have ref attribute"); @@ -2608,11 +2608,11 @@ void layout_view::add_items( if (itemboundsnode) { render_bounds itembounds; - parse_bounds(machine, itemboundsnode, itembounds); + parse_bounds(device.machine(), itemboundsnode, itembounds); grouptrans = found->second.make_transform(itembounds, transform); } - add_items(machine, found->second.get_groupnode(), elemmap, groupmap, grouptrans); + add_items(device, found->second.get_groupnode(), elemmap, groupmap, grouptrans); } else if (strcmp(itemnode->get_name(), "bounds")) { @@ -2621,6 +2621,22 @@ void layout_view::add_items( } } +std::string layout_view::make_name(device_t &device, util::xml::data_node const &viewnode) +{ + char const *const name(xml_get_attribute_string_with_subst(device.machine(), viewnode, "name", "")); + if (&device == &device.machine().root_device()) + { + return name; + } + else + { + char const *tag(device.tag()); + if (':' == *tag) + ++tag; + return util::string_format("%s %s", tag, name); + } +} + //************************************************************************** @@ -2632,20 +2648,21 @@ void layout_view::add_items( //------------------------------------------------- layout_view::item::item( - running_machine &machine, + device_t &device, util::xml::data_node const &itemnode, element_map &elemmap, render_bounds const &transform) : m_element(nullptr) - , m_output(machine.root_device(), xml_get_attribute_string_with_subst(machine, itemnode, "name", "")) - , m_have_output(xml_get_attribute_string_with_subst(machine, itemnode, "name", "")[0]) - , m_input_tag(xml_get_attribute_string_with_subst(machine, itemnode, "inputtag", "")) + , m_output(device, xml_get_attribute_string_with_subst(device.machine(), itemnode, "name", "")) + , m_have_output(xml_get_attribute_string_with_subst(device.machine(), itemnode, "name", "")[0]) + , m_input_tag(xml_get_attribute_string_with_subst(device.machine(), itemnode, "inputtag", "")) , m_input_port(nullptr) , m_input_mask(0) , m_screen(nullptr) , m_orientation(ROT0) { // find the associated element + running_machine &machine(device.machine()); char const *const name = xml_get_attribute_string_with_subst(machine, itemnode, "element", nullptr); if (name) { @@ -2676,22 +2693,25 @@ layout_view::item::item( // sanity checks if (strcmp(itemnode.get_name(), "screen") == 0) { - char const *const tag(itemnode.get_attribute_string("tag", nullptr)); - if (tag) - m_screen = dynamic_cast(machine.root_device().subdevice(tag)); - if (!m_screen) + if (itemnode.has_attribute("tag")) + { + char const *const tag(xml_get_attribute_string_with_subst(machine, itemnode, "tag", "")); + m_screen = dynamic_cast(device.subdevice(tag)); + if (!m_screen) + throw layout_reference_error(util::string_format("invalid screen tag '%d'", tag)); + } + else if (!m_screen) + { throw layout_reference_error(util::string_format("invalid screen index %d", index)); + } } - else + else if (!m_element) { - if (m_element == nullptr) - throw layout_syntax_error(util::string_format("item of type %s require an element tag", itemnode.get_name())); + throw layout_syntax_error(util::string_format("item of type %s require an element tag", itemnode.get_name())); } if (has_input()) - { - m_input_port = m_element->machine().root_device().ioport(m_input_tag.c_str()); - } + m_input_port = device.ioport(m_input_tag.c_str()); } @@ -2766,10 +2786,11 @@ void layout_view::item::resolve_tags() // layout_file - constructor //------------------------------------------------- -layout_file::layout_file(running_machine &machine, util::xml::data_node const &rootnode, const char *dirname) +layout_file::layout_file(device_t &device, util::xml::data_node const &rootnode, const char *dirname) : m_elemmap() , m_viewlist() { + running_machine &machine(device.machine()); try { // find the layout node @@ -2814,7 +2835,7 @@ layout_file::layout_file(running_machine &machine, util::xml::data_node const &r // if the error is allowed to propagate, the entire layout is dropped so you can't select the useful view try { - m_viewlist.emplace_back(machine, *viewnode, m_elemmap, groupmap); + m_viewlist.emplace_back(device, *viewnode, m_elemmap, groupmap); } catch (layout_reference_error const &err) { diff --git a/src/mame/drivers/24cdjuke.cpp b/src/mame/drivers/24cdjuke.cpp index e559e700e1899..6b052a6ce62be 100644 --- a/src/mame/drivers/24cdjuke.cpp +++ b/src/mame/drivers/24cdjuke.cpp @@ -290,7 +290,7 @@ MACHINE_CONFIG_START(midcoin24cdjuke_state::midcoin24cdjuke) MCFG_DEVICE_IO_MAP(midcoin24cdjuke_io) MCFG_DEVICE_PERIODIC_INT_DRIVER(midcoin24cdjuke_state, irq0_line_hold, 500) - MCFG_DEFAULT_LAYOUT(layout_24cdjuke) + config.set_default_layout(layout_24cdjuke); MCFG_DEVICE_ADD("ic11", I8255A, 0) MCFG_I8255_IN_PORTA_CB(IOPORT("MD1")) diff --git a/src/mame/drivers/4004clk.cpp b/src/mame/drivers/4004clk.cpp index 85520cd912932..d80d369b3a801 100644 --- a/src/mame/drivers/4004clk.cpp +++ b/src/mame/drivers/4004clk.cpp @@ -145,7 +145,7 @@ MACHINE_CONFIG_START(nixieclock_state::_4004clk) cpu.set_ram_ports_map(&nixieclock_state::_4004clk_mp); /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_4004clk) + config.set_default_layout(layout_4004clk); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/accomm.cpp b/src/mame/drivers/accomm.cpp index d22d79516e3c3..4670a88200782 100644 --- a/src/mame/drivers/accomm.cpp +++ b/src/mame/drivers/accomm.cpp @@ -847,7 +847,7 @@ MACHINE_CONFIG_START(accomm_state::accomm) MCFG_PALETTE_ADD( "palette", 16 ) MCFG_PALETTE_INIT_OWNER(accomm_state, accomm) - MCFG_DEFAULT_LAYOUT(layout_accomm) + config.set_default_layout(layout_accomm); /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/aces1.cpp b/src/mame/drivers/aces1.cpp index 9fb40f073444c..c1063e456d6ae 100644 --- a/src/mame/drivers/aces1.cpp +++ b/src/mame/drivers/aces1.cpp @@ -474,7 +474,7 @@ MACHINE_CONFIG_START(aces1_state::aces1) MCFG_I8255_IN_PORTB_CB(READ8(*this, aces1_state, ic37_read_b)) // meters, extra lamp select MCFG_I8255_IN_PORTC_CB(READ8(*this, aces1_state, ic37_read_c)) // reel write, extra lamp strobe - MCFG_DEFAULT_LAYOUT(layout_aces1) + config.set_default_layout(layout_aces1); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/acrnsys1.cpp b/src/mame/drivers/acrnsys1.cpp index ab8b51af0bb1b..916893b5eef20 100644 --- a/src/mame/drivers/acrnsys1.cpp +++ b/src/mame/drivers/acrnsys1.cpp @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(acrnsys1_state::acrnsys1) MCFG_DEVICE_ADD("maincpu", M6502, 1.008_MHz_XTAL) /* 1.008 MHz */ MCFG_DEVICE_PROGRAM_MAP(acrnsys1_map) - MCFG_DEFAULT_LAYOUT(layout_acrnsys1) + config.set_default_layout(layout_acrnsys1); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/aim65.cpp b/src/mame/drivers/aim65.cpp index eb6e24f64aff0..d8d941bdde0a1 100644 --- a/src/mame/drivers/aim65.cpp +++ b/src/mame/drivers/aim65.cpp @@ -191,7 +191,7 @@ MACHINE_CONFIG_START(aim65_state::aim65) MCFG_DEVICE_ADD("maincpu", M6502, AIM65_CLOCK) /* 1 MHz */ MCFG_DEVICE_PROGRAM_MAP(aim65_mem) - MCFG_DEFAULT_LAYOUT(layout_aim65) + config.set_default_layout(layout_aim65); /* alpha-numeric display */ MCFG_DEVICE_ADD("ds1", DL1416T, u32(0)) diff --git a/src/mame/drivers/aim65_40.cpp b/src/mame/drivers/aim65_40.cpp index 1ecd8fd507878..43a94f841fb80 100644 --- a/src/mame/drivers/aim65_40.cpp +++ b/src/mame/drivers/aim65_40.cpp @@ -122,7 +122,7 @@ MACHINE_CONFIG_START(aim65_40_state::aim65_40) MCFG_DEVICE_PROGRAM_MAP(aim65_40_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_aim65_40) + config.set_default_layout(layout_aim65_40); /* sound hardware */ diff --git a/src/mame/drivers/alesis.cpp b/src/mame/drivers/alesis.cpp index 699e4bb5fb7ff..fb331764ec455 100644 --- a/src/mame/drivers/alesis.cpp +++ b/src/mame/drivers/alesis.cpp @@ -429,9 +429,9 @@ MACHINE_CONFIG_START(alesis_state::hr16) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(6*16, 9*2) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) - MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_PALETTE_INIT_OWNER(alesis_state, alesis) @@ -461,7 +461,7 @@ MACHINE_CONFIG_START(alesis_state::sr16) MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(6*8, 9*2) MCFG_SCREEN_VISIBLE_AREA(0, 6*8-1, 0, 9*2-1) - MCFG_DEFAULT_LAYOUT(layout_sr16) + config.set_default_layout(layout_sr16); MCFG_DEVICE_MODIFY("hd44780") MCFG_HD44780_LCD_SIZE(2, 8) diff --git a/src/mame/drivers/allied.cpp b/src/mame/drivers/allied.cpp index ef4790e55e9a9..5bd376775addd 100644 --- a/src/mame/drivers/allied.cpp +++ b/src/mame/drivers/allied.cpp @@ -628,7 +628,7 @@ MACHINE_CONFIG_START(allied_state::allied) MCFG_DEVICE_PROGRAM_MAP(allied_map) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_allied) + config.set_default_layout(layout_allied); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/alphasma.cpp b/src/mame/drivers/alphasma.cpp index 3dea2e9810631..50736a86f616a 100644 --- a/src/mame/drivers/alphasma.cpp +++ b/src/mame/drivers/alphasma.cpp @@ -458,7 +458,7 @@ MACHINE_CONFIG_START(alphasmart_state::alphasmart) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(alphasmart_state, alphasmart) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_NVRAM_ADD_0FILL("nvram") MACHINE_CONFIG_END diff --git a/src/mame/drivers/alto2.cpp b/src/mame/drivers/alto2.cpp index a9239927d35d2..890548e059e3f 100644 --- a/src/mame/drivers/alto2.cpp +++ b/src/mame/drivers/alto2.cpp @@ -299,7 +299,7 @@ MACHINE_CONFIG_START(alto2_state::alto2) MCFG_SCREEN_UPDATE_DEVICE("maincpu", alto2_cpu_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT( layout_vertical ) + config.set_default_layout(layout_vertical); MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/amico2k.cpp b/src/mame/drivers/amico2k.cpp index a9e8688dce1a2..015f0534e9116 100644 --- a/src/mame/drivers/amico2k.cpp +++ b/src/mame/drivers/amico2k.cpp @@ -43,7 +43,7 @@ class amico2k_state : public driver_device : driver_device(mconfig, type, tag) , m_maincpu(*this, "maincpu") , m_digits(*this, "digit%u", 0U) - { } + { } void amico2k(machine_config &config); @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(amico2k_state::amico2k) MCFG_DEVICE_PROGRAM_MAP(amico2k_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_amico2k ) + config.set_default_layout(layout_amico2k); MCFG_DEVICE_ADD("i8255", I8255, 0) MCFG_I8255_IN_PORTA_CB(READ8(*this, amico2k_state, ppi_pa_r)) diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp index a8f3999662b86..2207bb82dd485 100644 --- a/src/mame/drivers/apollo.cpp +++ b/src/mame/drivers/apollo.cpp @@ -1098,7 +1098,7 @@ MACHINE_CONFIG_START(apollo_state::dsp3500) MCFG_RAM_EXTRA_OPTIONS("4M,8M,16M,32M") /* terminal hardware */ - MCFG_DEFAULT_LAYOUT( layout_apollo_dsp ) + config.set_default_layout(layout_apollo_dsp); MACHINE_CONFIG_END MACHINE_CONFIG_START(apollo_state::dn3500_19i) @@ -1156,7 +1156,7 @@ MACHINE_CONFIG_START(apollo_state::dsp3000) MCFG_RAM_MODIFY("messram") /* terminal hardware */ - MCFG_DEFAULT_LAYOUT( layout_apollo_dsp ) + config.set_default_layout(layout_apollo_dsp); MACHINE_CONFIG_END MACHINE_CONFIG_START(apollo_state::dn3000_19i) @@ -1197,7 +1197,7 @@ MACHINE_CONFIG_START(apollo_state::dsp5500) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00) /* terminal hardware */ - MCFG_DEFAULT_LAYOUT( layout_apollo_dsp ) + config.set_default_layout(layout_apollo_dsp); MACHINE_CONFIG_END MACHINE_CONFIG_START(apollo_state::dn5500_19i) diff --git a/src/mame/drivers/apricotp.cpp b/src/mame/drivers/apricotp.cpp index b8efc914a2f97..0c0d18a9859a1 100644 --- a/src/mame/drivers/apricotp.cpp +++ b/src/mame/drivers/apricotp.cpp @@ -601,7 +601,7 @@ MACHINE_CONFIG_START(fp_state::fp) MCFG_DEVICE_DISABLE() /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_apricotp ) + config.set_default_layout(layout_apricotp); MCFG_SCREEN_ADD(SCREEN_LCD_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(50) diff --git a/src/mame/drivers/atari_s1.cpp b/src/mame/drivers/atari_s1.cpp index b86e679551e72..24bee5c3c4910 100644 --- a/src/mame/drivers/atari_s1.cpp +++ b/src/mame/drivers/atari_s1.cpp @@ -466,7 +466,7 @@ MACHINE_CONFIG_START(atari_s1_state::atari_s1) MCFG_SOUND_ROUTE(0, "dac", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac", -1.0, DAC_VREF_NEG_INPUT) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_atari_s1) + config.set_default_layout(layout_atari_s1); MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi", atari_s1_state, nmi, attotime::from_hz(NMI_INT)) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", atari_s1_state, timer_s, attotime::from_hz(AUDIO_CLK)) diff --git a/src/mame/drivers/atari_s2.cpp b/src/mame/drivers/atari_s2.cpp index fc72dacb506b8..9f2d7fadaac1c 100644 --- a/src/mame/drivers/atari_s2.cpp +++ b/src/mame/drivers/atari_s2.cpp @@ -497,7 +497,7 @@ MACHINE_CONFIG_START(atari_s2_state::atari_s2) MCFG_SOUND_ROUTE(0, "dac1", 1.0, DAC_VREF_POS_INPUT) MCFG_SOUND_ROUTE(0, "dac1", -1.0, DAC_VREF_NEG_INPUT) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_atari_s2) + config.set_default_layout(layout_atari_s2); MCFG_TIMER_DRIVER_ADD_PERIODIC("irq", atari_s2_state, irq, attotime::from_hz(XTAL(4'000'000) / 8192)) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_s", atari_s2_state, timer_s, attotime::from_hz(150000)) diff --git a/src/mame/drivers/avigo.cpp b/src/mame/drivers/avigo.cpp index 538d4172a54e5..68c8606fc4b0d 100644 --- a/src/mame/drivers/avigo.cpp +++ b/src/mame/drivers/avigo.cpp @@ -778,7 +778,7 @@ MACHINE_CONFIG_START(avigo_state::avigo) MCFG_SCREEN_VISIBLE_AREA(0, AVIGO_SCREEN_WIDTH-1, 0, AVIGO_SCREEN_HEIGHT + AVIGO_PANEL_HEIGHT -1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_avigo) + config.set_default_layout(layout_avigo); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_avigo) MCFG_PALETTE_ADD("palette", AVIGO_NUM_COLOURS) diff --git a/src/mame/drivers/babbage.cpp b/src/mame/drivers/babbage.cpp index 212be497e0736..7dab73816539d 100644 --- a/src/mame/drivers/babbage.cpp +++ b/src/mame/drivers/babbage.cpp @@ -238,7 +238,7 @@ MACHINE_CONFIG_START(babbage_state::babbage) MCFG_Z80_DAISY_CHAIN(babbage_daisy_chain) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_babbage) + config.set_default_layout(layout_babbage); /* Devices */ MCFG_DEVICE_ADD("z80ctc", Z80CTC, MAIN_CLOCK) diff --git a/src/mame/drivers/backfire.cpp b/src/mame/drivers/backfire.cpp index 73bea29b34884..7c19b23d4f665 100644 --- a/src/mame/drivers/backfire.cpp +++ b/src/mame/drivers/backfire.cpp @@ -437,7 +437,7 @@ MACHINE_CONFIG_START(backfire_state::backfire) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_backfire) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/barata.cpp b/src/mame/drivers/barata.cpp index 8372a6b53be7b..c635ef52099dd 100644 --- a/src/mame/drivers/barata.cpp +++ b/src/mame/drivers/barata.cpp @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(barata_state::barata) MCFG_MCS51_PORT_P2_OUT_CB(WRITE8(*this, barata_state, port2_w)) MCFG_MCS51_PORT_P3_OUT_CB(WRITE8(*this, barata_state, fpga_w)) - MCFG_DEFAULT_LAYOUT( layout_barata ) + config.set_default_layout(layout_barata); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/bbc.cpp b/src/mame/drivers/bbc.cpp index 32875e015025c..caf5041d3eaa0 100644 --- a/src/mame/drivers/bbc.cpp +++ b/src/mame/drivers/bbc.cpp @@ -870,7 +870,7 @@ MACHINE_CONFIG_START(bbc_state::bbca) MCFG_VIDEO_START_OVERRIDE(bbc_state, bbc) - MCFG_DEFAULT_LAYOUT(layout_bbc) + config.set_default_layout(layout_bbc); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1313,7 +1313,7 @@ MACHINE_CONFIG_START(bbc_state::bbcm) MCFG_MACHINE_START_OVERRIDE(bbc_state, bbcm) MCFG_MACHINE_RESET_OVERRIDE(bbc_state, bbcm) - MCFG_DEFAULT_LAYOUT(layout_bbcm) + config.set_default_layout(layout_bbcm); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/beta.cpp b/src/mame/drivers/beta.cpp index 40213d3300735..0f7723e9593f5 100644 --- a/src/mame/drivers/beta.cpp +++ b/src/mame/drivers/beta.cpp @@ -350,7 +350,7 @@ MACHINE_CONFIG_START(beta_state::beta) MCFG_DEVICE_PROGRAM_MAP(beta_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_beta ) + config.set_default_layout(layout_beta); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/bfm_sc1.cpp b/src/mame/drivers/bfm_sc1.cpp index 1eb4b9795c024..66e3dc2401b4d 100644 --- a/src/mame/drivers/bfm_sc1.cpp +++ b/src/mame/drivers/bfm_sc1.cpp @@ -1089,7 +1089,7 @@ MACHINE_CONFIG_START(bfm_sc1_state::scorpion1) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_DEFAULT_LAYOUT(layout_sc1_vfd) + config.set_default_layout(layout_sc1_vfd); MCFG_DEVICE_ADD("reel0", REEL, STARPOINT_48STEP_REEL, 1, 3, 0x09, 4) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc1_state, reel_optic_cb<0>)) @@ -1118,7 +1118,7 @@ MACHINE_CONFIG_START(bfm_sc1_state::scorpion1_adder2) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(sc1_adder2) // setup read and write memorymap - MCFG_DEFAULT_LAYOUT(layout_sc1_vid) + config.set_default_layout(layout_sc1_vid); MCFG_BFM_ADDER2_ADD("adder2") MACHINE_CONFIG_END diff --git a/src/mame/drivers/bfm_sc2.cpp b/src/mame/drivers/bfm_sc2.cpp index 512ecc45cd8cd..0a6be61eedc88 100644 --- a/src/mame/drivers/bfm_sc2.cpp +++ b/src/mame/drivers/bfm_sc2.cpp @@ -2292,7 +2292,7 @@ MACHINE_CONFIG_START(bfm_sc2_vid_state::scorpion2_vid) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_NVRAM_ADD_CUSTOM_DRIVER("e2ram", bfm_sc2_vid_state, e2ram_init) - MCFG_DEFAULT_LAYOUT(layout_sc2_vid) + config.set_default_layout(layout_sc2_vid); MCFG_BFM_ADDER2_ADD("adder2") @@ -3771,7 +3771,7 @@ MACHINE_CONFIG_START(bfm_sc2_awp_state::scorpion2) MCFG_NVRAM_ADD_CUSTOM_DRIVER("e2ram", bfm_sc2_awp_state, e2ram_init) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_sc2_vfd) + config.set_default_layout(layout_sc2_vfd); MCFG_DEVICE_ADD("reel0", REEL, STARPOINT_48STEP_REEL, 1, 3, 0x09, 4) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, bfm_sc2_awp_state, reel_optic_cb<0>)) @@ -3828,7 +3828,7 @@ MACHINE_CONFIG_START(bfm_sc2_dmd_state::scorpion2_dm01) MCFG_NVRAM_ADD_CUSTOM_DRIVER("e2ram", bfm_sc2_dmd_state, e2ram_init) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_sc2_dmd) + config.set_default_layout(layout_sc2_dmd); MCFG_DEVICE_ADD("dm01", BFM_DM01, 0) MCFG_BFM_DM01_BUSY_CB(WRITELINE(*this, bfm_sc2_dmd_state, bfmdm01_busy)) diff --git a/src/mame/drivers/bfm_sc4.cpp b/src/mame/drivers/bfm_sc4.cpp index 92c60a5c5dff7..c3b5f344c8853 100644 --- a/src/mame/drivers/bfm_sc4.cpp +++ b/src/mame/drivers/bfm_sc4.cpp @@ -913,7 +913,7 @@ MACHINE_CONFIG_START(sc4_state::sc4_common) MCFG_BFMBDA_ADD("vfd0",0) -// MCFG_DEFAULT_LAYOUT(layout_bfm_sc4) +// config.set_default_layout(layout_bfm_sc4); MCFG_DEVICE_ADD("ymz", YMZ280B, 16000000) // ?? Mhz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) @@ -1262,7 +1262,7 @@ MACHINE_CONFIG_START(sc4_state::sc4dmd) sc4_common(config); /* video hardware */ - //MCFG_DEFAULT_LAYOUT(layout_sc4_dmd) + //config.set_default_layout(layout_sc4_dmd); MCFG_DEVICE_ADD("dm01", BFM_DM01, 0) MCFG_BFM_DM01_BUSY_CB(WRITELINE(*this, sc4_state, bfmdm01_busy)) diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp index cd02180cfb3cc..afed5b8ad0f6f 100644 --- a/src/mame/drivers/bfm_sc5.cpp +++ b/src/mame/drivers/bfm_sc5.cpp @@ -227,7 +227,7 @@ MACHINE_CONFIG_START(bfm_sc5_state::bfm_sc5) MCFG_BFMBDA_ADD("vfd0",0) - MCFG_DEFAULT_LAYOUT(layout_bfm_sc5) + config.set_default_layout(layout_bfm_sc5); MCFG_DEVICE_ADD("ymz", YMZ280B, 16000000) // ?? Mhz MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) diff --git a/src/mame/drivers/bfmsys85.cpp b/src/mame/drivers/bfmsys85.cpp index 5e7d98aa136c5..01a654c136c15 100644 --- a/src/mame/drivers/bfmsys85.cpp +++ b/src/mame/drivers/bfmsys85.cpp @@ -422,7 +422,7 @@ MACHINE_CONFIG_START(bfmsys85_state::bfmsys85) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) - MCFG_DEFAULT_LAYOUT(layout_bfmsys85) + config.set_default_layout(layout_bfmsys85); MACHINE_CONFIG_END // input ports for system85 board ///////////////////////////////////////// diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp index e26aff0cc3a51..995464ce05481 100644 --- a/src/mame/drivers/bnstars.cpp +++ b/src/mame/drivers/bnstars.cpp @@ -832,7 +832,7 @@ MACHINE_CONFIG_START(bnstars_state::bnstars) MCFG_PALETTE_FORMAT(XBRG) MCFG_PALETTE_MEMBITS(16) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/bob85.cpp b/src/mame/drivers/bob85.cpp index f30ef82ba03a2..c75242aaffed1 100644 --- a/src/mame/drivers/bob85.cpp +++ b/src/mame/drivers/bob85.cpp @@ -216,7 +216,7 @@ MACHINE_CONFIG_START(bob85_state::bob85) MCFG_I8085A_SOD(WRITELINE(*this, bob85_state, sod_w)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_bob85) + config.set_default_layout(layout_bob85); // devices MCFG_CASSETTE_ADD("cassette") diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index 5b3640c2a8194..976a5a9131e96 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -550,7 +550,7 @@ MACHINE_CONFIG_START(bw2_state::bw2) MCFG_DEVICE_IO_MAP(bw2_io) // video hardware - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(60) MCFG_SCREEN_UPDATE_DEVICE( MSM6255_TAG, msm6255_device, screen_update ) diff --git a/src/mame/drivers/by17.cpp b/src/mame/drivers/by17.cpp index 335d027452bcc..7ffbc648a1c11 100644 --- a/src/mame/drivers/by17.cpp +++ b/src/mame/drivers/by17.cpp @@ -1001,7 +1001,7 @@ MACHINE_CONFIG_START(by17_state::by17) MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup /* Video */ - MCFG_DEFAULT_LAYOUT(layout_by17) + config.set_default_layout(layout_by17); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/by35.cpp b/src/mame/drivers/by35.cpp index 37ddc966691e1..09b9e6788cd36 100644 --- a/src/mame/drivers/by35.cpp +++ b/src/mame/drivers/by35.cpp @@ -1100,7 +1100,7 @@ MACHINE_CONFIG_START(by35_state::by35) MCFG_NVRAM_ADD_0FILL("nvram") // 'F' filled causes Credit Display to be blank on first startup /* Video */ - MCFG_DEFAULT_LAYOUT(layout_by35) + config.set_default_layout(layout_by35); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/by6803.cpp b/src/mame/drivers/by6803.cpp index e1d4445edf554..6ee61feeeedf2 100644 --- a/src/mame/drivers/by6803.cpp +++ b/src/mame/drivers/by6803.cpp @@ -387,7 +387,7 @@ MACHINE_CONFIG_START(by6803_state::by6803) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - //MCFG_DEFAULT_LAYOUT(layout_by6803) + //config.set_default_layout(layout_by6803); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/c80.cpp b/src/mame/drivers/c80.cpp index 5d35a0bdba1aa..dd6bc7f47b1f0 100644 --- a/src/mame/drivers/c80.cpp +++ b/src/mame/drivers/c80.cpp @@ -262,7 +262,7 @@ MACHINE_CONFIG_START(c80_state::c80) MCFG_Z80_DAISY_CHAIN(c80_daisy_chain) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_c80 ) + config.set_default_layout(layout_c80); /* devices */ MCFG_DEVICE_ADD(Z80PIO1_TAG, Z80PIO, 2500000) diff --git a/src/mame/drivers/cardline.cpp b/src/mame/drivers/cardline.cpp index 9a673d6ef566c..94061d2c28ec6 100644 --- a/src/mame/drivers/cardline.cpp +++ b/src/mame/drivers/cardline.cpp @@ -355,7 +355,7 @@ MACHINE_CONFIG_START(cardline_state::cardline) MCFG_MC6845_OUT_HSYNC_CB(WRITELINE(*this, cardline_state, hsync_changed)) MCFG_MC6845_OUT_VSYNC_CB(WRITELINE(*this, cardline_state, vsync_changed)) - MCFG_DEFAULT_LAYOUT(layout_cardline) + config.set_default_layout(layout_cardline); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/cave.cpp b/src/mame/drivers/cave.cpp index a492890da7410..31ba73bfd19d4 100644 --- a/src/mame/drivers/cave.cpp +++ b/src/mame/drivers/cave.cpp @@ -2651,7 +2651,7 @@ MACHINE_CONFIG_START(cave_state::ppsatan) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ppsatan) MCFG_PALETTE_ADD("palette", 0x8000) MCFG_PALETTE_INIT_OWNER(cave_state,ppsatan) - MCFG_DEFAULT_LAYOUT(layout_ppsatan) + config.set_default_layout(layout_ppsatan); MCFG_VIDEO_START_OVERRIDE(cave_state,cave_3_layers) diff --git a/src/mame/drivers/cc40.cpp b/src/mame/drivers/cc40.cpp index 68e8d95451bd6..4f403882068b4 100644 --- a/src/mame/drivers/cc40.cpp +++ b/src/mame/drivers/cc40.cpp @@ -600,7 +600,7 @@ MACHINE_CONFIG_START(cc40_state::cc40) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(6*31+1, 9*1+1+1) MCFG_SCREEN_VISIBLE_AREA(0, 6*31, 0, 9*1+1) - MCFG_DEFAULT_LAYOUT(layout_cc40) + config.set_default_layout(layout_cc40); MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/cdi.cpp b/src/mame/drivers/cdi.cpp index b170703b8f824..5bf11a65c8a09 100644 --- a/src/mame/drivers/cdi.cpp +++ b/src/mame/drivers/cdi.cpp @@ -771,7 +771,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono1_base) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEFAULT_LAYOUT(layout_cdi) + config.set_default_layout(layout_cdi); MCFG_DEVICE_ADD("scc68070", CDI_68070, 0, "maincpu") @@ -819,7 +819,7 @@ MACHINE_CONFIG_START(cdi_state::cdimono2) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEFAULT_LAYOUT(layout_cdi) + config.set_default_layout(layout_cdi); MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 ) @@ -874,7 +874,7 @@ MACHINE_CONFIG_START(cdi_state::cdi910) MCFG_PALETTE_ADD("palette", 0x100) - MCFG_DEFAULT_LAYOUT(layout_cdi) + config.set_default_layout(layout_cdi); MCFG_MACHINE_RESET_OVERRIDE( cdi_state, cdimono2 ) diff --git a/src/mame/drivers/cesclass.cpp b/src/mame/drivers/cesclass.cpp index ca6a7442e3ce2..8536ed29e2199 100644 --- a/src/mame/drivers/cesclass.cpp +++ b/src/mame/drivers/cesclass.cpp @@ -267,7 +267,7 @@ MACHINE_CONFIG_START(cesclassic_state::cesclassic) MCFG_SCREEN_UPDATE_DRIVER(cesclassic_state, screen_update) MCFG_SCREEN_SIZE(8*16*2, 8*8+3*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 8*16*2-1, 0*8, 8*8-1) - MCFG_DEFAULT_LAYOUT( layout_lcd ) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(cesclassic_state, cesclassic) diff --git a/src/mame/drivers/cfx9850.cpp b/src/mame/drivers/cfx9850.cpp index 66e938c7ba0d5..8f9007a37403b 100644 --- a/src/mame/drivers/cfx9850.cpp +++ b/src/mame/drivers/cfx9850.cpp @@ -300,7 +300,7 @@ MACHINE_CONFIG_START(cfx9850_state::cfx9850) MCFG_SCREEN_UPDATE_DRIVER(cfx9850_state, screen_update_cfx9850) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); // TODO: Verify amount of colors and palette. Colors can be changed by changing the contrast. MCFG_PALETTE_ADD("palette", 4) diff --git a/src/mame/drivers/chessmst.cpp b/src/mame/drivers/chessmst.cpp index b451969152bba..1876b061339f5 100644 --- a/src/mame/drivers/chessmst.cpp +++ b/src/mame/drivers/chessmst.cpp @@ -395,7 +395,7 @@ MACHINE_CONFIG_START(chessmst_state::chessmst) MCFG_Z80PIO_IN_PA_CB(READ8(*this, chessmst_state, pio2_port_a_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio2_port_b_w)) - MCFG_DEFAULT_LAYOUT(layout_chessmst) + config.set_default_layout(layout_chessmst); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -420,7 +420,7 @@ MACHINE_CONFIG_START(chessmst_state::chessmsta) MCFG_Z80PIO_IN_PA_CB(READ8(*this, chessmst_state, pio2_port_a_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio2_port_b_w)) - MCFG_DEFAULT_LAYOUT(layout_chessmst) + config.set_default_layout(layout_chessmst); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -446,7 +446,7 @@ MACHINE_CONFIG_START(chessmst_state::chessmstdm) MCFG_Z80PIO_IN_PA_CB(READ8(*this, chessmst_state, pio2_port_a_r)) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, chessmst_state, pio2_port_b_w)) - MCFG_DEFAULT_LAYOUT(layout_chessmstdm) + config.set_default_layout(layout_chessmstdm); MCFG_DEVICE_ADD("555_timer", CLOCK, 500) // from 555 timer MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, chessmst_state, timer_555_w)) diff --git a/src/mame/drivers/chesstrv.cpp b/src/mame/drivers/chesstrv.cpp index 6ba3c3dc2c7b1..b7e97f1d7f0e8 100644 --- a/src/mame/drivers/chesstrv.cpp +++ b/src/mame/drivers/chesstrv.cpp @@ -278,7 +278,7 @@ MACHINE_CONFIG_START(chesstrv_state::chesstrv) MCFG_DEVICE_IO_MAP( chesstrv_io ) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_chesstrv ) + config.set_default_layout(layout_chesstrv); MACHINE_CONFIG_END MACHINE_CONFIG_START(borisdpl_state::borisdpl) @@ -288,7 +288,7 @@ MACHINE_CONFIG_START(borisdpl_state::borisdpl) MCFG_DEVICE_IO_MAP( borisdpl_io ) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_borisdpl ) + config.set_default_layout(layout_borisdpl); //MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_interrupt", borisdpl_state, timer_interrupt, attotime::from_hz(40)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/chexx.cpp b/src/mame/drivers/chexx.cpp index e9813cbf5a99d..091b2e6b44acf 100644 --- a/src/mame/drivers/chexx.cpp +++ b/src/mame/drivers/chexx.cpp @@ -351,7 +351,7 @@ MACHINE_CONFIG_START(chexx_state::chexx83) MCFG_VIA6522_IRQ_HANDLER(WRITELINE(*this, chexx_state, via_irq_out)) // Layout - MCFG_DEFAULT_LAYOUT(layout_chexx) + config.set_default_layout(layout_chexx); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/cischeat.cpp b/src/mame/drivers/cischeat.cpp index 20639f5812e33..ddbe81ffdba54 100644 --- a/src/mame/drivers/cischeat.cpp +++ b/src/mame/drivers/cischeat.cpp @@ -2259,7 +2259,7 @@ MACHINE_CONFIG_START(cischeat_state::captflag) MCFG_TIMER_ADD_NONE("motor_right") // Layout - MCFG_DEFAULT_LAYOUT(layout_captflag) + config.set_default_layout(layout_captflag); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/ckz80.cpp b/src/mame/drivers/ckz80.cpp index c294e4c7b8681..97bf9624895c4 100644 --- a/src/mame/drivers/ckz80.cpp +++ b/src/mame/drivers/ckz80.cpp @@ -447,7 +447,7 @@ MACHINE_CONFIG_START(ckz80_state::master) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(16) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", ckz80_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ck_master) + config.set_default_layout(layout_ck_master); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/clcd.cpp b/src/mame/drivers/clcd.cpp index 6accadc502139..e2e9a1bd457f8 100644 --- a/src/mame/drivers/clcd.cpp +++ b/src/mame/drivers/clcd.cpp @@ -815,7 +815,7 @@ MACHINE_CONFIG_START(clcd_state::clcd) MCFG_SCREEN_VISIBLE_AREA(0, 480-1, 0, 128-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(clcd_state, clcd) diff --git a/src/mame/drivers/coco3.cpp b/src/mame/drivers/coco3.cpp index 1ae287a428ff7..4ee4a33c1bbb6 100644 --- a/src/mame/drivers/coco3.cpp +++ b/src/mame/drivers/coco3.cpp @@ -290,7 +290,7 @@ MACHINE_CONFIG_START(coco3_state::coco3) MCFG_COCO_VHD_ADD(VHD1_TAG) // video hardware - MCFG_DEFAULT_LAYOUT(layout_coco3) + config.set_default_layout(layout_coco3); MCFG_DEVICE_ADD(GIME_TAG, GIME_NTSC, XTAL(28'636'363), MAINCPU_TAG, RAM_TAG, CARTRIDGE_TAG, MAINCPU_TAG) MCFG_GIME_HSYNC_CALLBACK(WRITELINE(PIA0_TAG, pia6821_device, ca1_w)) diff --git a/src/mame/drivers/coolridr.cpp b/src/mame/drivers/coolridr.cpp index 190bc139b5767..8b1f0372e25a3 100644 --- a/src/mame/drivers/coolridr.cpp +++ b/src/mame/drivers/coolridr.cpp @@ -3308,7 +3308,7 @@ MACHINE_CONFIG_START(coolridr_state::coolridr) MCFG_PALETTE_ADD_RRRRRGGGGGBBBBB("palette") - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/cosmicos.cpp b/src/mame/drivers/cosmicos.cpp index 4121cb9c32b36..9240905b0bb7d 100644 --- a/src/mame/drivers/cosmicos.cpp +++ b/src/mame/drivers/cosmicos.cpp @@ -522,7 +522,7 @@ MACHINE_CONFIG_START(cosmicos_state::cosmicos) MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, cosmicos_state, sc_w)) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_cosmicos ) + config.set_default_layout(layout_cosmicos); MCFG_DEVICE_ADD(DM9368_TAG, DM9368, 0) MCFG_TIMER_DRIVER_ADD_PERIODIC("digit", cosmicos_state, digit_tick, attotime::from_hz(100)) MCFG_TIMER_DRIVER_ADD_PERIODIC("interrupt", cosmicos_state, int_tick, attotime::from_hz(1000)) diff --git a/src/mame/drivers/cp1.cpp b/src/mame/drivers/cp1.cpp index 5fe52c736e8e7..7fdf206a24c11 100644 --- a/src/mame/drivers/cp1.cpp +++ b/src/mame/drivers/cp1.cpp @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(cp1_state::cp1) MCFG_DEVICE_ADD("i8155_cp3", I8155, 0) - MCFG_DEFAULT_LAYOUT(layout_cp1) + config.set_default_layout(layout_cp1); MCFG_CASSETTE_ADD("cassette") diff --git a/src/mame/drivers/cvicny.cpp b/src/mame/drivers/cvicny.cpp index d73da9d7db29c..12a03f7ee7194 100644 --- a/src/mame/drivers/cvicny.cpp +++ b/src/mame/drivers/cvicny.cpp @@ -141,7 +141,7 @@ MACHINE_CONFIG_START(cvicny_state::cvicny) MCFG_DEVICE_PROGRAM_MAP(cvicny_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_cvicny) + config.set_default_layout(layout_cvicny); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/cxgz80.cpp b/src/mame/drivers/cxgz80.cpp index 2c28dae346383..325524302513e 100644 --- a/src/mame/drivers/cxgz80.cpp +++ b/src/mame/drivers/cxgz80.cpp @@ -407,7 +407,7 @@ MACHINE_CONFIG_START(cxgz80_state::ch2001) MCFG_TIMER_DRIVER_ADD("speaker_off", cxgz80_state, speaker_off_callback) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", cxgz80_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cxg_ch2001) + config.set_default_layout(layout_cxg_ch2001); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/cybertnk.cpp b/src/mame/drivers/cybertnk.cpp index 8c10e05baa946..b77ac2ab2221e 100644 --- a/src/mame/drivers/cybertnk.cpp +++ b/src/mame/drivers/cybertnk.cpp @@ -828,7 +828,7 @@ MACHINE_CONFIG_START(cybertnk_state::cybertnk) MCFG_QUANTUM_TIME(attotime::from_hz(60000))//arbitrary value,needed to get the communication to work /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/cybiko.cpp b/src/mame/drivers/cybiko.cpp index 0259c65c7cc67..c08ec4a387f92 100644 --- a/src/mame/drivers/cybiko.cpp +++ b/src/mame/drivers/cybiko.cpp @@ -409,7 +409,7 @@ MACHINE_CONFIG_START(cybiko_state::cybikov1) MCFG_SCREEN_PALETTE("hd66421:palette") // video MCFG_HD66421_ADD("hd66421") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); // sound SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("speaker", SPEAKER_SOUND) diff --git a/src/mame/drivers/cz101.cpp b/src/mame/drivers/cz101.cpp index 16a21013af5a8..aeb76c3c052dc 100644 --- a/src/mame/drivers/cz101.cpp +++ b/src/mame/drivers/cz101.cpp @@ -407,7 +407,7 @@ MACHINE_CONFIG_START( cz101_state::cz101 ) MCFG_HD44780_LCD_SIZE(2, 16) MCFG_HD44780_PIXEL_UPDATE_CB(cz101_state, lcd_pixel_update) - MCFG_DEFAULT_LAYOUT(layout_cz101) + config.set_default_layout(layout_cz101); MACHINE_CONFIG_END diff --git a/src/mame/drivers/darius.cpp b/src/mame/drivers/darius.cpp index 35f6a06634782..f45f1ad48b95d 100644 --- a/src/mame/drivers/darius.cpp +++ b/src/mame/drivers/darius.cpp @@ -730,7 +730,7 @@ MACHINE_CONFIG_START(darius_state::darius) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_darius) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_DEFAULT_LAYOUT(layout_darius) + config.set_default_layout(layout_darius); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/daruma.cpp b/src/mame/drivers/daruma.cpp index de4087a8c620f..2a4946ba9fb40 100644 --- a/src/mame/drivers/daruma.cpp +++ b/src/mame/drivers/daruma.cpp @@ -131,7 +131,7 @@ MACHINE_CONFIG_START(daruma_state::daruma) MCFG_SOUND_ROUTE(0, "mono", 1.00) /* TODO: - MCFG_DEFAULT_LAYOUT(layout_daruma) + config.set_default_layout(layout_daruma); Motors: MTA011 http://pdf.datasheetcatalog.com/datasheet/Shindengen/mXstzvq.pdf diff --git a/src/mame/drivers/datum.cpp b/src/mame/drivers/datum.cpp index fecf35f477d78..def02c65eabdd 100644 --- a/src/mame/drivers/datum.cpp +++ b/src/mame/drivers/datum.cpp @@ -189,7 +189,7 @@ MACHINE_CONFIG_START(datum_state::datum) MCFG_DEVICE_PROGRAM_MAP(datum_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_datum) + config.set_default_layout(layout_datum); /* Devices */ MCFG_DEVICE_ADD("pia1", PIA6821, 0) // keyboard & display diff --git a/src/mame/drivers/dbox.cpp b/src/mame/drivers/dbox.cpp index 71dc04335d67f..f0d1da02110d5 100644 --- a/src/mame/drivers/dbox.cpp +++ b/src/mame/drivers/dbox.cpp @@ -627,7 +627,7 @@ MACHINE_CONFIG_START(dbox_state::dbox) /* LED Matrix Display */ MCFG_SDA5708_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_sda5708) + config.set_default_layout(layout_sda5708); /* IP16 74256 8 bit latch */ MCFG_LATCH8_ADD("hct259.ip16") MCFG_LATCH8_WRITE_4(WRITELINE("display", sda5708_device, reset_w)) diff --git a/src/mame/drivers/de_2.cpp b/src/mame/drivers/de_2.cpp index 6a1d34a2027b0..db52cf82502f3 100644 --- a/src/mame/drivers/de_2.cpp +++ b/src/mame/drivers/de_2.cpp @@ -554,7 +554,7 @@ MACHINE_CONFIG_START(de_2_state::de_type1) MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_de2) + config.set_default_layout(layout_de2); genpin_audio(config); de_bg_audio(config); @@ -569,7 +569,7 @@ MACHINE_CONFIG_START(de_2_state::de_type2) MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_de2) + config.set_default_layout(layout_de2); genpin_audio(config); de_bg_audio(config); @@ -584,7 +584,7 @@ MACHINE_CONFIG_START(de_2_state::de_type2_alpha3) MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_de2a3) + config.set_default_layout(layout_de2a3); genpin_audio(config); de_bg_audio(config); @@ -599,7 +599,7 @@ MACHINE_CONFIG_START(de_2_state::de_type3) MCFG_DECOCPU_LAMP(WRITE8(*this, de_2_state,lamps_w)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_de2a3) + config.set_default_layout(layout_de2a3); genpin_audio(config); de_bg_audio(config); diff --git a/src/mame/drivers/decwritr.cpp b/src/mame/drivers/decwritr.cpp index 34753234ef959..afc6b9dff278a 100644 --- a/src/mame/drivers/decwritr.cpp +++ b/src/mame/drivers/decwritr.cpp @@ -439,7 +439,7 @@ MACHINE_CONFIG_START(decwriter_state::la120) m_ledlatch->q_out_cb<6>().set_output("led7").invert(); // SETUP m_ledlatch->q_out_cb<7>().set_output("led8").invert(); // PAPER OUT - //MCFG_DEFAULT_LAYOUT( layout_la120 ) + //config.set_default_layout(layout_la120); /* audio hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/deshoros.cpp b/src/mame/drivers/deshoros.cpp index 0948abf8f4994..cbec35e6ab814 100644 --- a/src/mame/drivers/deshoros.cpp +++ b/src/mame/drivers/deshoros.cpp @@ -280,7 +280,7 @@ MACHINE_CONFIG_START(destiny_state::destiny) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(6*16, 9*2) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_UPDATE_DRIVER(destiny_state, screen_update_destiny) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/didact.cpp b/src/mame/drivers/didact.cpp index f8819b8a0e7d5..aa23a5fcf71fc 100644 --- a/src/mame/drivers/didact.cpp +++ b/src/mame/drivers/didact.cpp @@ -584,7 +584,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(didact_state::scan_artwork) MACHINE_CONFIG_START(md6802_state::md6802) MCFG_DEVICE_ADD("maincpu", M6802, XTAL(4'000'000)) MCFG_DEVICE_PROGRAM_MAP(md6802_map) - MCFG_DEFAULT_LAYOUT(layout_md6802) + config.set_default_layout(layout_md6802); /* Devices */ MCFG_DEVICE_ADD("tb16_74145", TTL74145, 0) @@ -619,7 +619,7 @@ MACHINE_CONFIG_START(mp68a_state::mp68a) // Trimpot seems broken/stuck at 5K Ohm thu. ROM code 1Ms delay loops suggest 1MHz+ MCFG_DEVICE_ADD("maincpu", M6800, 505000) MCFG_DEVICE_PROGRAM_MAP(mp68a_map) - MCFG_DEFAULT_LAYOUT(layout_mp68a) + config.set_default_layout(layout_mp68a); /* Devices */ /* PIA #1 0x500-0x503 - used differently by laborations and loaded software */ diff --git a/src/mame/drivers/digel804.cpp b/src/mame/drivers/digel804.cpp index e0d464023f1a0..de4e29a25320f 100644 --- a/src/mame/drivers/digel804.cpp +++ b/src/mame/drivers/digel804.cpp @@ -640,7 +640,7 @@ MACHINE_CONFIG_START(digel804_state::digel804) MCFG_ROC10937_ADD("vfd",0) // RIGHT_TO_LEFT /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_digel804) + config.set_default_layout(layout_digel804); MCFG_DEVICE_ADD("74c923", MM74C923, 0) MCFG_MM74C922_DA_CALLBACK(WRITELINE(*this, digel804_state, da_w)) diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 28317f8ab6980..5232bdda4f704 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -798,7 +798,7 @@ MACHINE_CONFIG_START(dmv_state::dmv) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_dmv) MCFG_PALETTE_ADD_3BIT_RGB("palette") - MCFG_DEFAULT_LAYOUT(layout_dmv) + config.set_default_layout(layout_dmv); // devices MCFG_DEVICE_ADD("upd7220", UPD7220, XTAL(5'000'000)/2) // unk clock diff --git a/src/mame/drivers/dolphunk.cpp b/src/mame/drivers/dolphunk.cpp index 3a2a950c8b2dc..a8992146c0732 100644 --- a/src/mame/drivers/dolphunk.cpp +++ b/src/mame/drivers/dolphunk.cpp @@ -242,7 +242,7 @@ MACHINE_CONFIG_START(dauphin_state::dauphin) MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, dauphin_state, cass_w)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_dolphunk) + config.set_default_layout(layout_dolphunk); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/dynax.cpp b/src/mame/drivers/dynax.cpp index e65380816de7f..3f3f114be4e1d 100644 --- a/src/mame/drivers/dynax.cpp +++ b/src/mame/drivers/dynax.cpp @@ -4718,7 +4718,7 @@ MACHINE_CONFIG_START(dynax_state::jantouki) /* video hardware */ MCFG_PALETTE_ADD("palette", 512) MCFG_PALETTE_INIT_OWNER(dynax_state,sprtmtch) // static palette - MCFG_DEFAULT_LAYOUT(layout_dualhuov) + config.set_default_layout(layout_dualhuov); screen_device &top(SCREEN(config, "top", SCREEN_TYPE_RASTER)); top.set_refresh_hz(60); diff --git a/src/mame/drivers/eacc.cpp b/src/mame/drivers/eacc.cpp index 898f51e2c4bb8..89bb4534c4a7c 100644 --- a/src/mame/drivers/eacc.cpp +++ b/src/mame/drivers/eacc.cpp @@ -250,7 +250,7 @@ MACHINE_CONFIG_START(eacc_state::eacc) MCFG_DEVICE_ADD("maincpu", M6802, XTAL(3'579'545)) /* Divided by 4 inside the m6802*/ MCFG_DEVICE_PROGRAM_MAP(eacc_mem) - MCFG_DEFAULT_LAYOUT(layout_eacc) + config.set_default_layout(layout_eacc); MCFG_DEVICE_ADD("pia", PIA6821, 0) MCFG_PIA_READPB_HANDLER(READ8(*this, eacc_state, eacc_keyboard_r)) diff --git a/src/mame/drivers/ecoinf2.cpp b/src/mame/drivers/ecoinf2.cpp index c5061925d5ecb..b18959b4f03ba 100644 --- a/src/mame/drivers/ecoinf2.cpp +++ b/src/mame/drivers/ecoinf2.cpp @@ -503,7 +503,7 @@ MACHINE_CONFIG_START(ecoinf2_state::ecoinf2_oxo) MCFG_DEVICE_PROGRAM_MAP(oxo_memmap) MCFG_DEVICE_IO_MAP(oxo_portmap) - MCFG_DEFAULT_LAYOUT(layout_ecoinf2) + config.set_default_layout(layout_ecoinf2); MCFG_DEVICE_ADD("ic10_lamp", I8255, 0) MCFG_I8255_OUT_PORTA_CB(WRITE8(*this, ecoinf2_state, ppi8255_ic10_write_a_strobedat0)) diff --git a/src/mame/drivers/ecoinf3.cpp b/src/mame/drivers/ecoinf3.cpp index 090230279a489..47a40ee347bfd 100644 --- a/src/mame/drivers/ecoinf3.cpp +++ b/src/mame/drivers/ecoinf3.cpp @@ -667,7 +667,7 @@ MACHINE_CONFIG_START(ecoinf3_state::ecoinf3_pyramid) MCFG_DEVICE_PROGRAM_MAP(pyramid_memmap) MCFG_DEVICE_IO_MAP(pyramid_portmap) - MCFG_DEFAULT_LAYOUT(layout_ecoinf3) + config.set_default_layout(layout_ecoinf3); SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/ecoinfr.cpp b/src/mame/drivers/ecoinfr.cpp index c96675a1740dd..bd7facf240d43 100644 --- a/src/mame/drivers/ecoinfr.cpp +++ b/src/mame/drivers/ecoinfr.cpp @@ -789,7 +789,7 @@ MACHINE_CONFIG_START(ecoinfr_state::ecoinfr) MCFG_DEVICE_IO_MAP(portmap) MCFG_TIMER_DRIVER_ADD_PERIODIC("ectimer", ecoinfr_state, ecoinfr_irq_timer, attotime::from_hz(250)) - MCFG_DEFAULT_LAYOUT(layout_ecoinfr) + config.set_default_layout(layout_ecoinfr); MCFG_DEVICE_ADD(UPD8251_TAG, I8251, 0) diff --git a/src/mame/drivers/elekscmp.cpp b/src/mame/drivers/elekscmp.cpp index fb18bd2aeaa48..da2cba712b306 100644 --- a/src/mame/drivers/elekscmp.cpp +++ b/src/mame/drivers/elekscmp.cpp @@ -150,7 +150,7 @@ MACHINE_CONFIG_START(elekscmp_state::elekscmp) MCFG_DEVICE_PROGRAM_MAP(mem_map) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_elekscmp) + config.set_default_layout(layout_elekscmp); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/elf.cpp b/src/mame/drivers/elf.cpp index f851a82118113..80f5ce9c3ab20 100644 --- a/src/mame/drivers/elf.cpp +++ b/src/mame/drivers/elf.cpp @@ -249,7 +249,7 @@ MACHINE_CONFIG_START(elf2_state::elf2) MCFG_COSMAC_SC_CALLBACK(WRITE8(*this, elf2_state, sc_w)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_elf2) + config.set_default_layout(layout_elf2); MCFG_DEVICE_ADD(CDP1861_TAG, CDP1861, XTAL(3'579'545)/2) MCFG_CDP1861_IRQ_CALLBACK(INPUTLINE(CDP1802_TAG, COSMAC_INPUT_LINE_INT)) diff --git a/src/mame/drivers/enmirage.cpp b/src/mame/drivers/enmirage.cpp index 4c1bd9d4873eb..d299c13dc17a3 100644 --- a/src/mame/drivers/enmirage.cpp +++ b/src/mame/drivers/enmirage.cpp @@ -57,8 +57,8 @@ class enmirage_state : public driver_device { public: - enmirage_state(const machine_config &mconfig, device_type type, const char *tag) - : driver_device(mconfig, type, tag), + enmirage_state(const machine_config &mconfig, device_type type, const char *tag) : + driver_device(mconfig, type, tag), m_maincpu(*this, "maincpu"), m_fdc(*this, "wd1772"), m_floppy_connector(*this, "wd1772:0"), @@ -224,7 +224,7 @@ MACHINE_CONFIG_START(enmirage_state::mirage) MCFG_DEVICE_ADD("maincpu", MC6809E, 2000000) MCFG_DEVICE_PROGRAM_MAP(mirage_map) - MCFG_DEFAULT_LAYOUT( layout_mirage ) + config.set_default_layout(layout_mirage); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/et3400.cpp b/src/mame/drivers/et3400.cpp index e408b0a0d997a..ac63c02542954 100644 --- a/src/mame/drivers/et3400.cpp +++ b/src/mame/drivers/et3400.cpp @@ -225,7 +225,7 @@ MACHINE_CONFIG_START(et3400_state::et3400) MCFG_DEVICE_PROGRAM_MAP(mem_map) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_et3400) + config.set_default_layout(layout_et3400); // Devices MCFG_DEVICE_ADD("pia", PIA6821, 0) diff --git a/src/mame/drivers/fb01.cpp b/src/mame/drivers/fb01.cpp index 8926ec0f7c21c..05e77a07e9ed2 100644 --- a/src/mame/drivers/fb01.cpp +++ b/src/mame/drivers/fb01.cpp @@ -192,11 +192,11 @@ MACHINE_CONFIG_START(fb01_state::fb01) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(6*16, 9) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9-1) - MCFG_DEFAULT_LAYOUT(layout_lcd) MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT( layout_fb01 ) + config.set_default_layout(layout_lcd); // why set layout only to replace? + config.set_default_layout(layout_fb01); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(fb01_state, fb01) diff --git a/src/mame/drivers/fidel6502.cpp b/src/mame/drivers/fidel6502.cpp index a6b1b2478db16..811ad7a58c93e 100644 --- a/src/mame/drivers/fidel6502.cpp +++ b/src/mame/drivers/fidel6502.cpp @@ -1849,7 +1849,7 @@ MACHINE_CONFIG_START(fidel6502_state::rsc) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia1_cb2_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_rsc_v2) + config.set_default_layout(layout_fidel_rsc_v2); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1883,7 +1883,7 @@ MACHINE_CONFIG_START(fidel6502_state::csc) MCFG_PIA_CB2_HANDLER(WRITELINE(*this, fidel6502_state, csc_pia1_cb2_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_csc) + config.set_default_layout(layout_fidel_csc); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1905,7 +1905,7 @@ MACHINE_CONFIG_START(fidel6502_state::su9) MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, su9) - MCFG_DEFAULT_LAYOUT(layout_fidel_su9) + config.set_default_layout(layout_fidel_su9); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::eas) @@ -1934,7 +1934,7 @@ MACHINE_CONFIG_START(fidel6502_state::eas) MCFG_NVRAM_ADD_0FILL("nvram") MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_eas) + config.set_default_layout(layout_fidel_eas); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1968,7 +1968,7 @@ MACHINE_CONFIG_START(fidel6502_state::pc) MCFG_DEVICE_REMOVE("ppi8255") MCFG_DEVICE_REMOVE("nvram") - MCFG_DEFAULT_LAYOUT(layout_fidel_pc) + config.set_default_layout(layout_fidel_pc); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::eag) @@ -1983,7 +1983,7 @@ MACHINE_CONFIG_START(fidel6502_state::eag) MCFG_DEVICE_MODIFY("mainmap") MCFG_DEVICE_PROGRAM_MAP(eag_map) - MCFG_DEFAULT_LAYOUT(layout_fidel_eag) + config.set_default_layout(layout_fidel_eag); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::sc9d) @@ -1996,7 +1996,7 @@ MACHINE_CONFIG_START(fidel6502_state::sc9d) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(610)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_sc9) + config.set_default_layout(layout_fidel_sc9); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2033,7 +2033,7 @@ MACHINE_CONFIG_START(fidel6502_state::playmatic) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_CLOCK(3100000) // approximation - MCFG_DEFAULT_LAYOUT(layout_fidel_playmatic) + config.set_default_layout(layout_fidel_playmatic); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::sc12) @@ -2054,7 +2054,7 @@ MACHINE_CONFIG_START(fidel6502_state::sc12) MCFG_ADDRESS_MAP_BANK_ADDR_WIDTH(16) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_sc12) + config.set_default_layout(layout_fidel_sc12); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2101,7 +2101,7 @@ MACHINE_CONFIG_START(fidel6502_state::as12) MCFG_TIMER_START_DELAY(attotime::from_hz(585) - attotime::from_nsec(15250)) // active for 15.25us MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(585)) - MCFG_DEFAULT_LAYOUT(layout_fidel_as12) + config.set_default_layout(layout_fidel_as12); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::fexcel) @@ -2114,7 +2114,7 @@ MACHINE_CONFIG_START(fidel6502_state::fexcel) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(630)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_ex) + config.set_default_layout(layout_fidel_ex); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2169,7 +2169,7 @@ MACHINE_CONFIG_START(fidel6502_state::fdes2100) MCFG_TIMER_START_DELAY(attotime::from_hz(585) - attotime::from_nsec(15250)) // active for 15.25us MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(585)) - MCFG_DEFAULT_LAYOUT(layout_fidel_des) + config.set_default_layout(layout_fidel_des); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::fdes2000) @@ -2193,7 +2193,7 @@ MACHINE_CONFIG_START(fidel6502_state::fexceld) fexcelb(config); /* basic machine hardware */ - MCFG_DEFAULT_LAYOUT(layout_fidel_exd) + config.set_default_layout(layout_fidel_exd); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel6502_state::fdes2100d) @@ -2206,7 +2206,7 @@ MACHINE_CONFIG_START(fidel6502_state::fdes2100d) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(630)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_desdis) + config.set_default_layout(layout_fidel_desdis); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2233,7 +2233,7 @@ MACHINE_CONFIG_START(fidel6502_state::fphantom) MCFG_MACHINE_RESET_OVERRIDE(fidel6502_state, fphantom) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - //MCFG_DEFAULT_LAYOUT(layout_fidel_phantom) + //config.set_default_layout(layout_fidel_phantom); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -2252,7 +2252,7 @@ MACHINE_CONFIG_START(fidel6502_state::chesster) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel6502_state, irq_off, attotime::from_hz(9615)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_chesster) + config.set_default_layout(layout_fidel_chesster); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/fidel68k.cpp b/src/mame/drivers/fidel68k.cpp index 5e9f18893ac88..98d7c544e34d1 100644 --- a/src/mame/drivers/fidel68k.cpp +++ b/src/mame/drivers/fidel68k.cpp @@ -571,7 +571,7 @@ MACHINE_CONFIG_START(fidel68k_state::fex68k) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(618)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_ex_68k) + config.set_default_layout(layout_fidel_ex_68k); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -607,7 +607,7 @@ MACHINE_CONFIG_START(fidel68k_state::fdes2265) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidel68k_state, irq_off, attotime::from_hz(597)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_desdis_68kr) + config.set_default_layout(layout_fidel_desdis_68kr); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -623,7 +623,7 @@ MACHINE_CONFIG_START(fidel68k_state::fdes2325) MCFG_DEVICE_REPLACE("maincpu", M68EC020, 20_MHz_XTAL) // MC68EC020RP25 MCFG_DEVICE_PROGRAM_MAP(fdes2325_map) - MCFG_DEFAULT_LAYOUT(layout_fidel_desdis_68kg) + config.set_default_layout(layout_fidel_desdis_68kg); MACHINE_CONFIG_END MACHINE_CONFIG_START(fidel68k_state::eag) @@ -638,7 +638,7 @@ MACHINE_CONFIG_START(fidel68k_state::eag) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_eag_68k) + config.set_default_layout(layout_fidel_eag_68k); MCFG_RAM_ADD("ram") MCFG_RAM_DEFAULT_SIZE("1M") diff --git a/src/mame/drivers/fidelmcs48.cpp b/src/mame/drivers/fidelmcs48.cpp index 78cdeb4b10497..71a59804cbbc6 100644 --- a/src/mame/drivers/fidelmcs48.cpp +++ b/src/mame/drivers/fidelmcs48.cpp @@ -161,7 +161,7 @@ MACHINE_CONFIG_START(fidelmcs48_state::sc6) MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, fidelmcs48_state, sc6_input7_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_sc6) + config.set_default_layout(layout_fidel_sc6); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/fidelz80.cpp b/src/mame/drivers/fidelz80.cpp index 0335655277d76..f0a02bbb3723c 100644 --- a/src/mame/drivers/fidelz80.cpp +++ b/src/mame/drivers/fidelz80.cpp @@ -1667,7 +1667,7 @@ MACHINE_CONFIG_START(fidelz80_state::bcc) MCFG_DEVICE_IO_MAP(bcc_io) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_bcc) + config.set_default_layout(layout_fidel_bcc); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1684,7 +1684,7 @@ MACHINE_CONFIG_START(fidelz80_state::scc) MCFG_DEVICE_IO_MAP(scc_io) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_sc8) + config.set_default_layout(layout_fidel_sc8); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1710,7 +1710,7 @@ MACHINE_CONFIG_START(fidelz80_state::cc10) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fidelz80_state, vcc_ppi_portc_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_cc) + config.set_default_layout(layout_fidel_cc); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1736,7 +1736,7 @@ MACHINE_CONFIG_START(fidelz80_state::vcc) MCFG_I8255_OUT_PORTC_CB(WRITE8(*this, fidelz80_state, vcc_ppi_portc_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_vcc) + config.set_default_layout(layout_fidel_vcc); MCFG_MACHINE_START_OVERRIDE(fidelz80_state,vcc) @@ -1766,7 +1766,7 @@ MACHINE_CONFIG_START(fidelz80_state::vsc) MCFG_Z80PIO_OUT_PB_CB(WRITE8(*this, fidelz80_state, vsc_pio_portb_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_vsc) + config.set_default_layout(layout_fidel_vsc); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1794,7 +1794,7 @@ MACHINE_CONFIG_START(fidelz80_state::vbrc) MCFG_I8243_ADD("i8243", CONSTANT(0), WRITE8(*this, fidelz80_state, vbrc_ioexp_port_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_vbrc) + config.set_default_layout(layout_fidel_vbrc); /* sound hardware */ SPEAKER(config, "speaker").front_center(); @@ -1813,7 +1813,7 @@ MACHINE_CONFIG_START(fidelz80_state::dsc) MCFG_TIMER_DRIVER_ADD_PERIODIC("irq_off", fidelz80_state, irq_off, attotime::from_hz(523)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", fidelbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fidel_dsc) + config.set_default_layout(layout_fidel_dsc); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/fireball.cpp b/src/mame/drivers/fireball.cpp index 9e238bac1755b..32acd4d2e01d7 100644 --- a/src/mame/drivers/fireball.cpp +++ b/src/mame/drivers/fireball.cpp @@ -511,7 +511,7 @@ MACHINE_CONFIG_START(fireball_state::fireball) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_fireball) + config.set_default_layout(layout_fireball); MACHINE_CONFIG_END diff --git a/src/mame/drivers/flicker.cpp b/src/mame/drivers/flicker.cpp index d7fb27cbe58a1..1b02a0d3b00fa 100644 --- a/src/mame/drivers/flicker.cpp +++ b/src/mame/drivers/flicker.cpp @@ -395,23 +395,24 @@ void flicker_state::driver_start() } -MACHINE_CONFIG_START(flicker_state::flicker) +void flicker_state::flicker(machine_config &config) +{ // basic machine hardware - MCFG_DEVICE_ADD(m_maincpu, I4004, 5_MHz_XTAL / 8) + I4004(config, m_maincpu, 5_MHz_XTAL / 8); m_maincpu->set_rom_map(&flicker_state::flicker_rom); m_maincpu->set_ram_memory_map(&flicker_state::flicker_memory); m_maincpu->set_rom_ports_map(&flicker_state::flicker_rom_ports); m_maincpu->set_ram_status_map(&flicker_state::flicker_status); m_maincpu->set_ram_ports_map(&flicker_state::flicker_ram_ports); - MCFG_I4004_CM_RAM1_CB(WRITELINE(*this, flicker_state, cm_ram1_w)) - MCFG_I4004_CM_RAM2_CB(WRITELINE(*this, flicker_state, cm_ram2_w)) + m_maincpu->cm_ram_cb<1>().set(FUNC(flicker_state::cm_ram1_w)); + m_maincpu->cm_ram_cb<2>().set(FUNC(flicker_state::cm_ram2_w)); // video - MCFG_DEFAULT_LAYOUT(layout_flicker) + config.set_default_layout(layout_flicker); // sound genpin_audio(config); -MACHINE_CONFIG_END +} ROM_START(flicker) diff --git a/src/mame/drivers/fromanc2.cpp b/src/mame/drivers/fromanc2.cpp index 4a8c9e32343f1..13b2e4f8e80e5 100644 --- a/src/mame/drivers/fromanc2.cpp +++ b/src/mame/drivers/fromanc2.cpp @@ -528,7 +528,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc2) MCFG_PALETTE_ADD("rpalette", 2048) MCFG_PALETTE_FORMAT(GGGGGRRRRRBBBBBx) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -588,7 +588,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromancr) MCFG_PALETTE_ADD("rpalette", 2048) MCFG_PALETTE_FORMAT(xGGGGGRRRRRBBBBB) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -649,7 +649,7 @@ MACHINE_CONFIG_START(fromanc2_state::fromanc4) MCFG_PALETTE_ADD("rpalette", 2048) MCFG_PALETTE_FORMAT(xRRRRRGGGGGBBBBB) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/g627.cpp b/src/mame/drivers/g627.cpp index 1f6f40b23c8e1..322780abe5a7d 100644 --- a/src/mame/drivers/g627.cpp +++ b/src/mame/drivers/g627.cpp @@ -317,7 +317,7 @@ MACHINE_CONFIG_START(g627_state::g627) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_g627) + config.set_default_layout(layout_g627); MACHINE_CONFIG_END /*------------------------------------------------------------------- diff --git a/src/mame/drivers/gaelco2.cpp b/src/mame/drivers/gaelco2.cpp index 1f39905399e3b..b7217a62a281a 100644 --- a/src/mame/drivers/gaelco2.cpp +++ b/src/mame/drivers/gaelco2.cpp @@ -1266,7 +1266,7 @@ MACHINE_CONFIG_START(gaelco2_state::touchgo) MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0400000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) @@ -1862,7 +1862,7 @@ MACHINE_CONFIG_START(wrally2_state::wrally2) MCFG_DEVICE_ADD("spriteram", BUFFERED_SPRITERAM16) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_0x0200000) MCFG_PALETTE_ADD("palette", 4096*16 - 16) /* game's palette is 4096 but we allocate 15 more for shadows & highlights */ - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(59.1) diff --git a/src/mame/drivers/gamecom.cpp b/src/mame/drivers/gamecom.cpp index 176e687d4d1df..46c752857ad5e 100644 --- a/src/mame/drivers/gamecom.cpp +++ b/src/mame/drivers/gamecom.cpp @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(gamecom_state::gamecom) MCFG_SCREEN_VISIBLE_AREA( 0, 199, 0, 159 ) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_gamecom) + config.set_default_layout(layout_gamecom); MCFG_PALETTE_ADD("palette", 5) MCFG_PALETTE_INIT_OWNER(gamecom_state, gamecom) diff --git a/src/mame/drivers/gamepock.cpp b/src/mame/drivers/gamepock.cpp index ca9e3faf7c510..5c8e8c5fbe5f5 100644 --- a/src/mame/drivers/gamepock.cpp +++ b/src/mame/drivers/gamepock.cpp @@ -59,7 +59,7 @@ MACHINE_CONFIG_START(gamepock_state::gamepock) screen.set_screen_update(FUNC(gamepock_state::screen_update_gamepock)); screen.set_palette("palette"); - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/gb.cpp b/src/mame/drivers/gb.cpp index ed76681bf865e..eaa2562c7afbb 100644 --- a/src/mame/drivers/gb.cpp +++ b/src/mame/drivers/gb.cpp @@ -623,7 +623,7 @@ MACHINE_CONFIG_START(gb_state::gameboy) MCFG_SCREEN_UPDATE_DEVICE("ppu", dmg_ppu_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); // MCFG_SCREEN_SIZE(20*8, 18*8) MCFG_SCREEN_SIZE( 458, 154 ) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1) @@ -666,7 +666,7 @@ MACHINE_CONFIG_START(gb_state::supergb) MCFG_SCREEN_UPDATE_DEVICE("ppu", dmg_ppu_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_horizont) /* runs on a TV, not an LCD */ + config.set_default_layout(layout_horizont); /* runs on a TV, not an LCD */ MCFG_SCREEN_SIZE(32*8, 28*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 0*8, 28*8-1) @@ -701,7 +701,7 @@ MACHINE_CONFIG_START(gb_state::supergb2) MCFG_MACHINE_RESET_OVERRIDE(gb_state, sgb) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_horizont) /* runs on a TV, not an LCD */ + config.set_default_layout(layout_horizont); /* runs on a TV, not an LCD */ MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_SIZE(32*8, 28*8) @@ -744,7 +744,7 @@ MACHINE_CONFIG_START(gb_state::gbcolor) MCFG_SCREEN_UPDATE_DEVICE("ppu", dmg_ppu_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); // MCFG_SCREEN_SIZE(20*8, 18*8) MCFG_SCREEN_SIZE( 458, 154 ) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1) @@ -795,7 +795,7 @@ MACHINE_CONFIG_START(megaduck_state::megaduck) MCFG_SCREEN_SIZE(20*8, 18*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 20*8-1, 0*8, 18*8-1) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfxdecode_device::empty) MCFG_PALETTE_ADD("palette", 4) diff --git a/src/mame/drivers/gizmondo.cpp b/src/mame/drivers/gizmondo.cpp index f80098736aa2a..c1fa29da12333 100644 --- a/src/mame/drivers/gizmondo.cpp +++ b/src/mame/drivers/gizmondo.cpp @@ -203,7 +203,7 @@ MACHINE_CONFIG_START(gizmondo_state::gizmondo) MCFG_SCREEN_VISIBLE_AREA(0, 320 - 1, 0, 240 - 1) MCFG_SCREEN_UPDATE_DEVICE("gf4500", gf4500_device, screen_update) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_GF4500_ADD("gf4500") diff --git a/src/mame/drivers/glasgow.cpp b/src/mame/drivers/glasgow.cpp index 5ba5be5176fd1..8c8ac8e63a34b 100644 --- a/src/mame/drivers/glasgow.cpp +++ b/src/mame/drivers/glasgow.cpp @@ -319,7 +319,7 @@ MACHINE_CONFIG_START(glasgow_state::glasgow) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_glasgow) + config.set_default_layout(layout_glasgow); SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("beeper", BEEP, 44) diff --git a/src/mame/drivers/globalfr.cpp b/src/mame/drivers/globalfr.cpp index efe6a2fe7549d..80a68815b3129 100644 --- a/src/mame/drivers/globalfr.cpp +++ b/src/mame/drivers/globalfr.cpp @@ -73,7 +73,7 @@ MACHINE_CONFIG_START(globalfr_state::globalfr) MCFG_DEVICE_ADD("maincpu", M37702S1, 4000000) MCFG_DEVICE_PROGRAM_MAP(globalfr_map) MCFG_S16LF01_ADD("vfd",0) - MCFG_DEFAULT_LAYOUT(layout_globalfr) + config.set_default_layout(layout_globalfr); MACHINE_CONFIG_END /******************************************************************************/ diff --git a/src/mame/drivers/gmaster.cpp b/src/mame/drivers/gmaster.cpp index 1f2c73a9e21b9..1863f322822bb 100644 --- a/src/mame/drivers/gmaster.cpp +++ b/src/mame/drivers/gmaster.cpp @@ -357,7 +357,7 @@ MACHINE_CONFIG_START(gmaster_state::gmaster) MCFG_PALETTE_ADD("palette", ARRAY_LENGTH(gmaster_palette)) MCFG_PALETTE_INIT_OWNER(gmaster_state, gmaster) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); SPEAKER(config, "mono").front_center(); SPEAKER_SOUND(config, m_speaker).add_route(0, "mono", 0.50); diff --git a/src/mame/drivers/gp32.cpp b/src/mame/drivers/gp32.cpp index 6ea829a7ee6e3..6235ce7eefd93 100644 --- a/src/mame/drivers/gp32.cpp +++ b/src/mame/drivers/gp32.cpp @@ -1688,7 +1688,7 @@ MACHINE_CONFIG_START(gp32_state::gp32) MCFG_SCREEN_UPDATE_DRIVER(gp32_state, screen_update_gp32) /* 320x240 is 4:3 but ROT270 causes an aspect ratio of 3:4 by default */ - MCFG_DEFAULT_LAYOUT(layout_lcd_rot) + config.set_default_layout(layout_lcd_rot); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/gp_1.cpp b/src/mame/drivers/gp_1.cpp index 4c97a07e8e499..e6270dc1826c8 100644 --- a/src/mame/drivers/gp_1.cpp +++ b/src/mame/drivers/gp_1.cpp @@ -443,7 +443,7 @@ MACHINE_CONFIG_START(gp_1_state::gp_1) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_gp_1) + config.set_default_layout(layout_gp_1); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/gp_2.cpp b/src/mame/drivers/gp_2.cpp index 2460596b0a5f2..73d0f3dd82822 100644 --- a/src/mame/drivers/gp_2.cpp +++ b/src/mame/drivers/gp_2.cpp @@ -592,7 +592,7 @@ MACHINE_CONFIG_START(gp_2_state::gp_2) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_gp_2) + config.set_default_layout(layout_gp_2); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/gridcomp.cpp b/src/mame/drivers/gridcomp.cpp index f784ba8f1eadd..eb6ce77c6747f 100644 --- a/src/mame/drivers/gridcomp.cpp +++ b/src/mame/drivers/gridcomp.cpp @@ -388,7 +388,7 @@ MACHINE_CONFIG_START(gridcomp_state::grid1101) MCFG_SCREEN_UPDATE_DRIVER(gridcomp_state, screen_update_110x) MCFG_SCREEN_RAW_PARAMS(XTAL(15'000'000)/2, 424, 0, 320, 262, 0, 240) // XXX 66 Hz refresh MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(I80130_TAG, i80130_device, ir3_w)) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/gts1.cpp b/src/mame/drivers/gts1.cpp index 1d83ccd32ce09..2d5814085119d 100644 --- a/src/mame/drivers/gts1.cpp +++ b/src/mame/drivers/gts1.cpp @@ -735,7 +735,7 @@ MACHINE_CONFIG_START(gts1_state::gts1) MCFG_R10788_UPDATE( WRITE8(*this, gts1_state,gts1_display_w) ) /* Video */ - MCFG_DEFAULT_LAYOUT( layout_gts1 ) + config.set_default_layout(layout_gts1); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/gts3.cpp b/src/mame/drivers/gts3.cpp index 118e847eb47ae..11832e8271c24 100644 --- a/src/mame/drivers/gts3.cpp +++ b/src/mame/drivers/gts3.cpp @@ -292,7 +292,7 @@ MACHINE_CONFIG_START(gts3_state::gts3) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_gts3) + config.set_default_layout(layout_gts3); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/gts80.cpp b/src/mame/drivers/gts80.cpp index 49a32b8a49529..3c525acea078d 100644 --- a/src/mame/drivers/gts80.cpp +++ b/src/mame/drivers/gts80.cpp @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(gts80_state::gts80) MCFG_NVRAM_ADD_1FILL("nvram") // must be 1 /* Video */ - MCFG_DEFAULT_LAYOUT(layout_gts80) + config.set_default_layout(layout_gts80); /* Devices */ MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4) diff --git a/src/mame/drivers/gts80a.cpp b/src/mame/drivers/gts80a.cpp index 02b028950e76c..d0ff17e18b262 100644 --- a/src/mame/drivers/gts80a.cpp +++ b/src/mame/drivers/gts80a.cpp @@ -355,7 +355,7 @@ MACHINE_CONFIG_START(gts80a_state::gts80a) MCFG_NVRAM_ADD_1FILL("nvram") // must be 1 /* Video */ - MCFG_DEFAULT_LAYOUT(layout_gts80a) + config.set_default_layout(layout_gts80a); /* Devices */ MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4) @@ -476,7 +476,7 @@ MACHINE_CONFIG_START(caveman_state::caveman) MCFG_PALETTE_ADD("palette", 16) - MCFG_DEFAULT_LAYOUT(layout_gts80a_caveman) + config.set_default_layout(layout_gts80a_caveman); MACHINE_CONFIG_END diff --git a/src/mame/drivers/gts80b.cpp b/src/mame/drivers/gts80b.cpp index e8cc0c3bddf27..2a5663d8c03b6 100644 --- a/src/mame/drivers/gts80b.cpp +++ b/src/mame/drivers/gts80b.cpp @@ -396,7 +396,7 @@ MACHINE_CONFIG_START(gts80b_state::gts80b) MCFG_NVRAM_ADD_1FILL("nvram") // must be 1 /* Video */ - MCFG_DEFAULT_LAYOUT(layout_gts80b) + config.set_default_layout(layout_gts80b); /* Devices */ MCFG_DEVICE_ADD("riot1", RIOT6532, XTAL(3'579'545)/4) diff --git a/src/mame/drivers/guab.cpp b/src/mame/drivers/guab.cpp index fbb2a9246144a..51326adc80e9c 100644 --- a/src/mame/drivers/guab.cpp +++ b/src/mame/drivers/guab.cpp @@ -554,7 +554,7 @@ MACHINE_CONFIG_START(guab_state::guab) MCFG_SOFTWARE_LIST_ADD("floppy_list", "guab") - MCFG_DEFAULT_LAYOUT(layout_guab) + config.set_default_layout(layout_guab); MACHINE_CONFIG_END diff --git a/src/mame/drivers/h8.cpp b/src/mame/drivers/h8.cpp index ea1d710a28a51..eca8a3cdb83cb 100644 --- a/src/mame/drivers/h8.cpp +++ b/src/mame/drivers/h8.cpp @@ -321,7 +321,7 @@ MACHINE_CONFIG_START(h8_state::h8) MCFG_I8085A_INTE(WRITELINE(*this, h8_state, h8_inte_callback)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_h8) + config.set_default_layout(layout_h8); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/hankin.cpp b/src/mame/drivers/hankin.cpp index 7a0aeda7bfc4f..9a4c94e53bdff 100644 --- a/src/mame/drivers/hankin.cpp +++ b/src/mame/drivers/hankin.cpp @@ -483,7 +483,7 @@ MACHINE_CONFIG_START(hankin_state::hankin) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_hankin) + config.set_default_layout(layout_hankin); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/hh_amis2k.cpp b/src/mame/drivers/hh_amis2k.cpp index 4b34c94d33699..b176883557b3a 100644 --- a/src/mame/drivers/hh_amis2k.cpp +++ b/src/mame/drivers/hh_amis2k.cpp @@ -325,7 +325,7 @@ MACHINE_CONFIG_START(wildfire_state::wildfire) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", wildfire_state, display_decay_tick, attotime::from_msec(1)) MCFG_TIMER_DRIVER_ADD("a12_decay", wildfire_state, reset_q2) - MCFG_DEFAULT_LAYOUT(layout_wildfire) + config.set_default_layout(layout_wildfire); /* no video! */ diff --git a/src/mame/drivers/hh_cop400.cpp b/src/mame/drivers/hh_cop400.cpp index 27535ab6ed6c8..3f0804681a60c 100644 --- a/src/mame/drivers/hh_cop400.cpp +++ b/src/mame/drivers/hh_cop400.cpp @@ -324,7 +324,7 @@ MACHINE_CONFIG_START(ctstein_state::ctstein) MCFG_COP400_READ_L_CB(READ8(*this, ctstein_state, read_l)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ctstein) + config.set_default_layout(layout_ctstein); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -467,7 +467,7 @@ MACHINE_CONFIG_START(h2hbaskbc_state::h2hbaskbc) MCFG_COP400_WRITE_SO_CB(WRITELINE("speaker", speaker_sound_device, level_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_h2hbaskbc) + config.set_default_layout(layout_h2hbaskbc); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -479,14 +479,14 @@ MACHINE_CONFIG_START(h2hbaskbc_state::h2hhockeyc) h2hbaskbc(config); /* basic machine hardware */ - MCFG_DEFAULT_LAYOUT(layout_h2hhockeyc) + config.set_default_layout(layout_h2hhockeyc); MACHINE_CONFIG_END MACHINE_CONFIG_START(h2hbaskbc_state::h2hsoccerc) h2hbaskbc(config); /* basic machine hardware */ - MCFG_DEFAULT_LAYOUT(layout_h2hsoccerc) + config.set_default_layout(layout_h2hsoccerc); MACHINE_CONFIG_END @@ -599,7 +599,7 @@ MACHINE_CONFIG_START(einvaderc_state::einvaderc) MCFG_SCREEN_SIZE(913, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 913-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_einvaderc) + config.set_default_layout(layout_einvaderc); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -723,7 +723,7 @@ MACHINE_CONFIG_START(unkeinv_state::unkeinv) MCFG_COP400_WRITE_SO_CB(WRITELINE("speaker", speaker_sound_device, level_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_unkeinv) + config.set_default_layout(layout_unkeinv); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -880,7 +880,7 @@ MACHINE_CONFIG_START(lchicken_state::lchicken) MCFG_TIMER_DRIVER_ADD_PERIODIC("chicken_motor", lchicken_state, motor_sim_tick, attotime::from_msec(6000/0x100)) // ~6sec for a full rotation MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_lchicken) + config.set_default_layout(layout_lchicken); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -988,7 +988,7 @@ MACHINE_CONFIG_START(funjacks_state::funjacks) MCFG_COP400_READ_G_CB(READ8(*this, funjacks_state, read_g)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_funjacks) + config.set_default_layout(layout_funjacks); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1083,7 +1083,7 @@ MACHINE_CONFIG_START(funrlgl_state::funrlgl) MCFG_COP400_READ_G_CB(IOPORT("IN.0")) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_funrlgl) + config.set_default_layout(layout_funrlgl); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1219,7 +1219,7 @@ MACHINE_CONFIG_START(mdallas_state::mdallas) MCFG_COP400_WRITE_SO_CB(WRITELINE("speaker", speaker_sound_device, level_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mdallas) + config.set_default_layout(layout_mdallas); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1431,7 +1431,7 @@ MACHINE_CONFIG_START(lightfgt_state::lightfgt) MCFG_COP400_READ_G_CB(READ8(*this, lightfgt_state, read_g)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_lightfgt) + config.set_default_layout(layout_lightfgt); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1586,7 +1586,7 @@ MACHINE_CONFIG_START(bship82_state::bship82) MCFG_COP400_READ_SI_CB(IOPORT("IN.4")) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_bship82) + config.set_default_layout(layout_bship82); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1717,7 +1717,7 @@ MACHINE_CONFIG_START(qkracer_state::qkracer) MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, qkracer_state, write_sk)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_qkracer) + config.set_default_layout(layout_qkracer); /* no sound! */ MACHINE_CONFIG_END @@ -1808,7 +1808,7 @@ MACHINE_CONFIG_START(vidchal_state::vidchal) MCFG_COP400_WRITE_SK_CB(WRITELINE(*this, vidchal_state, write_sk)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_cop400_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_vidchal) + config.set_default_layout(layout_vidchal); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/hh_hmcs40.cpp b/src/mame/drivers/hh_hmcs40.cpp index b236a3e127e43..b2caa7e5aca5c 100644 --- a/src/mame/drivers/hh_hmcs40.cpp +++ b/src/mame/drivers/hh_hmcs40.cpp @@ -445,7 +445,7 @@ MACHINE_CONFIG_START(bambball_state::bambball) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 478) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 478-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -582,7 +582,7 @@ MACHINE_CONFIG_START(bmboxing_state::bmboxing) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 529) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 529-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -706,7 +706,7 @@ MACHINE_CONFIG_START(bfriskyt_state::bfriskyt) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 675) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 675-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -817,7 +817,7 @@ MACHINE_CONFIG_START(packmon_state::packmon) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 766) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 766-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -951,7 +951,7 @@ MACHINE_CONFIG_START(msthawk_state::msthawk) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 696) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 696-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1073,7 +1073,7 @@ MACHINE_CONFIG_START(bzaxxon_state::bzaxxon) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(613, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 613-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1191,7 +1191,7 @@ MACHINE_CONFIG_START(zackman_state::zackman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(487, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 487-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1319,7 +1319,7 @@ MACHINE_CONFIG_START(bpengo_state::bpengo) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 759) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 759-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1443,7 +1443,7 @@ MACHINE_CONFIG_START(bbtime_state::bbtime) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(379, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 379-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1542,7 +1542,7 @@ MACHINE_CONFIG_START(bdoramon_state::bdoramon) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 668) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 668-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1634,7 +1634,7 @@ MACHINE_CONFIG_START(bultrman_state::bultrman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 673) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 673-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1724,7 +1724,7 @@ MACHINE_CONFIG_START(machiman_state::machiman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1534, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1534-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1876,7 +1876,7 @@ MACHINE_CONFIG_START(pairmtch_state::pairmtch) MCFG_QUANTUM_PERFECT_CPU("maincpu") MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_pairmtch) + config.set_default_layout(layout_pairmtch); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1993,7 +1993,7 @@ MACHINE_CONFIG_START(alnattck_state::alnattck) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 700) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 700-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2123,7 +2123,7 @@ MACHINE_CONFIG_START(cdkong_state::cdkong) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(605, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 605-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2252,7 +2252,7 @@ MACHINE_CONFIG_START(cgalaxn_state::cgalaxn) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(526, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 526-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2374,7 +2374,7 @@ MACHINE_CONFIG_START(cpacman_state::cpacman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(484, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 484-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2491,7 +2491,7 @@ MACHINE_CONFIG_START(cmspacmn_state::cmspacmn) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(481, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 481-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2632,7 +2632,7 @@ MACHINE_CONFIG_START(sag_state::sag) MCFG_HMCS40_READ_D_CB(READ16(*this, sag_state, input_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_sag) + config.set_default_layout(layout_sag); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2753,7 +2753,7 @@ MACHINE_CONFIG_START(egalaxn2_state::egalaxn2) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(505, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 505-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3014,7 +3014,7 @@ MACHINE_CONFIG_START(eturtles_state::eturtles) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(484, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 484-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3123,7 +3123,7 @@ MACHINE_CONFIG_START(estargte_state::estargte) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 854) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 854-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3239,7 +3239,7 @@ MACHINE_CONFIG_START(ghalien_state::ghalien) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 699) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 699-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3366,7 +3366,7 @@ MACHINE_CONFIG_START(gckong_state::gckong) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(506, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 506-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3487,7 +3487,7 @@ MACHINE_CONFIG_START(gdigdug_state::gdigdug) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(476, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 476-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3648,7 +3648,7 @@ MACHINE_CONFIG_START(mwcbaseb_state::mwcbaseb) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 478) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 478-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3738,7 +3738,7 @@ MACHINE_CONFIG_START(pbqbert_state::pbqbert) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(603, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 603-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3859,7 +3859,7 @@ MACHINE_CONFIG_START(kingman_state::kingman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(374, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 374-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -3980,7 +3980,7 @@ MACHINE_CONFIG_START(tmtron_state::tmtron) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 662) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 662-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -4075,7 +4075,7 @@ MACHINE_CONFIG_START(vinvader_state::vinvader) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(233, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 233-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_hmcs40_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ diff --git a/src/mame/drivers/hh_melps4.cpp b/src/mame/drivers/hh_melps4.cpp index 95ba61f5c99f9..f600c87b2a8a3 100644 --- a/src/mame/drivers/hh_melps4.cpp +++ b/src/mame/drivers/hh_melps4.cpp @@ -311,7 +311,7 @@ MACHINE_CONFIG_START(cfrogger_state::cfrogger) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(500, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 500-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_melps4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -428,7 +428,7 @@ MACHINE_CONFIG_START(gjungler_state::gjungler) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(481, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 481-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_melps4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ diff --git a/src/mame/drivers/hh_pic16.cpp b/src/mame/drivers/hh_pic16.cpp index 1774503a00bc2..fa06b635c0e5d 100644 --- a/src/mame/drivers/hh_pic16.cpp +++ b/src/mame/drivers/hh_pic16.cpp @@ -391,7 +391,7 @@ MACHINE_CONFIG_START(touchme_state::touchme) MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_touchme) + config.set_default_layout(layout_touchme); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -497,7 +497,7 @@ MACHINE_CONFIG_START(pabball_state::pabball) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, pabball_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_hh_pic16_test) + config.set_default_layout(layout_hh_pic16_test); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -612,7 +612,7 @@ MACHINE_CONFIG_START(melodym_state::melodym) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, melodym_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_melodym) + config.set_default_layout(layout_melodym); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -711,7 +711,7 @@ MACHINE_CONFIG_START(maniac_state::maniac) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, maniac_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_maniac) + config.set_default_layout(layout_maniac); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -861,7 +861,7 @@ MACHINE_CONFIG_START(matchme_state::matchme) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, matchme_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_matchme) + config.set_default_layout(layout_matchme); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1017,7 +1017,7 @@ MACHINE_CONFIG_START(leboom_state::leboom) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, leboom_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_leboom) + config.set_default_layout(layout_leboom); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1127,7 +1127,7 @@ MACHINE_CONFIG_START(tbaskb_state::tbaskb) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, tbaskb_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tbaskb) + config.set_default_layout(layout_tbaskb); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1243,7 +1243,7 @@ MACHINE_CONFIG_START(rockpin_state::rockpin) MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_rockpin) + config.set_default_layout(layout_rockpin); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1354,7 +1354,7 @@ MACHINE_CONFIG_START(hccbaskb_state::hccbaskb) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, hccbaskb_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_hccbaskb) + config.set_default_layout(layout_hccbaskb); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1506,7 +1506,7 @@ MACHINE_CONFIG_START(ttfball_state::ttfball) MCFG_PIC16C5x_WRITE_C_CB(WRITE8(*this, ttfball_state, write_c)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ttfball) + config.set_default_layout(layout_ttfball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1617,7 +1617,7 @@ MACHINE_CONFIG_START(uspbball_state::uspbball) MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_hh_pic16_test) + config.set_default_layout(layout_hh_pic16_test); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1752,7 +1752,7 @@ MACHINE_CONFIG_START(us2pfball_state::us2pfball) MCFG_CLOCK_SIGNAL_HANDLER(INPUTLINE("maincpu", PIC16C5x_RTCC)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_pic16_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_us2pfball) + config.set_default_layout(layout_us2pfball); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/hh_sm510.cpp b/src/mame/drivers/hh_sm510.cpp index 5f38bcd3bd7c9..04d5e0fc2131a 100644 --- a/src/mame/drivers/hh_sm510.cpp +++ b/src/mame/drivers/hh_sm510.cpp @@ -297,7 +297,7 @@ MACHINE_CONFIG_START(kdribble_state::kdribble) MCFG_SCREEN_VISIBLE_AREA(0, 1524-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -370,7 +370,7 @@ MACHINE_CONFIG_START(ktopgun_state::ktopgun) MCFG_SCREEN_VISIBLE_AREA(0, 1515-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -444,7 +444,7 @@ MACHINE_CONFIG_START(kcontra_state::kcontra) MCFG_SCREEN_VISIBLE_AREA(0, 1505-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -517,7 +517,7 @@ MACHINE_CONFIG_START(ktmnt_state::ktmnt) MCFG_SCREEN_VISIBLE_AREA(0, 1505-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -587,7 +587,7 @@ MACHINE_CONFIG_START(kgradius_state::kgradius) MCFG_SCREEN_VISIBLE_AREA(0, 1420-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -655,7 +655,7 @@ MACHINE_CONFIG_START(kloneran_state::kloneran) MCFG_SCREEN_VISIBLE_AREA(0, 1497-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -726,7 +726,7 @@ MACHINE_CONFIG_START(kblades_state::kblades) MCFG_SCREEN_SIZE(1516, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1516-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -799,7 +799,7 @@ MACHINE_CONFIG_START(knfl_state::knfl) MCFG_SCREEN_SIZE(1449, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1449-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -871,7 +871,7 @@ MACHINE_CONFIG_START(kbilly_state::kbilly) MCFG_SCREEN_SIZE(1490, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1490-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -937,7 +937,7 @@ MACHINE_CONFIG_START(kbucky_state::kbucky) MCFG_SCREEN_SIZE(1490, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1490-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1007,7 +1007,7 @@ MACHINE_CONFIG_START(kgarfld_state::kgarfld) MCFG_SCREEN_SIZE(1500, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1500-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1102,7 +1102,7 @@ MACHINE_CONFIG_START(gnw_mmouse_state::gnw_mmouse) MCFG_SCREEN_VISIBLE_AREA(0, 1711-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1217,7 +1217,7 @@ MACHINE_CONFIG_START(gnw_mickdon_state::gnw_mickdon) MCFG_SCREEN_VISIBLE_AREA(0, 1920/2-1, 0, 1236/2-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_gnw_dualv) + config.set_default_layout(layout_gnw_dualv); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1301,7 +1301,7 @@ MACHINE_CONFIG_START(gnw_dkong2_state::gnw_dkong2) MCFG_SCREEN_VISIBLE_AREA(0, 1920/2-1, 0, 1237/2-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_gnw_dualv) + config.set_default_layout(layout_gnw_dualv); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1387,7 +1387,7 @@ MACHINE_CONFIG_START(gnw_mario_state::gnw_mario) MCFG_SCREEN_VISIBLE_AREA(0, 2261/2-1, 0, 1440/2-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_gnw_dualh) + config.set_default_layout(layout_gnw_dualh); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1474,7 +1474,7 @@ MACHINE_CONFIG_START(gnw_dkjr_state::gnw_dkjr) MCFG_SCREEN_VISIBLE_AREA(0, 1647-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1556,7 +1556,7 @@ MACHINE_CONFIG_START(gnw_mariocm_state::gnw_mariocm) MCFG_SCREEN_VISIBLE_AREA(0, 1647-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1639,7 +1639,7 @@ MACHINE_CONFIG_START(gnw_smb_state::gnw_smb) MCFG_SCREEN_VISIBLE_AREA(0, 1677-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1742,7 +1742,7 @@ MACHINE_CONFIG_START(gnw_boxing_state::gnw_boxing) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 524-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1853,7 +1853,7 @@ MACHINE_CONFIG_START(tgaunt_state::tgaunt) MCFG_SCREEN_VISIBLE_AREA(0, 1425-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1956,7 +1956,7 @@ MACHINE_CONFIG_START(tddragon_state::tddragon) MCFG_SCREEN_VISIBLE_AREA(0, 1467-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2051,7 +2051,7 @@ MACHINE_CONFIG_START(tkarnov_state::tkarnov) MCFG_SCREEN_VISIBLE_AREA(0, 1477-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2145,7 +2145,7 @@ MACHINE_CONFIG_START(tvindictr_state::tvindictr) MCFG_SCREEN_VISIBLE_AREA(0, 1459-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2262,7 +2262,7 @@ MACHINE_CONFIG_START(tgaiden_state::tgaiden) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2352,7 +2352,7 @@ MACHINE_CONFIG_START(tbatman_state::tbatman) MCFG_SCREEN_VISIBLE_AREA(0, 1442-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2446,7 +2446,7 @@ MACHINE_CONFIG_START(tsharr2_state::tsharr2) MCFG_SCREEN_VISIBLE_AREA(0, 1493-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2537,7 +2537,7 @@ MACHINE_CONFIG_START(tstrider_state::tstrider) MCFG_SCREEN_VISIBLE_AREA(0, 1479-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2632,7 +2632,7 @@ MACHINE_CONFIG_START(tgoldnaxe_state::tgoldnaxe) MCFG_SCREEN_VISIBLE_AREA(0, 1456-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2744,7 +2744,7 @@ MACHINE_CONFIG_START(trobocop2_state::trobocop2) MCFG_SCREEN_VISIBLE_AREA(0, 1487-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2852,7 +2852,7 @@ MACHINE_CONFIG_START(taltbeast_state::taltbeast) MCFG_SCREEN_VISIBLE_AREA(0, 1455-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2947,7 +2947,7 @@ MACHINE_CONFIG_START(tsf2010_state::tsf2010) MCFG_SCREEN_VISIBLE_AREA(0, 1465-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3038,7 +3038,7 @@ MACHINE_CONFIG_START(tswampt_state::tswampt) MCFG_SCREEN_VISIBLE_AREA(0, 1450-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3133,7 +3133,7 @@ MACHINE_CONFIG_START(tspidman_state::tspidman) MCFG_SCREEN_VISIBLE_AREA(0, 1440-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3228,7 +3228,7 @@ MACHINE_CONFIG_START(txmen_state::txmen) MCFG_SCREEN_VISIBLE_AREA(0, 1467-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3323,7 +3323,7 @@ MACHINE_CONFIG_START(tddragon3_state::tddragon3) MCFG_SCREEN_VISIBLE_AREA(0, 1514-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3418,7 +3418,7 @@ MACHINE_CONFIG_START(tflash_state::tflash) MCFG_SCREEN_VISIBLE_AREA(0, 1444-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3513,7 +3513,7 @@ MACHINE_CONFIG_START(tmchammer_state::tmchammer) MCFG_SCREEN_VISIBLE_AREA(0, 1471-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3608,7 +3608,7 @@ MACHINE_CONFIG_START(tbtoads_state::tbtoads) MCFG_SCREEN_VISIBLE_AREA(0, 1454-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3703,7 +3703,7 @@ MACHINE_CONFIG_START(thook_state::thook) MCFG_SCREEN_VISIBLE_AREA(0, 1489-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3797,7 +3797,7 @@ MACHINE_CONFIG_START(tbttf_state::tbttf) MCFG_SCREEN_VISIBLE_AREA(0, 1466-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3894,7 +3894,7 @@ MACHINE_CONFIG_START(taddams_state::taddams) MCFG_SCREEN_VISIBLE_AREA(0, 1464-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3989,7 +3989,7 @@ MACHINE_CONFIG_START(thalone_state::thalone) MCFG_SCREEN_VISIBLE_AREA(0, 1448-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4080,7 +4080,7 @@ MACHINE_CONFIG_START(txmenpx_state::txmenpx) MCFG_SCREEN_VISIBLE_AREA(0, 1464-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4175,7 +4175,7 @@ MACHINE_CONFIG_START(thalone2_state::thalone2) MCFG_SCREEN_VISIBLE_AREA(0, 1454-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4263,7 +4263,7 @@ MACHINE_CONFIG_START(tsonic_state::tsonic) MCFG_SCREEN_SIZE(1517, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1517-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4359,7 +4359,7 @@ MACHINE_CONFIG_START(trobocop3_state::trobocop3) MCFG_SCREEN_VISIBLE_AREA(0, 1464-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4450,7 +4450,7 @@ MACHINE_CONFIG_START(tdummies_state::tdummies) MCFG_SCREEN_VISIBLE_AREA(0, 1441-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4545,7 +4545,7 @@ MACHINE_CONFIG_START(tsfight2_state::tsfight2) MCFG_SCREEN_VISIBLE_AREA(0, 1444-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4640,7 +4640,7 @@ MACHINE_CONFIG_START(twworld_state::twworld) MCFG_SCREEN_VISIBLE_AREA(0, 1429-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4731,7 +4731,7 @@ MACHINE_CONFIG_START(tjpark_state::tjpark) MCFG_SCREEN_VISIBLE_AREA(0, 1454-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4819,7 +4819,7 @@ MACHINE_CONFIG_START(tsonic2_state::tsonic2) MCFG_SCREEN_SIZE(1475, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1475-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4920,7 +4920,7 @@ MACHINE_CONFIG_START(tsddragon_state::tsddragon) MCFG_SCREEN_VISIBLE_AREA(0, 1503-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5016,7 +5016,7 @@ MACHINE_CONFIG_START(tdennis_state::tdennis) MCFG_SCREEN_VISIBLE_AREA(0, 1467-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5115,7 +5115,7 @@ MACHINE_CONFIG_START(tnmarebc_state::tnmarebc) MCFG_SCREEN_VISIBLE_AREA(0, 1456-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5210,7 +5210,7 @@ MACHINE_CONFIG_START(ttransf2_state::ttransf2) MCFG_SCREEN_VISIBLE_AREA(0, 1476-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5301,7 +5301,7 @@ MACHINE_CONFIG_START(topaliens_state::topaliens) MCFG_SCREEN_VISIBLE_AREA(0, 1450-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5397,7 +5397,7 @@ MACHINE_CONFIG_START(tmkombat_state::tmkombat) MCFG_SCREEN_VISIBLE_AREA(0, 1468-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5492,7 +5492,7 @@ MACHINE_CONFIG_START(tshadow_state::tshadow) MCFG_SCREEN_VISIBLE_AREA(0, 1484-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5587,7 +5587,7 @@ MACHINE_CONFIG_START(tskelwarr_state::tskelwarr) MCFG_SCREEN_VISIBLE_AREA(0, 1444-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5683,7 +5683,7 @@ MACHINE_CONFIG_START(tbatfor_state::tbatfor) MCFG_SCREEN_VISIBLE_AREA(0, 1493-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5779,7 +5779,7 @@ MACHINE_CONFIG_START(tjdredd_state::tjdredd) MCFG_SCREEN_VISIBLE_AREA(0, 1444-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5875,7 +5875,7 @@ MACHINE_CONFIG_START(tapollo13_state::tapollo13) MCFG_SCREEN_VISIBLE_AREA(0, 1467-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5971,7 +5971,7 @@ MACHINE_CONFIG_START(tgoldeye_state::tgoldeye) MCFG_SCREEN_VISIBLE_AREA(0, 1461-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6062,7 +6062,7 @@ MACHINE_CONFIG_START(tinday_state::tinday) MCFG_SCREEN_VISIBLE_AREA(0, 1463-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6153,7 +6153,7 @@ MACHINE_CONFIG_START(tsjam_state::tsjam) MCFG_SCREEN_VISIBLE_AREA(0, 1421-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6242,7 +6242,7 @@ MACHINE_CONFIG_START(tbatmana_state::tbatmana) MCFG_SCREEN_SIZE(1478, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 1478-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6346,7 +6346,7 @@ MACHINE_CONFIG_START(tigarden_state::tigarden) MCFG_SCREEN_VISIBLE_AREA(0, 1515-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6446,7 +6446,7 @@ MACHINE_CONFIG_START(nummunch_state::nummunch) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 875-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/hh_tms1k.cpp b/src/mame/drivers/hh_tms1k.cpp index fbbfdbddd6595..6dc3282b62237 100644 --- a/src/mame/drivers/hh_tms1k.cpp +++ b/src/mame/drivers/hh_tms1k.cpp @@ -539,7 +539,7 @@ MACHINE_CONFIG_START(matchnum_state::matchnum) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, matchnum_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_matchnum) + config.set_default_layout(layout_matchnum); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -639,7 +639,7 @@ MACHINE_CONFIG_START(arrball_state::arrball) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, arrball_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_arrball) + config.set_default_layout(layout_arrball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -820,7 +820,7 @@ MACHINE_CONFIG_START(mathmagi_state::mathmagi) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mathmagi_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mathmagi) + config.set_default_layout(layout_mathmagi); /* no sound! */ MACHINE_CONFIG_END @@ -924,7 +924,7 @@ MACHINE_CONFIG_START(bcheetah_state::bcheetah) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, bcheetah_state, write_r)) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bcheetah_state, write_o)) - MCFG_DEFAULT_LAYOUT(layout_bcheetah) + config.set_default_layout(layout_bcheetah); /* no sound! */ MACHINE_CONFIG_END @@ -1052,7 +1052,7 @@ MACHINE_CONFIG_START(amaztron_state::amaztron) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, amaztron_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_amaztron) + config.set_default_layout(layout_amaztron); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1230,7 +1230,7 @@ MACHINE_CONFIG_START(zodiac_state::zodiac) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, zodiac_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_zodiac) + config.set_default_layout(layout_zodiac); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1345,7 +1345,7 @@ MACHINE_CONFIG_START(cqback_state::cqback) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cqback_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cqback) + config.set_default_layout(layout_cqback); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1463,7 +1463,7 @@ MACHINE_CONFIG_START(h2hfootb_state::h2hfootb) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hfootb_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_h2hfootb) + config.set_default_layout(layout_h2hfootb); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1606,7 +1606,7 @@ MACHINE_CONFIG_START(h2hhockey_state::h2hhockey) MCFG_TIMER_DRIVER_ADD("cap_empty", h2hhockey_state, cap_empty_callback) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_h2hhockey) + config.set_default_layout(layout_h2hhockey); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1745,7 +1745,7 @@ MACHINE_CONFIG_START(h2hbaseb_state::h2hbaseb) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hbaseb_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_h2hbaseb) + config.set_default_layout(layout_h2hbaseb); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1857,7 +1857,7 @@ MACHINE_CONFIG_START(h2hboxing_state::h2hboxing) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, h2hboxing_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_h2hboxing) + config.set_default_layout(layout_h2hboxing); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2028,7 +2028,7 @@ MACHINE_CONFIG_START(quizwizc_state::quizwizc) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, quizwizc_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_quizwizc) + config.set_default_layout(layout_quizwizc); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2204,7 +2204,7 @@ MACHINE_CONFIG_START(tc4_state::tc4) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tc4_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tc4) + config.set_default_layout(layout_tc4); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2319,7 +2319,7 @@ MACHINE_CONFIG_START(cnbaskb_state::cnbaskb) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnbaskb_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cnbaskb) + config.set_default_layout(layout_cnbaskb); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2432,7 +2432,7 @@ MACHINE_CONFIG_START(cmsport_state::cmsport) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cmsport_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cmsport) + config.set_default_layout(layout_cmsport); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2558,7 +2558,7 @@ MACHINE_CONFIG_START(cnfball_state::cnfball) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnfball_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cnfball) + config.set_default_layout(layout_cnfball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2685,7 +2685,7 @@ MACHINE_CONFIG_START(cnfball2_state::cnfball2) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnfball2_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cnfball2) + config.set_default_layout(layout_cnfball2); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2826,7 +2826,7 @@ MACHINE_CONFIG_START(eleciq_state::eleciq) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, eleciq_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_eleciq) + config.set_default_layout(layout_eleciq); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2931,7 +2931,7 @@ MACHINE_CONFIG_START(esoccer_state::esoccer) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, esoccer_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_esoccer) + config.set_default_layout(layout_esoccer); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3065,7 +3065,7 @@ MACHINE_CONFIG_START(ebball_state::ebball) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebball_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ebball) + config.set_default_layout(layout_ebball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3188,7 +3188,7 @@ MACHINE_CONFIG_START(ebball2_state::ebball2) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebball2_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ebball2) + config.set_default_layout(layout_ebball2); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3368,7 +3368,7 @@ MACHINE_CONFIG_START(ebball3_state::ebball3) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebball3_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ebball3) + config.set_default_layout(layout_ebball3); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3479,7 +3479,7 @@ MACHINE_CONFIG_START(esbattle_state::esbattle) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, esbattle_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_esbattle) + config.set_default_layout(layout_esbattle); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3593,7 +3593,7 @@ MACHINE_CONFIG_START(einvader_state::einvader) MCFG_SCREEN_SIZE(939, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 939-1, 0, 1080-1) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_einvader) + config.set_default_layout(layout_einvader); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3708,7 +3708,7 @@ MACHINE_CONFIG_START(efootb4_state::efootb4) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, efootb4_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_efootb4) + config.set_default_layout(layout_efootb4); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3829,7 +3829,7 @@ MACHINE_CONFIG_START(ebaskb2_state::ebaskb2) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ebaskb2_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ebaskb2) + config.set_default_layout(layout_ebaskb2); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -3968,7 +3968,7 @@ MACHINE_CONFIG_START(raisedvl_state::raisedvl) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, raisedvl_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_raisedvl) + config.set_default_layout(layout_raisedvl); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4099,7 +4099,7 @@ MACHINE_CONFIG_START(f2pbball_state::f2pbball) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, f2pbball_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_f2pbball) + config.set_default_layout(layout_f2pbball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4236,7 +4236,7 @@ MACHINE_CONFIG_START(f3in1_state::f3in1) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, f3in1_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_f3in1) + config.set_default_layout(layout_f3in1); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4381,7 +4381,7 @@ MACHINE_CONFIG_START(gpoker_state::gpoker) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, gpoker_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_gpoker) + config.set_default_layout(layout_gpoker); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4494,7 +4494,7 @@ MACHINE_CONFIG_START(gjackpot_state::gjackpot) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, gpoker_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_gjackpot) + config.set_default_layout(layout_gjackpot); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -4603,7 +4603,7 @@ MACHINE_CONFIG_START(ginv1000_state::ginv1000) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(226, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 226-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -4739,7 +4739,7 @@ MACHINE_CONFIG_START(ginv2000_state::ginv2000) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(364, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 364-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -4878,7 +4878,7 @@ MACHINE_CONFIG_START(fxmcr165_state::fxmcr165) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, fxmcr165_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_fxmcr165) + config.set_default_layout(layout_fxmcr165); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5007,7 +5007,7 @@ MACHINE_CONFIG_START(elecdet_state::elecdet) MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_elecdet) + config.set_default_layout(layout_elecdet); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5134,7 +5134,7 @@ MACHINE_CONFIG_START(starwbc_state::starwbc) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, starwbc_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_starwbc) + config.set_default_layout(layout_starwbc); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5261,7 +5261,7 @@ MACHINE_CONFIG_START(astro_state::astro) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, astro_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_astro) + config.set_default_layout(layout_astro); /* no sound! */ MACHINE_CONFIG_END @@ -5427,7 +5427,7 @@ MACHINE_CONFIG_START(elecbowl_state::elecbowl) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, elecbowl_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_elecbowl) + config.set_default_layout(layout_elecbowl); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5585,7 +5585,7 @@ MACHINE_CONFIG_START(horseran_state::horseran) MCFG_DEVICE_ADD("lcd", HLCD0569, 1100) // C=0.022uF MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(*this, horseran_state, lcd_output_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_horseran) + config.set_default_layout(layout_horseran); /* no sound! */ MACHINE_CONFIG_END @@ -5762,7 +5762,7 @@ MACHINE_CONFIG_START(mdndclab_state::mdndclab) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mdndclab_state, write_o)) /* no visual feedback! */ - MCFG_DEFAULT_LAYOUT(layout_mdndclab) // playing board + config.set_default_layout(layout_mdndclab); // playing board /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -5866,7 +5866,7 @@ MACHINE_CONFIG_START(comp4_state::comp4) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, comp4_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_comp4) + config.set_default_layout(layout_comp4); /* no sound! */ MACHINE_CONFIG_END @@ -6016,7 +6016,7 @@ MACHINE_CONFIG_START(bship_state::bship) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bship_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_bship) + config.set_default_layout(layout_bship); /* sound hardware */ // TODO @@ -6119,7 +6119,7 @@ MACHINE_CONFIG_START(bshipb_state::bshipb) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bshipb_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_bship) + config.set_default_layout(layout_bship); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6236,7 +6236,7 @@ MACHINE_CONFIG_START(simon_state::simon) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, simon_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_simon) + config.set_default_layout(layout_simon); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6377,7 +6377,7 @@ MACHINE_CONFIG_START(ssimon_state::ssimon) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ssimon_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ssimon) + config.set_default_layout(layout_ssimon); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6559,7 +6559,7 @@ MACHINE_CONFIG_START(bigtrak_state::bigtrak) MCFG_TIMER_DRIVER_ADD_PERIODIC("gearbox", bigtrak_state, gearbox_sim_tick, attotime::from_msec(1)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_bigtrak) + config.set_default_layout(layout_bigtrak); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6792,7 +6792,7 @@ MACHINE_CONFIG_START(mbdtower_state::mbdtower) MCFG_TIMER_DRIVER_ADD_PERIODIC("tower_motor", mbdtower_state, motor_sim_tick, attotime::from_msec(3500/0x80)) // ~3.5sec for a full rotation MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mbdtower) + config.set_default_layout(layout_mbdtower); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -6902,7 +6902,7 @@ MACHINE_CONFIG_START(arcmania_state::arcmania) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, arcmania_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_arcmania) + config.set_default_layout(layout_arcmania); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7021,7 +7021,7 @@ MACHINE_CONFIG_START(cnsector_state::cnsector) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, cnsector_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cnsector) + config.set_default_layout(layout_cnsector); /* no sound! */ MACHINE_CONFIG_END @@ -7135,7 +7135,7 @@ MACHINE_CONFIG_START(merlin_state::merlin) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, merlin_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_merlin) + config.set_default_layout(layout_merlin); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7200,7 +7200,7 @@ MACHINE_CONFIG_START(mmerlin_state::mmerlin) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, mmerlin_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mmerlin) + config.set_default_layout(layout_mmerlin); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7316,7 +7316,7 @@ MACHINE_CONFIG_START(stopthief_state::stopthief) MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_stopthief) + config.set_default_layout(layout_stopthief); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7429,7 +7429,7 @@ MACHINE_CONFIG_START(bankshot_state::bankshot) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, bankshot_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_bankshot) + config.set_default_layout(layout_bankshot); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7546,7 +7546,7 @@ MACHINE_CONFIG_START(splitsec_state::splitsec) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, splitsec_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_splitsec) + config.set_default_layout(layout_splitsec); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7664,7 +7664,7 @@ MACHINE_CONFIG_START(lostreas_state::lostreas) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, lostreas_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_lostreas) + config.set_default_layout(layout_lostreas); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7787,7 +7787,7 @@ MACHINE_CONFIG_START(alphie_state::alphie) MCFG_TIMER_DRIVER_ADD_PERIODIC("arm_position", alphie_state, show_arm_position, attotime::from_msec(50)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_alphie) + config.set_default_layout(layout_alphie); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7896,7 +7896,7 @@ MACHINE_CONFIG_START(tcfball_state::tcfball) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tcfball_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tcfball) + config.set_default_layout(layout_tcfball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -7962,7 +7962,7 @@ MACHINE_CONFIG_START(tcfballa_state::tcfballa) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tcfballa_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tcfballa) + config.set_default_layout(layout_tcfballa); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8126,7 +8126,7 @@ MACHINE_CONFIG_START(tandy12_state::tandy12) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tandy12_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tandy12) + config.set_default_layout(layout_tandy12); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8234,7 +8234,7 @@ MACHINE_CONFIG_START(monkeysee_state::monkeysee) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, monkeysee_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_monkeysee) + config.set_default_layout(layout_monkeysee); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8383,7 +8383,7 @@ MACHINE_CONFIG_START(speechp_state::speechp) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, speechp_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_speechp) + config.set_default_layout(layout_speechp); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8465,7 +8465,7 @@ MACHINE_CONFIG_START(timaze_state::timaze) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, timaze_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_timaze) + config.set_default_layout(layout_timaze); /* no sound! */ MACHINE_CONFIG_END @@ -8567,7 +8567,7 @@ MACHINE_CONFIG_START(copycat_state::copycat) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, copycat_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_copycat) + config.set_default_layout(layout_copycat); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8643,7 +8643,7 @@ MACHINE_CONFIG_START(copycatm2_state::copycatm2) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, copycatm2_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_copycatm2) + config.set_default_layout(layout_copycatm2); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8714,7 +8714,7 @@ MACHINE_CONFIG_START(ditto_state::ditto) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ditto_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ditto) + config.set_default_layout(layout_ditto); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -8830,7 +8830,7 @@ MACHINE_CONFIG_START(ss7in1_state::ss7in1) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ss7in1_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_7in1ss) + config.set_default_layout(layout_7in1ss); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9032,7 +9032,7 @@ MACHINE_CONFIG_START(tbreakup_state::tbreakup) MCFG_TMS1025_WRITE_PORT_CB(PORT7, WRITE8(*this, tbreakup_state, expander_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tbreakup) + config.set_default_layout(layout_tbreakup); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9156,7 +9156,7 @@ MACHINE_CONFIG_START(phpball_state::phpball) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, phpball_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_hh_tms1k_test) + config.set_default_layout(layout_hh_tms1k_test); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9292,7 +9292,7 @@ MACHINE_CONFIG_START(ssports4_state::ssports4) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ssports4_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ssports4) + config.set_default_layout(layout_ssports4); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -9461,7 +9461,7 @@ MACHINE_CONFIG_START(xl25_state::xl25) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, xl25_state, write_o)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_xl25) + config.set_default_layout(layout_xl25); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/hh_ucom4.cpp b/src/mame/drivers/hh_ucom4.cpp index 3c4f699dd6593..a4d9eeba981c6 100644 --- a/src/mame/drivers/hh_ucom4.cpp +++ b/src/mame/drivers/hh_ucom4.cpp @@ -348,7 +348,7 @@ MACHINE_CONFIG_START(ufombs_state::ufombs) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(243, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 243-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -495,7 +495,7 @@ MACHINE_CONFIG_START(ssfball_state::ssfball) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 482) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 482-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -623,7 +623,7 @@ MACHINE_CONFIG_START(bmsoccer_state::bmsoccer) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(271, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 271-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -730,7 +730,7 @@ MACHINE_CONFIG_START(bmsafari_state::bmsafari) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(248, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 248-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -881,7 +881,7 @@ MACHINE_CONFIG_START(splasfgt_state::splasfgt) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 476) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 476-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -985,7 +985,7 @@ MACHINE_CONFIG_START(bcclimbr_state::bcclimbr) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(310, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 310-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1101,7 +1101,7 @@ MACHINE_CONFIG_START(tactix_state::tactix) MCFG_UCOM4_WRITE_G_CB(WRITE8(*this, tactix_state, speaker_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tactix) + config.set_default_layout(layout_tactix); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1202,7 +1202,7 @@ MACHINE_CONFIG_START(invspace_state::invspace) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(289, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 289-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1314,7 +1314,7 @@ MACHINE_CONFIG_START(efball_state::efball) MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, efball_state, plate_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_efball) + config.set_default_layout(layout_efball); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1418,7 +1418,7 @@ MACHINE_CONFIG_START(galaxy2_state::galaxy2) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(304, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 304-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1537,7 +1537,7 @@ MACHINE_CONFIG_START(astrocmd_state::astrocmd) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 525) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 525-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1633,7 +1633,7 @@ MACHINE_CONFIG_START(edracula_state::edracula) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 526) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 526-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -1714,7 +1714,7 @@ MACHINE_CONFIG_START(mcompgin_state::mcompgin) MCFG_DEVICE_ADD("lcd", HLCD0530, 500) // C=0.01uF MCFG_HLCD0515_WRITE_COLS_CB(WRITE32(*this, mcompgin_state, lcd_output_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mcompgin) + config.set_default_layout(layout_mcompgin); /* no sound! */ MACHINE_CONFIG_END @@ -1814,7 +1814,7 @@ MACHINE_CONFIG_START(mvbfree_state::mvbfree) MCFG_UCOM4_WRITE_I_CB(WRITE8(*this, mvbfree_state, speaker_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mvbfree) + config.set_default_layout(layout_mvbfree); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1929,7 +1929,7 @@ MACHINE_CONFIG_START(grobot9_state::grobot9) MCFG_UCOM4_WRITE_F_CB(WRITE8(*this, grobot9_state, lamps_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_grobot9) + config.set_default_layout(layout_grobot9); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -2026,7 +2026,7 @@ MACHINE_CONFIG_START(tccombat_state::tccombat) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(300, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 300-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2184,7 +2184,7 @@ MACHINE_CONFIG_START(tmtennis_state::tmtennis) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 417) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 417-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2293,7 +2293,7 @@ MACHINE_CONFIG_START(tmpacman_state::tmpacman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 508) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 508-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2396,7 +2396,7 @@ MACHINE_CONFIG_START(tmscramb_state::tmscramb) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 556) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 556-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2495,7 +2495,7 @@ MACHINE_CONFIG_START(tcaveman_state::tcaveman) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(1920, 559) MCFG_SCREEN_VISIBLE_AREA(0, 1920-1, 0, 559-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ @@ -2628,7 +2628,7 @@ MACHINE_CONFIG_START(alnchase_state::alnchase) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_SIZE(365, 1080) MCFG_SCREEN_VISIBLE_AREA(0, 365-1, 0, 1080-1) - MCFG_DEFAULT_LAYOUT(layout_svg) + config.set_default_layout(layout_svg); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) /* sound hardware */ diff --git a/src/mame/drivers/hp2640.cpp b/src/mame/drivers/hp2640.cpp index d17294b6581b4..298317db947af 100644 --- a/src/mame/drivers/hp2640.cpp +++ b/src/mame/drivers/hp2640.cpp @@ -984,7 +984,7 @@ MACHINE_CONFIG_START(hp2645_state::hp2645) MCFG_SCREEN_UPDATE_DRIVER(hp2645_state , screen_update) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hp2645_state, scanline_timer, "screen", 0, 1) MCFG_PALETTE_ADD_MONOCHROME_HIGHLIGHT("palette") - MCFG_DEFAULT_LAYOUT(layout_hp2640) + config.set_default_layout(layout_hp2640); // RS232 MCFG_DEVICE_ADD("rs232" , RS232_PORT, default_rs232_devices , nullptr) diff --git a/src/mame/drivers/hp49gp.cpp b/src/mame/drivers/hp49gp.cpp index b2ca9e5d9d817..d08ad80e98fb8 100644 --- a/src/mame/drivers/hp49gp.cpp +++ b/src/mame/drivers/hp49gp.cpp @@ -297,7 +297,7 @@ MACHINE_CONFIG_START(hp49gp_state::hp49gp) MCFG_SCREEN_VISIBLE_AREA(0, 131 - 1, 0, 80 - 1) MCFG_SCREEN_UPDATE_DEVICE("s3c2410", s3c2410_device, screen_update) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_DEVICE_ADD("s3c2410", S3C2410, 12000000) diff --git a/src/mame/drivers/hp9845.cpp b/src/mame/drivers/hp9845.cpp index 725bbeca99723..2ae2eb70c9a90 100644 --- a/src/mame/drivers/hp9845.cpp +++ b/src/mame/drivers/hp9845.cpp @@ -3835,7 +3835,7 @@ MACHINE_CONFIG_START(hp9845b_state::hp9845b) MCFG_PALETTE_ADD("palette", 4) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", hp9845b_state, scanline_timer, "screen", 0, 1) - MCFG_DEFAULT_LAYOUT(layout_hp9845b) + config.set_default_layout(layout_hp9845b); MCFG_SOFTWARE_LIST_ADD("optrom_list", "hp9845b_rom") diff --git a/src/mame/drivers/hp_ipc.cpp b/src/mame/drivers/hp_ipc.cpp index c043f1a7e8bd3..899cc0768f524 100644 --- a/src/mame/drivers/hp_ipc.cpp +++ b/src/mame/drivers/hp_ipc.cpp @@ -805,7 +805,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp_ipc) MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update) MCFG_SCREEN_RAW_PARAMS(6_MHz_XTAL * 2, 720, 0, 512, 278, 0, 256) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("mlc", hp_hil_mlc_device, ap_w)) // XXX actually it's driven by 555 (U59) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") @@ -825,7 +825,7 @@ MACHINE_CONFIG_START(hp_ipc_state::hp9808a) MCFG_SCREEN_UPDATE_DEVICE("gpu", hp1ll3_device, screen_update) MCFG_SCREEN_RAW_PARAMS(6_MHz_XTAL * 2, 720, 0, 640, 480, 0, 400) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE("mlc", hp_hil_mlc_device, ap_w)) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/hprot1.cpp b/src/mame/drivers/hprot1.cpp index 84787c7c89cdb..c353fb912a5e5 100644 --- a/src/mame/drivers/hprot1.cpp +++ b/src/mame/drivers/hprot1.cpp @@ -262,7 +262,7 @@ MACHINE_CONFIG_START(hprot1_state::hprot1) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(hprot1_state, hprot1) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_hprot1) diff --git a/src/mame/drivers/hunter2.cpp b/src/mame/drivers/hunter2.cpp index 36df799a881d1..054bffa35339b 100644 --- a/src/mame/drivers/hunter2.cpp +++ b/src/mame/drivers/hunter2.cpp @@ -391,7 +391,7 @@ MACHINE_CONFIG_START(hunter2_state::hunter2) MCFG_SCREEN_VISIBLE_AREA(0, 239, 0, 63) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(hunter2_state, hunter2) MCFG_DEVICE_ADD("lcdc", HD61830, XTAL(4'915'200)/2/2) // unknown clock diff --git a/src/mame/drivers/hx20.cpp b/src/mame/drivers/hx20.cpp index 9f4fb83fe4acb..b203f1193d153 100644 --- a/src/mame/drivers/hx20.cpp +++ b/src/mame/drivers/hx20.cpp @@ -905,7 +905,7 @@ MACHINE_CONFIG_START(hx20_state::hx20) MCFG_DEVICE_IO_MAP(hx20_sub_io) // video hardware - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(50) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) diff --git a/src/mame/drivers/ibm6580.cpp b/src/mame/drivers/ibm6580.cpp index 02f34f0a59724..73dd51fb62eca 100644 --- a/src/mame/drivers/ibm6580.cpp +++ b/src/mame/drivers/ibm6580.cpp @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(ibm6580_state::ibm6580) MCFG_SCREEN_UPDATE_DRIVER(ibm6580_state, screen_update) MCFG_SCREEN_PALETTE("palette") MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ibm6580_state, vblank_w)) - MCFG_DEFAULT_LAYOUT(layout_ibm6580) + config.set_default_layout(layout_ibm6580); MCFG_PALETTE_ADD("palette", 3) MCFG_PALETTE_INIT_OWNER(ibm6580_state, ibm6580) diff --git a/src/mame/drivers/icatel.cpp b/src/mame/drivers/icatel.cpp index 5530b035d9891..65591006ec5d3 100644 --- a/src/mame/drivers/icatel.cpp +++ b/src/mame/drivers/icatel.cpp @@ -273,7 +273,7 @@ MACHINE_CONFIG_START(icatel_state::icatel) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(icatel_state, icatel) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_icatel) diff --git a/src/mame/drivers/icecold.cpp b/src/mame/drivers/icecold.cpp index 409d88cc508a6..c9d32dc41c822 100644 --- a/src/mame/drivers/icecold.cpp +++ b/src/mame/drivers/icecold.cpp @@ -398,7 +398,7 @@ MACHINE_CONFIG_START(icecold_state::icecold) MCFG_TIMER_DRIVER_ADD_PERIODIC("motors_timer", icecold_state, icecold_motors_timer, attotime::from_msec(50)) // video hardware - MCFG_DEFAULT_LAYOUT(layout_icecold) + config.set_default_layout(layout_icecold); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/inder.cpp b/src/mame/drivers/inder.cpp index 20650f2ab102e..d108a2e2f0080 100644 --- a/src/mame/drivers/inder.cpp +++ b/src/mame/drivers/inder.cpp @@ -1366,7 +1366,7 @@ MACHINE_CONFIG_START(inder_state::brvteam) MCFG_NVRAM_ADD_1FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_inder) + config.set_default_layout(layout_inder); /* Sound */ genpin_audio(config); @@ -1384,7 +1384,7 @@ MACHINE_CONFIG_START(inder_state::canasta) MCFG_NVRAM_ADD_1FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_inder) + config.set_default_layout(layout_inder); /* Sound */ genpin_audio(config); @@ -1405,7 +1405,7 @@ MACHINE_CONFIG_START(inder_state::lapbylap) MCFG_NVRAM_ADD_1FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_inder) + config.set_default_layout(layout_inder); /* Sound */ genpin_audio(config); @@ -1429,7 +1429,7 @@ MACHINE_CONFIG_START(inder_state::inder) MCFG_NVRAM_ADD_1FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_inder) + config.set_default_layout(layout_inder); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/instruct.cpp b/src/mame/drivers/instruct.cpp index 887c6b1796fcf..43de8c4a9f745 100644 --- a/src/mame/drivers/instruct.cpp +++ b/src/mame/drivers/instruct.cpp @@ -432,7 +432,7 @@ MACHINE_CONFIG_START(instruct_state::instruct) MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, instruct_state, flag_w)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_instruct) + config.set_default_layout(layout_instruct); /* quickload */ MCFG_QUICKLOAD_ADD("quickload", instruct_state, instruct, "pgm", 1) diff --git a/src/mame/drivers/intellec4.cpp b/src/mame/drivers/intellec4.cpp index 09588fdda4d6f..64c25f719d5e7 100644 --- a/src/mame/drivers/intellec4.cpp +++ b/src/mame/drivers/intellec4.cpp @@ -1122,23 +1122,24 @@ INPUT_CHANGED_MEMBER(mod4_state::sw_one_shot) MOD 4-specific configuration ----------------------------------*/ -MACHINE_CONFIG_START(mod4_state::mod4) +void mod4_state::mod4(machine_config &config) +{ intellec4(config); - MCFG_DEVICE_ADD(m_cpu, I4004, 5.185_MHz_XTAL / 7) - m_cpu->set_rom_map(&mod4_state::intellec4_rom); - m_cpu->set_ram_memory_map(&mod4_state::intellec4_ram_memory); - m_cpu->set_rom_ports_map(&mod4_state::intellec4_rom_ports); - m_cpu->set_ram_status_map(&mod4_state::intellec4_ram_status); - m_cpu->set_ram_ports_map(&mod4_state::intellec4_ram_ports); - m_cpu->set_program_memory_map(&mod4_state::intellec4_program_memory); - MCFG_I4004_BUS_CYCLE_CB(BUSCYCLE(mod4_state, bus_cycle)); - MCFG_I4004_SYNC_CB(WRITELINE(m_bus, bus::intellec4::univ_bus_device, sync_in)) + i4004_cpu_device &cpu(I4004(config, m_cpu, 5.185_MHz_XTAL / 7)); + cpu.set_rom_map(&mod4_state::intellec4_rom); + cpu.set_ram_memory_map(&mod4_state::intellec4_ram_memory); + cpu.set_rom_ports_map(&mod4_state::intellec4_rom_ports); + cpu.set_ram_status_map(&mod4_state::intellec4_ram_status); + cpu.set_ram_ports_map(&mod4_state::intellec4_ram_ports); + cpu.set_program_memory_map(&mod4_state::intellec4_program_memory); + cpu.set_bus_cycle_cb(FUNC(mod4_state::bus_cycle), this); + cpu.sync_cb().set(m_bus, FUNC(bus::intellec4::univ_bus_device::sync_in)); m_bus->test_out_cb().set(FUNC(mod4_state::bus_test)); - MCFG_DEFAULT_LAYOUT(layout_intlc44) -MACHINE_CONFIG_END + config.set_default_layout(layout_intlc44); +} /*---------------------------------- @@ -1347,25 +1348,26 @@ INPUT_CHANGED_MEMBER(mod40_state::sw_single_step) MOD 40-specific configuration ----------------------------------*/ -MACHINE_CONFIG_START(mod40_state::mod40) +void mod40_state::mod40(machine_config &config) +{ intellec4(config); - MCFG_DEVICE_ADD(m_cpu, I4040, 5.185_MHz_XTAL / 7) - m_cpu->set_rom_map(&mod40_state::intellec4_rom); - m_cpu->set_ram_memory_map(&mod40_state::intellec4_ram_memory); - m_cpu->set_rom_ports_map(&mod40_state::intellec4_rom_ports); - m_cpu->set_ram_status_map(&mod40_state::intellec4_ram_status); - m_cpu->set_ram_ports_map(&mod40_state::intellec4_ram_ports); - m_cpu->set_program_memory_map(&mod40_state::intellec4_program_memory); - MCFG_I4040_BUS_CYCLE_CB(BUSCYCLE(mod40_state, bus_cycle)) - MCFG_I4040_SYNC_CB(WRITELINE(m_bus, bus::intellec4::univ_bus_device, sync_in)) - MCFG_I4040_STP_ACK_CB(WRITELINE(*this, mod40_state, stp_ack)) + i4040_cpu_device &cpu(I4040(config, m_cpu, 5.185_MHz_XTAL / 7)); + cpu.set_rom_map(&mod40_state::intellec4_rom); + cpu.set_ram_memory_map(&mod40_state::intellec4_ram_memory); + cpu.set_rom_ports_map(&mod40_state::intellec4_rom_ports); + cpu.set_ram_status_map(&mod40_state::intellec4_ram_status); + cpu.set_ram_ports_map(&mod40_state::intellec4_ram_ports); + cpu.set_program_memory_map(&mod40_state::intellec4_program_memory); + cpu.set_bus_cycle_cb(FUNC(mod40_state::bus_cycle), this); + cpu.sync_cb().set(m_bus, FUNC(bus::intellec4::univ_bus_device::sync_in)); + cpu.stp_ack_cb().set(FUNC(mod40_state::stp_ack)); m_bus->stop_out_cb().set(FUNC(mod40_state::bus_stop)); m_bus->test_out_cb().set(FUNC(mod40_state::bus_test)); - MCFG_DEFAULT_LAYOUT(layout_intlc440) -MACHINE_CONFIG_END + config.set_default_layout(layout_intlc440); +} /*---------------------------------- diff --git a/src/mame/drivers/interpro.cpp b/src/mame/drivers/interpro.cpp index 8b5ae65f35f6d..e4a252547f74c 100644 --- a/src/mame/drivers/interpro.cpp +++ b/src/mame/drivers/interpro.cpp @@ -857,7 +857,7 @@ MACHINE_CONFIG_START(interpro_state::interpro) MCFG_MOUSE_STATE_CB(WRITE32(m_ioga, interpro_ioga_device, mouse_status_w)) // system layout - MCFG_DEFAULT_LAYOUT(layout_interpro) + config.set_default_layout(layout_interpro); // software lists MCFG_SOFTWARE_LIST_ADD("softlist", "interpro") diff --git a/src/mame/drivers/jclub2.cpp b/src/mame/drivers/jclub2.cpp index bc175d00da94e..0ce848b2cb2f5 100644 --- a/src/mame/drivers/jclub2.cpp +++ b/src/mame/drivers/jclub2.cpp @@ -1165,7 +1165,7 @@ MACHINE_CONFIG_START(jclub2o_state::jclub2o) MCFG_ST0020_SPRITES_PALETTE("palette") // layout - MCFG_DEFAULT_LAYOUT(layout_jclub2o) + config.set_default_layout(layout_jclub2o); MACHINE_CONFIG_END @@ -1201,7 +1201,7 @@ MACHINE_CONFIG_START(jclub2_state::jclub2) MCFG_ST0020_SPRITES_PALETTE("palette") // layout - MCFG_DEFAULT_LAYOUT(layout_jclub2o) + config.set_default_layout(layout_jclub2o); MACHINE_CONFIG_END @@ -1233,7 +1233,7 @@ MACHINE_CONFIG_START(darkhors_state::darkhors) MCFG_VIDEO_START_OVERRIDE(darkhors_state, darkhors) // layout - MCFG_DEFAULT_LAYOUT(layout_jclub2) + config.set_default_layout(layout_jclub2); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/jeutel.cpp b/src/mame/drivers/jeutel.cpp index 8f2c6573ff47e..93e60159ac723 100644 --- a/src/mame/drivers/jeutel.cpp +++ b/src/mame/drivers/jeutel.cpp @@ -209,7 +209,7 @@ MACHINE_CONFIG_START(jeutel_state::jeutel) MCFG_DEVICE_IO_MAP(jeutel_cpu3_io) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_jeutel) + config.set_default_layout(layout_jeutel); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/jp.cpp b/src/mame/drivers/jp.cpp index be2e3fe54004a..59bb093df2818 100644 --- a/src/mame/drivers/jp.cpp +++ b/src/mame/drivers/jp.cpp @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(jp_state::jp) LS259(config, m_latch[9]); /* Video */ - MCFG_DEFAULT_LAYOUT(layout_jp) + config.set_default_layout(layout_jp); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/jpmimpct.cpp b/src/mame/drivers/jpmimpct.cpp index 125ac80b51ade..999a98033ca76 100644 --- a/src/mame/drivers/jpmimpct.cpp +++ b/src/mame/drivers/jpmimpct.cpp @@ -1333,7 +1333,7 @@ MACHINE_CONFIG_START(jpmimpct_state::impctawp) SPEAKER(config, "mono").front_center(); MCFG_DEVICE_ADD("upd",UPD7759) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEFAULT_LAYOUT(layout_jpmimpct) + config.set_default_layout(layout_jpmimpct); MCFG_DEVICE_ADD("reel0", REEL, STARPOINT_48STEP_REEL, 1, 3, 0x09, 4) MCFG_STEPPER_OPTIC_CALLBACK(WRITELINE(*this, jpmimpct_state, reel0_optic_cb)) diff --git a/src/mame/drivers/jpmmps.cpp b/src/mame/drivers/jpmmps.cpp index 0d0f44eefa021..b9b553ef1a28a 100644 --- a/src/mame/drivers/jpmmps.cpp +++ b/src/mame/drivers/jpmmps.cpp @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(jpmmps_state::jpmmps) MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(9) // TODO: meters.cpp sets a max of 8 - MCFG_DEFAULT_LAYOUT(layout_jpmmps) + config.set_default_layout(layout_jpmmps); MACHINE_CONFIG_END diff --git a/src/mame/drivers/jpmsys5.cpp b/src/mame/drivers/jpmsys5.cpp index c59942041d536..9d30ff1344e66 100644 --- a/src/mame/drivers/jpmsys5.cpp +++ b/src/mame/drivers/jpmsys5.cpp @@ -855,7 +855,7 @@ MACHINE_CONFIG_START(jpmsys5_state::jpmsys5_ym) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) MCFG_PTM6840_O1_CB(WRITELINE(*this, jpmsys5_state, u26_o1_callback)) MCFG_PTM6840_IRQ_CB(WRITELINE(*this, jpmsys5_state, ptm_irq)) - MCFG_DEFAULT_LAYOUT(layout_jpmsys5) + config.set_default_layout(layout_jpmsys5); MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) @@ -912,7 +912,7 @@ MACHINE_CONFIG_START(jpmsys5_state::jpmsys5) MCFG_PTM6840_EXTERNAL_CLOCKS(0, 0, 0) MCFG_PTM6840_O1_CB(WRITELINE(*this, jpmsys5_state, u26_o1_callback)) MCFG_PTM6840_IRQ_CB(WRITELINE(*this, jpmsys5_state, ptm_irq)) - MCFG_DEFAULT_LAYOUT(layout_jpmsys5) + config.set_default_layout(layout_jpmsys5); MCFG_DEVICE_ADD("meters", METERS, 0) MCFG_METERS_NUMBER(8) diff --git a/src/mame/drivers/juicebox.cpp b/src/mame/drivers/juicebox.cpp index aca44325b0619..387537611ce7e 100644 --- a/src/mame/drivers/juicebox.cpp +++ b/src/mame/drivers/juicebox.cpp @@ -320,7 +320,7 @@ MACHINE_CONFIG_START(juicebox_state::juicebox) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(240, 160) MCFG_SCREEN_VISIBLE_AREA(0, 240 - 1, 0, 160 - 1) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_UPDATE_DEVICE("s3c44b0", s3c44b0_device, video_update) diff --git a/src/mame/drivers/junior.cpp b/src/mame/drivers/junior.cpp index 35eeaaf6652a7..44ba5f62e8f29 100644 --- a/src/mame/drivers/junior.cpp +++ b/src/mame/drivers/junior.cpp @@ -232,7 +232,7 @@ MACHINE_CONFIG_START(junior_state::junior) MCFG_QUANTUM_TIME(attotime::from_hz(50)) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_junior ) + config.set_default_layout(layout_junior); /* Devices */ MCFG_DEVICE_ADD("riot", MOS6532_NEW, 1_MHz_XTAL) diff --git a/src/mame/drivers/k1003.cpp b/src/mame/drivers/k1003.cpp index 06f58a76d64d8..95a11014fa5b3 100644 --- a/src/mame/drivers/k1003.cpp +++ b/src/mame/drivers/k1003.cpp @@ -154,7 +154,7 @@ MACHINE_CONFIG_START(k1003_state::k1003) MCFG_DEVICE_IO_MAP(k1003_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_k1003) + config.set_default_layout(layout_k1003); MACHINE_CONFIG_END diff --git a/src/mame/drivers/k28.cpp b/src/mame/drivers/k28.cpp index 8d5b2e43da021..81326e6542215 100644 --- a/src/mame/drivers/k28.cpp +++ b/src/mame/drivers/k28.cpp @@ -464,7 +464,7 @@ MACHINE_CONFIG_START(k28_state::k28) MCFG_TIMER_ADD_NONE("on_button") MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", k28_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_k28) + config.set_default_layout(layout_k28); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/kdt6.cpp b/src/mame/drivers/kdt6.cpp index e2f4be5934a76..d8a76b955b898 100644 --- a/src/mame/drivers/kdt6.cpp +++ b/src/mame/drivers/kdt6.cpp @@ -628,7 +628,7 @@ MACHINE_CONFIG_START(kdt6_state::psi98) MCFG_SCREEN_UPDATE_DRIVER(kdt6_state, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEFAULT_LAYOUT(layout_kdt6) + config.set_default_layout(layout_kdt6); MCFG_MC6845_ADD("crtc", MC6845, "screen", XTAL(13'516'800) / 8) MCFG_MC6845_SHOW_BORDER_AREA(false) diff --git a/src/mame/drivers/kim1.cpp b/src/mame/drivers/kim1.cpp index fa2a39ff1f704..178e5bfce3ca3 100644 --- a/src/mame/drivers/kim1.cpp +++ b/src/mame/drivers/kim1.cpp @@ -247,7 +247,7 @@ MACHINE_CONFIG_START(kim1_state::kim1) MCFG_QUANTUM_TIME(attotime::from_hz(60)) // video hardware - MCFG_DEFAULT_LAYOUT( layout_kim1 ) + config.set_default_layout(layout_kim1); // devices MCFG_DEVICE_ADD("miot_u2", MOS6530, 1000000) diff --git a/src/mame/drivers/konamigx.cpp b/src/mame/drivers/konamigx.cpp index 1c3df354694f6..da7f54114162f 100644 --- a/src/mame/drivers/konamigx.cpp +++ b/src/mame/drivers/konamigx.cpp @@ -1827,7 +1827,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype3) MCFG_DEVICE_PROGRAM_MAP(gx_type3_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konamigx_state, konamigx_type4_scanline, "screen", 0, 1) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_type3) MCFG_VIDEO_START_OVERRIDE(konamigx_state, konamigx_type3) @@ -1868,7 +1868,7 @@ MACHINE_CONFIG_START(konamigx_state::gxtype4) MCFG_DEVICE_PROGRAM_MAP(gx_type4_map) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", konamigx_state, konamigx_type4_scanline, "screen", 0, 1) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_MODIFY("screen") MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK | VIDEO_ALWAYS_UPDATE) @@ -1905,7 +1905,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(konamigx_state::gxtype4_vsn) gxtype4(config); - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); //MCFG_SCREEN_MODIFY("screen") //MCFG_SCREEN_SIZE(128*8, 32*8) diff --git a/src/mame/drivers/lc80.cpp b/src/mame/drivers/lc80.cpp index ff531a8d70193..ecb865a889abe 100644 --- a/src/mame/drivers/lc80.cpp +++ b/src/mame/drivers/lc80.cpp @@ -337,7 +337,7 @@ MACHINE_CONFIG_START(lc80_state::lc80) MCFG_DEVICE_IO_MAP(lc80_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_lc80 ) + config.set_default_layout(layout_lc80); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -376,7 +376,7 @@ MACHINE_CONFIG_START(lc80_state::lc80_2) MCFG_DEVICE_IO_MAP(lc80_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_lc80 ) + config.set_default_layout(layout_lc80); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/lcmate2.cpp b/src/mame/drivers/lcmate2.cpp index bb90638333dd9..96c9247d13010 100644 --- a/src/mame/drivers/lcmate2.cpp +++ b/src/mame/drivers/lcmate2.cpp @@ -248,7 +248,7 @@ MACHINE_CONFIG_START(lcmate2_state::lcmate2) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(lcmate2_state, lcmate2) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_lcmate2) MCFG_HD44780_ADD("hd44780") diff --git a/src/mame/drivers/llc.cpp b/src/mame/drivers/llc.cpp index 7a338a5bbdffb..b524a59238d76 100644 --- a/src/mame/drivers/llc.cpp +++ b/src/mame/drivers/llc.cpp @@ -221,7 +221,7 @@ MACHINE_CONFIG_START(llc_state::llc1) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_llc1) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEFAULT_LAYOUT(layout_llc1) + config.set_default_layout(layout_llc1); MCFG_DEVICE_ADD("z80pio1", Z80PIO, XTAL(3'000'000)) MCFG_Z80PIO_IN_PA_CB(READ8(*this, llc_state, llc1_port1_a_r)) diff --git a/src/mame/drivers/ltd.cpp b/src/mame/drivers/ltd.cpp index 0cf43061aa800..7e4e2abfd8f01 100644 --- a/src/mame/drivers/ltd.cpp +++ b/src/mame/drivers/ltd.cpp @@ -538,7 +538,7 @@ MACHINE_CONFIG_START(ltd_state::ltd3) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_ltd) + config.set_default_layout(layout_ltd); /* Sound */ genpin_audio(config); @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(ltd_state::ltd4) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_ltd) + config.set_default_layout(layout_ltd); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/lynx.cpp b/src/mame/drivers/lynx.cpp index d4f2299cb94d9..27236471df11a 100644 --- a/src/mame/drivers/lynx.cpp +++ b/src/mame/drivers/lynx.cpp @@ -101,7 +101,7 @@ MACHINE_CONFIG_START(lynx_state::lynx) MCFG_SCREEN_UPDATE_DRIVER(lynx_state, screen_update) MCFG_SCREEN_SIZE(160, 102) MCFG_SCREEN_VISIBLE_AREA(0, 160-1, 0, 102-1) - MCFG_DEFAULT_LAYOUT(layout_lynx) + config.set_default_layout(layout_lynx); MCFG_PALETTE_ADD("palette", 0x10) diff --git a/src/mame/drivers/m68705prg.cpp b/src/mame/drivers/m68705prg.cpp index 8da7cc881a53d..fb157729c5b83 100644 --- a/src/mame/drivers/m68705prg.cpp +++ b/src/mame/drivers/m68705prg.cpp @@ -238,7 +238,7 @@ MACHINE_CONFIG_START(m68705prg_state_base::m68705prg) MCFG_GENERIC_EXTENSIONS("bin,rom") MCFG_GENERIC_LOAD(m68705prg_state_base, mcu_load) - MCFG_DEFAULT_LAYOUT(layout_m68705prg) + config.set_default_layout(layout_m68705prg); MACHINE_CONFIG_END template<> MACHINE_CONFIG_START(p3prg_state::prg) diff --git a/src/mame/drivers/mac.cpp b/src/mame/drivers/mac.cpp index e1433fc6894bd..40721c3436020 100644 --- a/src/mame/drivers/mac.cpp +++ b/src/mame/drivers/mac.cpp @@ -1283,7 +1283,7 @@ MACHINE_CONFIG_START(mac_state::maclc) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macv8) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mac_state, mac_rbv_vbl)) - MCFG_DEFAULT_LAYOUT(layout_mac) + config.set_default_layout(layout_mac); MCFG_RAM_MODIFY(RAM_TAG) MCFG_RAM_DEFAULT_SIZE("2M") @@ -1810,7 +1810,7 @@ MACHINE_CONFIG_START(mac_state::maciici) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mac_state, mac_rbv_vbl)) - MCFG_DEFAULT_LAYOUT(layout_mac) + config.set_default_layout(layout_mac); /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) @@ -1845,7 +1845,7 @@ MACHINE_CONFIG_START(mac_state::maciisi) MCFG_SCREEN_VISIBLE_AREA(0, 640-1, 0, 480-1) MCFG_SCREEN_UPDATE_DRIVER(mac_state, screen_update_macrbv) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, mac_state, mac_rbv_vbl)) - MCFG_DEFAULT_LAYOUT(layout_mac) + config.set_default_layout(layout_mac); /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/marywu.cpp b/src/mame/drivers/marywu.cpp index 3d652fc57adaa..ee61ae6c1f991 100644 --- a/src/mame/drivers/marywu.cpp +++ b/src/mame/drivers/marywu.cpp @@ -200,7 +200,7 @@ MACHINE_CONFIG_START(marywu_state::marywu) MCFG_I8279_OUT_DISP_CB(WRITE8(*this, marywu_state, display_7seg_data_w)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_marywu) + config.set_default_layout(layout_marywu); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/maxaflex.cpp b/src/mame/drivers/maxaflex.cpp index dd6a9883f2458..1e2dea2e489d0 100644 --- a/src/mame/drivers/maxaflex.cpp +++ b/src/mame/drivers/maxaflex.cpp @@ -357,7 +357,7 @@ MACHINE_CONFIG_START(maxaflex_state::maxaflex) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(maxaflex_state, atari) - MCFG_DEFAULT_LAYOUT(layout_maxaflex) + config.set_default_layout(layout_maxaflex); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp index e85c86dd9dfc8..a6399edf24ba2 100644 --- a/src/mame/drivers/maygay1b.cpp +++ b/src/mame/drivers/maygay1b.cpp @@ -841,7 +841,7 @@ MACHINE_CONFIG_START(maygay1b_state::maygay_m1) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_DEFAULT_LAYOUT(layout_maygay1b) + config.set_default_layout(layout_maygay1b); MACHINE_CONFIG_END MACHINE_CONFIG_START(maygay1b_state::maygay_m1_no_oki) diff --git a/src/mame/drivers/megatech.cpp b/src/mame/drivers/megatech.cpp index b2cc0915029a5..d8143d1170583 100644 --- a/src/mame/drivers/megatech.cpp +++ b/src/mame/drivers/megatech.cpp @@ -710,7 +710,7 @@ MACHINE_CONFIG_START(mtech_state::megatech) MCFG_MACHINE_RESET_OVERRIDE(mtech_state, megatech) - MCFG_DEFAULT_LAYOUT(layout_dualhovu) + config.set_default_layout(layout_dualhovu); MCFG_SCREEN_MODIFY("megadriv") MCFG_SCREEN_RAW_PARAMS(XTAL(10'738'635)/2, \ diff --git a/src/mame/drivers/mekd2.cpp b/src/mame/drivers/mekd2.cpp index 811a6af1f568f..21d88b70c498b 100644 --- a/src/mame/drivers/mekd2.cpp +++ b/src/mame/drivers/mekd2.cpp @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(mekd2_state::mekd2) MCFG_DEVICE_ADD("maincpu", M6800, XTAL_MEKD2 / 2) /* 614.4 kHz */ MCFG_DEVICE_PROGRAM_MAP(mekd2_mem) - MCFG_DEFAULT_LAYOUT(layout_mekd2) + config.set_default_layout(layout_mekd2); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/mephisto.cpp b/src/mame/drivers/mephisto.cpp index ca28e53d4645c..b2c5966da1003 100644 --- a/src/mame/drivers/mephisto.cpp +++ b/src/mame/drivers/mephisto.cpp @@ -322,7 +322,7 @@ MACHINE_CONFIG_START(mephisto_state::mephisto) MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", mephisto_state, update_nmi, attotime::from_hz(600)) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") - MCFG_DEFAULT_LAYOUT(layout_mephisto) + config.set_default_layout(layout_mephisto); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_state::rebel5) diff --git a/src/mame/drivers/mephisto_montec.cpp b/src/mame/drivers/mephisto_montec.cpp index 8fd5f522e2f2b..c64697e00a2cf 100644 --- a/src/mame/drivers/mephisto_montec.cpp +++ b/src/mame/drivers/mephisto_montec.cpp @@ -472,7 +472,7 @@ MACHINE_CONFIG_START(mephisto_montec_state::montec) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") - MCFG_DEFAULT_LAYOUT(layout_mephisto_montec) + config.set_default_layout(layout_mephisto_montec); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_montec_state::monteciv) @@ -491,7 +491,7 @@ MACHINE_CONFIG_START(mephisto_montec_state::megaiv) MCFG_DEVICE_REMOVE("board") MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board") MCFG_MEPHISTO_BOARD_DISABLE_LEDS(true) - MCFG_DEFAULT_LAYOUT(layout_mephisto_megaiv) + config.set_default_layout(layout_mephisto_megaiv); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_montec_state::mondial2) @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(mephisto_montec_state::mondial2) MCFG_DEVICE_PERIODIC_INT_DRIVER(mephisto_montec_state, nmi_line_pulse, XTAL(2'000'000) / (1 << 12)) MCFG_TIMER_DRIVER_ADD_PERIODIC("refresh_leds", mephisto_montec_state, refresh_leds, attotime::from_hz(10)) - MCFG_DEFAULT_LAYOUT(layout_mephisto_mondial2) + config.set_default_layout(layout_mephisto_mondial2); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_montec_state::smondial) @@ -521,7 +521,7 @@ MACHINE_CONFIG_START(mephisto_montec_state::smondial2) MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "smondial2_cart") MCFG_SOFTWARE_LIST_ADD("cart_list", "smondial2") - MCFG_DEFAULT_LAYOUT(layout_mephisto_smondial2) + config.set_default_layout(layout_mephisto_smondial2); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mgavegas.cpp b/src/mame/drivers/mgavegas.cpp index 1c457b3a5b6e0..a2d131a9d92c6 100644 --- a/src/mame/drivers/mgavegas.cpp +++ b/src/mame/drivers/mgavegas.cpp @@ -616,7 +616,7 @@ MACHINE_CONFIG_START(mgavegas_state::mgavegas) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_mgavegas) + config.set_default_layout(layout_mgavegas); MACHINE_CONFIG_END diff --git a/src/mame/drivers/micronic.cpp b/src/mame/drivers/micronic.cpp index e72dbdbd513de..08414f85a7a45 100644 --- a/src/mame/drivers/micronic.cpp +++ b/src/mame/drivers/micronic.cpp @@ -364,7 +364,7 @@ MACHINE_CONFIG_START(micronic_state::micronic) MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 64-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(micronic_state, micronic) diff --git a/src/mame/drivers/micropin.cpp b/src/mame/drivers/micropin.cpp index e3326faa2ee6c..e5685bc2debd9 100644 --- a/src/mame/drivers/micropin.cpp +++ b/src/mame/drivers/micropin.cpp @@ -307,7 +307,7 @@ MACHINE_CONFIG_START(micropin_state::micropin) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_micropin) + config.set_default_layout(layout_micropin); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/microvsn.cpp b/src/mame/drivers/microvsn.cpp index d7acef85f9d13..b0c30de961654 100644 --- a/src/mame/drivers/microvsn.cpp +++ b/src/mame/drivers/microvsn.cpp @@ -667,7 +667,7 @@ MACHINE_CONFIG_START(microvision_state::microvision) MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(microvision_state,microvision) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/mini2440.cpp b/src/mame/drivers/mini2440.cpp index fd663f30d8780..2fd5b759f81e8 100644 --- a/src/mame/drivers/mini2440.cpp +++ b/src/mame/drivers/mini2440.cpp @@ -237,7 +237,7 @@ MACHINE_CONFIG_START(mini2440_state::mini2440) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(1024, 768) MCFG_SCREEN_VISIBLE_AREA(0, 239, 0, 319) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_UPDATE_DEVICE("s3c2440", s3c2440_device, screen_update) diff --git a/src/mame/drivers/minicom.cpp b/src/mame/drivers/minicom.cpp index 646cdcfd7fef9..8b61f4273be33 100644 --- a/src/mame/drivers/minicom.cpp +++ b/src/mame/drivers/minicom.cpp @@ -231,7 +231,7 @@ MACHINE_CONFIG_START(minicom_state::minicom) /* video hardware */ /* fluorescent 14-segment display forming a row of 20 characters */ - MCFG_DEFAULT_LAYOUT(layout_minicom) + config.set_default_layout(layout_minicom); /* TODO: Map the keyboard rows/cols inputs (43-key, 4-row keyboard) */ diff --git a/src/mame/drivers/mk1.cpp b/src/mame/drivers/mk1.cpp index 028f03a0a5b7e..d9882b526a3b7 100644 --- a/src/mame/drivers/mk1.cpp +++ b/src/mame/drivers/mk1.cpp @@ -203,7 +203,7 @@ MACHINE_CONFIG_START(mk1_state::mk1) MCFG_F3853_EXT_INPUT_CB(mk1_state, mk1_interrupt) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mk1) + config.set_default_layout(layout_mk1); MCFG_TIMER_DRIVER_ADD_PERIODIC("led_timer", mk1_state, mk1_update_leds, attotime::from_hz(30)) MACHINE_CONFIG_END diff --git a/src/mame/drivers/mk14.cpp b/src/mame/drivers/mk14.cpp index 37bf50993fa61..f192a1874e6e4 100644 --- a/src/mame/drivers/mk14.cpp +++ b/src/mame/drivers/mk14.cpp @@ -209,7 +209,7 @@ MACHINE_CONFIG_START(mk14_state::mk14) MCFG_DEVICE_PROGRAM_MAP(mem_map) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mk14) + config.set_default_layout(layout_mk14); // sound SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/mk2.cpp b/src/mame/drivers/mk2.cpp index 92d9af457d385..a126253a09b27 100644 --- a/src/mame/drivers/mk2.cpp +++ b/src/mame/drivers/mk2.cpp @@ -207,7 +207,7 @@ MACHINE_CONFIG_START(mk2_state::mk2) MCFG_QUANTUM_TIME(attotime::from_hz(60)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mk2) + config.set_default_layout(layout_mk2); MCFG_DEVICE_ADD("miot", MOS6530, 1000000) MCFG_MOS6530_IN_PA_CB(READ8(*this, mk2_state, mk2_read_a)) diff --git a/src/mame/drivers/mkit09.cpp b/src/mame/drivers/mkit09.cpp index 4b119305dc044..2eec24edc8ad3 100644 --- a/src/mame/drivers/mkit09.cpp +++ b/src/mame/drivers/mkit09.cpp @@ -204,7 +204,7 @@ MACHINE_CONFIG_START(mkit09_state::mkit09) MCFG_DEVICE_PROGRAM_MAP(mkit09_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mkit09) + config.set_default_layout(layout_mkit09); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -228,7 +228,7 @@ MACHINE_CONFIG_START(mkit09_state::mkit09a) MCFG_DEVICE_PROGRAM_MAP(mkit09a_mem) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mkit09) + config.set_default_layout(layout_mkit09); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/mmd1.cpp b/src/mame/drivers/mmd1.cpp index 9455b4c2820a5..7a47f3c8fcaba 100644 --- a/src/mame/drivers/mmd1.cpp +++ b/src/mame/drivers/mmd1.cpp @@ -502,7 +502,7 @@ MACHINE_CONFIG_START(mmd1_state::mmd1) MCFG_MACHINE_RESET_OVERRIDE(mmd1_state,mmd1) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mmd1) + config.set_default_layout(layout_mmd1); MACHINE_CONFIG_END MACHINE_CONFIG_START(mmd1_state::mmd2) @@ -516,7 +516,7 @@ MACHINE_CONFIG_START(mmd1_state::mmd2) MCFG_MACHINE_RESET_OVERRIDE(mmd1_state,mmd2) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mmd2) + config.set_default_layout(layout_mmd2); /* Devices */ MCFG_DEVICE_ADD("i8279", I8279, 400000) // based on divider diff --git a/src/mame/drivers/mmodular.cpp b/src/mame/drivers/mmodular.cpp index 2f8f9d7e04327..9927cf82b7707 100644 --- a/src/mame/drivers/mmodular.cpp +++ b/src/mame/drivers/mmodular.cpp @@ -262,7 +262,7 @@ MACHINE_CONFIG_START(mmodular_state::alm16) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_mmodular) + config.set_default_layout(layout_mmodular); MACHINE_CONFIG_END @@ -282,7 +282,7 @@ MACHINE_CONFIG_START(mmodular_state::alm32) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_mmodular) + config.set_default_layout(layout_mmodular); MACHINE_CONFIG_END @@ -302,7 +302,7 @@ MACHINE_CONFIG_START(mmodular_state::gen32) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_mmodular) + config.set_default_layout(layout_mmodular); MACHINE_CONFIG_END @@ -315,7 +315,7 @@ MACHINE_CONFIG_START(berlinp_state::berlinp) MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board") MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_mmodular) + config.set_default_layout(layout_mmodular); MACHINE_CONFIG_END diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp index 9eb184b0fa795..17070e1c8defd 100644 --- a/src/mame/drivers/model1.cpp +++ b/src/mame/drivers/model1.cpp @@ -1803,7 +1803,7 @@ MACHINE_CONFIG_START(model1_state::wingwar) ioboard.an_callback<2>().set_ioport("THROTTLE"); ioboard.output_callback().set(FUNC(model1_state::wingwar_outputs_w)); - MCFG_DEFAULT_LAYOUT(layout_model1io2) + config.set_default_layout(layout_model1io2); M1COMM(config, "m1comm", 0).set_default_bios_tag("epr15112"); MACHINE_CONFIG_END @@ -1818,7 +1818,7 @@ void model1_state::wingwar360(machine_config &config) ioboard.an_callback<2>().set_constant(0); ioboard.output_callback().set(FUNC(model1_state::wingwar360_outputs_w)); - MCFG_DEFAULT_LAYOUT(layout_model1io2) + config.set_default_layout(layout_model1io2); MACHINE_CONFIG_END void model1_state::polhemus_map(address_map &map) @@ -1843,7 +1843,7 @@ MACHINE_CONFIG_START(model1_state::netmerc) ioboard.an_callback<2>().set_ioport("STICKY"); ioboard.output_callback().set(FUNC(model1_state::netmerc_outputs_w)); - MCFG_DEFAULT_LAYOUT(layout_model1io2) + config.set_default_layout(layout_model1io2); MACHINE_CONFIG_END diff --git a/src/mame/drivers/model2.cpp b/src/mame/drivers/model2.cpp index 747984b3d2985..bd6b5c4c150a3 100644 --- a/src/mame/drivers/model2.cpp +++ b/src/mame/drivers/model2.cpp @@ -2608,7 +2608,7 @@ MACHINE_CONFIG_START(model2o_state::vcop) ioboard.set_lightgun_p2x_tag("P2_X"); ioboard.set_lightgun_p2y_tag("P2_Y"); - MCFG_DEFAULT_LAYOUT(layout_model1io2) + config.set_default_layout(layout_model1io2); MACHINE_CONFIG_END /* 2A-CRX */ diff --git a/src/mame/drivers/mpf1.cpp b/src/mame/drivers/mpf1.cpp index aa4a7caeb57b3..fedc0334e2f65 100644 --- a/src/mame/drivers/mpf1.cpp +++ b/src/mame/drivers/mpf1.cpp @@ -380,7 +380,7 @@ MACHINE_CONFIG_START(mpf1_state::mpf1) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mpf1) + config.set_default_layout(layout_mpf1); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -414,7 +414,7 @@ MACHINE_CONFIG_START(mpf1_state::mpf1b) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_SPEAKER_ENABLED | CASSETTE_MOTOR_ENABLED) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mpf1b) + config.set_default_layout(layout_mpf1b); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -436,7 +436,7 @@ MACHINE_CONFIG_START(mpf1_state::mpf1p) MCFG_Z80_DAISY_CHAIN(mpf1_daisy_chain) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_mpf1p) + config.set_default_layout(layout_mpf1p); /* devices */ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, 2500000) diff --git a/src/mame/drivers/mpu3.cpp b/src/mame/drivers/mpu3.cpp index b4d0341723842..5165396fe8c13 100644 --- a/src/mame/drivers/mpu3.cpp +++ b/src/mame/drivers/mpu3.cpp @@ -897,7 +897,7 @@ MACHINE_CONFIG_START(mpu3_state::mpu3base) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_DEFAULT_LAYOUT(layout_mpu3) + config.set_default_layout(layout_mpu3); MACHINE_CONFIG_END diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp index acb8fcc2f6a53..cb28537aba466 100644 --- a/src/mame/drivers/mpu5.cpp +++ b/src/mame/drivers/mpu5.cpp @@ -550,7 +550,7 @@ MACHINE_CONFIG_START(mpu5_state::mpu5) MCFG_DEVICE_ADD("maincpu", M68340, 16000000) // ? MCFG_DEVICE_PROGRAM_MAP(mpu5_map) - MCFG_DEFAULT_LAYOUT(layout_mpu5) + config.set_default_layout(layout_mpu5); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/ms0515.cpp b/src/mame/drivers/ms0515.cpp index 975bddfa8ef87..848a9a86ac613 100644 --- a/src/mame/drivers/ms0515.cpp +++ b/src/mame/drivers/ms0515.cpp @@ -533,7 +533,7 @@ MACHINE_CONFIG_START(ms0515_state::ms0515) MCFG_SCREEN_UPDATE_DRIVER(ms0515_state, screen_update_ms0515) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, ms0515_state, screen_vblank)) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_ms0515) + config.set_default_layout(layout_ms0515); MCFG_PALETTE_ADD("palette", 16) MCFG_PALETTE_INIT_OWNER(ms0515_state, ms0515) diff --git a/src/mame/drivers/mstation.cpp b/src/mame/drivers/mstation.cpp index dc56405abc31c..1bd1734bfbb03 100644 --- a/src/mame/drivers/mstation.cpp +++ b/src/mame/drivers/mstation.cpp @@ -463,7 +463,7 @@ MACHINE_CONFIG_START(mstation_state::mstation) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(mstation_state, mstation) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_AMD_29F080_ADD("flash0") MCFG_SST_28SF040_ADD("flash1") diff --git a/src/mame/drivers/nakajies.cpp b/src/mame/drivers/nakajies.cpp index 66aabc6b3103e..44ea42721c67f 100644 --- a/src/mame/drivers/nakajies.cpp +++ b/src/mame/drivers/nakajies.cpp @@ -763,7 +763,7 @@ MACHINE_CONFIG_START(nakajies_state::nakajies210) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_wales210) MCFG_PALETTE_ADD( "palette", 2 ) MCFG_PALETTE_INIT_OWNER(nakajies_state, nakajies) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* sound */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/nbmj8688.cpp b/src/mame/drivers/nbmj8688.cpp index f9e135ae116f8..95e7fd95c28bc 100644 --- a/src/mame/drivers/nbmj8688.cpp +++ b/src/mame/drivers/nbmj8688.cpp @@ -2634,7 +2634,7 @@ MACHINE_CONFIG_START(nbmj8688_state::mbmj_p16bit_LCD) /* video hardware */ MCFG_PALETTE_ADD("palette", 65536) MCFG_PALETTE_INIT_OWNER(nbmj8688_state,mbmj8688_16bit) - MCFG_DEFAULT_LAYOUT(layout_nbmj8688) + config.set_default_layout(layout_nbmj8688); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/nc.cpp b/src/mame/drivers/nc.cpp index 562e5cca09902..e4bdc34ca76f2 100644 --- a/src/mame/drivers/nc.cpp +++ b/src/mame/drivers/nc.cpp @@ -1393,7 +1393,7 @@ MACHINE_CONFIG_START(nc_state::nc_base) MCFG_PALETTE_ADD("palette", NC_NUM_COLOURS) MCFG_PALETTE_INIT_OWNER(nc_state, nc) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp index 04dee44e56081..1729c48ed3f6c 100644 --- a/src/mame/drivers/neogeo.cpp +++ b/src/mame/drivers/neogeo.cpp @@ -1951,7 +1951,7 @@ MACHINE_CONFIG_START(neogeo_base_state::neogeo_base) MCFG_ADDRESSABLE_LATCH_Q7_OUT_CB(WRITELINE(*this, neogeo_base_state, set_palette_bank)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_neogeo) + config.set_default_layout(layout_neogeo); MCFG_SCREEN_ADD(m_screen, RASTER) MCFG_SCREEN_RAW_PARAMS(NEOGEO_PIXEL_CLOCK, NEOGEO_HTOTAL, NEOGEO_HBEND, NEOGEO_HBSTART, NEOGEO_VTOTAL, NEOGEO_VBEND, NEOGEO_VBSTART) @@ -2498,7 +2498,7 @@ MACHINE_CONFIG_START(mvs_state::irrmaze) MCFG_NEOGEO_CONTROL_EDGE_CONNECTOR_ADD("edge", neogeo_arc_edge_fixed, "irrmaze", true) - MCFG_DEFAULT_LAYOUT(layout_irrmaze) + config.set_default_layout(layout_irrmaze); NEOGEO_CONFIG_ONE_FIXED_CARTSLOT("rom") MACHINE_CONFIG_END diff --git a/src/mame/drivers/newbrain.cpp b/src/mame/drivers/newbrain.cpp index 16e31d06c8d6d..9f5ac627ec583 100644 --- a/src/mame/drivers/newbrain.cpp +++ b/src/mame/drivers/newbrain.cpp @@ -852,7 +852,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(newbrain_state::newbrain_ad) newbrain(config); - MCFG_DEFAULT_LAYOUT(layout_newbrain) + config.set_default_layout(layout_newbrain); MACHINE_CONFIG_END @@ -862,7 +862,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(newbrain_state::newbrain_a) newbrain(config); - MCFG_DEFAULT_LAYOUT(layout_newbraina) + config.set_default_layout(layout_newbraina); MACHINE_CONFIG_END @@ -872,7 +872,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(newbrain_state::newbrain_md) newbrain(config); - MCFG_DEFAULT_LAYOUT(layout_newbrain) + config.set_default_layout(layout_newbrain); MACHINE_CONFIG_END diff --git a/src/mame/drivers/ngp.cpp b/src/mame/drivers/ngp.cpp index 58e44dc1df722..b926a156ff0f6 100644 --- a/src/mame/drivers/ngp.cpp +++ b/src/mame/drivers/ngp.cpp @@ -842,7 +842,7 @@ MACHINE_CONFIG_START(ngp_state::ngp_common) 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) + config.set_default_layout(layout_lcd); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/ninjaw.cpp b/src/mame/drivers/ninjaw.cpp index b6cd27bcf4d53..3cfeace627000 100644 --- a/src/mame/drivers/ninjaw.cpp +++ b/src/mame/drivers/ninjaw.cpp @@ -767,7 +767,7 @@ MACHINE_CONFIG_START(ninjaw_state::ninjaw) MCFG_PALETTE_ADD("palette2", 4096) MCFG_PALETTE_ADD("palette3", 4096) - MCFG_DEFAULT_LAYOUT(layout_ninjaw) + config.set_default_layout(layout_ninjaw); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -883,7 +883,7 @@ MACHINE_CONFIG_START(ninjaw_state::darius2) MCFG_PALETTE_ADD("palette2", 4096) MCFG_PALETTE_ADD("palette3", 4096) - MCFG_DEFAULT_LAYOUT(layout_ninjaw) + config.set_default_layout(layout_ninjaw); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/novag6502.cpp b/src/mame/drivers/novag6502.cpp index b82ef47b4e388..45115665565d7 100644 --- a/src/mame/drivers/novag6502.cpp +++ b/src/mame/drivers/novag6502.cpp @@ -77,8 +77,8 @@ instead of magnet sensors. class novag6502_state : public novagbase_state { public: - novag6502_state(const machine_config &mconfig, device_type type, const char *tag) - : novagbase_state(mconfig, type, tag), + novag6502_state(const machine_config &mconfig, device_type type, const char *tag) : + novagbase_state(mconfig, type, tag), m_hlcd0538(*this, "hlcd0538"), m_rombank(*this, "rombank") { } @@ -881,7 +881,7 @@ MACHINE_CONFIG_START(novag6502_state::supercon) MCFG_NVRAM_ADD_1FILL("nvram") MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_novag_supercon) + config.set_default_layout(layout_novag_supercon); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -901,11 +901,11 @@ MACHINE_CONFIG_START(novag6502_state::cforte) MCFG_NVRAM_ADD_1FILL("nvram") /* video hardware */ - MCFG_DEVICE_ADD("hlcd0538", HLCD0538, 0) - MCFG_HLCD0538_WRITE_COLS_CB(WRITE64(*this, novag6502_state, cforte_lcd_output_w)) + HLCD0538(config, m_hlcd0538, 0); + m_hlcd0538->write_cols_callback().set(FUNC(novag6502_state::cforte_lcd_output_w)); MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_novag_cforte) + config.set_default_layout(layout_novag_cforte); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -952,7 +952,7 @@ MACHINE_CONFIG_START(novag6502_state::sexpert) MCFG_HD44780_PIXEL_UPDATE_CB(novagbase_state, novag_lcd_pixel_update) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_novag_sexpert) + config.set_default_layout(layout_novag_sexpert); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -969,7 +969,7 @@ MACHINE_CONFIG_START(novag6502_state::sforte) MCFG_TIMER_MODIFY("irq_on") MCFG_TIMER_START_DELAY(attotime::from_hz(32.768_kHz_XTAL/128) - attotime::from_usec(11)) // active for ?us (assume same as cforte) - MCFG_DEFAULT_LAYOUT(layout_novag_sforte) + config.set_default_layout(layout_novag_sforte); MACHINE_CONFIG_END diff --git a/src/mame/drivers/novag68k.cpp b/src/mame/drivers/novag68k.cpp index 89b76e5742c5e..1e553a78fd7e5 100644 --- a/src/mame/drivers/novag68k.cpp +++ b/src/mame/drivers/novag68k.cpp @@ -265,7 +265,7 @@ MACHINE_CONFIG_START(novag68k_state::diablo68k) MCFG_HD44780_PIXEL_UPDATE_CB(novagbase_state, novag_lcd_pixel_update) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_novag_diablo68k) + config.set_default_layout(layout_novag_diablo68k); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -280,7 +280,7 @@ MACHINE_CONFIG_START(novag68k_state::scorpio68k) MCFG_DEVICE_MODIFY("maincpu") MCFG_DEVICE_PROGRAM_MAP(scorpio68k_map) - MCFG_DEFAULT_LAYOUT(layout_novag_scorpio68k) + config.set_default_layout(layout_novag_scorpio68k); MACHINE_CONFIG_END diff --git a/src/mame/drivers/novagf8.cpp b/src/mame/drivers/novagf8.cpp index 97154e903f478..86977caae961b 100644 --- a/src/mame/drivers/novagf8.cpp +++ b/src/mame/drivers/novagf8.cpp @@ -203,7 +203,7 @@ MACHINE_CONFIG_START(novagf8_state::delta1) MCFG_F3853_EXT_INPUT_CB(novagf8_state, f3853_interrupt) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_novag_delta1) + config.set_default_layout(layout_novag_delta1); MACHINE_CONFIG_END diff --git a/src/mame/drivers/novagmcs48.cpp b/src/mame/drivers/novagmcs48.cpp index 5b4fdbf909ec3..7b340d274ac57 100644 --- a/src/mame/drivers/novagmcs48.cpp +++ b/src/mame/drivers/novagmcs48.cpp @@ -156,7 +156,7 @@ MACHINE_CONFIG_START(novagmcs48_state::presto) MCFG_MCS48_PORT_BUS_OUT_CB(WRITE8(*this, novagmcs48_state, presto_mux_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", novagbase_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_novag_presto) + config.set_default_layout(layout_novag_presto); /* sound hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/nsm.cpp b/src/mame/drivers/nsm.cpp index 4d313a4a542e6..0ef999a24b52d 100644 --- a/src/mame/drivers/nsm.cpp +++ b/src/mame/drivers/nsm.cpp @@ -131,7 +131,7 @@ MACHINE_CONFIG_START(nsm_state::nsm) MCFG_TMS99xx_ADD("maincpu", TMS9995, 11052000, nsm_map, nsm_io_map) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_nsm) + config.set_default_layout(layout_nsm); /* Sound */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/nss.cpp b/src/mame/drivers/nss.cpp index 9618457ed66f3..5bbcbc0e13be0 100644 --- a/src/mame/drivers/nss.cpp +++ b/src/mame/drivers/nss.cpp @@ -863,7 +863,7 @@ MACHINE_CONFIG_START(nss_state::nss) /* video hardware */ /* TODO: the screen should actually superimpose, but for the time being let's just separate outputs */ - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); // SNES PPU MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp index 19c4f02b17f70..fcb6fe5c4cec9 100644 --- a/src/mame/drivers/palm.cpp +++ b/src/mame/drivers/palm.cpp @@ -200,7 +200,7 @@ MACHINE_CONFIG_START(palm_state::palm) MCFG_PALETTE_ADD( "palette", 2 ) MCFG_PALETTE_INIT_OWNER(palm_state, palm) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* audio hardware */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/palmz22.cpp b/src/mame/drivers/palmz22.cpp index a5b1b62cc84e9..f6ed4ef927c01 100644 --- a/src/mame/drivers/palmz22.cpp +++ b/src/mame/drivers/palmz22.cpp @@ -300,7 +300,7 @@ MACHINE_CONFIG_START(palmz22_state::palmz22) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) /* not accurate */ MCFG_SCREEN_SIZE(160, 160) MCFG_SCREEN_VISIBLE_AREA(0, 160 - 1, 0, 160 - 1) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_UPDATE_DEVICE("s3c2410", s3c2410_device, screen_update) diff --git a/src/mame/drivers/pasopia7.cpp b/src/mame/drivers/pasopia7.cpp index 93be2a209ff0b..57fce524b9aa9 100644 --- a/src/mame/drivers/pasopia7.cpp +++ b/src/mame/drivers/pasopia7.cpp @@ -1012,7 +1012,7 @@ MACHINE_CONFIG_START(pasopia7_state::p7_lcd) MCFG_MC6845_SHOW_BORDER_AREA(false) MCFG_MC6845_CHAR_WIDTH(8) - MCFG_DEFAULT_LAYOUT( layout_lcd ) + config.set_default_layout(layout_lcd); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/patinho_feio.cpp b/src/mame/drivers/patinho_feio.cpp index 69db196665af5..fbdc34795900e 100644 --- a/src/mame/drivers/patinho_feio.cpp +++ b/src/mame/drivers/patinho_feio.cpp @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(patinho_feio_state::patinho_feio) MCFG_GENERIC_EXTENSIONS("bin") MCFG_GENERIC_LOAD(patinho_feio_state, patinho_tape) - MCFG_DEFAULT_LAYOUT(layout_patinho) + config.set_default_layout(layout_patinho); // software lists // MCFG_SOFTWARE_LIST_ADD("tape_list", "patinho") diff --git a/src/mame/drivers/pb1000.cpp b/src/mame/drivers/pb1000.cpp index 3a4064ceb66b0..09f50dee1bd5d 100644 --- a/src/mame/drivers/pb1000.cpp +++ b/src/mame/drivers/pb1000.cpp @@ -504,7 +504,7 @@ MACHINE_CONFIG_START(pb1000_state::pb1000) MCFG_SCREEN_VISIBLE_AREA(0, 192-1, 0, 32-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pb1000_state, pb1000) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pb1000) diff --git a/src/mame/drivers/pc1500.cpp b/src/mame/drivers/pc1500.cpp index 8b5da041bb643..5c9bf79d7fec5 100644 --- a/src/mame/drivers/pc1500.cpp +++ b/src/mame/drivers/pc1500.cpp @@ -284,7 +284,7 @@ MACHINE_CONFIG_START(pc1500_state::pc1500) MCFG_SCREEN_VISIBLE_AREA(0, 156-1, 0, 7-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_pc1500) + config.set_default_layout(layout_pc1500); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc1500_state, pc1500) diff --git a/src/mame/drivers/pc2000.cpp b/src/mame/drivers/pc2000.cpp index 8d8300ac82882..159cd07f4fbb6 100644 --- a/src/mame/drivers/pc2000.cpp +++ b/src/mame/drivers/pc2000.cpp @@ -898,7 +898,7 @@ MACHINE_CONFIG_START(pc2000_state::pc2000) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc2000_state, pc2000) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc2000) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(2, 20) @@ -951,7 +951,7 @@ MACHINE_CONFIG_START(gl3000s_state::gl3000s) MCFG_SCREEN_VISIBLE_AREA(0, 120-1, 0, 24-1) MCFG_SCREEN_UPDATE_DRIVER( gl3000s_state, screen_update ) - MCFG_DEFAULT_LAYOUT(layout_gl3000s) + config.set_default_layout(layout_gl3000s); MCFG_DEVICE_REMOVE("gfxdecode") diff --git a/src/mame/drivers/pc4.cpp b/src/mame/drivers/pc4.cpp index 5b2486625ce89..e0a29cbd5bac2 100644 --- a/src/mame/drivers/pc4.cpp +++ b/src/mame/drivers/pc4.cpp @@ -232,7 +232,7 @@ MACHINE_CONFIG_START(pc4_state::pc4) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 36-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc4_state, pc4) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pc4) diff --git a/src/mame/drivers/pce220.cpp b/src/mame/drivers/pce220.cpp index f239405088d4d..2880970573aac 100644 --- a/src/mame/drivers/pce220.cpp +++ b/src/mame/drivers/pce220.cpp @@ -962,7 +962,7 @@ MACHINE_CONFIG_START(pce220_state::pce220) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pce220_state,pce220) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -998,7 +998,7 @@ MACHINE_CONFIG_START(pcg850v_state::pcg815) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pce220_state,pce220) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1034,7 +1034,7 @@ MACHINE_CONFIG_START(pcg850v_state::pcg850v) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pce220_state,pce220) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/pcw.cpp b/src/mame/drivers/pcw.cpp index 189ca93eb88dc..bd75f43135dcc 100644 --- a/src/mame/drivers/pcw.cpp +++ b/src/mame/drivers/pcw.cpp @@ -1287,7 +1287,7 @@ MACHINE_CONFIG_START(pcw_state::pcw8256) MCFG_SCREEN_UPDATE_DRIVER(pcw_state, screen_update_pcw_printer) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT( layout_pcw ) + config.set_default_layout(layout_pcw); MACHINE_CONFIG_END @@ -1300,7 +1300,7 @@ MACHINE_CONFIG_START(pcw_state::pcw8512) MCFG_SCREEN_UPDATE_DRIVER(pcw_state, screen_update_pcw_printer) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT( layout_pcw ) + config.set_default_layout(layout_pcw); /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) diff --git a/src/mame/drivers/pda600.cpp b/src/mame/drivers/pda600.cpp index 9e2dfdd47a6db..374eb596379fd 100644 --- a/src/mame/drivers/pda600.cpp +++ b/src/mame/drivers/pda600.cpp @@ -220,7 +220,7 @@ MACHINE_CONFIG_START(pda600_state::pda600) MCFG_SCREEN_PALETTE("palette") MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_pda600) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD_MONOCHROME("palette") // NVRAM needs to be filled with random data to fail the checksum and be initialized correctly diff --git a/src/mame/drivers/peyper.cpp b/src/mame/drivers/peyper.cpp index bcf4ad25e2285..7fe9539902c67 100644 --- a/src/mame/drivers/peyper.cpp +++ b/src/mame/drivers/peyper.cpp @@ -611,7 +611,7 @@ MACHINE_CONFIG_START(peyper_state::peyper) MCFG_NVRAM_ADD_0FILL("nvram") /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_peyper) + config.set_default_layout(layout_peyper); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/piggypas.cpp b/src/mame/drivers/piggypas.cpp index 6eec01e1da538..f8519e1930bf3 100644 --- a/src/mame/drivers/piggypas.cpp +++ b/src/mame/drivers/piggypas.cpp @@ -222,7 +222,7 @@ MACHINE_CONFIG_START(piggypas_state::piggypas) MCFG_SCREEN_PALETTE("palette") MCFG_PALETTE_ADD("palette", 2) - MCFG_DEFAULT_LAYOUT(layout_piggypas) + config.set_default_layout(layout_piggypas); MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(1, 16) diff --git a/src/mame/drivers/pitagjr.cpp b/src/mame/drivers/pitagjr.cpp index 6eee08b3af8e5..29177c5665ba2 100644 --- a/src/mame/drivers/pitagjr.cpp +++ b/src/mame/drivers/pitagjr.cpp @@ -222,7 +222,7 @@ MACHINE_CONFIG_START(pitagjr_state::pitajr) MCFG_SCREEN_VISIBLE_AREA( 0, 200-1, 0, 100-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pitagjr_state, pitagjr) diff --git a/src/mame/drivers/play_1.cpp b/src/mame/drivers/play_1.cpp index f09636495f881..c5e144b551745 100644 --- a/src/mame/drivers/play_1.cpp +++ b/src/mame/drivers/play_1.cpp @@ -484,7 +484,7 @@ MACHINE_CONFIG_START(play_1_state::play_1) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_play_1) + config.set_default_layout(layout_play_1); MCFG_DEVICE_ADD("xpoint", CLOCK, 100) // crossing-point detector MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_1_state, clock_w)) diff --git a/src/mame/drivers/play_2.cpp b/src/mame/drivers/play_2.cpp index 12865da25cd5d..c966c13bd9f61 100644 --- a/src/mame/drivers/play_2.cpp +++ b/src/mame/drivers/play_2.cpp @@ -379,7 +379,7 @@ MACHINE_CONFIG_START(play_2_state::play_2) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_play_2) + config.set_default_layout(layout_play_2); MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL(2'950'000) / 8) // TPB line from CPU MCFG_CLOCK_SIGNAL_HANDLER(WRITELINE(*this, play_2_state, clock_w)) diff --git a/src/mame/drivers/play_3.cpp b/src/mame/drivers/play_3.cpp index 5c56395a9f2ef..cbfdce094e8cb 100644 --- a/src/mame/drivers/play_3.cpp +++ b/src/mame/drivers/play_3.cpp @@ -489,7 +489,7 @@ MACHINE_CONFIG_START(play_3_state::play_3) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_play_3) + config.set_default_layout(layout_play_3); // Devices MCFG_DEVICE_ADD("tpb_clock", CLOCK, XTAL(3'579'545) / 8) // TPB line from CPU diff --git a/src/mame/drivers/playch10.cpp b/src/mame/drivers/playch10.cpp index 5c1106e2b8d94..be7dd33b3ef18 100644 --- a/src/mame/drivers/playch10.cpp +++ b/src/mame/drivers/playch10.cpp @@ -672,7 +672,7 @@ MACHINE_CONFIG_START(playch10_state::playch10) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_playch10) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(playch10_state, playch10) - MCFG_DEFAULT_LAYOUT(layout_playch10) + config.set_default_layout(layout_playch10); MCFG_SCREEN_ADD("top", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/pmi80.cpp b/src/mame/drivers/pmi80.cpp index b5d239df908e4..86ace8c173661 100644 --- a/src/mame/drivers/pmi80.cpp +++ b/src/mame/drivers/pmi80.cpp @@ -176,7 +176,7 @@ MACHINE_CONFIG_START(pmi80_state::pmi80) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_pmi80) + config.set_default_layout(layout_pmi80); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/pofo.cpp b/src/mame/drivers/pofo.cpp index 4c7f7a6a4db6f..166207bce87e1 100644 --- a/src/mame/drivers/pofo.cpp +++ b/src/mame/drivers/pofo.cpp @@ -1031,7 +1031,7 @@ MACHINE_CONFIG_START(portfolio_state::portfolio) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 64-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(portfolio_state, portfolio) diff --git a/src/mame/drivers/pokemini.cpp b/src/mame/drivers/pokemini.cpp index 55a148e644f90..2699933d568c1 100644 --- a/src/mame/drivers/pokemini.cpp +++ b/src/mame/drivers/pokemini.cpp @@ -1779,7 +1779,7 @@ MACHINE_CONFIG_START(pokemini_state::pokemini) MCFG_SCREEN_REFRESH_RATE( 72 ) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(pokemini_state, pokemini) diff --git a/src/mame/drivers/polepos.cpp b/src/mame/drivers/polepos.cpp index f3489d4df0f7a..f6994a82250a8 100644 --- a/src/mame/drivers/polepos.cpp +++ b/src/mame/drivers/polepos.cpp @@ -926,7 +926,7 @@ MACHINE_CONFIG_START(polepos_state::polepos) MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_palette, gfx_polepos) MCFG_PALETTE_ADD(m_palette, 0x0f00) MCFG_PALETTE_INDIRECT_ENTRIES(128) - MCFG_DEFAULT_LAYOUT(layout_polepos) + config.set_default_layout(layout_polepos); MCFG_PALETTE_INIT_OWNER(polepos_state,polepos) @@ -1036,7 +1036,7 @@ MACHINE_CONFIG_START(polepos_state::topracern) MCFG_DEVICE_ADD(m_gfxdecode, GFXDECODE, m_palette, gfx_polepos) MCFG_PALETTE_ADD(m_palette, 0x0f00) MCFG_PALETTE_INDIRECT_ENTRIES(128) - MCFG_DEFAULT_LAYOUT(layout_topracer) + config.set_default_layout(layout_topracer); MCFG_PALETTE_INIT_OWNER(polepos_state,polepos) diff --git a/src/mame/drivers/polgar.cpp b/src/mame/drivers/polgar.cpp index a935b2a50a8e3..d89775b73f601 100644 --- a/src/mame/drivers/polgar.cpp +++ b/src/mame/drivers/polgar.cpp @@ -493,7 +493,7 @@ MACHINE_CONFIG_START(mephisto_polgar_state::polgar) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_mephisto_lcd) + config.set_default_layout(layout_mephisto_lcd); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_polgar_state::polgar10) @@ -529,7 +529,7 @@ MACHINE_CONFIG_START(mephisto_risc_state::mrisc) MCFG_MEPHISTO_SENSORS_BOARD_ADD("board") MCFG_MEPHISTO_DISPLAY_MODUL_ADD("display") - MCFG_DEFAULT_LAYOUT(layout_mephisto_lcd) + config.set_default_layout(layout_mephisto_lcd); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_milano_state::milano) @@ -540,7 +540,7 @@ MACHINE_CONFIG_START(mephisto_milano_state::milano) MCFG_DEVICE_REMOVE("board") MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board") MCFG_MEPHISTO_BOARD_DISABLE_LEDS(true) - MCFG_DEFAULT_LAYOUT(layout_mephisto_milano) + config.set_default_layout(layout_mephisto_milano); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_academy_state::academy) @@ -552,7 +552,7 @@ MACHINE_CONFIG_START(mephisto_academy_state::academy) outlatch.q_out_cb<1>().set(FUNC(mephisto_academy_state::academy_nmi_w)); outlatch.q_out_cb<2>().set("display:beeper", FUNC(beep_device::set_state)).invert(); - MCFG_DEFAULT_LAYOUT(layout_mephisto_academy) + config.set_default_layout(layout_mephisto_academy); MACHINE_CONFIG_END MACHINE_CONFIG_START(mephisto_modena_state::modena) @@ -569,7 +569,7 @@ MACHINE_CONFIG_START(mephisto_modena_state::modena) MCFG_DEVICE_REMOVE("display") MCFG_MEPHISTO_BUTTONS_BOARD_ADD("board") MCFG_MEPHISTO_BOARD_DISABLE_LEDS(true) - MCFG_DEFAULT_LAYOUT(layout_mephisto_modena) + config.set_default_layout(layout_mephisto_modena); MCFG_DEVICE_REMOVE("outlatch") diff --git a/src/mame/drivers/poly880.cpp b/src/mame/drivers/poly880.cpp index a4aeedbf29d3a..a90bdaea0a818 100644 --- a/src/mame/drivers/poly880.cpp +++ b/src/mame/drivers/poly880.cpp @@ -252,7 +252,7 @@ MACHINE_CONFIG_START(poly880_state::poly880) MCFG_DEVICE_IO_MAP(poly880_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_poly880 ) + config.set_default_layout(layout_poly880); /* devices */ MCFG_DEVICE_ADD(Z80CTC_TAG, Z80CTC, XTAL(7'372'800)/16) diff --git a/src/mame/drivers/prestige.cpp b/src/mame/drivers/prestige.cpp index cd05c9cc500d3..39838a468d98e 100644 --- a/src/mame/drivers/prestige.cpp +++ b/src/mame/drivers/prestige.cpp @@ -760,7 +760,7 @@ MACHINE_CONFIG_START(prestige_state::prestige_base) MCFG_SCREEN_VISIBLE_AREA( 0, 240-1, 0, 100-1 ) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT( layout_lcd ) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(prestige_state, prestige) diff --git a/src/mame/drivers/pro80.cpp b/src/mame/drivers/pro80.cpp index 70cdd70bd9240..0a519b3057d70 100644 --- a/src/mame/drivers/pro80.cpp +++ b/src/mame/drivers/pro80.cpp @@ -182,7 +182,7 @@ MACHINE_CONFIG_START(pro80_state::pro80) MCFG_DEVICE_IO_MAP(pro80_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_pro80) + config.set_default_layout(layout_pro80); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/proconn.cpp b/src/mame/drivers/proconn.cpp index 3a9d5507da735..08d8216704f54 100644 --- a/src/mame/drivers/proconn.cpp +++ b/src/mame/drivers/proconn.cpp @@ -326,7 +326,7 @@ MACHINE_CONFIG_START(proconn_state::proconn) SPEAKER(config, "rspeaker").front_right(); - MCFG_DEFAULT_LAYOUT(layout_proconn) + config.set_default_layout(layout_proconn); MCFG_DEVICE_ADD("aysnd", AY8910, 1000000) /* ?? Mhz */ // YM2149F on PC92? MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, proconn_state, meter_w)) diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp index 5f8d9a7323d3c..e1c008166bbf2 100644 --- a/src/mame/drivers/prodigy.cpp +++ b/src/mame/drivers/prodigy.cpp @@ -645,7 +645,7 @@ MACHINE_CONFIG_START(prodigy_state::prodigy) /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", M6502, XTAL(2'000'000)) MCFG_DEVICE_PROGRAM_MAP(maincpu_map) - MCFG_DEFAULT_LAYOUT(layout_prodigy) + config.set_default_layout(layout_prodigy); MCFG_DEVICE_ADD("io_74145", TTL74145, 0) diff --git a/src/mame/drivers/prophet600.cpp b/src/mame/drivers/prophet600.cpp index eac3bc6f695c9..2b8291583b65e 100644 --- a/src/mame/drivers/prophet600.cpp +++ b/src/mame/drivers/prophet600.cpp @@ -276,7 +276,7 @@ MACHINE_CONFIG_START(prophet600_state::prophet600) MCFG_DEVICE_PROGRAM_MAP(cpu_map) MCFG_DEVICE_IO_MAP(io_map) - MCFG_DEFAULT_LAYOUT( layout_prophet600 ) + config.set_default_layout(layout_prophet600); MCFG_DEVICE_ADD(PIT_TAG, PIT8253, XTAL(8'000'000)/4) MCFG_PIT8253_CLK0(XTAL(8'000'000)/4) diff --git a/src/mame/drivers/psikyo4.cpp b/src/mame/drivers/psikyo4.cpp index 683bb01361e3d..6b2978ef19917 100644 --- a/src/mame/drivers/psikyo4.cpp +++ b/src/mame/drivers/psikyo4.cpp @@ -667,7 +667,7 @@ MACHINE_CONFIG_START(psikyo4_state::ps4big) MCFG_PALETTE_ADD("lpalette", (0x2000/4) + 1) /* palette + clear colour */ MCFG_PALETTE_ADD("rpalette", (0x2000/4) + 1) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) diff --git a/src/mame/drivers/psion.cpp b/src/mame/drivers/psion.cpp index 32ab1d2737f1c..41ebbdc07e73f 100644 --- a/src/mame/drivers/psion.cpp +++ b/src/mame/drivers/psion.cpp @@ -583,7 +583,7 @@ MACHINE_CONFIG_START(psion_state::psion_2lines) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(psion_state, psion) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_psion) diff --git a/src/mame/drivers/punchout.cpp b/src/mame/drivers/punchout.cpp index 4242cd10c1550..20cec8cd3ab9d 100644 --- a/src/mame/drivers/punchout.cpp +++ b/src/mame/drivers/punchout.cpp @@ -647,7 +647,7 @@ MACHINE_CONFIG_START(punchout_state::punchout) /* video hardware */ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_punchout) MCFG_PALETTE_ADD("palette", 0x200) - MCFG_DEFAULT_LAYOUT(layout_dualhovu) + config.set_default_layout(layout_dualhovu); screen_device &top(SCREEN(config, "top", SCREEN_TYPE_RASTER)); top.set_refresh_hz(60); diff --git a/src/mame/drivers/pve500.cpp b/src/mame/drivers/pve500.cpp index 2342cf415d1b9..502444c5cb5a6 100644 --- a/src/mame/drivers/pve500.cpp +++ b/src/mame/drivers/pve500.cpp @@ -445,7 +445,7 @@ MACHINE_CONFIG_START(pve500_state::pve500) MCFG_MB8421_INTR_HANDLER(WRITELINE(*this, pve500_state, mb8421_intr)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_pve500) + config.set_default_layout(layout_pve500); /* audio hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/px4.cpp b/src/mame/drivers/px4.cpp index 1f6f792235142..44f0b79cd7d08 100644 --- a/src/mame/drivers/px4.cpp +++ b/src/mame/drivers/px4.cpp @@ -1499,7 +1499,7 @@ MACHINE_CONFIG_START(px4_state::px4) MCFG_SCREEN_UPDATE_DRIVER(px4_state, screen_update_px4) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_px4) + config.set_default_layout(layout_px4); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(px4_state, px4) diff --git a/src/mame/drivers/px8.cpp b/src/mame/drivers/px8.cpp index cf6e54457105e..8b61e82ef4e4b 100644 --- a/src/mame/drivers/px8.cpp +++ b/src/mame/drivers/px8.cpp @@ -769,7 +769,7 @@ MACHINE_CONFIG_START(px8_state::px8) // MCFG_DEVICE_DISABLE() /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_px8) + config.set_default_layout(layout_px8); MCFG_SCREEN_ADD(SCREEN_TAG, LCD) MCFG_SCREEN_REFRESH_RATE(72) diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index 2ea5671fa0109..91ea68f198bf5 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -3212,7 +3212,7 @@ void rainbow_state::upd7220_map(address_map &map) } MACHINE_CONFIG_START(rainbow_state::rainbow) - MCFG_DEFAULT_LAYOUT(layout_rainbow) + config.set_default_layout(layout_rainbow); /* basic machine hardware */ MCFG_DEVICE_ADD("maincpu", I8088, 24.0734_MHz_XTAL / 5) // approximately 4.815 MHz diff --git a/src/mame/drivers/ravens.cpp b/src/mame/drivers/ravens.cpp index 836b337bf6dc0..62fd50f840fdd 100644 --- a/src/mame/drivers/ravens.cpp +++ b/src/mame/drivers/ravens.cpp @@ -347,7 +347,7 @@ MACHINE_CONFIG_START(ravens_state::ravens) MCFG_S2650_FLAG_OUTPUT(WRITELINE(*this, ravens_state, cass_w)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_ravens) + config.set_default_layout(layout_ravens); /* quickload */ MCFG_QUICKLOAD_ADD("quickload", ravens_state, ravens, "pgm", 1) diff --git a/src/mame/drivers/replicator.cpp b/src/mame/drivers/replicator.cpp index 6d62bfb5babb1..7d18085be6684 100644 --- a/src/mame/drivers/replicator.cpp +++ b/src/mame/drivers/replicator.cpp @@ -637,7 +637,7 @@ MACHINE_CONFIG_START(replicator_state::replicator) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(replicator_state, replicator) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_replicator) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_HD44780_ADD("hd44780") MCFG_HD44780_LCD_SIZE(4, 20) diff --git a/src/mame/drivers/rex6000.cpp b/src/mame/drivers/rex6000.cpp index df2a32b70a1ad..c8999baed30d3 100644 --- a/src/mame/drivers/rex6000.cpp +++ b/src/mame/drivers/rex6000.cpp @@ -915,7 +915,7 @@ MACHINE_CONFIG_START(rex6000_state::rex6000) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 120-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(rex6000_state, rex6000) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_rex6000) @@ -1005,7 +1005,7 @@ MACHINE_CONFIG_START(oz750_state::oz750) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 80-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(rex6000_state, rex6000) diff --git a/src/mame/drivers/risc2500.cpp b/src/mame/drivers/risc2500.cpp index 5307078cd8c76..961942decc6b7 100644 --- a/src/mame/drivers/risc2500.cpp +++ b/src/mame/drivers/risc2500.cpp @@ -326,7 +326,7 @@ MACHINE_CONFIG_START(risc2500_state::risc2500) MCFG_SCREEN_UPDATE_DRIVER(risc2500_state, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_risc2500) + config.set_default_layout(layout_risc2500); MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/rowamet.cpp b/src/mame/drivers/rowamet.cpp index 3f8794fa794c5..19b6f39b9af63 100644 --- a/src/mame/drivers/rowamet.cpp +++ b/src/mame/drivers/rowamet.cpp @@ -232,7 +232,7 @@ MACHINE_CONFIG_START(rowamet_state::rowamet) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_a", rowamet_state, timer_a, attotime::from_hz(200)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_rowamet) + config.set_default_layout(layout_rowamet); /* Sound */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/rvoice.cpp b/src/mame/drivers/rvoice.cpp index 0797051cf4ac4..6f7fcab89a7af 100644 --- a/src/mame/drivers/rvoice.cpp +++ b/src/mame/drivers/rvoice.cpp @@ -382,7 +382,7 @@ MACHINE_CONFIG_START(rvoice_state::rvoicepc) MCFG_MOS6551_XTAL(XTAL(1'843'200)) /* video hardware */ - //MCFG_DEFAULT_LAYOUT(layout_dectalk) // hack to avoid screenless system crash + //config.set_default_layout(layout_dectalk); // hack to avoid screenless system crash /* sound hardware */ MCFG_DEVICE_ADD(TERMINAL_TAG, GENERIC_TERMINAL, 0) diff --git a/src/mame/drivers/rz1.cpp b/src/mame/drivers/rz1.cpp index a54bdb1c7161e..f835d43dbe80d 100644 --- a/src/mame/drivers/rz1.cpp +++ b/src/mame/drivers/rz1.cpp @@ -359,7 +359,7 @@ MACHINE_CONFIG_START( rz1_state::rz1 ) m_hd44780->set_lcd_size(1, 16); m_hd44780->set_pixel_update_cb(FUNC(rz1_state::lcd_pixel_update), this); - MCFG_DEFAULT_LAYOUT(layout_rz1) + config.set_default_layout(layout_rz1); SPEAKER(config, "speaker").front_center(); UPD934G(config, m_pg[0], 1333000); diff --git a/src/mame/drivers/rzone.cpp b/src/mame/drivers/rzone.cpp index a6caf5bfe5fec..fa6905d839d39 100644 --- a/src/mame/drivers/rzone.cpp +++ b/src/mame/drivers/rzone.cpp @@ -259,7 +259,7 @@ MACHINE_CONFIG_START(rzone_state::rzbatfor) MCFG_TIMER_DRIVER_ADD("led_off", rzone_state, led_off_callback) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_rzone) + config.set_default_layout(layout_rzone); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -285,7 +285,7 @@ MACHINE_CONFIG_START(rzone_state::rztoshden) MCFG_TIMER_DRIVER_ADD("led_off", rzone_state, led_off_callback) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_rzone) + config.set_default_layout(layout_rzone); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -311,7 +311,7 @@ MACHINE_CONFIG_START(rzone_state::rzindy500) MCFG_TIMER_DRIVER_ADD("led_off", rzone_state, led_off_callback) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_sm510_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_rzone) + config.set_default_layout(layout_rzone); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/s11.cpp b/src/mame/drivers/s11.cpp index b29aac581855f..e5948db198de3 100644 --- a/src/mame/drivers/s11.cpp +++ b/src/mame/drivers/s11.cpp @@ -389,7 +389,7 @@ MACHINE_CONFIG_START(s11_state::s11) MCFG_MACHINE_RESET_OVERRIDE(s11_state, s11) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s11) + config.set_default_layout(layout_s11); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s11a.cpp b/src/mame/drivers/s11a.cpp index 1d15af82ce9ac..c9e0fa3876bb8 100644 --- a/src/mame/drivers/s11a.cpp +++ b/src/mame/drivers/s11a.cpp @@ -181,7 +181,7 @@ MACHINE_CONFIG_START(s11a_state::s11a) MCFG_MACHINE_RESET_OVERRIDE(s11a_state, s11a) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s11a) + config.set_default_layout(layout_s11a); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s11b.cpp b/src/mame/drivers/s11b.cpp index 31127bc718f45..45f637d13a70e 100644 --- a/src/mame/drivers/s11b.cpp +++ b/src/mame/drivers/s11b.cpp @@ -255,7 +255,7 @@ MACHINE_CONFIG_START(s11b_state::s11b) MCFG_MACHINE_RESET_OVERRIDE(s11b_state, s11b) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s11b) + config.set_default_layout(layout_s11b); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s11c.cpp b/src/mame/drivers/s11c.cpp index 0874d83108009..2cbd6fd7248b4 100644 --- a/src/mame/drivers/s11c.cpp +++ b/src/mame/drivers/s11c.cpp @@ -160,7 +160,7 @@ MACHINE_CONFIG_START(s11c_state::s11c) MCFG_MACHINE_RESET_OVERRIDE(s11c_state, s11c) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s11c) + config.set_default_layout(layout_s11c); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s3.cpp b/src/mame/drivers/s3.cpp index 48355dec7e2a6..3c1fbddc96d53 100644 --- a/src/mame/drivers/s3.cpp +++ b/src/mame/drivers/s3.cpp @@ -444,7 +444,7 @@ MACHINE_CONFIG_START(s3_state::s3) MCFG_MACHINE_RESET_OVERRIDE(s3_state, s3) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s3) + config.set_default_layout(layout_s3); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s4.cpp b/src/mame/drivers/s4.cpp index c09c74cb20060..41982978d374b 100644 --- a/src/mame/drivers/s4.cpp +++ b/src/mame/drivers/s4.cpp @@ -438,7 +438,7 @@ MACHINE_CONFIG_START(s4_state::s4) MCFG_MACHINE_RESET_OVERRIDE(s4_state, s4) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s4) + config.set_default_layout(layout_s4); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s6.cpp b/src/mame/drivers/s6.cpp index 7c0e99fc29078..79db4cea411fb 100644 --- a/src/mame/drivers/s6.cpp +++ b/src/mame/drivers/s6.cpp @@ -416,7 +416,7 @@ MACHINE_CONFIG_START(s6_state::s6) MCFG_MACHINE_RESET_OVERRIDE(s6_state, s6) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s6) + config.set_default_layout(layout_s6); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s6a.cpp b/src/mame/drivers/s6a.cpp index d0fa1fad5cc6c..14688eb3b1f13 100644 --- a/src/mame/drivers/s6a.cpp +++ b/src/mame/drivers/s6a.cpp @@ -399,7 +399,7 @@ MACHINE_CONFIG_START(s6a_state::s6a) MCFG_MACHINE_RESET_OVERRIDE(s6a_state, s6a) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s6a) + config.set_default_layout(layout_s6a); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s7.cpp b/src/mame/drivers/s7.cpp index d88b3f32cc3e8..0c1393e7d8efa 100644 --- a/src/mame/drivers/s7.cpp +++ b/src/mame/drivers/s7.cpp @@ -441,7 +441,7 @@ MACHINE_CONFIG_START(s7_state::s7) MCFG_MACHINE_RESET_OVERRIDE(s7_state, s7) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s7) + config.set_default_layout(layout_s7); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s8.cpp b/src/mame/drivers/s8.cpp index cb2f2dc70c9c9..4081ad4cbfd33 100644 --- a/src/mame/drivers/s8.cpp +++ b/src/mame/drivers/s8.cpp @@ -324,7 +324,7 @@ MACHINE_CONFIG_START(s8_state::s8) MCFG_MACHINE_RESET_OVERRIDE(s8_state, s8) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s8) + config.set_default_layout(layout_s8); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s8a.cpp b/src/mame/drivers/s8a.cpp index ccd47b5dd3fe3..e6316dec59934 100644 --- a/src/mame/drivers/s8a.cpp +++ b/src/mame/drivers/s8a.cpp @@ -296,7 +296,7 @@ MACHINE_CONFIG_START(s8a_state::s8a) MCFG_MACHINE_RESET_OVERRIDE(s8a_state, s8a) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s8a) + config.set_default_layout(layout_s8a); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/s9.cpp b/src/mame/drivers/s9.cpp index 341db9bae1834..698b6409c81fc 100644 --- a/src/mame/drivers/s9.cpp +++ b/src/mame/drivers/s9.cpp @@ -330,7 +330,7 @@ MACHINE_CONFIG_START(s9_state::s9) MCFG_MACHINE_RESET_OVERRIDE(s9_state, s9) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_s9) + config.set_default_layout(layout_s9); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/savia84.cpp b/src/mame/drivers/savia84.cpp index 2f6efa75d8650..22ffc686b69b2 100644 --- a/src/mame/drivers/savia84.cpp +++ b/src/mame/drivers/savia84.cpp @@ -188,7 +188,7 @@ MACHINE_CONFIG_START(savia84_state::savia84) MCFG_DEVICE_IO_MAP(io_map) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_savia84) + config.set_default_layout(layout_savia84); /* Devices */ MCFG_DEVICE_ADD("ppi8255", I8255, 0) diff --git a/src/mame/drivers/sc1.cpp b/src/mame/drivers/sc1.cpp index 5d8d4e1e72fc6..ece405cc9e841 100644 --- a/src/mame/drivers/sc1.cpp +++ b/src/mame/drivers/sc1.cpp @@ -165,7 +165,7 @@ MACHINE_CONFIG_START(sc1_state::sc1) MCFG_DEVICE_IO_MAP(sc1_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_sc1) + config.set_default_layout(layout_sc1); /* devices */ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000)) diff --git a/src/mame/drivers/sc2.cpp b/src/mame/drivers/sc2.cpp index a938e8bdfd1d5..cc685a0a64120 100644 --- a/src/mame/drivers/sc2.cpp +++ b/src/mame/drivers/sc2.cpp @@ -220,7 +220,7 @@ MACHINE_CONFIG_START(sc2_state::sc2) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_sc2) + config.set_default_layout(layout_sc2); /* devices */ MCFG_DEVICE_ADD("z80pio", Z80PIO, XTAL(4'000'000)) diff --git a/src/mame/drivers/sdk85.cpp b/src/mame/drivers/sdk85.cpp index 43ef2643343d3..239942208aee1 100644 --- a/src/mame/drivers/sdk85.cpp +++ b/src/mame/drivers/sdk85.cpp @@ -164,7 +164,7 @@ MACHINE_CONFIG_START(sdk85_state::sdk85) MCFG_DEVICE_ADD("expramio", I8155, 6.144_MHz_XTAL / 2) // Expansion RAM (A17) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_sdk85) + config.set_default_layout(layout_sdk85); /* Devices */ MCFG_DEVICE_ADD("kdc", I8279, 6.144_MHz_XTAL / 2) // Keyboard/Display Controller (A13) diff --git a/src/mame/drivers/sdk86.cpp b/src/mame/drivers/sdk86.cpp index fba2a060f41e6..150bc51e7d058 100644 --- a/src/mame/drivers/sdk86.cpp +++ b/src/mame/drivers/sdk86.cpp @@ -153,7 +153,7 @@ MACHINE_CONFIG_START(sdk86_state::sdk86) MCFG_DEVICE_IO_MAP(sdk86_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_sdk86) + config.set_default_layout(layout_sdk86); /* Devices */ MCFG_DEVICE_ADD(I8251_TAG, I8251, 0) diff --git a/src/mame/drivers/segas32.cpp b/src/mame/drivers/segas32.cpp index 93c95fdfd4044..4ba45a8caf4af 100644 --- a/src/mame/drivers/segas32.cpp +++ b/src/mame/drivers/segas32.cpp @@ -2557,7 +2557,7 @@ MACHINE_CONFIG_START(sega_multi32_state::device_add_mconfig) /* video hardware */ MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_segas32) MCFG_PALETTE_ADD("palette", 0x8000) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/selz80.cpp b/src/mame/drivers/selz80.cpp index 655bc7269d58a..1c47c6fc10a46 100644 --- a/src/mame/drivers/selz80.cpp +++ b/src/mame/drivers/selz80.cpp @@ -225,7 +225,7 @@ MACHINE_CONFIG_START(selz80_state::selz80) MCFG_MACHINE_RESET_OVERRIDE(selz80_state, selz80 ) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_selz80) + config.set_default_layout(layout_selz80); /* Devices */ CLOCK(config, m_clock, 153600); diff --git a/src/mame/drivers/seta.cpp b/src/mame/drivers/seta.cpp index 0bb9e67619622..3ae176449c5f1 100644 --- a/src/mame/drivers/seta.cpp +++ b/src/mame/drivers/seta.cpp @@ -8589,7 +8589,7 @@ MACHINE_CONFIG_START(setaroul_state::setaroul) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) // layout - MCFG_DEFAULT_LAYOUT(layout_setaroul) + config.set_default_layout(layout_setaroul); MACHINE_CONFIG_END /*************************************************************************** @@ -9847,7 +9847,7 @@ MACHINE_CONFIG_START(jockeyc_state::jockeyc) MCFG_SOUND_ROUTE(1, "rspeaker", 1.0) // layout - MCFG_DEFAULT_LAYOUT(layout_jockeyc) + config.set_default_layout(layout_jockeyc); MACHINE_CONFIG_END @@ -9876,7 +9876,7 @@ MACHINE_CONFIG_START(jockeyc_state::inttoote) MCFG_DEVICE_ADD ("acia2", ACIA6850, 0) // layout - MCFG_DEFAULT_LAYOUT(layout_inttoote) + config.set_default_layout(layout_inttoote); MACHINE_CONFIG_END diff --git a/src/mame/drivers/sfcbox.cpp b/src/mame/drivers/sfcbox.cpp index d9be50fe51f2a..e56338588437e 100644 --- a/src/mame/drivers/sfcbox.cpp +++ b/src/mame/drivers/sfcbox.cpp @@ -485,7 +485,7 @@ MACHINE_CONFIG_START(sfcbox_state::sfcbox) /* video hardware */ /* TODO: the screen should actually superimpose, but for the time being let's just separate outputs */ - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); // SNES PPU MCFG_SCREEN_ADD("screen", RASTER) diff --git a/src/mame/drivers/sitcom.cpp b/src/mame/drivers/sitcom.cpp index e44564e6e4d93..83d5c7f137974 100644 --- a/src/mame/drivers/sitcom.cpp +++ b/src/mame/drivers/sitcom.cpp @@ -381,7 +381,7 @@ MACHINE_CONFIG_START(sitcom_state::sitcom) MCFG_RS232_RXD_HANDLER(WRITELINE(*this, sitcom_state, update_rxd)) MCFG_SOFTWARE_LIST_ADD("bitb_list", "sitcom") - MCFG_DEFAULT_LAYOUT(layout_sitcom) + config.set_default_layout(layout_sitcom); MACHINE_CONFIG_END @@ -391,7 +391,7 @@ MACHINE_CONFIG_START(sitcom_timer_state::sitcomtmr) MCFG_DEVICE_ADD("ds2", DL1414T, u32(0)) // remote display MCFG_DL1414_UPDATE_HANDLER(WRITE16(*this, sitcom_timer_state, update_ds<2>)) - MCFG_DEFAULT_LAYOUT(layout_sitcomtmr) + config.set_default_layout(layout_sitcomtmr); MACHINE_CONFIG_END diff --git a/src/mame/drivers/slc1.cpp b/src/mame/drivers/slc1.cpp index f966c7f9b0a1d..9d02c12419c95 100644 --- a/src/mame/drivers/slc1.cpp +++ b/src/mame/drivers/slc1.cpp @@ -274,7 +274,7 @@ MACHINE_CONFIG_START(slc1_state::slc1) MCFG_DEVICE_IO_MAP(io_map) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_slc1) + config.set_default_layout(layout_slc1); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/sms.cpp b/src/mame/drivers/sms.cpp index 38e297f9940ad..ccd8189851d13 100644 --- a/src/mame/drivers/sms.cpp +++ b/src/mame/drivers/sms.cpp @@ -609,7 +609,7 @@ MACHINE_CONFIG_START(sms_state::sms1_ntsc) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) - MCFG_DEFAULT_LAYOUT(layout_sms1) + config.set_default_layout(layout_sms1); MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) @@ -732,7 +732,7 @@ MACHINE_CONFIG_START(sms_state::sms1_pal) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) - MCFG_DEFAULT_LAYOUT(layout_sms1) + config.set_default_layout(layout_sms1); MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) @@ -804,7 +804,7 @@ MACHINE_CONFIG_START(sms_state::sms1_paln) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) - MCFG_DEFAULT_LAYOUT(layout_sms1) + config.set_default_layout(layout_sms1); MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) @@ -878,7 +878,7 @@ MACHINE_CONFIG_START(sms_state::sms1_br) MCFG_SCREEN_VBLANK_CALLBACK(WRITELINE(*this, sms_state, screen_vblank_sms1)) - MCFG_DEFAULT_LAYOUT(layout_sms1) + config.set_default_layout(layout_sms1); MCFG_VIDEO_START_OVERRIDE(sms_state,sms1) MCFG_VIDEO_RESET_OVERRIDE(sms_state,sms1) diff --git a/src/mame/drivers/spectra.cpp b/src/mame/drivers/spectra.cpp index 7398b8df6a1c2..f150554d0f6be 100644 --- a/src/mame/drivers/spectra.cpp +++ b/src/mame/drivers/spectra.cpp @@ -247,7 +247,7 @@ MACHINE_CONFIG_START(spectra_state::spectra) MCFG_TIMER_DRIVER_ADD_PERIODIC("outtimer", spectra_state, outtimer, attotime::from_hz(1200)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_spectra) + config.set_default_layout(layout_spectra); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/st_mp100.cpp b/src/mame/drivers/st_mp100.cpp index 8417cd14e3df9..fc8aad06f90b8 100644 --- a/src/mame/drivers/st_mp100.cpp +++ b/src/mame/drivers/st_mp100.cpp @@ -717,7 +717,7 @@ MACHINE_CONFIG_START(st_mp100_state::st_mp100) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_st_mp100) + config.set_default_layout(layout_st_mp100); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/st_mp200.cpp b/src/mame/drivers/st_mp200.cpp index 7fbe095611a43..43cc8fb335987 100644 --- a/src/mame/drivers/st_mp200.cpp +++ b/src/mame/drivers/st_mp200.cpp @@ -588,7 +588,7 @@ MACHINE_CONFIG_START(st_mp200_state::st_mp200) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_st_mp200) + config.set_default_layout(layout_st_mp200); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/subs.cpp b/src/mame/drivers/subs.cpp index 335b71b7293cb..1b1033ec4b8de 100644 --- a/src/mame/drivers/subs.cpp +++ b/src/mame/drivers/subs.cpp @@ -187,7 +187,7 @@ MACHINE_CONFIG_START(subs_state::subs) MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(subs_state, subs) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(57) diff --git a/src/mame/drivers/super80.cpp b/src/mame/drivers/super80.cpp index 5b321852d37fb..53879d334aab5 100644 --- a/src/mame/drivers/super80.cpp +++ b/src/mame/drivers/super80.cpp @@ -728,7 +728,7 @@ MACHINE_CONFIG_START(super80_state::super80) MCFG_PALETTE_INIT_OWNER(super80_state,super80m) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super80) - MCFG_DEFAULT_LAYOUT( layout_super80 ) + config.set_default_layout(layout_super80); MCFG_VIDEO_START_OVERRIDE(super80_state,super80) /* sound hardware */ @@ -821,7 +821,7 @@ MACHINE_CONFIG_START(super80_state::super80v) MCFG_MC6845_UPDATE_ROW_CB(super80_state, crtc_update_row) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_super80v) - MCFG_DEFAULT_LAYOUT( layout_super80 ) + config.set_default_layout(layout_super80); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/svision.cpp b/src/mame/drivers/svision.cpp index d9bc55519eb1b..cb1ef29b90846 100644 --- a/src/mame/drivers/svision.cpp +++ b/src/mame/drivers/svision.cpp @@ -500,7 +500,7 @@ MACHINE_RESET_MEMBER(svision_state,tvlink) } MACHINE_CONFIG_START(svision_state::svision_base) - MCFG_DEFAULT_LAYOUT(layout_svision) + config.set_default_layout(layout_svision); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/svmu.cpp b/src/mame/drivers/svmu.cpp index 51475b916098f..2ba3bea9fbb5b 100644 --- a/src/mame/drivers/svmu.cpp +++ b/src/mame/drivers/svmu.cpp @@ -328,7 +328,7 @@ MACHINE_CONFIG_START(svmu_state::svmu) MCFG_SCREEN_UPDATE_DEVICE("maincpu", lc8670_cpu_device, screen_update) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_svmu) + config.set_default_layout(layout_svmu); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(svmu_state, svmu) diff --git a/src/mame/drivers/sym1.cpp b/src/mame/drivers/sym1.cpp index 6970a11fe2d9e..d41dc93c632c2 100644 --- a/src/mame/drivers/sym1.cpp +++ b/src/mame/drivers/sym1.cpp @@ -332,7 +332,7 @@ MACHINE_CONFIG_START(sym1_state::sym1) MCFG_DEVICE_ADD("maincpu", M6502, SYM1_CLOCK) MCFG_DEVICE_PROGRAM_MAP(sym1_map) - MCFG_DEFAULT_LAYOUT(layout_sym1) + config.set_default_layout(layout_sym1); // sound hardware SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/taito.cpp b/src/mame/drivers/taito.cpp index 9624a5e0af0fa..2a0c0e3143860 100644 --- a/src/mame/drivers/taito.cpp +++ b/src/mame/drivers/taito.cpp @@ -359,7 +359,7 @@ MACHINE_CONFIG_START(taito_state::taito) MCFG_DEVICE_PROGRAM_MAP(taito_sub_map) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_taito) + config.set_default_layout(layout_taito); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/tamag1.cpp b/src/mame/drivers/tamag1.cpp index 0ea21efaceb17..bbc36bf84fb4f 100644 --- a/src/mame/drivers/tamag1.cpp +++ b/src/mame/drivers/tamag1.cpp @@ -148,9 +148,9 @@ MACHINE_CONFIG_START(tamag1_state::tama) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) MCFG_SCREEN_SIZE(40, 16) MCFG_SCREEN_VISIBLE_AREA(0, 32-1, 0, 16-1) - MCFG_DEFAULT_LAYOUT(layout_tama) MCFG_SCREEN_UPDATE_DEVICE("maincpu", e0c6s46_device, screen_update) MCFG_SCREEN_PALETTE("palette") + config.set_default_layout(layout_tama); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(tamag1_state, tama) diff --git a/src/mame/drivers/tavernie.cpp b/src/mame/drivers/tavernie.cpp index 0d87cd96cb0f4..146073b5e4070 100644 --- a/src/mame/drivers/tavernie.cpp +++ b/src/mame/drivers/tavernie.cpp @@ -351,7 +351,7 @@ MACHINE_CONFIG_START(tavernie_state::ivg09) MCFG_SCREEN_VISIBLE_AREA(0, 80*8-1, 0, 25*10-1) MCFG_SCREEN_UPDATE_DEVICE("crtc", mc6845_device, screen_update) MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEFAULT_LAYOUT(layout_tavernie) + config.set_default_layout(layout_tavernie); /* sound hardware */ MCFG_DEVICE_ADD("beeper", BEEP, 950) // guess diff --git a/src/mame/drivers/tb303.cpp b/src/mame/drivers/tb303.cpp index 9592fd7f8e949..8239648f693dd 100644 --- a/src/mame/drivers/tb303.cpp +++ b/src/mame/drivers/tb303.cpp @@ -269,7 +269,7 @@ MACHINE_CONFIG_START(tb303_state::tb303) MCFG_TIMER_DRIVER_ADD_PERIODIC("tp3_clear", tb303_state, tp3_clear, TP3_PERIOD) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tb303) + config.set_default_layout(layout_tb303); /* sound hardware */ // discrete... diff --git a/src/mame/drivers/tbowl.cpp b/src/mame/drivers/tbowl.cpp index 40e778f1f27ac..807e76c02acd3 100644 --- a/src/mame/drivers/tbowl.cpp +++ b/src/mame/drivers/tbowl.cpp @@ -453,7 +453,7 @@ MACHINE_CONFIG_START(tbowl_state::tbowl) MCFG_PALETTE_ADD("palette", 1024*2) MCFG_PALETTE_FORMAT(xxxxBBBBRRRRGGGG) MCFG_PALETTE_ENDIANNESS(ENDIANNESS_BIG) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_DEVICE_ADD("spritegen", TECMO_SPRITE, 0) diff --git a/src/mame/drivers/tec1.cpp b/src/mame/drivers/tec1.cpp index 46aa6c0587109..e214ac747cb19 100644 --- a/src/mame/drivers/tec1.cpp +++ b/src/mame/drivers/tec1.cpp @@ -425,7 +425,7 @@ MACHINE_CONFIG_START(tec1_state::tec1) MCFG_DEVICE_IO_MAP(tec1_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_tec1) + config.set_default_layout(layout_tec1); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -440,7 +440,7 @@ MACHINE_CONFIG_START(tec1_state::tecjmon) MCFG_DEVICE_IO_MAP(tecjmon_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_tec1) + config.set_default_layout(layout_tec1); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/techno.cpp b/src/mame/drivers/techno.cpp index ecb46bdbf67be..c7349677157d1 100644 --- a/src/mame/drivers/techno.cpp +++ b/src/mame/drivers/techno.cpp @@ -298,7 +298,7 @@ MACHINE_CONFIG_START(techno_state::techno) //MCFG_DEVICE_PROGRAM_MAP(techno_sub_map) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_techno) + config.set_default_layout(layout_techno); MACHINE_CONFIG_END ROM_START(xforce) diff --git a/src/mame/drivers/tecnbras.cpp b/src/mame/drivers/tecnbras.cpp index 48f9713fccf63..0a2cc9d769a4f 100644 --- a/src/mame/drivers/tecnbras.cpp +++ b/src/mame/drivers/tecnbras.cpp @@ -133,7 +133,7 @@ MACHINE_CONFIG_START(tecnbras_state::tecnbras) */ /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_tecnbras) + config.set_default_layout(layout_tecnbras); MACHINE_CONFIG_END diff --git a/src/mame/drivers/testconsole.cpp b/src/mame/drivers/testconsole.cpp index d66819e8a157c..ee68ee91d2874 100644 --- a/src/mame/drivers/testconsole.cpp +++ b/src/mame/drivers/testconsole.cpp @@ -196,7 +196,7 @@ MACHINE_CONFIG_START(whouse_testcons_state::whousetc) MCFG_DEVICE_ADD("dsp3", DL1416B, u32(0)) MCFG_DL1416_UPDATE_HANDLER(WRITE16(*this, whouse_testcons_state, update_dsp<3>)) - MCFG_DEFAULT_LAYOUT(layout_whousetc) + config.set_default_layout(layout_whousetc); MACHINE_CONFIG_END diff --git a/src/mame/drivers/tetrisp2.cpp b/src/mame/drivers/tetrisp2.cpp index 2598a1a86ba72..d14aaccbdf610 100644 --- a/src/mame/drivers/tetrisp2.cpp +++ b/src/mame/drivers/tetrisp2.cpp @@ -1854,7 +1854,7 @@ MACHINE_CONFIG_START(tetrisp2_state::rocknms) MCFG_DEVICE_ADD("sub_gfxdecode", GFXDECODE, "sub_palette", gfx_rocknms_sub) MCFG_PALETTE_ADD("sub_palette", 0x8000) - MCFG_DEFAULT_LAYOUT(layout_rocknms) + config.set_default_layout(layout_rocknms); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -1934,7 +1934,7 @@ MACHINE_CONFIG_START(stepstag_state::stepstag) MCFG_DEVICE_ADD("gfxdecode_r", GFXDECODE, "rpalette", gfx_vj_rscreen) MCFG_PALETTE_ADD("rpalette", 0x8000) - MCFG_DEFAULT_LAYOUT(layout_stepstag) + config.set_default_layout(layout_stepstag); // sound hardware SPEAKER(config, "lspeaker").front_left(); @@ -2007,7 +2007,7 @@ MACHINE_CONFIG_START(stepstag_state::vjdash) // 4 Screens MCFG_DEVICE_ADD("gfxdecode_r", GFXDECODE, "rpalette", gfx_vj_rscreen) MCFG_PALETTE_ADD("rpalette", 0x8000) - MCFG_DEFAULT_LAYOUT(layout_vjdash) + config.set_default_layout(layout_vjdash); // sound hardware SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/ti630.cpp b/src/mame/drivers/ti630.cpp index 540722bced5a1..768aa9f228b54 100644 --- a/src/mame/drivers/ti630.cpp +++ b/src/mame/drivers/ti630.cpp @@ -156,7 +156,7 @@ MACHINE_CONFIG_START(ti630_state::ti630) MCFG_SCREEN_VISIBLE_AREA(0, 6*16-1, 0, 9*2-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(ti630_state, ti630) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_ti630) diff --git a/src/mame/drivers/ti74.cpp b/src/mame/drivers/ti74.cpp index 04969624c1dec..049571fda7be3 100644 --- a/src/mame/drivers/ti74.cpp +++ b/src/mame/drivers/ti74.cpp @@ -534,7 +534,7 @@ MACHINE_CONFIG_START(ti74_state::ti74) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(6*31+1, 9*1+1+1) MCFG_SCREEN_VISIBLE_AREA(0, 6*31, 0, 9*1+1) - MCFG_DEFAULT_LAYOUT(layout_ti74) + config.set_default_layout(layout_ti74); MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") @@ -570,7 +570,7 @@ MACHINE_CONFIG_START(ti74_state::ti95) MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(2500)) MCFG_SCREEN_SIZE(200, 20) MCFG_SCREEN_VISIBLE_AREA(0, 200-1, 0, 20-1) - MCFG_DEFAULT_LAYOUT(layout_ti95) + config.set_default_layout(layout_ti95); MCFG_SCREEN_UPDATE_DEVICE("hd44780", hd44780_device, screen_update) MCFG_SCREEN_PALETTE("palette") diff --git a/src/mame/drivers/ti89.cpp b/src/mame/drivers/ti89.cpp index aa8702e6a3d92..57261b448b003 100644 --- a/src/mame/drivers/ti89.cpp +++ b/src/mame/drivers/ti89.cpp @@ -538,7 +538,7 @@ MACHINE_CONFIG_START(ti68k_state::ti89) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(ti68k_state, ti68k) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SHARP_UNK128MBIT_ADD("flash") //should be LH28F320 for ti89t and v200 and LH28F160S3T for other models diff --git a/src/mame/drivers/ticalc1x.cpp b/src/mame/drivers/ticalc1x.cpp index 9f0835c8ca8a4..d4653966847fd 100644 --- a/src/mame/drivers/ticalc1x.cpp +++ b/src/mame/drivers/ticalc1x.cpp @@ -196,7 +196,7 @@ MACHINE_CONFIG_START(cmulti8_state::cmulti8) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, cmulti8_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_cmulti8) + config.set_default_layout(layout_cmulti8); /* no sound! */ MACHINE_CONFIG_END @@ -413,7 +413,7 @@ MACHINE_CONFIG_START(tisr16_state::tisr16) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tisr16_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tisr16) + config.set_default_layout(layout_tisr16); /* no sound! */ MACHINE_CONFIG_END @@ -555,7 +555,7 @@ MACHINE_CONFIG_START(ti1250_state::ti1250) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti1250_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ti1250) + config.set_default_layout(layout_ti1250); /* no sound! */ MACHINE_CONFIG_END @@ -569,7 +569,7 @@ MACHINE_CONFIG_START(ti1250_state::ti1270) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, ti1250_state, write_o)) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti1250_state, write_r)) - MCFG_DEFAULT_LAYOUT(layout_ti1270) + config.set_default_layout(layout_ti1270); MACHINE_CONFIG_END @@ -685,7 +685,7 @@ MACHINE_CONFIG_START(ti25503_state::ti25503) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti25503_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ti25503) + config.set_default_layout(layout_ti25503); /* no sound! */ MACHINE_CONFIG_END @@ -788,7 +788,7 @@ MACHINE_CONFIG_START(ti1000_state::ti1000) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, ti1000_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ti1270) + config.set_default_layout(layout_ti1270); /* no sound! */ MACHINE_CONFIG_END @@ -890,7 +890,7 @@ MACHINE_CONFIG_START(wizatron_state::wizatron) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, wizatron_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_wizatron) + config.set_default_layout(layout_wizatron); /* no sound! */ MACHINE_CONFIG_END @@ -967,7 +967,7 @@ MACHINE_CONFIG_START(lilprof_state::lilprof) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, wizatron_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_wizatron) + config.set_default_layout(layout_wizatron); /* no sound! */ MACHINE_CONFIG_END @@ -1080,7 +1080,7 @@ MACHINE_CONFIG_START(lilprof78_state::lilprof78) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, lilprof78_state, write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_wizatron) + config.set_default_layout(layout_wizatron); /* no sound! */ MACHINE_CONFIG_END @@ -1195,7 +1195,7 @@ MACHINE_CONFIG_START(dataman_state::dataman) MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_dataman) + config.set_default_layout(layout_dataman); /* no sound! */ MACHINE_CONFIG_END @@ -1265,7 +1265,7 @@ MACHINE_CONFIG_START(mathmarv_state::mathmarv) MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_mathmarv) + config.set_default_layout(layout_mathmarv); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -1528,7 +1528,7 @@ MACHINE_CONFIG_START(ti30_state::ti30) MCFG_TMS1XXX_POWER_OFF_CB(WRITELINE(*this, hh_tms1k_state, auto_power_off)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_ti30) + config.set_default_layout(layout_ti30); /* no sound! */ MACHINE_CONFIG_END diff --git a/src/mame/drivers/tispeak.cpp b/src/mame/drivers/tispeak.cpp index 9206af6be133d..70761a18d925e 100644 --- a/src/mame/drivers/tispeak.cpp +++ b/src/mame/drivers/tispeak.cpp @@ -1293,7 +1293,7 @@ MACHINE_CONFIG_START(tispeak_state::snmath) MCFG_TMS0270_WRITE_PDC_CB(WRITELINE("tms5100", tms5110_device, pdc_w)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_snmath) + config.set_default_layout(layout_snmath); /* sound hardware */ MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4) @@ -1311,7 +1311,7 @@ MACHINE_CONFIG_START(tispeak_state::sns_cd2801) MCFG_DEVICE_MODIFY("maincpu") MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspell_write_o)) - MCFG_DEFAULT_LAYOUT(layout_snspell) + config.set_default_layout(layout_snspell); /* cartridge */ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "snspell") @@ -1325,7 +1325,7 @@ MACHINE_CONFIG_START(tispeak_state::snspellit) sns_cd2801(config); /* basic machine hardware */ - MCFG_DEFAULT_LAYOUT(layout_snmath) + config.set_default_layout(layout_snmath); MACHINE_CONFIG_END MACHINE_CONFIG_START(tispeak_state::sns_tmc0281) @@ -1340,7 +1340,7 @@ MACHINE_CONFIG_START(tispeak_state::snspellsp) sns_tmc0281(config); /* basic machine hardware */ - MCFG_DEFAULT_LAYOUT(layout_snspellsp) + config.set_default_layout(layout_snspellsp); MACHINE_CONFIG_END MACHINE_CONFIG_START(tispeak_state::sns_tmc0281d) @@ -1359,7 +1359,7 @@ MACHINE_CONFIG_START(tispeak_state::snread) MCFG_DEVICE_MODIFY("maincpu") MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspell_write_o)) - MCFG_DEFAULT_LAYOUT(layout_snread) + config.set_default_layout(layout_snread); /* cartridge */ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "snread") @@ -1378,7 +1378,7 @@ MACHINE_CONFIG_START(tispeak_state::lantutor) MCFG_TMS1XXX_WRITE_O_CB(WRITE16(*this, tispeak_state, snspell_write_o)) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, lantutor_write_r)) - MCFG_DEFAULT_LAYOUT(layout_snread) + config.set_default_layout(layout_snread); /* cartridge */ MCFG_GENERIC_CARTSLOT_ADD("cartslot", generic_plain_slot, "lantutor") @@ -1434,7 +1434,7 @@ MACHINE_CONFIG_START(tispeak_state::vocaid) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) MCFG_TIMER_DRIVER_ADD_PERIODIC("ol_timer", tispeak_state, tntell_get_overlay, attotime::from_msec(50)) - MCFG_DEFAULT_LAYOUT(layout_tntell) + config.set_default_layout(layout_tntell); /* sound hardware */ MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4) @@ -1465,7 +1465,7 @@ MACHINE_CONFIG_START(tispeak_state::k28m2) MCFG_TMS1XXX_WRITE_R_CB(WRITE16(*this, tispeak_state, k28_write_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_k28m2) + config.set_default_layout(layout_k28m2); /* sound hardware */ MCFG_DEVICE_ADD("tms6100", TMS6100, MASTER_CLOCK/4) diff --git a/src/mame/drivers/tispellb.cpp b/src/mame/drivers/tispellb.cpp index 13d39065f746d..5905d4ad82dea 100644 --- a/src/mame/drivers/tispellb.cpp +++ b/src/mame/drivers/tispellb.cpp @@ -363,7 +363,7 @@ MACHINE_CONFIG_START(tispellb_state::rev1) MCFG_QUANTUM_PERFECT_CPU("maincpu") MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_spellb) + config.set_default_layout(layout_spellb); /* no sound! */ MACHINE_CONFIG_END @@ -383,7 +383,7 @@ MACHINE_CONFIG_START(tispellb_state::rev2) MCFG_TMS6100_4BIT_MODE() MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_tms1k_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_spellb) + config.set_default_layout(layout_spellb); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/tk80.cpp b/src/mame/drivers/tk80.cpp index 6000dcaa41405..09f46b3690bb8 100644 --- a/src/mame/drivers/tk80.cpp +++ b/src/mame/drivers/tk80.cpp @@ -290,7 +290,7 @@ MACHINE_CONFIG_START(tk80_state::tk80) MCFG_DEVICE_IO_MAP(tk80_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_tk80) + config.set_default_layout(layout_tk80); /* Devices */ MCFG_DEVICE_ADD("ppi8255", I8255, 0) @@ -319,7 +319,7 @@ MACHINE_CONFIG_START(tk80_state::nd80z) MCFG_DEVICE_IO_MAP(nd80z_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_tk80) + config.set_default_layout(layout_tk80); /* Devices */ MCFG_DEVICE_ADD("ppi8255", I8255, 0) diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index e9e8814581e5b..fff3b587eb1f5 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -831,7 +831,7 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189) MCFG_MACHINE_RESET_OVERRIDE(tm990189_state, tm990_189 ) /* Video hardware */ - MCFG_DEFAULT_LAYOUT(layout_tm990189) + config.set_default_layout(layout_tm990189); /* sound hardware */ SPEAKER(config, "mono").front_center(); @@ -890,7 +890,7 @@ MACHINE_CONFIG_START(tm990189_state::tm990_189_v) MCFG_TMS9928A_VRAM_SIZE(0x4000) MCFG_TMS9928A_SCREEN_ADD_NTSC( "screen" ) MCFG_SCREEN_UPDATE_DEVICE( "tms9918", tms9918_device, screen_update ) - MCFG_DEFAULT_LAYOUT(layout_tm990189v) + config.set_default_layout(layout_tm990189v); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/tmmjprd.cpp b/src/mame/drivers/tmmjprd.cpp index 1bac8968242aa..904787851b977 100644 --- a/src/mame/drivers/tmmjprd.cpp +++ b/src/mame/drivers/tmmjprd.cpp @@ -757,7 +757,7 @@ MACHINE_CONFIG_START(tmmjprd_state::tmmjprd) MCFG_PALETTE_FORMAT(XGRB) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -789,7 +789,7 @@ MACHINE_CONFIG_END MACHINE_CONFIG_START(tmmjprd_state::tmpdoki) tmmjprd(config); - MCFG_DEFAULT_LAYOUT(layout_horizont) + config.set_default_layout(layout_horizont); MCFG_DEVICE_REMOVE("rscreen") MACHINE_CONFIG_END diff --git a/src/mame/drivers/tr606.cpp b/src/mame/drivers/tr606.cpp index affe49799e123..6eeb292ea3020 100644 --- a/src/mame/drivers/tr606.cpp +++ b/src/mame/drivers/tr606.cpp @@ -90,7 +90,7 @@ MACHINE_CONFIG_START(tr606_state::tr606) MCFG_TIMER_DRIVER_ADD_PERIODIC("tp3_clear", tr606_state, tp3_clear, TP3_PERIOD) MCFG_TIMER_DRIVER_ADD_PERIODIC("display_decay", hh_ucom4_state, display_decay_tick, attotime::from_msec(1)) - MCFG_DEFAULT_LAYOUT(layout_tr606) + config.set_default_layout(layout_tr606); /* sound hardware */ // discrete... diff --git a/src/mame/drivers/tranz330.cpp b/src/mame/drivers/tranz330.cpp index f81be4882b1a8..3968a1e49f932 100644 --- a/src/mame/drivers/tranz330.cpp +++ b/src/mame/drivers/tranz330.cpp @@ -179,7 +179,7 @@ void tranz330_state::tranz330(machine_config &config) // video MIC10937(config, VFD_TAG).set_port_value(0); - config.m_default_layout = &layout_tranz330; + config.set_default_layout(layout_tranz330); // sound SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/tx1.cpp b/src/mame/drivers/tx1.cpp index 25ea3d720dfe5..2adcfa361aec7 100644 --- a/src/mame/drivers/tx1.cpp +++ b/src/mame/drivers/tx1.cpp @@ -183,7 +183,7 @@ MACHINE_CONFIG_START(tx1_state::tx1) MCFG_PALETTE_ADD("palette", 256) MCFG_PALETTE_INIT_OWNER(tx1_state,tx1) - MCFG_DEFAULT_LAYOUT(layout_triphsxs) + config.set_default_layout(layout_triphsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_RAW_PARAMS(TX1_PIXEL_CLOCK, TX1_HTOTAL, TX1_HBEND, TX1_HBSTART, TX1_VTOTAL, TX1_VBEND, TX1_VBSTART) @@ -227,7 +227,7 @@ MACHINE_CONFIG_START(tx1_state::buggyboy) MCFG_MACHINE_RESET_OVERRIDE(tx1_state,buggyboy) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_DEFAULT_LAYOUT(layout_triphsxs) + config.set_default_layout(layout_triphsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_RAW_PARAMS(BB_PIXEL_CLOCK, BB_HTOTAL, BB_HBEND, BB_HBSTART, BB_VTOTAL, BB_VBEND, BB_VBSTART) diff --git a/src/mame/drivers/unixpc.cpp b/src/mame/drivers/unixpc.cpp index 323ccf6cb87ac..a598d04b01b89 100644 --- a/src/mame/drivers/unixpc.cpp +++ b/src/mame/drivers/unixpc.cpp @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(unixpc_state::unixpc) MCFG_SCREEN_PALETTE("palette") // vsync should actually last 17264 pixels - MCFG_DEFAULT_LAYOUT(layout_unixpc) + config.set_default_layout(layout_unixpc); MCFG_PALETTE_ADD_MONOCHROME("palette") diff --git a/src/mame/drivers/ut88.cpp b/src/mame/drivers/ut88.cpp index 20d9b27bb99dd..1fb8b37876bef 100644 --- a/src/mame/drivers/ut88.cpp +++ b/src/mame/drivers/ut88.cpp @@ -238,7 +238,7 @@ MACHINE_CONFIG_START(ut88_state::ut88mini) MCFG_MACHINE_RESET_OVERRIDE(ut88_state, ut88mini ) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_ut88mini) + config.set_default_layout(layout_ut88mini); /* Cassette */ SPEAKER(config, "speaker").front_center(); diff --git a/src/mame/drivers/vboy.cpp b/src/mame/drivers/vboy.cpp index 7b08e528a2aaf..b7914b9ed28e7 100644 --- a/src/mame/drivers/vboy.cpp +++ b/src/mame/drivers/vboy.cpp @@ -1370,7 +1370,7 @@ MACHINE_CONFIG_START(vboy_state::vboy) MCFG_TIMER_DRIVER_ADD_PERIODIC("timer_pad", vboy_state, timer_pad_tick, attotime::from_hz(50.038029f)) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_vboy) + config.set_default_layout(layout_vboy); MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(vboy_state, vboy) diff --git a/src/mame/drivers/vcombat.cpp b/src/mame/drivers/vcombat.cpp index 82387f50ebc15..46fc15dab91db 100644 --- a/src/mame/drivers/vcombat.cpp +++ b/src/mame/drivers/vcombat.cpp @@ -591,7 +591,7 @@ MACHINE_CONFIG_START(vcombat_state::vcombat) /* Disabled for now as it can't handle multiple screens */ // MCFG_MC6845_ADD("crtc", MC6845, "screen", 6000000 / 16) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_RAW_PARAMS(XTAL(12'000'000) / 2, 400, 0, 256, 291, 0, 208) diff --git a/src/mame/drivers/vcs80.cpp b/src/mame/drivers/vcs80.cpp index d55f58269f55c..101d437709d00 100644 --- a/src/mame/drivers/vcs80.cpp +++ b/src/mame/drivers/vcs80.cpp @@ -224,7 +224,7 @@ MACHINE_CONFIG_START(vcs80_state::vcs80) MCFG_TIMER_DRIVER_ADD_PERIODIC("keyboard", vcs80_state, vcs80_keyboard_tick, attotime::from_hz(1000)) /* video hardware */ - MCFG_DEFAULT_LAYOUT( layout_vcs80 ) + config.set_default_layout(layout_vcs80); /* devices */ MCFG_DEVICE_ADD(Z80PIO_TAG, Z80PIO, XTAL(5'000'000)/2) diff --git a/src/mame/drivers/vd.cpp b/src/mame/drivers/vd.cpp index 5424f20cad55e..99664a605b06f 100644 --- a/src/mame/drivers/vd.cpp +++ b/src/mame/drivers/vd.cpp @@ -206,7 +206,7 @@ MACHINE_CONFIG_START(vd_state::vd) MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW3")) //? /* Video */ - MCFG_DEFAULT_LAYOUT(layout_vd) + config.set_default_layout(layout_vd); MACHINE_CONFIG_END /*------------------------------------------------------------------- diff --git a/src/mame/drivers/vgmplay.cpp b/src/mame/drivers/vgmplay.cpp index ed883385e89f3..67bd4ff98d1d2 100644 --- a/src/mame/drivers/vgmplay.cpp +++ b/src/mame/drivers/vgmplay.cpp @@ -1872,7 +1872,7 @@ MACHINE_CONFIG_START(vgmplay_state::vgmplay) MCFG_DEVICE_ADD("file", BITBANGER, 0) MCFG_BITBANGER_READONLY(true) - MCFG_DEFAULT_LAYOUT(layout_vgmplay) + config.set_default_layout(layout_vgmplay); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/vidbrain.cpp b/src/mame/drivers/vidbrain.cpp index 916bcb75c2a49..54d7854413877 100644 --- a/src/mame/drivers/vidbrain.cpp +++ b/src/mame/drivers/vidbrain.cpp @@ -510,7 +510,7 @@ MACHINE_CONFIG_START(vidbrain_state::vidbrain) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(vidbrain_state,vidbrain_int_ack) // video hardware - MCFG_DEFAULT_LAYOUT(layout_vidbrain) + config.set_default_layout(layout_vidbrain); MCFG_SCREEN_ADD(SCREEN_TAG, RASTER) MCFG_SCREEN_UPDATE_DEVICE(UV201_TAG, uv201_device, screen_update) diff --git a/src/mame/drivers/vk100.cpp b/src/mame/drivers/vk100.cpp index 9b4820d6b568e..3090162f4e100 100644 --- a/src/mame/drivers/vk100.cpp +++ b/src/mame/drivers/vk100.cpp @@ -1066,7 +1066,7 @@ MACHINE_CONFIG_START(vk100_state::vk100) dbrg.fr_handler().set(m_uart, FUNC(i8251_device::write_rxc)); dbrg.ft_handler().set(m_uart, FUNC(i8251_device::write_txc)); - MCFG_DEFAULT_LAYOUT( layout_vk100 ) + config.set_default_layout(layout_vk100); SPEAKER(config, "mono").front_center(); BEEP(config, m_speaker, 116).add_route(ALL_OUTPUTS, "mono", 0.25); // 116 hz (page 172 of TM), but duty cycle is wrong here! diff --git a/src/mame/drivers/votrpss.cpp b/src/mame/drivers/votrpss.cpp index fadb8fea0bdbe..74820808cf8d8 100644 --- a/src/mame/drivers/votrpss.cpp +++ b/src/mame/drivers/votrpss.cpp @@ -251,7 +251,7 @@ MACHINE_CONFIG_START(votrpss_state::votrpss) MCFG_DEVICE_IRQ_ACKNOWLEDGE_DRIVER(votrpss_state,irq_ack) /* video hardware */ - //MCFG_DEFAULT_LAYOUT(layout_votrpss) + //config.set_default_layout(layout_votrpss); /* sound hardware */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/votrtnt.cpp b/src/mame/drivers/votrtnt.cpp index 6653e3af148db..b0beaa9630249 100644 --- a/src/mame/drivers/votrtnt.cpp +++ b/src/mame/drivers/votrtnt.cpp @@ -143,7 +143,7 @@ void votrtnt_state::votrtnt(machine_config &config) m_maincpu->set_addrmap(AS_PROGRAM, &votrtnt_state::_6802_mem); /* video hardware */ - //MCFG_DEFAULT_LAYOUT(layout_votrtnt) + //config.set_default_layout(layout_votrtnt); /* serial hardware */ acia6850_device &acia(ACIA6850(config, "acia")); diff --git a/src/mame/drivers/vsnes.cpp b/src/mame/drivers/vsnes.cpp index 5e91db8842375..b659e7f6a5013 100644 --- a/src/mame/drivers/vsnes.cpp +++ b/src/mame/drivers/vsnes.cpp @@ -1778,7 +1778,7 @@ MACHINE_CONFIG_START(vsnes_state::vsdual) MCFG_MACHINE_RESET_OVERRIDE(vsnes_state,vsdual) MCFG_MACHINE_START_OVERRIDE(vsnes_state,vsdual) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("screen1", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/vt100.cpp b/src/mame/drivers/vt100.cpp index 3deea3ebc9801..d886f42c3621c 100644 --- a/src/mame/drivers/vt100.cpp +++ b/src/mame/drivers/vt100.cpp @@ -329,7 +329,7 @@ MACHINE_CONFIG_START(vt100_state::vt100) MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "vt100_video:palette", gfx_vt100) // MCFG_PALETTE_ADD_MONOCHROME("palette") - MCFG_DEFAULT_LAYOUT( layout_vt100 ) + config.set_default_layout(layout_vt100); MCFG_DEVICE_ADD("vt100_video", VT100_VIDEO, XTAL(24'073'400)) MCFG_VT_SET_SCREEN("screen") diff --git a/src/mame/drivers/wacky_gator.cpp b/src/mame/drivers/wacky_gator.cpp index 691e11841fe18..63d3434fae783 100644 --- a/src/mame/drivers/wacky_gator.cpp +++ b/src/mame/drivers/wacky_gator.cpp @@ -292,7 +292,7 @@ MACHINE_CONFIG_START(wackygtr_state::wackygtr) MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", wackygtr_state, nmi_timer, attotime::from_hz(100)) // FIXME /* Video */ - MCFG_DEFAULT_LAYOUT(layout_wackygtr) + config.set_default_layout(layout_wackygtr); /* Sound */ SPEAKER(config, "mono").front_center(); diff --git a/src/mame/drivers/warriorb.cpp b/src/mame/drivers/warriorb.cpp index c1826bc900330..f2bd0bdbe3a69 100644 --- a/src/mame/drivers/warriorb.cpp +++ b/src/mame/drivers/warriorb.cpp @@ -458,7 +458,7 @@ MACHINE_CONFIG_START(warriorb_state::darius2d) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_ADD("palette2", 4096) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) @@ -542,7 +542,7 @@ MACHINE_CONFIG_START(warriorb_state::warriorb) MCFG_PALETTE_ADD("palette", 4096) MCFG_PALETTE_ADD("palette2", 4096) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("lscreen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/wicat.cpp b/src/mame/drivers/wicat.cpp index 41f0e90e68f04..1b692b4370198 100644 --- a/src/mame/drivers/wicat.cpp +++ b/src/mame/drivers/wicat.cpp @@ -895,7 +895,7 @@ MACHINE_CONFIG_START(wicat_state::wicat) MCFG_I8275_VRTC_CALLBACK(WRITELINE(*this, wicat_state, crtc_irq_w)) MCFG_VIDEO_SET_SCREEN("screen") - MCFG_DEFAULT_LAYOUT(layout_wicat) + config.set_default_layout(layout_wicat); /* Winchester Disk Controller (WD1000 + FD1795) */ MCFG_DEVICE_ADD("wd1kcpu", N8X300, 8_MHz_XTAL) diff --git a/src/mame/drivers/wico.cpp b/src/mame/drivers/wico.cpp index ee0b234c0c9bd..2076e6a922988 100644 --- a/src/mame/drivers/wico.cpp +++ b/src/mame/drivers/wico.cpp @@ -451,7 +451,7 @@ MACHINE_CONFIG_START(wico_state::wico) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_wico) + config.set_default_layout(layout_wico); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/wpc_an.cpp b/src/mame/drivers/wpc_an.cpp index e82a82ec545f5..317ccca254d0b 100644 --- a/src/mame/drivers/wpc_an.cpp +++ b/src/mame/drivers/wpc_an.cpp @@ -343,7 +343,7 @@ MACHINE_CONFIG_START(wpc_an_state::wpc_an_base) MCFG_WPC_SOUND_DATA(READ8(*this, wpc_an_state,wpc_sound_data_r),WRITE8(*this, wpc_an_state,wpc_sound_data_w)) MCFG_WPC_SOUND_S11C(WRITE8(*this, wpc_an_state,wpc_sound_s11_w)) - MCFG_DEFAULT_LAYOUT(layout_wpc_an) + config.set_default_layout(layout_wpc_an); MACHINE_CONFIG_END MACHINE_CONFIG_START(wpc_an_state::wpc_an) diff --git a/src/mame/drivers/wpc_dot.cpp b/src/mame/drivers/wpc_dot.cpp index a2833b5c4e750..60835081bcf4e 100644 --- a/src/mame/drivers/wpc_dot.cpp +++ b/src/mame/drivers/wpc_dot.cpp @@ -321,7 +321,7 @@ MACHINE_CONFIG_START(wpc_dot_state::wpc_dot) MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_dot_state,wpcsnd_reply_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE(128, 32) diff --git a/src/mame/drivers/wpc_flip1.cpp b/src/mame/drivers/wpc_flip1.cpp index aa2e2c86ac15b..f8c801e824ba5 100644 --- a/src/mame/drivers/wpc_flip1.cpp +++ b/src/mame/drivers/wpc_flip1.cpp @@ -177,7 +177,7 @@ MACHINE_CONFIG_START(wpc_flip1_state::wpc_flip1) MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_dot_state,wpcsnd_reply_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE(128, 32) diff --git a/src/mame/drivers/wpc_flip2.cpp b/src/mame/drivers/wpc_flip2.cpp index d6ac9a7dbf0bf..e9e421b6e4021 100644 --- a/src/mame/drivers/wpc_flip2.cpp +++ b/src/mame/drivers/wpc_flip2.cpp @@ -206,7 +206,7 @@ MACHINE_CONFIG_START(wpc_flip2_state::wpc_flip2) MCFG_WPC_SOUND_REPLY_CALLBACK(WRITELINE(*this, wpc_dot_state,wpcsnd_reply_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_SIZE(128, 32) diff --git a/src/mame/drivers/wswan.cpp b/src/mame/drivers/wswan.cpp index 2b4b1f49770de..0893850ae068a 100644 --- a/src/mame/drivers/wswan.cpp +++ b/src/mame/drivers/wswan.cpp @@ -132,7 +132,7 @@ MACHINE_CONFIG_START(wswan_state::wswan) MCFG_SCREEN_RAW_PARAMS(3.072_MHz_XTAL, 256, 0, WSWAN_X_PIXELS, 159, 0, WSWAN_Y_PIXELS) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_wswan) + config.set_default_layout(layout_wswan); MCFG_QUANTUM_TIME(attotime::from_hz(60)) diff --git a/src/mame/drivers/x07.cpp b/src/mame/drivers/x07.cpp index f606feb4adcda..2e0074aab218a 100644 --- a/src/mame/drivers/x07.cpp +++ b/src/mame/drivers/x07.cpp @@ -1497,7 +1497,7 @@ MACHINE_CONFIG_START(x07_state::x07) MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(x07_state, x07) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_x07) /* sound hardware */ diff --git a/src/mame/drivers/x1twin.cpp b/src/mame/drivers/x1twin.cpp index 336383ae730de..8c2eec0fd3008 100644 --- a/src/mame/drivers/x1twin.cpp +++ b/src/mame/drivers/x1twin.cpp @@ -454,7 +454,7 @@ MACHINE_CONFIG_START(x1twin_state::x1twin) MCFG_TIMER_ADD_SCANLINE("scantimer", pce_interrupt, "pce_screen", 0, 1) #endif - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); /* video hardware */ MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/x68k.cpp b/src/mame/drivers/x68k.cpp index d8971ad574602..41fcd74d2938f 100644 --- a/src/mame/drivers/x68k.cpp +++ b/src/mame/drivers/x68k.cpp @@ -1664,7 +1664,7 @@ MACHINE_CONFIG_START(x68k_state::x68000) MCFG_VIDEO_START_OVERRIDE(x68k_state, x68000 ) - MCFG_DEFAULT_LAYOUT( layout_x68000 ) + config.set_default_layout(layout_x68000); /* sound hardware */ SPEAKER(config, "lspeaker").front_left(); diff --git a/src/mame/drivers/xmen.cpp b/src/mame/drivers/xmen.cpp index 8c3c056b9b1fb..c36b927e333fd 100644 --- a/src/mame/drivers/xmen.cpp +++ b/src/mame/drivers/xmen.cpp @@ -369,7 +369,7 @@ MACHINE_CONFIG_START(xmen_state::xmen6p) MCFG_PALETTE_ADD("palette", 2048) MCFG_PALETTE_ENABLE_SHADOWS() MCFG_PALETTE_FORMAT(xBBBBBGGGGGRRRRR) - MCFG_DEFAULT_LAYOUT(layout_dualhsxs) + config.set_default_layout(layout_dualhsxs); MCFG_SCREEN_ADD("screen", RASTER) MCFG_SCREEN_REFRESH_RATE(60) diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp index 825bd084e0c80..4eccfd7bf81f2 100644 --- a/src/mame/drivers/ymmu100.cpp +++ b/src/mame/drivers/ymmu100.cpp @@ -455,7 +455,7 @@ MACHINE_CONFIG_START(mu100_state::mu100) MCFG_SCREEN_UPDATE_DRIVER(mu100_state, screen_update) MCFG_SCREEN_SIZE(900, 241) MCFG_SCREEN_VISIBLE_AREA(0, 899, 0, 240) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); diff --git a/src/mame/drivers/z80dev.cpp b/src/mame/drivers/z80dev.cpp index 18e914cfeca7b..1df8b699238b2 100644 --- a/src/mame/drivers/z80dev.cpp +++ b/src/mame/drivers/z80dev.cpp @@ -130,7 +130,7 @@ MACHINE_CONFIG_START(z80dev_state::z80dev) MCFG_DEVICE_IO_MAP(io_map) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_z80dev) + config.set_default_layout(layout_z80dev); MACHINE_CONFIG_END /* ROM definition */ diff --git a/src/mame/drivers/z80ne.cpp b/src/mame/drivers/z80ne.cpp index 0c56e03ebe9cf..e34e741bf328c 100644 --- a/src/mame/drivers/z80ne.cpp +++ b/src/mame/drivers/z80ne.cpp @@ -436,7 +436,7 @@ MACHINE_CONFIG_START(z80ne_state::z80ne) MCFG_CASSETTE_DEFAULT_STATE(CASSETTE_STOPPED | CASSETTE_MOTOR_ENABLED | CASSETTE_SPEAKER_ENABLED) MCFG_CASSETTE_INTERFACE("z80ne_cass") - MCFG_DEFAULT_LAYOUT(layout_z80ne) + config.set_default_layout(layout_z80ne); /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -476,7 +476,7 @@ MACHINE_CONFIG_START(z80ne_state::z80net) // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected - MCFG_DEFAULT_LAYOUT(layout_z80net) + config.set_default_layout(layout_z80net); /* internal ram */ MCFG_RAM_MODIFY(RAM_TAG) @@ -527,7 +527,7 @@ MACHINE_CONFIG_START(z80ne_state::z80netb) // AG = GND, GM2 = GND, GM1 = GND, GM0 = GND, CSS = GND // other lines not connected - MCFG_DEFAULT_LAYOUT(layout_z80netb) + config.set_default_layout(layout_z80netb); /* internal ram */ MCFG_RAM_ADD(RAM_TAG) @@ -574,7 +574,7 @@ MACHINE_CONFIG_START(z80netf_state::z80netf) MCFG_FLOPPY_DRIVE_ADD("wd1771:2", z80ne_floppies, nullptr, z80ne_state::floppy_formats) MCFG_FLOPPY_DRIVE_ADD("wd1771:3", z80ne_floppies, nullptr, z80ne_state::floppy_formats) - MCFG_DEFAULT_LAYOUT(layout_z80netf) + config.set_default_layout(layout_z80netf); /* internal ram */ MCFG_RAM_ADD(RAM_TAG) diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp index 366ddde565c59..35e9dccb6739f 100644 --- a/src/mame/drivers/z88.cpp +++ b/src/mame/drivers/z88.cpp @@ -614,7 +614,7 @@ MACHINE_CONFIG_START(z88_state::z88) device = &PALETTE(config, m_palette, Z88_NUM_COLOURS); MCFG_PALETTE_INIT_OWNER(z88_state, z88) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); device = &UPD65031(config, m_blink, XTAL(9'830'400)); m_blink->kb_rd_callback().set(FUNC(z88_state::kb_r)); diff --git a/src/mame/drivers/zac_1.cpp b/src/mame/drivers/zac_1.cpp index 93a531d019fff..18b9505bbf9bf 100644 --- a/src/mame/drivers/zac_1.cpp +++ b/src/mame/drivers/zac_1.cpp @@ -273,7 +273,7 @@ MACHINE_CONFIG_START(zac_1_state::zac_1) MCFG_TIMER_DRIVER_ADD_PERIODIC("zac_1_outtimer", zac_1_state, zac_1_outtimer, attotime::from_hz(187500)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_zac_1) + config.set_default_layout(layout_zac_1); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/zac_2.cpp b/src/mame/drivers/zac_2.cpp index eb3a90a1207ee..aa4df46c3526d 100644 --- a/src/mame/drivers/zac_2.cpp +++ b/src/mame/drivers/zac_2.cpp @@ -225,7 +225,7 @@ MACHINE_CONFIG_START(zac_2_state::zac_2) MCFG_TIMER_DRIVER_ADD_PERIODIC("zac_2_outtimer", zac_2_state, zac_2_outtimer, attotime::from_hz(187500)) /* Video */ - MCFG_DEFAULT_LAYOUT(layout_zac_2) + config.set_default_layout(layout_zac_2); MACHINE_CONFIG_END /*-------------------------------- diff --git a/src/mame/drivers/zac_proto.cpp b/src/mame/drivers/zac_proto.cpp index 59dbe2c762e3e..05bf78f81c922 100644 --- a/src/mame/drivers/zac_proto.cpp +++ b/src/mame/drivers/zac_proto.cpp @@ -248,7 +248,7 @@ MACHINE_CONFIG_START(zac_proto_state::zac_proto) MCFG_NVRAM_ADD_0FILL("nvram") /* Video */ - MCFG_DEFAULT_LAYOUT(layout_zac_proto) + config.set_default_layout(layout_zac_proto); /* Sound */ genpin_audio(config); diff --git a/src/mame/drivers/zapcomputer.cpp b/src/mame/drivers/zapcomputer.cpp index 5ad54d10a1d2b..1f43a87eb8538 100644 --- a/src/mame/drivers/zapcomputer.cpp +++ b/src/mame/drivers/zapcomputer.cpp @@ -162,7 +162,7 @@ MACHINE_CONFIG_START(zapcomp_state::zapcomp) MCFG_DEVICE_IO_MAP(zapcomp_io) /* video hardware */ - MCFG_DEFAULT_LAYOUT(layout_zapcomputer) + config.set_default_layout(layout_zapcomputer); MACHINE_CONFIG_END ROM_START( zapcomp ) diff --git a/src/mame/machine/esqlcd.cpp b/src/mame/machine/esqlcd.cpp index f689532cfdd46..78d6b6f91d1d7 100644 --- a/src/mame/machine/esqlcd.cpp +++ b/src/mame/machine/esqlcd.cpp @@ -163,7 +163,7 @@ static unsigned char const Font5x7[][5] = { //-------------------------------------------------------------------------------------------------------------------------------------------- MACHINE_CONFIG_START(esq2x16_sq1_device::device_add_mconfig) - MCFG_DEFAULT_LAYOUT(layout_esq2by16) + config.set_default_layout(layout_esq2by16); MACHINE_CONFIG_END //-------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/src/mame/machine/esqvfd.cpp b/src/mame/machine/esqvfd.cpp index cbf27db521839..987e0b72596d3 100644 --- a/src/mame/machine/esqvfd.cpp +++ b/src/mame/machine/esqvfd.cpp @@ -170,7 +170,7 @@ void esqvfd_device::update_display() /* 2x40 VFD display used in the ESQ-1, VFX-SD, SD-1, and others */ MACHINE_CONFIG_START(esq2x40_device::device_add_mconfig) - MCFG_DEFAULT_LAYOUT(layout_esq2by40) + config.set_default_layout(layout_esq2by40); MACHINE_CONFIG_END void esq2x40_device::write_char(int data) @@ -303,7 +303,7 @@ esq2x40_device::esq2x40_device(const machine_config &mconfig, const char *tag, d /* 1x22 display from the VFX (not right, but it'll do for now) */ MACHINE_CONFIG_START(esq1x22_device::device_add_mconfig) - MCFG_DEFAULT_LAYOUT(layout_esq1by22) + config.set_default_layout(layout_esq1by22); MACHINE_CONFIG_END @@ -350,7 +350,7 @@ esq1x22_device::esq1x22_device(const machine_config &mconfig, const char *tag, d /* SQ-1 display, I think it's really an LCD but we'll deal with it for now */ MACHINE_CONFIG_START(esq2x40_sq1_device::device_add_mconfig) - MCFG_DEFAULT_LAYOUT(layout_esq2by40) // we use the normal 2x40 layout + config.set_default_layout(layout_esq2by40); // we use the normal 2x40 layout MACHINE_CONFIG_END void esq2x40_sq1_device::write_char(int data) diff --git a/src/mame/machine/megacd.cpp b/src/mame/machine/megacd.cpp index 80490f7f1fbb4..e28d46b600fe1 100644 --- a/src/mame/machine/megacd.cpp +++ b/src/mame/machine/megacd.cpp @@ -309,7 +309,7 @@ MACHINE_CONFIG_START(sega_segacd_device::device_add_mconfig) MCFG_TIMER_DRIVER_ADD("irq3_timer", sega_segacd_device, irq3_timer_callback) MCFG_TIMER_DRIVER_ADD("dma_timer", sega_segacd_device, dma_timer_callback) - MCFG_DEFAULT_LAYOUT( layout_megacd ) + config.set_default_layout(layout_megacd); MCFG_DEVICE_ADD("rfsnd", RF5C68, SEGACD_CLOCK) // RF5C164! MCFG_SOUND_ROUTE( 0, ":lspeaker", 0.50 ) diff --git a/src/mame/machine/mpu4.cpp b/src/mame/machine/mpu4.cpp index 72d6ad703392c..80693c5212e35 100644 --- a/src/mame/machine/mpu4.cpp +++ b/src/mame/machine/mpu4.cpp @@ -3056,7 +3056,7 @@ MACHINE_CONFIG_START(mpu4_state::mpu4base) MCFG_NVRAM_ADD_0FILL("nvram") - MCFG_DEFAULT_LAYOUT(layout_mpu4) + config.set_default_layout(layout_mpu4); MACHINE_CONFIG_END diff --git a/src/mame/video/abc1600.cpp b/src/mame/video/abc1600.cpp index cfa38bf51e341..b2e3859376267 100644 --- a/src/mame/video/abc1600.cpp +++ b/src/mame/video/abc1600.cpp @@ -200,7 +200,7 @@ MC6845_ON_UPDATE_ADDR_CHANGED( abc1600_mover_device::crtc_update ) //------------------------------------------------- MACHINE_CONFIG_START(abc1600_mover_device::device_add_mconfig) - MCFG_DEFAULT_LAYOUT(layout_abc1600) + config.set_default_layout(layout_abc1600); MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green()) MCFG_SCREEN_UPDATE_DRIVER(abc1600_mover_device, screen_update) diff --git a/src/mame/video/apollo.cpp b/src/mame/video/apollo.cpp index fa77c5bae535a..2e5948c51911d 100644 --- a/src/mame/video/apollo.cpp +++ b/src/mame/video/apollo.cpp @@ -1714,7 +1714,7 @@ void apollo_graphics_15i::register_vblank_callback() ***************************************************************************/ MACHINE_CONFIG_START(apollo_state::apollo_graphics) - MCFG_DEFAULT_LAYOUT( layout_apollo_15i ) + config.set_default_layout(layout_apollo_15i); MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) MCFG_SCREEN_RAW_PARAMS(68000000, 1346, 0, 1024, 841, 0, 800) @@ -1884,7 +1884,7 @@ void apollo_graphics_15i::device_reset() //------------------------------------------------- MACHINE_CONFIG_START(apollo_state::apollo_mono19i) - MCFG_DEFAULT_LAYOUT( layout_apollo ) + config.set_default_layout(layout_apollo); MCFG_PALETTE_ADD_MONOCHROME("palette") MCFG_SCREEN_ADD(VIDEO_SCREEN_TAG, RASTER) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_AFTER_VBLANK) diff --git a/src/mame/video/decodmd1.cpp b/src/mame/video/decodmd1.cpp index e23e47644a7a1..d3af92b81e219 100644 --- a/src/mame/video/decodmd1.cpp +++ b/src/mame/video/decodmd1.cpp @@ -206,7 +206,7 @@ MACHINE_CONFIG_START(decodmd_type1_device::device_add_mconfig) MCFG_TIMER_DRIVER_ADD_PERIODIC("nmi_timer", decodmd_type1_device, dmd_nmi, attotime::from_hz(2000)) // seems a lot - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD("dmd",LCD) MCFG_SCREEN_SIZE(128, 16) diff --git a/src/mame/video/decodmd2.cpp b/src/mame/video/decodmd2.cpp index 02e459e56bc3c..752ef6c522f77 100644 --- a/src/mame/video/decodmd2.cpp +++ b/src/mame/video/decodmd2.cpp @@ -143,7 +143,7 @@ MACHINE_CONFIG_START(decodmd_type2_device::device_add_mconfig) MCFG_MC6845_CHAR_WIDTH(8) MCFG_MC6845_UPDATE_ROW_CB(decodmd_type2_device, crtc_update_row) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD("dmd",RASTER) MCFG_SCREEN_SIZE(128, 32) diff --git a/src/mame/video/decodmd3.cpp b/src/mame/video/decodmd3.cpp index 736fe551ab37b..414ab2c1a5ec5 100644 --- a/src/mame/video/decodmd3.cpp +++ b/src/mame/video/decodmd3.cpp @@ -145,7 +145,7 @@ MACHINE_CONFIG_START(decodmd_type3_device::device_add_mconfig) MCFG_MC6845_CHAR_WIDTH(16) MCFG_MC6845_UPDATE_ROW_CB(decodmd_type3_device, crtc_update_row) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_SCREEN_ADD("dmd",RASTER) MCFG_SCREEN_SIZE(192, 64) diff --git a/src/mame/video/gamate.cpp b/src/mame/video/gamate.cpp index 6820f089c0c5c..39f62d0884f17 100644 --- a/src/mame/video/gamate.cpp +++ b/src/mame/video/gamate.cpp @@ -316,7 +316,7 @@ MACHINE_CONFIG_START(gamate_video_device::device_add_mconfig) MCFG_SCREEN_VIDEO_ATTRIBUTES(VIDEO_UPDATE_SCANLINE) // close approximate until we use timers to emulate exact video update MCFG_SCREEN_VBLANK_TIME(ATTOSECONDS_IN_USEC(0)) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 4) MCFG_PALETTE_INIT_OWNER(gamate_video_device,gamate) diff --git a/src/mame/video/kyocera.cpp b/src/mame/video/kyocera.cpp index 537ed085bb393..78e96a6833cc1 100644 --- a/src/mame/video/kyocera.cpp +++ b/src/mame/video/kyocera.cpp @@ -56,7 +56,7 @@ MACHINE_CONFIG_START(kc85_state::kc85_video) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 64-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(kc85_state,kc85) @@ -84,7 +84,7 @@ MACHINE_CONFIG_START(tandy200_state::tandy200_video) MCFG_SCREEN_VISIBLE_AREA(0, 240-1, 0, 128-1) MCFG_SCREEN_PALETTE("palette") - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(tandy200_state,tandy200) diff --git a/src/mame/video/pc8401a.cpp b/src/mame/video/pc8401a.cpp index 0fe16b3ee9f36..8a497d2e503e2 100644 --- a/src/mame/video/pc8401a.cpp +++ b/src/mame/video/pc8401a.cpp @@ -59,7 +59,7 @@ void pc8401a_state::pc8500_lcdc(address_map &map) /* Machine Drivers */ MACHINE_CONFIG_START(pc8401a_state::pc8401a_video) -// MCFG_DEFAULT_LAYOUT(layout_pc8401a) +// config.set_default_layout(layout_pc8401a); MCFG_PALETTE_ADD("palette", 2) MCFG_PALETTE_INIT_OWNER(pc8401a_state,pc8401a) @@ -76,7 +76,7 @@ MACHINE_CONFIG_START(pc8401a_state::pc8401a_video) MACHINE_CONFIG_END MACHINE_CONFIG_START(pc8500_state::pc8500_video) - MCFG_DEFAULT_LAYOUT(layout_pc8500) + config.set_default_layout(layout_pc8500); MCFG_PALETTE_ADD("palette", 2+8) MCFG_PALETTE_INIT_OWNER(pc8401a_state,pc8401a) diff --git a/src/mame/video/wpc_dmd.cpp b/src/mame/video/wpc_dmd.cpp index f49398974872a..98675d0561dda 100644 --- a/src/mame/video/wpc_dmd.cpp +++ b/src/mame/video/wpc_dmd.cpp @@ -43,7 +43,7 @@ MACHINE_CONFIG_START(wpc_dmd_device::device_add_mconfig) MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wpc_dmd_device, screen_update) MCFG_SCREEN_SIZE(128*4, 32*4) MCFG_SCREEN_VISIBLE_AREA(0, 128*4-1, 0, 32*4-1) - MCFG_DEFAULT_LAYOUT(layout_lcd) + config.set_default_layout(layout_lcd); MCFG_TIMER_DRIVER_ADD_PERIODIC("scanline", wpc_dmd_device, scanline_timer, attotime::from_hz(60*4*32)) MACHINE_CONFIG_END