finally got rid of machine_mconfig_additions (nw)

src/devices/bus/amiga/keyboard/a500.cpp

@@ -36,11 +36,6 @@ namespace bus { namespace amiga { namespace keyboard {
 
 namespace {
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
 ADDRESS_MAP_START( mpu6500_map, AS_PROGRAM, 8, a500_kbd_device )
 	ADDRESS_MAP_GLOBAL_MASK(0xfff)
 	AM_RANGE(0x000, 0x03f) AM_RAM
@@ -136,6 +131,11 @@ INPUT_PORTS_END
 } // anonymous namespace
 
 
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+
 MACHINE_CONFIG_MEMBER(a500_kbd_device::device_add_mconfig)
 	MCFG_CPU_ADD("ic1", M6502, XTAL_3MHz / 2)
 	MCFG_CPU_PROGRAM_MAP(mpu6500_map)

src/devices/bus/rs232/null_modem.cpp

@@ -22,15 +22,10 @@ null_modem_device::null_modem_device(const machine_config &mconfig, const char *
 {
 }
 
-static MACHINE_CONFIG_START(null_modem)
+MACHINE_CONFIG_MEMBER(null_modem_device::device_add_mconfig)
 	MCFG_DEVICE_ADD("stream", BITBANGER, 0)
 MACHINE_CONFIG_END
 
-machine_config_constructor null_modem_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME(null_modem);
-}
-
 static INPUT_PORTS_START(null_modem)
 	MCFG_RS232_BAUD("RS232_TXBAUD", RS232_BAUD_9600, "TX Baud", null_modem_device, update_serial)
 	MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", null_modem_device, update_serial)

src/devices/bus/rs232/null_modem.h

@@ -12,7 +12,6 @@ class null_modem_device : public device_t,
 {
 public:
 	null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-	virtual machine_config_constructor device_mconfig_additions() const override;
 
 	virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
 	virtual WRITE_LINE_MEMBER( input_rts ) override { m_rts = state; }
@@ -24,6 +23,7 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	virtual void tra_callback() override;
 	virtual void tra_complete() override;

src/devices/bus/rs232/printer.cpp

@@ -16,16 +16,11 @@ serial_printer_device::serial_printer_device(const machine_config &mconfig, cons
 {
 }
 
-static MACHINE_CONFIG_START(serial_printer)
+MACHINE_CONFIG_MEMBER(serial_printer_device::device_add_mconfig)
 	MCFG_DEVICE_ADD("printer", PRINTER, 0)
 	MCFG_PRINTER_ONLINE_CB(WRITELINE(serial_printer_device, printer_online))
 MACHINE_CONFIG_END
 
-machine_config_constructor serial_printer_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME(serial_printer);
-}
-
 static INPUT_PORTS_START(serial_printer)
 	MCFG_RS232_BAUD("RS232_RXBAUD", RS232_BAUD_9600, "RX Baud", serial_printer_device, update_serial)
 	MCFG_RS232_STARTBITS("RS232_STARTBITS", RS232_STARTBITS_1, "Start Bits", serial_printer_device, update_serial)

src/devices/bus/rs232/printer.h

@@ -18,10 +18,9 @@ public:
 	virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
 
 	DECLARE_WRITE_LINE_MEMBER(update_serial);
-	DECLARE_WRITE_LINE_MEMBER(printer_online);
 
 protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual ioport_constructor device_input_ports() const override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
@@ -30,6 +29,8 @@ protected:
 	virtual void rcv_complete() override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER(printer_online);
+
 	required_device<printer_image_device> m_printer;
 
 	required_ioport m_rs232_rxbaud;

src/devices/bus/rs232/sun_kbd.cpp

@@ -5,14 +5,6 @@
 DEFINE_DEVICE_TYPE(SUN_KBD_ADAPTOR, sun_keyboard_adaptor_device, "sunkbd_adaptor", "Sun Keyboard Adaptor")
 
 
-namespace {
-MACHINE_CONFIG_START(sun_keyboard_adaptor)
-	MCFG_SUNKBD_PORT_ADD("keyboard", default_sun_keyboard_devices, nullptr)
-	MCFG_SUNKBD_RXD_HANDLER(WRITELINE(sun_keyboard_adaptor_device, output_rxd))
-MACHINE_CONFIG_END
-} // anonymous namespace
-
-
 sun_keyboard_adaptor_device::sun_keyboard_adaptor_device(
 		machine_config const &mconfig,
 		char const *tag,
@@ -30,10 +22,10 @@ sun_keyboard_adaptor_device::~sun_keyboard_adaptor_device()
 }
 
 
-machine_config_constructor sun_keyboard_adaptor_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER(sun_keyboard_adaptor_device::device_add_mconfig)
-{
+	MCFG_SUNKBD_PORT_ADD("keyboard", default_sun_keyboard_devices, nullptr)
-	return MACHINE_CONFIG_NAME(sun_keyboard_adaptor);
+	MCFG_SUNKBD_RXD_HANDLER(WRITELINE(sun_keyboard_adaptor_device, output_rxd))
-}
+MACHINE_CONFIG_END
 
 
 WRITE_LINE_MEMBER( sun_keyboard_adaptor_device::input_txd )

src/devices/bus/rs232/sun_kbd.h

@@ -18,14 +18,14 @@ public:
 	sun_keyboard_adaptor_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
 	virtual ~sun_keyboard_adaptor_device() override;
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override;
 
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 private:
 	required_device<sun_keyboard_port_device> m_keyboard_port;
 };

src/devices/bus/rs232/xvd701.cpp

@@ -12,14 +12,9 @@ jvc_xvd701_device::jvc_xvd701_device(const machine_config &mconfig, const char *
 {
 }
 
-static MACHINE_CONFIG_START(xvd701)
+MACHINE_CONFIG_MEMBER(jvc_xvd701_device::device_add_mconfig)
 MACHINE_CONFIG_END
 
-machine_config_constructor jvc_xvd701_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME(xvd701);
-}
-
 static INPUT_PORTS_START(xvd701)
 INPUT_PORTS_END
 

src/devices/bus/rs232/xvd701.h

@@ -11,7 +11,6 @@ class jvc_xvd701_device : public device_t,
 {
 public:
 	jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-	virtual machine_config_constructor device_mconfig_additions() const override;
 
 	virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); }
 protected:
@@ -19,6 +18,7 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	virtual void tra_callback() override;
 	virtual void tra_complete() override;

src/devices/bus/s100/dj2db.cpp

@@ -98,10 +98,10 @@ WRITE_LINE_MEMBER( s100_dj2db_device::fdc_drq_w )
 
 
 //-------------------------------------------------
-//  MACHINE_CONFIG_START( s100_dj2db )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( s100_dj2db )
+MACHINE_CONFIG_MEMBER( s100_dj2db_device::device_add_mconfig )
 	MCFG_DEVICE_ADD(BR1941_TAG, COM8116, XTAL_5_0688MHz)
 	MCFG_COM8116_FR_HANDLER(WRITELINE(s100_dj2db_device, fr_w))
 
@@ -116,17 +116,6 @@ static MACHINE_CONFIG_START( s100_dj2db )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor s100_dj2db_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( s100_dj2db );
-}
-
-
 //-------------------------------------------------
 //  INPUT_PORTS( mm65k16s )
 //-------------------------------------------------

src/devices/bus/s100/dj2db.h

@@ -30,21 +30,16 @@ public:
 	// construction/destruction
 	s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	virtual ioport_constructor device_input_ports() const override;
-
-	// not really public
-	DECLARE_WRITE_LINE_MEMBER( fr_w );
-	DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
-	DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+
 	// device_s100_card_interface overrides
 	virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
 	virtual void s100_mwrt_w(address_space &space, offs_t offset, uint8_t data) override;
@@ -53,6 +48,10 @@ protected:
 	virtual void s100_phantom_w(int state) override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER( fr_w );
+	DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w );
+	DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+
 	// internal state
 	required_device<mb8866_device> m_fdc;
 	required_device<com8116_device> m_dbrg;

src/devices/bus/s100/djdma.cpp

@@ -73,27 +73,16 @@ ADDRESS_MAP_END
 
 
 //-------------------------------------------------
-//  MACHINE_CONFIG_START( s100_djdma )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( s100_djdma )
+MACHINE_CONFIG_MEMBER( s100_djdma_device::device_add_mconfig )
 	MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_4MHz)
 	MCFG_CPU_PROGRAM_MAP(djdma_mem)
 	MCFG_CPU_IO_MAP(djdma_io)
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor s100_djdma_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( s100_djdma );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/s100/djdma.h

@@ -29,14 +29,14 @@ public:
 	// construction/destruction
 	s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	virtual const tiny_rom_entry *device_rom_region() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
 

src/devices/bus/s100/nsmdsa.cpp

@@ -53,26 +53,15 @@ SLOT_INTERFACE_END
 
 
 //-------------------------------------------------
-//  MACHINE_CONFIG_START( mds_a )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( mds_a )
+MACHINE_CONFIG_MEMBER( s100_mds_a_device::device_add_mconfig )
 	MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_a_floppies, "525sd", floppy_image_device::default_floppy_formats)
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor s100_mds_a_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( mds_a );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/s100/nsmdsa.h

@@ -29,15 +29,15 @@ public:
 	// construction/destruction
 	s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	// device_s100_card_interface overrides
 	virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
 

src/devices/bus/s100/nsmdsad.cpp

@@ -54,26 +54,15 @@ SLOT_INTERFACE_END
 
 
 //-------------------------------------------------
-//  MACHINE_CONFIG_START( mds_ad )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( mds_ad )
+MACHINE_CONFIG_MEMBER( s100_mds_ad_device::device_add_mconfig )
 	MCFG_FLOPPY_DRIVE_ADD("floppy0", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("floppy1", mds_ad_floppies, "525dd", floppy_image_device::default_floppy_formats)
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor s100_mds_ad_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( mds_ad );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/s100/nsmdsad.h

@@ -29,15 +29,15 @@ public:
 	// construction/destruction
 	s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	// device_s100_card_interface overrides
 	virtual uint8_t s100_smemr_r(address_space &space, offs_t offset) override;
 

src/devices/bus/s100/wunderbus.cpp

@@ -83,10 +83,11 @@ WRITE_LINE_MEMBER( s100_wunderbus_device::rtc_tp_w )
 
 
 //-------------------------------------------------
-//  MACHINE_CONFIG_START( s100_wunderbus )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( s100_wunderbus )
+
+MACHINE_CONFIG_MEMBER( s100_wunderbus_device::device_add_mconfig )
 	MCFG_PIC8259_ADD(I8259A_TAG, DEVWRITELINE(DEVICE_SELF, s100_wunderbus_device, pic_int_w), VCC, NOOP)
 	MCFG_DEVICE_ADD(INS8250_1_TAG, INS8250, XTAL_18_432MHz/10)
 	MCFG_INS8250_OUT_TX_CB(DEVWRITELINE(RS232_A_TAG, rs232_port_device, write_txd))
@@ -130,17 +131,6 @@ static MACHINE_CONFIG_START( s100_wunderbus )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor s100_wunderbus_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( s100_wunderbus );
-}
-
-
 //-------------------------------------------------
 //  INPUT_PORTS( wunderbus )
 //-------------------------------------------------

src/devices/bus/s100/wunderbus.h

@@ -31,19 +31,15 @@ public:
 	// construction/destruction
 	s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	virtual ioport_constructor device_input_ports() const override;
-
-	// not really public
-	DECLARE_WRITE_LINE_MEMBER( pic_int_w );
-	DECLARE_WRITE_LINE_MEMBER( rtc_tp_w );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+
 	// device_s100_card_interface overrides
 	virtual void s100_vi0_w(int state) override;
 	virtual void s100_vi1_w(int state) override;
@@ -52,6 +48,9 @@ protected:
 	virtual void s100_sout_w(address_space &space, offs_t offset, uint8_t data) override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER( pic_int_w );
+	DECLARE_WRITE_LINE_MEMBER( rtc_tp_w );
+
 	required_device<pic8259_device> m_pic;
 	required_device<ins8250_device> m_ace1;
 	required_device<ins8250_device> m_ace2;

src/devices/bus/sat_ctrl/multitap.cpp

@@ -124,7 +124,7 @@ uint8_t saturn_multitap_device::read_id(int idx)
 }
 
 
-static MACHINE_CONFIG_START( multitap_slot )
+MACHINE_CONFIG_MEMBER( saturn_multitap_device::device_add_mconfig )
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad")
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad")
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad")
@@ -132,9 +132,3 @@ static MACHINE_CONFIG_START( multitap_slot )
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl5", saturn_joys, "joypad")
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl6", saturn_joys, "joypad")
 MACHINE_CONFIG_END
-
-
-machine_config_constructor saturn_multitap_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( multitap_slot );
-}

src/devices/bus/sat_ctrl/multitap.h

@@ -29,14 +29,14 @@ public:
 	// construction/destruction
 	saturn_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	// device_saturn_control_port_interface overrides
 	virtual uint8_t read_ctrl(uint8_t offset) override;
 	virtual uint8_t read_status() override { return 0x16; }

src/devices/bus/sat_ctrl/segatap.cpp

@@ -108,15 +108,9 @@ uint8_t saturn_segatap_device::read_id(int idx)
 }
 
 
-static MACHINE_CONFIG_START( segatap_slot )
+MACHINE_CONFIG_MEMBER( saturn_segatap_device::device_add_mconfig )
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl1", saturn_joys, "joypad")
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl2", saturn_joys, "joypad")
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl3", saturn_joys, "joypad")
 	MCFG_SATURN_CONTROL_PORT_ADD("ctrl4", saturn_joys, "joypad")
 MACHINE_CONFIG_END
-
-
-machine_config_constructor saturn_segatap_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( segatap_slot );
-}

src/devices/bus/sat_ctrl/segatap.h

@@ -29,14 +29,14 @@ public:
 	// construction/destruction
 	saturn_segatap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	// device_saturn_control_port_interface overrides
 	virtual uint8_t read_ctrl(uint8_t offset) override;
 	virtual uint8_t read_status() override { return 0x04; }

src/devices/bus/scsi/omti5100.cpp

@@ -176,13 +176,7 @@ void omti5100_device::WriteData( uint8_t *data, int dataLength )
 	}
 }
 
-static MACHINE_CONFIG_START( omti5100 )
+MACHINE_CONFIG_MEMBER( omti5100_device::device_add_mconfig )
 	MCFG_HARDDISK_ADD("image0")
 	MCFG_HARDDISK_ADD("image1")
 MACHINE_CONFIG_END
-
-
-machine_config_constructor omti5100_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( omti5100 );
-}

src/devices/bus/scsi/omti5100.h

@@ -12,9 +12,6 @@ class omti5100_device : public scsihd_device
 public:
 	omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	//virtual const rom_entry *device_rom_region() const;
-
 	virtual void ExecCommand() override;
 	virtual void ReadData( uint8_t *data, int dataLength ) override;
 	virtual void WriteData( uint8_t *data, int dataLength ) override;
@@ -22,6 +19,8 @@ public:
 protected:
 	void device_start() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 private:
 	required_device<harddisk_image_device> m_image0;
 	required_device<harddisk_image_device> m_image1;

src/devices/bus/scsi/s1410.cpp

@@ -160,10 +160,10 @@ ADDRESS_MAP_END
 
 
 //-------------------------------------------------
-//  MACHINE_DRIVER( s1410 )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( s1410 )
+MACHINE_CONFIG_MEMBER( s1410_device::device_add_mconfig )
 	MCFG_CPU_ADD(Z8400A_TAG, Z80, XTAL_16MHz/4)
 	MCFG_CPU_PROGRAM_MAP(s1410_mem)
 	MCFG_CPU_IO_MAP(s1410_io)
@@ -173,17 +173,6 @@ static MACHINE_CONFIG_START( s1410 )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor s1410_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( s1410 );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/scsi/s1410.h

@@ -19,13 +19,14 @@ public:
 	// construction/destruction
 	s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	virtual void ExecCommand() override;
 	virtual void WriteData( uint8_t *data, int dataLength ) override;
 	virtual void ReadData( uint8_t *data, int dataLength ) override;
+
+protected:
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 };
 
 

src/devices/bus/scsi/sa1403d.cpp

@@ -54,25 +54,14 @@ const tiny_rom_entry *sa1403d_device::device_rom_region() const
 
 
 //-------------------------------------------------
-//  MACHINE_DRIVER( sa1403d )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sa1403d )
+MACHINE_CONFIG_MEMBER( sa1403d_device::device_add_mconfig )
 	MCFG_HARDDISK_ADD("image")
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor sa1403d_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sa1403d );
-}
-
-
 //-------------------------------------------------
 //  INPUT_PORTS( sa1403d )
 //-------------------------------------------------

src/devices/bus/scsi/sa1403d.h

@@ -20,13 +20,14 @@ public:
 	// construction/destruction
 	sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	virtual ioport_constructor device_input_ports() const override;
-
 	virtual void ExecCommand() override;
 	virtual void WriteData( uint8_t *data, int dataLength ) override;
+
+protected:
+	// optional information overrides
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
 };
 
 

src/devices/bus/scsi/scsi.cpp

@@ -61,7 +61,7 @@ scsi_port_device::scsi_port_device(const machine_config &mconfig, const char *ta
 {
 }
 
-static MACHINE_CONFIG_START( scsi_port )
+MACHINE_CONFIG_MEMBER( scsi_port_device::device_add_mconfig )
 	MCFG_DEVICE_ADD( SCSI_PORT_DEVICE1, SCSI_PORT_SLOT, 0 )
 	MCFG_DEVICE_ADD( SCSI_PORT_DEVICE2, SCSI_PORT_SLOT, 0 )
 	MCFG_DEVICE_ADD( SCSI_PORT_DEVICE3, SCSI_PORT_SLOT, 0 )
@@ -71,11 +71,6 @@ static MACHINE_CONFIG_START( scsi_port )
 	MCFG_DEVICE_ADD( SCSI_PORT_DEVICE7, SCSI_PORT_SLOT, 0 )
 MACHINE_CONFIG_END
 
-machine_config_constructor scsi_port_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( scsi_port );
-}
-
 void scsi_port_device::device_start()
 {
 	const char *deviceName[] =

src/devices/bus/scsi/scsi.h

@@ -139,7 +139,7 @@ public:
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	void update_bsy();
 	void update_sel();

src/devices/bus/scsi/scsicd.cpp

@@ -30,13 +30,8 @@ void scsicd_device::device_start()
 	scsihle_device::device_start();
 }
 
-static MACHINE_CONFIG_START(scsi_cdrom)
+MACHINE_CONFIG_MEMBER(scsicd_device::device_add_mconfig)
 	MCFG_CDROM_ADD("image")
 	MCFG_CDROM_INTERFACE("cdrom")
 	MCFG_SOUND_ADD("cdda", CDDA, 0)
 MACHINE_CONFIG_END
-
-machine_config_constructor scsicd_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME(scsi_cdrom);
-}

src/devices/bus/scsi/scsicd.h

@@ -17,11 +17,12 @@ class scsicd_device : public scsihle_device, public t10mmc
 public:
 	// construction/destruction
 	scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-	virtual machine_config_constructor device_mconfig_additions() const override;
 
 protected:
 	scsicd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 	virtual void device_start() override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
 };
 
 // device type definition

src/devices/bus/scsi/scsihd.cpp

@@ -29,12 +29,7 @@ void scsihd_device::device_start()
 	scsihle_device::device_start();
 }
 
-static MACHINE_CONFIG_START(scsi_harddisk)
+MACHINE_CONFIG_MEMBER(scsihd_device::device_add_mconfig)
 	MCFG_HARDDISK_ADD("image")
 	MCFG_HARDDISK_INTERFACE("scsi_hdd")
 MACHINE_CONFIG_END
-
-machine_config_constructor scsihd_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME(scsi_harddisk);
-}

src/devices/bus/scsi/scsihd.h

@@ -19,11 +19,12 @@ class scsihd_device : public scsihle_device, public t10sbc
 public:
 	// construction/destruction
 	scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-	virtual machine_config_constructor device_mconfig_additions() const override;
 
 protected:
 	scsihd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 	virtual void device_start() override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
 };
 
 // device type definition

src/devices/bus/sega8/ccatch.cpp

@@ -52,11 +52,6 @@ static SLOT_INTERFACE_START(sg1000_card)
 	SLOT_INTERFACE_INTERNAL("rom",  SEGA8_ROM_STD)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START( sub_slot )
+MACHINE_CONFIG_MEMBER( sega8_cardcatch_device::device_add_mconfig )
 	MCFG_SG1000_CARD_ADD("cardslot", sg1000_card, nullptr)
 MACHINE_CONFIG_END
-
-machine_config_constructor sega8_cardcatch_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sub_slot );
-}

src/devices/bus/sega8/ccatch.h

@@ -21,9 +21,9 @@ public:
 	virtual DECLARE_WRITE8_MEMBER(write_cart) override;
 	virtual DECLARE_WRITE8_MEMBER(write_mapper) override {}
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	required_device<sega8_card_slot_device> m_card;
 };
 

src/devices/bus/sega8/mgear.cpp

@@ -37,16 +37,8 @@ void sega8_mgear_device::device_reset()
 {
 }
 
-/*-------------------------------------------------
- mapper specific handlers
- -------------------------------------------------*/
 
-static MACHINE_CONFIG_START( sub_slot )
+MACHINE_CONFIG_MEMBER( sega8_mgear_device::device_add_mconfig )
 	MCFG_SMS_CARTRIDGE_ADD("subslot", sms_cart, nullptr)
 	MCFG_SOFTWARE_LIST_ADD("cart_list","sms")
 MACHINE_CONFIG_END
-
-machine_config_constructor sega8_mgear_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sub_slot );
-}

src/devices/bus/sega8/mgear.h

@@ -17,19 +17,19 @@ public:
 	// construction/destruction
 	sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// device-level overrides
-	virtual void device_start() override;
-	virtual void device_reset() override;
-
 	// reading and writing
 	virtual DECLARE_READ8_MEMBER(read_cart) override { return m_subslot->read_cart(space, offset); }
 	virtual DECLARE_WRITE8_MEMBER(write_cart) override { m_subslot->write_cart(space, offset, data); }
 	virtual DECLARE_WRITE8_MEMBER(write_mapper) override { m_subslot->write_mapper(space, offset, data); }
 	virtual int get_lphaser_xoffs() override { return m_subslot->get_lphaser_xoffs(); }
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	required_device<sega8_cart_slot_device> m_subslot;
 };
 

src/devices/bus/sega8/rom.cpp

@@ -713,15 +713,10 @@ WRITE8_MEMBER(sega8_eeprom_device::write_mapper)
 	}
 }
 
-MACHINE_CONFIG_START( gg_eeprom )
+MACHINE_CONFIG_MEMBER( sega8_eeprom_device::device_add_mconfig )
 	MCFG_EEPROM_SERIAL_93C46_ADD("eeprom")
 MACHINE_CONFIG_END
 
-machine_config_constructor sega8_eeprom_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( gg_eeprom );
-}
-
 
 /*-------------------------------------------------
 

src/devices/bus/sega8/rom.h

@@ -184,9 +184,6 @@ public:
 	// construction/destruction
 	sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	virtual void late_bank_setup() override;
 
 	// reading and writing
@@ -198,6 +195,9 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	uint8_t m_rom_bank_base[3];
 
 	required_device<eeprom_serial_93cxx_device> m_eeprom;

src/devices/bus/sg1000_exp/fm_unit.cpp

@@ -50,7 +50,7 @@ SMS version is not playing PSG sound on his Mark III with the FM unit.
 DEFINE_DEVICE_TYPE(SEGA_FM_UNIT, sega_fm_unit_device, "sega_fm_unit", "SG-1000 FM Sound Unit")
 
 
-static MACHINE_CONFIG_START( fm_config )
+MACHINE_CONFIG_MEMBER( sega_fm_unit_device::device_add_mconfig )
 	MCFG_SOUND_ADD("ym2413", YM2413, XTAL_10_738635MHz/3)
 	// if this output gain is changed, the gain set when unmute the output need
 	// to be changed too, probably along the gain set for SMSJ/SMSKRFM drivers.
@@ -58,13 +58,6 @@ static MACHINE_CONFIG_START( fm_config )
 MACHINE_CONFIG_END
 
 
-machine_config_constructor sega_fm_unit_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( fm_config );
-}
-
-
-
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************

src/devices/bus/sg1000_exp/fm_unit.h

@@ -35,7 +35,7 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_sg1000_expansion_slot_interface overrides
 	virtual DECLARE_READ8_MEMBER(peripheral_r) override;

src/devices/bus/sg1000_exp/sk1100.cpp

@@ -154,7 +154,7 @@ ioport_constructor sega_sk1100_device::device_input_ports() const
 }
 
 
-static MACHINE_CONFIG_START( sk1100_config )
+MACHINE_CONFIG_MEMBER( sega_sk1100_device::device_add_mconfig )
 	/* devices */
 	MCFG_DEVICE_ADD(UPD9255_0_TAG, I8255, 0)
 	MCFG_I8255_IN_PORTA_CB(READ8(sega_sk1100_device, ppi_pa_r))
@@ -173,12 +173,6 @@ static MACHINE_CONFIG_START( sk1100_config )
 	MCFG_SOFTWARE_LIST_ADD("cass_list","sc3000_cass")
 MACHINE_CONFIG_END
 
-
-machine_config_constructor sega_sk1100_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sk1100_config );
-}
-
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************

src/devices/bus/sg1000_exp/sk1100.h

@@ -38,14 +38,10 @@ public:
 	// optional information overrides
 	virtual ioport_constructor device_input_ports() const override;
 
-	DECLARE_READ8_MEMBER( ppi_pa_r );
-	DECLARE_READ8_MEMBER( ppi_pb_r );
-	DECLARE_WRITE8_MEMBER( ppi_pc_w );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_sg1000_expansion_slot_interface overrides
 	virtual DECLARE_READ8_MEMBER(peripheral_r) override;
@@ -53,6 +49,10 @@ protected:
 	virtual bool is_readable(uint8_t offset) override;
 
 private:
+	DECLARE_READ8_MEMBER( ppi_pa_r );
+	DECLARE_READ8_MEMBER( ppi_pb_r );
+	DECLARE_WRITE8_MEMBER( ppi_pc_w );
+
 	required_device<cassette_image_device> m_cassette;
 	required_device<i8255_device> m_ppi;
 	required_ioport_array<8> m_pa;

src/devices/bus/sms_ctrl/multitap.cpp

@@ -120,8 +120,7 @@ void sms_multitap_device::peripheral_w(uint8_t data)
 
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
 READ32_MEMBER( sms_multitap_device::pixel_r )
@@ -130,7 +129,7 @@ READ32_MEMBER( sms_multitap_device::pixel_r )
 }
 
 
-static MACHINE_CONFIG_START( multitap_slot )
+MACHINE_CONFIG_MEMBER( sms_multitap_device::device_add_mconfig )
 	// Controller subports setup, without the TH callback declaration,
 	// because the circuit scheme shows TH of subports without connection.
 	MCFG_SMS_CONTROL_PORT_ADD("ctrl1", sms_control_port_devices, "joypad")
@@ -142,9 +141,3 @@ static MACHINE_CONFIG_START( multitap_slot )
 	MCFG_SMS_CONTROL_PORT_ADD("ctrl4", sms_control_port_devices, "joypad")
 	MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_multitap_device, pixel_r))
 MACHINE_CONFIG_END
-
-
-machine_config_constructor sms_multitap_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( multitap_slot );
-}

src/devices/bus/sms_ctrl/multitap.h

@@ -29,18 +29,18 @@ public:
 	// construction/destruction
 	sms_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	DECLARE_READ32_MEMBER(pixel_r);
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_sms_control_port_interface overrides
 	virtual uint8_t peripheral_r() override;
 	virtual void peripheral_w(uint8_t data) override;
 
 private:
+	DECLARE_READ32_MEMBER(pixel_r);
+
 	required_device<sms_control_port_device> m_subctrl1_port;
 	required_device<sms_control_port_device> m_subctrl2_port;
 	required_device<sms_control_port_device> m_subctrl3_port;

src/devices/bus/sms_ctrl/rfu.cpp

@@ -123,8 +123,7 @@ void sms_rapid_fire_device::peripheral_w(uint8_t data)
 
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
 WRITE_LINE_MEMBER( sms_rapid_fire_device::th_pin_w )
@@ -139,14 +138,8 @@ READ32_MEMBER( sms_rapid_fire_device::pixel_r )
 }
 
 
-static MACHINE_CONFIG_START( rfire_slot )
+MACHINE_CONFIG_MEMBER( sms_rapid_fire_device::device_add_mconfig )
 	MCFG_SMS_CONTROL_PORT_ADD("ctrl", sms_control_port_devices, "joypad")
 	MCFG_SMS_CONTROL_PORT_TH_INPUT_HANDLER(WRITELINE(sms_rapid_fire_device, th_pin_w))
 	MCFG_SMS_CONTROL_PORT_PIXEL_HANDLER(READ32(sms_rapid_fire_device, pixel_r))
 MACHINE_CONFIG_END
-
-
-machine_config_constructor sms_rapid_fire_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( rfire_slot );
-}

src/devices/bus/sms_ctrl/rfu.h

@@ -29,22 +29,22 @@ public:
 	// construction/destruction
 	sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual ioport_constructor device_input_ports() const override;
-
-	DECLARE_WRITE_LINE_MEMBER(th_pin_w);
-	DECLARE_READ32_MEMBER(pixel_r);
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+
+	// optional information overrides
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_sms_control_port_interface overrides
 	virtual uint8_t peripheral_r() override;
 	virtual void peripheral_w(uint8_t data) override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER(th_pin_w);
+	DECLARE_READ32_MEMBER(pixel_r);
+
 	required_ioport m_rfire_sw;
 	required_device<sms_control_port_device> m_subctrl_port;
 

src/devices/bus/sms_exp/gender.cpp

@@ -92,16 +92,9 @@ WRITE8_MEMBER(sms_gender_adapter_device::write_ram)
 }
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( genderadp_slot )
+MACHINE_CONFIG_MEMBER( sms_gender_adapter_device::device_add_mconfig )
 	MCFG_SMS_CARTRIDGE_ADD("subslot", sms_cart, nullptr)
 MACHINE_CONFIG_END
-
-
-machine_config_constructor sms_gender_adapter_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( genderadp_slot );
-}

src/devices/bus/sms_exp/gender.h

@@ -42,7 +42,7 @@ public:
 protected:
 	// device-level overrides
 	virtual void device_start() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 private:
 	required_device<sega8_cart_slot_device> m_subslot;

src/devices/bus/snes/bsx.cpp

@@ -233,38 +233,28 @@ void sns_rom_bsx_device::bsx_base::write(uint32_t offset, uint8_t data)
 	}
 }
 
-//-------------------------------------------------
-//  MACHINE_CONFIG_START( bs_slot )
-//-------------------------------------------------
 
 static SLOT_INTERFACE_START(bsx_cart)
 	SLOT_INTERFACE_INTERNAL("bsmempak",  SNS_BSMEMPAK)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START( bs_slot )
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+MACHINE_CONFIG_MEMBER( sns_rom_bsx_device::device_add_mconfig )
 	MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr)
 MACHINE_CONFIG_END
 
+MACHINE_CONFIG_MEMBER( sns_rom_bsxlo_device::device_add_mconfig )
+	MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr)
+MACHINE_CONFIG_END
 
-//-------------------------------------------------
+MACHINE_CONFIG_MEMBER( sns_rom_bsxhi_device::device_add_mconfig )
-//  machine_config_additions - device-specific
+	MCFG_SNS_BSX_CARTRIDGE_ADD("bs_slot", bsx_cart, nullptr)
-//  machine configurations
+MACHINE_CONFIG_END
-//-------------------------------------------------
 
-machine_config_constructor sns_rom_bsx_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( bs_slot );
-}
-
-machine_config_constructor sns_rom_bsxlo_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( bs_slot );
-}
-
-machine_config_constructor sns_rom_bsxhi_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( bs_slot );
-}
 
 /*-------------------------------------------------
  mapper specific handlers

src/devices/bus/snes/bsx.h

@@ -17,8 +17,6 @@ public:
 	// construction/destruction
 	sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	// additional reading and writing
 	virtual DECLARE_READ8_MEMBER(read_l) override;
 	virtual DECLARE_READ8_MEMBER(read_h) override;
@@ -55,6 +53,8 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	void access_update();
 
 	// base regs
@@ -83,8 +83,6 @@ public:
 	// construction/destruction
 	sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	// additional reading and writing
 	virtual DECLARE_READ8_MEMBER(read_l) override;
 	virtual DECLARE_READ8_MEMBER(read_h) override;
@@ -93,6 +91,8 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 private:
 	required_device<sns_bsx_cart_slot_device> m_slot;
 };
@@ -105,8 +105,6 @@ public:
 	// construction/destruction
 	sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	// additional reading and writing
 	virtual DECLARE_READ8_MEMBER(read_l) override;
 	virtual DECLARE_READ8_MEMBER(read_h) override;
@@ -115,6 +113,8 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 private:
 	required_device<sns_bsx_cart_slot_device> m_slot;
 };

src/devices/bus/snes/event.cpp

@@ -216,25 +216,15 @@ ADDRESS_MAP_END
 
 
 //-------------------------------------------------
-//  MACHINE_DRIVER( snes_dsp )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( snes_dsp_pfest94 )
+MACHINE_CONFIG_MEMBER( sns_pfest94_device::device_add_mconfig )
 	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
 	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
 	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor sns_pfest94_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_dsp_pfest94 );
-}
-
 //-------------------------------------------------
 //  Dipswitch
 //-------------------------------------------------

src/devices/bus/snes/event.h

@@ -18,10 +18,6 @@ public:
 	// construction/destruction
 	sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	virtual ioport_constructor device_input_ports() const override;
-
 	virtual void speedup_addon_bios_access() override;
 
 	// reading and writing
@@ -40,6 +36,10 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
+
 	required_device<upd7725_device> m_upd7725;
 	required_ioport m_dsw;
 

src/devices/bus/snes/sa1.cpp

@@ -1142,12 +1142,7 @@ static ADDRESS_MAP_START( sa1_map, AS_PROGRAM, 8, sns_sa1_device )
 ADDRESS_MAP_END
 
 
-static MACHINE_CONFIG_START( snes_sa1 )
+MACHINE_CONFIG_MEMBER( sns_sa1_device::device_add_mconfig )
 	MCFG_CPU_ADD("sa1cpu", G65816, 10000000)
 	MCFG_CPU_PROGRAM_MAP(sa1_map)
 MACHINE_CONFIG_END
-
-machine_config_constructor sns_sa1_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_sa1 );
-}

src/devices/bus/snes/sa1.h

@@ -18,8 +18,6 @@ public:
 	// construction/destruction
 	sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	// reading and writing
 	virtual DECLARE_READ8_MEMBER(read_l) override;
 	virtual DECLARE_READ8_MEMBER(read_h) override;
@@ -40,6 +38,8 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 private:
 	uint8_t var_length_read(address_space &space, uint32_t offset);
 	void dma_transfer(address_space &space);

src/devices/bus/snes/sfx.cpp

@@ -85,17 +85,12 @@ WRITE_LINE_MEMBER(sns_rom_superfx_device::snes_extern_irq_w)
 }
 
 
-static MACHINE_CONFIG_START( snes_sfx )
+MACHINE_CONFIG_MEMBER( sns_rom_superfx_device::device_add_mconfig )
 	MCFG_CPU_ADD("superfx", SUPERFX, 21480000)  /* 21.48MHz */
 	MCFG_CPU_PROGRAM_MAP(sfx_map)
 	MCFG_SUPERFX_OUT_IRQ(WRITELINE(sns_rom_superfx_device, snes_extern_irq_w))  /* IRQ line from cart */
 MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom_superfx_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_sfx );
-}
-
 READ8_MEMBER( sns_rom_superfx_device::chip_read )
 {
 	return m_superfx->mmio_read(offset);

src/devices/bus/snes/sfx.h

@@ -16,8 +16,6 @@ public:
 	// construction/destruction
 	sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	// additional reading and writing
 	virtual DECLARE_READ8_MEMBER(read_l) override;
 	virtual DECLARE_READ8_MEMBER(read_h) override;
@@ -32,13 +30,16 @@ public:
 	virtual DECLARE_WRITE8_MEMBER(superfx_w_bank1);
 	virtual DECLARE_WRITE8_MEMBER(superfx_w_bank2);
 	virtual DECLARE_WRITE8_MEMBER(superfx_w_bank3);
-	virtual DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w);
 
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
+	virtual DECLARE_WRITE_LINE_MEMBER(snes_extern_irq_w);
+
 	required_device<superfx_device> m_superfx;
 
 	uint8_t sfx_ram[0x200000];

src/devices/bus/snes/sgb.cpp

@@ -160,7 +160,7 @@ static SLOT_INTERFACE_START(supergb_cart)
 SLOT_INTERFACE_END
 
 
-static MACHINE_CONFIG_START( supergb )
+MACHINE_CONFIG_MEMBER( sns_rom_sgb1_device::device_add_mconfig )
 	MCFG_CPU_ADD("sgb_cpu", LR35902, 4295454)   /* 4.295454 MHz */
 	MCFG_CPU_PROGRAM_MAP(supergb_map)
 	MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback))
@@ -174,12 +174,6 @@ static MACHINE_CONFIG_START( supergb )
 MACHINE_CONFIG_END
 
 
-machine_config_constructor sns_rom_sgb1_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( supergb );
-}
-
-
 ROM_START( supergb )
 	ROM_REGION(0x100, "sgb_cpu", 0)
 	ROM_LOAD("sgb_boot.bin", 0x0000, 0x0100, CRC(ec8a83b9) SHA1(aa2f50a77dfb4823da96ba99309085a3c6278515))
@@ -192,7 +186,7 @@ const tiny_rom_entry *sns_rom_sgb1_device::device_rom_region() const
 }
 
 
-static MACHINE_CONFIG_START( supergb2 )
+MACHINE_CONFIG_MEMBER( sns_rom_sgb2_device::device_add_mconfig )
 	MCFG_CPU_ADD("sgb_cpu", LR35902, XTAL_4_194304Mhz)   /* 4.194MHz derived from clock on sgb2 pcb */
 	MCFG_CPU_PROGRAM_MAP(supergb_map)
 	MCFG_LR35902_TIMER_CB(WRITE8(sns_rom_sgb_device, gb_timer_callback))
@@ -206,12 +200,6 @@ static MACHINE_CONFIG_START( supergb2 )
 MACHINE_CONFIG_END
 
 
-machine_config_constructor sns_rom_sgb2_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( supergb2 );
-}
-
-
 ROM_START( supergb2 )
 	ROM_REGION(0x100, "sgb_cpu", 0)
 	ROM_LOAD("sgb2_boot.bin", 0x0000, 0x0100, CRC(53d0dd63) SHA1(93407ea10d2f30ab96a314d8eca44fe160aea734))

src/devices/bus/snes/sgb.h

@@ -83,8 +83,9 @@ public:
 	// construction/destruction
 	sns_rom_sgb1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -95,8 +96,9 @@ public:
 	// construction/destruction
 	sns_rom_sgb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 

src/devices/bus/snes/sufami.cpp

@@ -45,30 +45,21 @@ void sns_rom_strom_device::device_start()
 {
 }
 
-//-------------------------------------------------
-//  MACHINE_CONFIG_START( st_slot )
-//-------------------------------------------------
 
 static SLOT_INTERFACE_START(sufamiturbo_cart)
 	SLOT_INTERFACE_INTERNAL("strom",  SNS_STROM)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START( st_slot )
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+MACHINE_CONFIG_MEMBER( sns_rom_sufami_device::device_add_mconfig )
 	MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot1", sufamiturbo_cart, nullptr)
 	MCFG_SNS_SUFAMI_CARTRIDGE_ADD("st_slot2", sufamiturbo_cart, nullptr)
 MACHINE_CONFIG_END
 
-
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor sns_rom_sufami_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( st_slot );
-}
-
 /*-------------------------------------------------
  mapper specific handlers
  -------------------------------------------------*/

src/devices/bus/snes/sufami.h

@@ -17,8 +17,6 @@ public:
 	// construction/destruction
 	sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 	// additional reading and writing
 	virtual DECLARE_READ8_MEMBER(read_l) override;
 	virtual DECLARE_READ8_MEMBER(read_h) override;
@@ -29,6 +27,8 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 private:
 	required_device<sns_sufami_cart_slot_device> m_slot1;
 	required_device<sns_sufami_cart_slot_device> m_slot2;

src/devices/bus/snes/upd.cpp

@@ -127,25 +127,15 @@ ADDRESS_MAP_END
 
 
 //-------------------------------------------------
-//  MACHINE_DRIVER( snes_dsp )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( snes_dsp_lorom )
+MACHINE_CONFIG_MEMBER( sns_rom20_necdsp_device::device_add_mconfig )
 	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
 	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
 	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor sns_rom20_necdsp_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_dsp_lorom );
-}
-
 READ8_MEMBER( sns_rom20_necdsp_device::chip_read )
 {
 	offset &= 0x7fff;
@@ -191,27 +181,16 @@ static ADDRESS_MAP_START( dsp_data_map_hirom, AS_DATA, 16, sns_rom21_necdsp_devi
 	AM_RANGE(0x0000, 0x03ff) AM_READ(necdsp_data_r)
 ADDRESS_MAP_END
 
-
 //-------------------------------------------------
-//  MACHINE_DRIVER( snes_dsp )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( snes_dsp_hirom )
+MACHINE_CONFIG_MEMBER( sns_rom21_necdsp_device::device_add_mconfig )
 	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
 	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_hirom)
 	MCFG_CPU_DATA_MAP(dsp_data_map_hirom)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor sns_rom21_necdsp_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_dsp_hirom );
-}
-
 READ8_MEMBER( sns_rom21_necdsp_device::chip_read )
 {
 	offset &= 0x1fff;
@@ -312,40 +291,22 @@ ADDRESS_MAP_END
 
 
 //-------------------------------------------------
-//  MACHINE_DRIVER( snes_st010 )
+//  device_add_mconfig - add device configuration
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( snes_st010 )
+MACHINE_CONFIG_MEMBER( sns_rom_seta10dsp_device::device_add_mconfig )
 	MCFG_CPU_ADD("dsp", UPD96050, 10000000)
 	MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
 	MCFG_CPU_DATA_MAP(st01x_data_map)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  MACHINE_DRIVER( snes_st011 )
-//-------------------------------------------------
 
-static MACHINE_CONFIG_START( snes_st011 )
+MACHINE_CONFIG_MEMBER( sns_rom_seta11dsp_device::device_add_mconfig )
 	MCFG_CPU_ADD("dsp", UPD96050, 15000000)
 	MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
 	MCFG_CPU_DATA_MAP(st01x_data_map)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor sns_rom_seta10dsp_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_st010 );
-}
-
-machine_config_constructor sns_rom_seta11dsp_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_st011 );
-}
-
 
 // To make faster DSP access to its internal rom, let's install read banks and map m_bios there with correct byte order
 
@@ -444,45 +405,53 @@ sns_rom_seta11dsp_legacy_device::sns_rom_seta11dsp_legacy_device(const machine_c
 }
 
 
-machine_config_constructor sns_rom20_necdsp1_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom20_necdsp1_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
-	return MACHINE_CONFIG_NAME( snes_dsp_lorom );
+	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
-}
+	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom20_necdsp1b_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom20_necdsp1b_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
-	return MACHINE_CONFIG_NAME( snes_dsp_lorom );
+	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
-}
+	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom20_necdsp2_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom20_necdsp2_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
-	return MACHINE_CONFIG_NAME( snes_dsp_lorom );
+	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
-}
+	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom20_necdsp3_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom20_necdsp3_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
-	return MACHINE_CONFIG_NAME( snes_dsp_lorom );
+	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
-}
+	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom20_necdsp4_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom20_necdsp4_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
-	return MACHINE_CONFIG_NAME( snes_dsp_lorom );
+	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_lorom)
-}
+	MCFG_CPU_DATA_MAP(dsp_data_map_lorom)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom21_necdsp1_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom21_necdsp1_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD7725, 8000000)
-	return MACHINE_CONFIG_NAME( snes_dsp_hirom );
+	MCFG_CPU_PROGRAM_MAP(dsp_prg_map_hirom)
-}
+	MCFG_CPU_DATA_MAP(dsp_data_map_hirom)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom_seta10dsp_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom_seta10dsp_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD96050, 10000000)
-	return MACHINE_CONFIG_NAME( snes_st010 );
+	MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
-}
+	MCFG_CPU_DATA_MAP(st01x_data_map)
+MACHINE_CONFIG_END
 
-machine_config_constructor sns_rom_seta11dsp_legacy_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( sns_rom_seta11dsp_legacy_device::device_add_mconfig )
-{
+	MCFG_CPU_ADD("dsp", UPD96050, 15000000)
-	return MACHINE_CONFIG_NAME( snes_st011 );
+	MCFG_CPU_PROGRAM_MAP(st01x_prg_map)
-}
+	MCFG_CPU_DATA_MAP(st01x_data_map)
+MACHINE_CONFIG_END
 
 
 ROM_START( snes_dsp1 )

src/devices/bus/snes/upd.h

@@ -18,8 +18,6 @@ public:
 	// construction/destruction
 	sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual void device_start() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
 	virtual void speedup_addon_bios_access() override;
 
 	// additional reading and writing
@@ -33,6 +31,9 @@ protected:
 	sns_rom20_necdsp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
 
 	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	required_device<upd7725_device> m_upd7725;
 
 	std::vector<uint32_t> m_dsp_prg;
@@ -47,7 +48,6 @@ public:
 	// construction/destruction
 	sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
 	virtual void speedup_addon_bios_access() override;
 
 	// additional reading and writing
@@ -62,6 +62,7 @@ protected:
 
 	// device-level overrides
 	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	required_device<upd7725_device> m_upd7725;
 
@@ -104,8 +105,9 @@ public:
 	// construction/destruction
 	sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 };
 
 // ======================> sns_rom_seta11dsp_device [Faster CPU than ST010]
@@ -116,8 +118,9 @@ public:
 	// construction/destruction
 	sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 };
 
 
@@ -137,8 +140,9 @@ public:
 	// construction/destruction
 	sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -148,8 +152,9 @@ public:
 	// construction/destruction
 	sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -159,8 +164,9 @@ public:
 	// construction/destruction
 	sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -170,8 +176,9 @@ public:
 	// construction/destruction
 	sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -181,8 +188,9 @@ public:
 	// construction/destruction
 	sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -192,8 +200,9 @@ public:
 	// construction/destruction
 	sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -203,8 +212,9 @@ public:
 	// construction/destruction
 	sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 
@@ -214,8 +224,9 @@ public:
 	// construction/destruction
 	sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
 	// device-level overrides
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry *device_rom_region() const override;
 };
 

src/devices/bus/snes_ctrl/bcbattle.cpp

@@ -20,15 +20,10 @@
 DEFINE_DEVICE_TYPE(SNES_BARCODE_BATTLER, snes_bcbattle_device, "snes_bcbattle", "Epoch Barcode Battler (SFC)")
 
 
-MACHINE_CONFIG_START( snes_battler )
+MACHINE_CONFIG_MEMBER( snes_bcbattle_device::device_add_mconfig )
 	MCFG_BARCODE_READER_ADD("battler")
 MACHINE_CONFIG_END
 
-machine_config_constructor snes_bcbattle_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_battler );
-}
-
 
 //-------------------------------------------------
 //  device_timer - handler timer events

src/devices/bus/snes_ctrl/bcbattle.h

@@ -28,14 +28,14 @@ public:
 	// construction/destruction
 	snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	virtual uint8_t read_pin4() override;
 	virtual void write_strobe(uint8_t data) override;
 	virtual void port_poll() override;

src/devices/bus/snes_ctrl/miracle.cpp

@@ -23,18 +23,13 @@
 DEFINE_DEVICE_TYPE(SNES_MIRACLE, snes_miracle_device, "snes_miracle", "Miracle Piano SNES Cable")
 
 
-MACHINE_CONFIG_START( snes_miracle )
+MACHINE_CONFIG_MEMBER( snes_miracle_device::device_add_mconfig )
 	MCFG_MIDI_PORT_ADD("mdin", midiin_slot, "midiin")
 	MCFG_MIDI_RX_HANDLER(WRITELINE(snes_miracle_device, rx_w))
 
 	MCFG_MIDI_PORT_ADD("mdout", midiout_slot, "midiout")
 MACHINE_CONFIG_END
 
-machine_config_constructor snes_miracle_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( snes_miracle );
-}
-
 
 //-------------------------------------------------
 //  device_timer - handler timer events

src/devices/bus/snes_ctrl/miracle.h

@@ -29,8 +29,6 @@ public:
 	// construction/destruction
 	snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	static constexpr device_timer_id TIMER_STROBE_ON = 0;
 
@@ -42,6 +40,8 @@ protected:
 	virtual void device_reset() override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	// serial overrides
 	virtual void rcv_complete() override;    // Rx completed receiving byte
 	virtual void tra_complete() override;    // Tx completed sending byte

src/devices/bus/snes_ctrl/multitap.cpp

@@ -41,7 +41,12 @@ static SLOT_INTERFACE_START( snes_multitap )
 	SLOT_INTERFACE("twintap", SNES_TWINTAP)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START( multi5p )
+
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+MACHINE_CONFIG_MEMBER( snes_multitap_device::device_add_mconfig )
 	MCFG_SNES_CONTROL_PORT_ADD("port1", snes_multitap, "joypad")
 	MCFG_SNES_CONTROL_PORT_ADD("port2", snes_multitap, "joypad")
 	MCFG_SNES_CONTROL_PORT_ADD("port3", snes_multitap, "joypad")
@@ -49,17 +54,6 @@ static MACHINE_CONFIG_START( multi5p )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor snes_multitap_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( multi5p );
-}
-
-
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************

src/devices/bus/snes_ctrl/multitap.h

@@ -27,15 +27,15 @@ public:
 	// construction/destruction
 	snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
-	virtual ioport_constructor device_input_ports() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
+	// optional information overrides
+	virtual ioport_constructor device_input_ports() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
 	// device_snes_control_port_interface overrides
 	virtual uint8_t read_pin4() override;
 	virtual uint8_t read_pin5() override;

src/devices/bus/svi3x8/expander/sv601.cpp

@@ -17,11 +17,10 @@
 DEFINE_DEVICE_TYPE(SV601, sv601_device, "sv601", "SV-601 Super Expander")
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sv601 )
+MACHINE_CONFIG_MEMBER( sv601_device::device_add_mconfig )
 	MCFG_SVI_SLOT_BUS_ADD
 	MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv601_device, int_w))
 	MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv601_device, romdis_w))
@@ -35,11 +34,6 @@ static MACHINE_CONFIG_START( sv601 )
 	MCFG_SVI_SLOT_ADD("6", svi_slot_cards, nullptr)
 MACHINE_CONFIG_END
 
-machine_config_constructor sv601_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv601 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/svi3x8/expander/sv601.h

@@ -44,7 +44,7 @@ public:
 	virtual void bk32_w(int state) override;
 
 protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 
 private:

src/devices/bus/svi3x8/expander/sv602.cpp

@@ -17,11 +17,10 @@
 DEFINE_DEVICE_TYPE(SV602, sv602_device, "sv602", "SV-602 Single Slot Expander")
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sv602 )
+MACHINE_CONFIG_MEMBER( sv602_device::device_add_mconfig )
 	MCFG_SVI_SLOT_BUS_ADD
 	MCFG_SVI_SLOT_INT_HANDLER(WRITELINE(sv602_device, int_w))
 	MCFG_SVI_SLOT_ROMDIS_HANDLER(WRITELINE(sv602_device, romdis_w))
@@ -29,11 +28,6 @@ static MACHINE_CONFIG_START( sv602 )
 	MCFG_SVI_SLOT_ADD("0", sv602_slot_cards, nullptr)
 MACHINE_CONFIG_END
 
-machine_config_constructor sv602_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv602 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/svi3x8/expander/sv602.h

@@ -27,11 +27,6 @@ public:
 	// construction/destruction
 	sv602_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// from slots
-	WRITE_LINE_MEMBER( int_w );
-	WRITE_LINE_MEMBER( romdis_w );
-	WRITE_LINE_MEMBER( ramdis_w );
-
 	// from host
 	virtual DECLARE_READ8_MEMBER( mreq_r ) override;
 	virtual DECLARE_WRITE8_MEMBER( mreq_w ) override;
@@ -44,10 +39,15 @@ public:
 	virtual void bk32_w(int state) override;
 
 protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 
 private:
+	// from slots
+	WRITE_LINE_MEMBER( int_w );
+	WRITE_LINE_MEMBER( romdis_w );
+	WRITE_LINE_MEMBER( ramdis_w );
+
 	required_device<svi_slot_bus_device> m_slotbus;
 };
 

src/devices/bus/svi3x8/expander/sv603.cpp

@@ -34,11 +34,10 @@ const tiny_rom_entry *sv603_device::device_rom_region() const
 }
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sv603 )
+MACHINE_CONFIG_MEMBER( sv603_device::device_add_mconfig )
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 	MCFG_SOUND_ADD("snd", SN76489A, XTAL_10_738635MHz / 3)
 	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
@@ -50,11 +49,6 @@ static MACHINE_CONFIG_START( sv603 )
 	MCFG_SOFTWARE_LIST_ADD("cart_list", "coleco")
 MACHINE_CONFIG_END
 
-machine_config_constructor sv603_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv603 );
-}
-
 
 //**************************************************************************
 //  CARTRIDGE

src/devices/bus/svi3x8/expander/sv603.h

@@ -39,7 +39,7 @@ public:
 
 protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
 

src/devices/bus/svi3x8/slot/sv801.cpp

@@ -18,11 +18,6 @@
 
 DEFINE_DEVICE_TYPE(SV801, sv801_device, "sv801", "SV-801 Disk Controller")
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
 FLOPPY_FORMATS_MEMBER( sv801_device::floppy_formats )
 	FLOPPY_SVI_FORMAT
 FLOPPY_FORMATS_END
@@ -31,7 +26,11 @@ static SLOT_INTERFACE_START( svi_floppies )
 	SLOT_INTERFACE("dd", FLOPPY_525_DD)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START( sv801 )
+//-------------------------------------------------
+//  device_add_mconfig - add device configuration
+//-------------------------------------------------
+
+MACHINE_CONFIG_MEMBER( sv801_device::device_add_mconfig )
 	MCFG_FD1793_ADD("fdc", XTAL_8MHz / 8)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(sv801_device, intrq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(sv801_device, drq_w))
@@ -42,11 +41,6 @@ static MACHINE_CONFIG_START( sv801 )
 	MCFG_SOFTWARE_LIST_ADD("disk_list", "svi318_flop")
 MACHINE_CONFIG_END
 
-machine_config_constructor sv801_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv801 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/svi3x8/slot/sv801.h

@@ -28,22 +28,22 @@ public:
 	// construction/destruction
 	sv801_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	DECLARE_FLOPPY_FORMATS(floppy_formats);
-
 	virtual DECLARE_READ8_MEMBER( iorq_r ) override;
 	virtual DECLARE_WRITE8_MEMBER( iorq_w ) override;
 
-	DECLARE_WRITE_LINE_MEMBER( intrq_w );
-	DECLARE_WRITE_LINE_MEMBER( drq_w );
-
 protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 private:
 	DECLARE_WRITE8_MEMBER( motor_w );
 
+	DECLARE_WRITE_LINE_MEMBER( intrq_w );
+	DECLARE_WRITE_LINE_MEMBER( drq_w );
+
+	DECLARE_FLOPPY_FORMATS(floppy_formats);
+
 	required_device<fd1793_device> m_fdc;
 	required_device<floppy_connector> m_floppy0;
 	required_device<floppy_connector> m_floppy1;

src/devices/bus/svi3x8/slot/sv802.cpp

@@ -17,22 +17,16 @@
 DEFINE_DEVICE_TYPE(SV802, sv802_device, "sv802", "SV-802 Centronics Printer Interface")
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sv802 )
+MACHINE_CONFIG_MEMBER( sv802_device::device_add_mconfig )
 	MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
 	MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(sv802_device, busy_w))
 
 	MCFG_CENTRONICS_OUTPUT_LATCH_ADD("cent_data_out", "centronics")
 MACHINE_CONFIG_END
 
-machine_config_constructor sv802_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv802 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/svi3x8/slot/sv802.h

@@ -31,13 +31,13 @@ public:
 	virtual DECLARE_READ8_MEMBER( iorq_r ) override;
 	virtual DECLARE_WRITE8_MEMBER( iorq_w ) override;
 
-	DECLARE_WRITE_LINE_MEMBER( busy_w );
-
 protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER( busy_w );
+
 	required_device<centronics_device> m_centronics;
 	required_device<output_latch_device> m_cent_data_out;
 

src/devices/bus/svi3x8/slot/sv805.cpp

@@ -17,11 +17,10 @@
 DEFINE_DEVICE_TYPE(SV805, sv805_device, "sv805", "SV-805 RS-232 Interface")
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sv805 )
+MACHINE_CONFIG_MEMBER( sv805_device::device_add_mconfig )
 	MCFG_DEVICE_ADD("uart", INS8250, XTAL_3_072MHz)
 	MCFG_INS8250_OUT_INT_CB(WRITELINE(sv805_device, uart_intr_w))
 	MCFG_INS8250_OUT_TX_CB(DEVWRITELINE("rs232", rs232_port_device, write_txd))
@@ -35,11 +34,6 @@ static MACHINE_CONFIG_START( sv805 )
 	MCFG_RS232_CTS_HANDLER(DEVWRITELINE("uart", ins8250_uart_device, cts_w))
 MACHINE_CONFIG_END
 
-machine_config_constructor sv805_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv805 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/svi3x8/slot/sv805.h

@@ -31,13 +31,13 @@ public:
 	virtual DECLARE_READ8_MEMBER( iorq_r ) override;
 	virtual DECLARE_WRITE8_MEMBER( iorq_w ) override;
 
-	DECLARE_WRITE_LINE_MEMBER( uart_intr_w );
-
 protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER( uart_intr_w );
+
 	required_device<ins8250_device> m_uart;
 	required_device<rs232_port_device> m_rs232;
 };

src/devices/bus/svi3x8/slot/sv806.cpp

@@ -36,11 +36,10 @@ const tiny_rom_entry *sv806_device::device_rom_region() const
 }
 
 //-------------------------------------------------
-//  machine_config_additions - device-specific
+//  device_add_mconfig - add device configuration
-//  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( sv806 )
+MACHINE_CONFIG_MEMBER( sv806_device::device_add_mconfig )
 	MCFG_SCREEN_ADD_MONOCHROME("80col", RASTER, rgb_t::green())
 	MCFG_SCREEN_RAW_PARAMS((XTAL_12MHz / 6) * 8, 864, 0, 640, 317, 0, 192)
 	MCFG_SCREEN_UPDATE_DEVICE("crtc", hd6845_device, screen_update)
@@ -53,11 +52,6 @@ static MACHINE_CONFIG_START( sv806 )
 	MCFG_MC6845_UPDATE_ROW_CB(sv806_device, crtc_update_row)
 MACHINE_CONFIG_END
 
-machine_config_constructor sv806_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( sv806 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/svi3x8/slot/sv806.h

@@ -32,14 +32,14 @@ public:
 	virtual DECLARE_READ8_MEMBER( iorq_r ) override;
 	virtual DECLARE_WRITE8_MEMBER( iorq_w ) override;
 
-	MC6845_UPDATE_ROW(crtc_update_row);
-
 protected:
 	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 
 private:
+	MC6845_UPDATE_ROW(crtc_update_row);
+
 	required_device<hd6845_device> m_crtc;
 	required_device<palette_device> m_palette;
 	required_memory_region m_gfx;

src/devices/bus/ti99/gromport/cartridges.cpp

@@ -389,7 +389,7 @@ void ti99_cartridge_device::device_config_complete()
 /*
     5 GROMs that may be contained in a cartridge
 */
-static MACHINE_CONFIG_START( ti99_cartridge )
+MACHINE_CONFIG_MEMBER( ti99_cartridge_device::device_add_mconfig )
 	MCFG_GROM_ADD( GROM3_TAG, 3, CARTGROM_TAG, 0x0000, WRITELINE(ti99_cartridge_device, ready_line))
 	MCFG_GROM_ADD( GROM4_TAG, 4, CARTGROM_TAG, 0x2000, WRITELINE(ti99_cartridge_device, ready_line))
 	MCFG_GROM_ADD( GROM5_TAG, 5, CARTGROM_TAG, 0x4000, WRITELINE(ti99_cartridge_device, ready_line))
@@ -397,10 +397,6 @@ static MACHINE_CONFIG_START( ti99_cartridge )
 	MCFG_GROM_ADD( GROM7_TAG, 7, CARTGROM_TAG, 0x8000, WRITELINE(ti99_cartridge_device, ready_line))
 MACHINE_CONFIG_END
 
-machine_config_constructor ti99_cartridge_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( ti99_cartridge );
-}
 
 /*
     Memory area for one cartridge. For most cartridges we only need 8 KiB for

src/devices/bus/ti99/gromport/cartridges.h

@@ -83,7 +83,7 @@ public:
 protected:
 	virtual void device_start() override { }
 	virtual void device_config_complete() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry* device_rom_region() const override;
 
 	// Image handling: implementation of methods which are abstract in the parent

src/devices/bus/ti99/gromport/gkracker.cpp

@@ -414,10 +414,6 @@ void ti99_gkracker_device::device_reset()
 	m_grom_selected = false;
 }
 
-static MACHINE_CONFIG_START( gkracker_slot )
-	MCFG_DEVICE_ADD("cartridge", TI99_CART, 0)
-MACHINE_CONFIG_END
-
 /*
     The GRAMKracker ROM
 */
@@ -432,10 +428,9 @@ const tiny_rom_entry *ti99_gkracker_device::device_rom_region() const
 	return ROM_NAME( gkracker_rom );
 }
 
-machine_config_constructor ti99_gkracker_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( ti99_gkracker_device::device_add_mconfig )
-{
+	MCFG_DEVICE_ADD("cartridge", TI99_CART, 0)
-	return MACHINE_CONFIG_NAME( gkracker_slot );
+MACHINE_CONFIG_END
-}
 
 INPUT_PORTS_START(gkracker)
 	PORT_START( GKSWITCH1_TAG )

src/devices/bus/ti99/gromport/gkracker.h

@@ -37,7 +37,7 @@ protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual const tiny_rom_entry* device_rom_region() const override;
 	virtual ioport_constructor device_input_ports() const override;
 

src/devices/bus/ti99/gromport/multiconn.cpp

@@ -296,18 +296,13 @@ void ti99_multi_cart_conn_device::device_reset(void)
 	m_grom_selected = false;
 }
 
-static MACHINE_CONFIG_START( multi_slot )
+MACHINE_CONFIG_MEMBER( ti99_multi_cart_conn_device::device_add_mconfig )
 	MCFG_DEVICE_ADD("cartridge1", TI99_CART, 0)
 	MCFG_DEVICE_ADD("cartridge2", TI99_CART, 0)
 	MCFG_DEVICE_ADD("cartridge3", TI99_CART, 0)
 	MCFG_DEVICE_ADD("cartridge4", TI99_CART, 0)
 MACHINE_CONFIG_END
 
-machine_config_constructor ti99_multi_cart_conn_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( multi_slot );
-}
-
 INPUT_CHANGED_MEMBER( ti99_multi_cart_conn_device::switch_changed )
 {
 	if (TRACE_CHANGE) logerror("Slot changed %d - %d\n", (int)((uint64_t)param & 0x07), newval);

src/devices/bus/ti99/gromport/multiconn.h

@@ -42,7 +42,7 @@ protected:
 
 	virtual void device_start() override;
 	virtual void device_reset() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual ioport_constructor device_input_ports() const override;
 
 private:

src/devices/bus/ti99/gromport/singleconn.cpp

@@ -83,14 +83,9 @@ void ti99_single_cart_conn_device::device_reset()
 	m_cartridge->set_slot(0);
 }
 
-static MACHINE_CONFIG_START( single_slot )
+MACHINE_CONFIG_MEMBER( ti99_single_cart_conn_device::device_add_mconfig )
 	MCFG_DEVICE_ADD("cartridge", TI99_CART, 0)
 MACHINE_CONFIG_END
 
-machine_config_constructor ti99_single_cart_conn_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( single_slot );
-}
-
 } } } // end namespace bus::ti99::gromport
 

src/devices/bus/ti99/gromport/singleconn.h

@@ -32,7 +32,7 @@ public:
 protected:
 	virtual void device_start() override;
 	virtual void device_reset() override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 private:
 	ti99_cartridge_device *m_cartridge;

src/devices/bus/ti99/internal/998board.cpp

@@ -1009,18 +1009,13 @@ void mainboard8_device::device_reset()
 	m_space = &cpu->space(AS_PROGRAM);
 }
 
-MACHINE_CONFIG_START( ti998_mainboard )
+MACHINE_CONFIG_MEMBER( mainboard8_device::device_add_mconfig )
 	MCFG_DEVICE_ADD(TI998_VAQUERRO_TAG, TI99_VAQUERRO, 0)
 	MCFG_DEVICE_ADD(TI998_MOFETTA_TAG, TI99_MOFETTA, 0)
 	MCFG_DEVICE_ADD(TI998_AMIGO_TAG, TI99_AMIGO, 0)
 	MCFG_DEVICE_ADD(TI998_OSO_TAG, TI99_OSO, 0)
 MACHINE_CONFIG_END
 
-machine_config_constructor mainboard8_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( ti998_mainboard );
-}
-
 /***************************************************************************
   ===== VAQUERRO: Logical Address Space decoder =====
 

src/devices/bus/ti99/internal/998board.h

@@ -498,7 +498,7 @@ public:
 protected:
 	void device_start() override;
 	void device_reset() override;
-	machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 private:
 	// Holds the state of the A14 line

src/devices/bus/ti99/peb/bwg.cpp

@@ -688,7 +688,12 @@ static SLOT_INTERFACE_START( bwg_floppies )
 	SLOT_INTERFACE( "35dd", FLOPPY_35_DD )          // 80 tracks
 SLOT_INTERFACE_END
 
-MACHINE_CONFIG_START( bwg_fdc )
+ROM_START( bwg_fdc )
+	ROM_REGION(0x8000, TI99_DSRROM, 0)
+	ROM_LOAD("bwg_dsr.u15", 0x0000, 0x8000, CRC(06f1ec89) SHA1(6ad77033ed268f986d9a5439e65f7d391c4b7651)) /* BwG disk DSR ROM */
+ROM_END
+
+MACHINE_CONFIG_MEMBER( snug_bwg_device::device_add_mconfig )
 	MCFG_WD1773_ADD(FDC_TAG, XTAL_8MHz)
 	MCFG_WD_FDC_INTRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_irq_w))
 	MCFG_WD_FDC_DRQ_CALLBACK(WRITELINE(snug_bwg_device, fdc_drq_w))
@@ -711,16 +716,6 @@ MACHINE_CONFIG_START( bwg_fdc )
 	MCFG_RAM_DEFAULT_VALUE(0)
 MACHINE_CONFIG_END
 
-ROM_START( bwg_fdc )
-	ROM_REGION(0x8000, TI99_DSRROM, 0)
-	ROM_LOAD("bwg_dsr.u15", 0x0000, 0x8000, CRC(06f1ec89) SHA1(6ad77033ed268f986d9a5439e65f7d391c4b7651)) /* BwG disk DSR ROM */
-ROM_END
-
-machine_config_constructor snug_bwg_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( bwg_fdc );
-}
-
 ioport_constructor snug_bwg_device::device_input_ports() const
 {
 	return INPUT_PORTS_NAME( bwg_fdc );

src/devices/bus/ti99/peb/bwg.h

@@ -36,23 +36,23 @@ public:
 	DECLARE_READ8Z_MEMBER(crureadz) override;
 	DECLARE_WRITE8_MEMBER(cruwrite) override;
 
-	DECLARE_FLOPPY_FORMATS( floppy_formats );
-
-	DECLARE_WRITE_LINE_MEMBER( fdc_irq_w );
-	DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
-
 protected:
 	void device_start() override;
 	void device_reset() override;
 	void device_config_complete() override;
 
 	const tiny_rom_entry *device_rom_region() const override;
-	machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 	ioport_constructor device_input_ports() const override;
 
 private:
 	void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
+	DECLARE_FLOPPY_FORMATS( floppy_formats );
+
+	DECLARE_WRITE_LINE_MEMBER( fdc_irq_w );
+	DECLARE_WRITE_LINE_MEMBER( fdc_drq_w );
+
 	// Debugger accessors
 	void debug_read(offs_t offset, uint8_t* value);
 	void debug_write(offs_t offset, uint8_t data);

src/devices/bus/ti99/peb/evpc.cpp

@@ -443,23 +443,6 @@ ROM_START( ti99_evpc )
 	ROM_LOAD("evpc_dsr.u21", 0, 0x10000, CRC(a062b75d) SHA1(6e8060f86e3bb9c36f244d88825e3fe237bfe9a9)) /* evpc DSR ROM */
 ROM_END
 
-MACHINE_CONFIG_START( ti99_evpc )
-	// video hardware
-	MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL_21_4772MHz)  /* typical 9938 clock, not verified */
-	MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in))
-	MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL_21_4772MHz)
-
-	// Sound hardware
-	MCFG_SPEAKER_STANDARD_MONO("sound_out")
-	MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
-	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
-	MCFG_SN76496_READY_HANDLER( WRITELINE(snug_enhanced_video_device, ready_line) )
-
-	// Mouse connected to the color bus of the v9938
-	MCFG_COLORBUS_MOUSE_ADD( COLORBUS_TAG )
-
-MACHINE_CONFIG_END
-
 /*
     Input ports for the EPVC
 */
@@ -495,9 +478,21 @@ ioport_constructor snug_enhanced_video_device::device_input_ports() const
 	return INPUT_PORTS_NAME(ti99_evpc);
 }
 
-machine_config_constructor snug_enhanced_video_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( snug_enhanced_video_device::device_add_mconfig )
-{
+	// video hardware
-	return MACHINE_CONFIG_NAME( ti99_evpc );
+	MCFG_V9938_ADD(TI_VDP_TAG, TI_SCREEN_TAG, 0x20000, XTAL_21_4772MHz)  /* typical 9938 clock, not verified */
-}
+	MCFG_V99X8_INTERRUPT_CALLBACK(WRITELINE(snug_enhanced_video_device, video_interrupt_in))
+	MCFG_V99X8_SCREEN_ADD_NTSC(TI_SCREEN_TAG, TI_VDP_TAG, XTAL_21_4772MHz)
+
+	// Sound hardware
+	MCFG_SPEAKER_STANDARD_MONO("sound_out")
+	MCFG_SOUND_ADD(TI_SOUNDCHIP_TAG, SN94624, 3579545/8) /* 3.579545 MHz */
+	MCFG_SOUND_ROUTE(ALL_OUTPUTS, "sound_out", 0.75)
+	MCFG_SN76496_READY_HANDLER( WRITELINE(snug_enhanced_video_device, ready_line) )
+
+	// Mouse connected to the color bus of the v9938
+	MCFG_COLORBUS_MOUSE_ADD( COLORBUS_TAG )
+
+MACHINE_CONFIG_END
 
 } } } // end namespace bus::ti99::peb

src/devices/bus/ti99/peb/evpc.h

@@ -34,11 +34,8 @@ public:
 	DECLARE_WRITE8_MEMBER(write) override;
 	DECLARE_SETADDRESS_DBIN_MEMBER(setaddress_dbin) override;
 
-	DECLARE_WRITE_LINE_MEMBER( ready_line );
-
 	DECLARE_READ8Z_MEMBER(crureadz) override;
 	DECLARE_WRITE8_MEMBER(cruwrite) override;
-	DECLARE_WRITE_LINE_MEMBER( video_interrupt_in );
 
 	TIMER_DEVICE_CALLBACK_MEMBER( hblank_interrupt );
 
@@ -58,13 +55,17 @@ protected:
 
 	virtual const tiny_rom_entry *device_rom_region() const override;
 	virtual ioport_constructor device_input_ports() const override;
-	machine_config_constructor device_mconfig_additions() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	void nvram_default() override;
 	void nvram_read(emu_file &file) override;
 	void nvram_write(emu_file &file) override;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER( ready_line );
+
+	DECLARE_WRITE_LINE_MEMBER( video_interrupt_in );
+
 	int     m_address;
 	int     m_dsr_page;
 	bool    m_inDsrArea;

src/devices/bus/ti99/peb/hfdc.cpp

@@ -1065,7 +1065,13 @@ static SLOT_INTERFACE_START( hfdc_harddisks )
 	SLOT_INTERFACE( "st251", MFMHD_ST251 )        // Seagate ST-251 (40 MB)
 SLOT_INTERFACE_END
 
-MACHINE_CONFIG_START( ti99_hfdc )
+ROM_START( ti99_hfdc )
+	ROM_REGION(0x4000, TI99_DSRROM, 0)
+	ROM_LOAD("hfdc_dsr.u34", 0x0000, 0x4000, CRC(66fbe0ed) SHA1(11df2ecef51de6f543e4eaf8b2529d3e65d0bd59)) /* HFDC disk DSR ROM */
+ROM_END
+
+
+MACHINE_CONFIG_MEMBER( myarc_hfdc_device::device_add_mconfig )
 	MCFG_DEVICE_ADD(FDC_TAG, HDC9234, 0)
 	MCFG_HDC92X4_INTRQ_CALLBACK(WRITELINE(myarc_hfdc_device, intrq_w))
 	MCFG_HDC92X4_DIP_CALLBACK(WRITELINE(myarc_hfdc_device, dip_w))
@@ -1097,17 +1103,6 @@ MACHINE_CONFIG_START( ti99_hfdc )
 	MCFG_RAM_DEFAULT_VALUE(0)
 MACHINE_CONFIG_END
 
-ROM_START( ti99_hfdc )
-	ROM_REGION(0x4000, TI99_DSRROM, 0)
-	ROM_LOAD("hfdc_dsr.u34", 0x0000, 0x4000, CRC(66fbe0ed) SHA1(11df2ecef51de6f543e4eaf8b2529d3e65d0bd59)) /* HFDC disk DSR ROM */
-ROM_END
-
-
-machine_config_constructor myarc_hfdc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( ti99_hfdc );
-}
-
 const tiny_rom_entry *myarc_hfdc_device::device_rom_region() const
 {
 	return ROM_NAME( ti99_hfdc );