another fifty device_mconfig_additions out of the way (nw)

src/devices/bus/spc1000/fdd.cpp

@@ -73,10 +73,14 @@ static SLOT_INTERFACE_START( sd725_floppies )
 	SLOT_INTERFACE("sd320", EPSON_SD_320)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START(spc1000_fdd)
+//-------------------------------------------------
+//  device_add_mconfig
+//-------------------------------------------------
 
-	/* sub CPU(5 inch floppy drive) */
+MACHINE_CONFIG_MEMBER( spc1000_fdd_exp_device::device_add_mconfig )
-	MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz)       /* 4 MHz */
+
+	// sub CPU (5 inch floppy drive)
+	MCFG_CPU_ADD("fdccpu", Z80, XTAL_4MHz)
 	MCFG_CPU_PROGRAM_MAP(sd725_mem)
 	MCFG_CPU_IO_MAP(sd725_io)
 
@@ -96,15 +100,6 @@ static MACHINE_CONFIG_START(spc1000_fdd)
 	MCFG_FLOPPY_DRIVE_ADD("upd765:1", sd725_floppies, "sd320", floppy_image_device::default_floppy_formats)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  device_mconfig_additions
-//-------------------------------------------------
-
-machine_config_constructor spc1000_fdd_exp_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( spc1000_fdd );
-}
-
 ROM_START( spc1000_fdd )
 	ROM_REGION(0x10000, "fdccpu", 0)
 	ROM_LOAD("sd725a.bin", 0x0000, 0x1000, CRC(96ac2eb8) SHA1(8e9d8f63a7fb87af417e95603e71cf537a6e83f1))

src/devices/bus/spc1000/fdd.h

@@ -22,21 +22,21 @@ public:
 	// construction/destruction
 	spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
+	// not really public
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	DECLARE_READ8_MEMBER(tc_r);
-	virtual const tiny_rom_entry *device_rom_region() const override;
+	DECLARE_WRITE8_MEMBER(control_w);
 
-public:
+protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 	virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
 
 	virtual DECLARE_READ8_MEMBER(read) override;
 	virtual DECLARE_WRITE8_MEMBER(write) override;
 
-	DECLARE_READ8_MEMBER(tc_r);
-	DECLARE_WRITE8_MEMBER(control_w);
 	DECLARE_WRITE8_MEMBER(i8255_b_w);
 	DECLARE_READ8_MEMBER(i8255_c_r);
 	DECLARE_WRITE8_MEMBER(i8255_c_w);

src/devices/bus/spc1000/vdp.cpp

@@ -19,7 +19,11 @@ WRITE_LINE_MEMBER(spc1000_vdp_exp_device::vdp_interrupt)
 	// nothing here?
 }
 
-static MACHINE_CONFIG_START(scp1000_vdp)
+//-------------------------------------------------
+//  device_add_mconfig
+//-------------------------------------------------
+
+MACHINE_CONFIG_MEMBER(spc1000_vdp_exp_device::device_add_mconfig)
 
 	MCFG_DEVICE_ADD("tms", TMS9928A, XTAL_10_738635MHz / 2) // TODO: which clock?
 	MCFG_TMS9928A_VRAM_SIZE(0x4000)
@@ -28,15 +32,6 @@ static MACHINE_CONFIG_START(scp1000_vdp)
 	MCFG_SCREEN_UPDATE_DEVICE("tms", tms9928a_device, screen_update)
 MACHINE_CONFIG_END
 
-//-------------------------------------------------
-//  device_mconfig_additions
-//-------------------------------------------------
-
-machine_config_constructor spc1000_vdp_exp_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( scp1000_vdp );
-}
-
 
 //**************************************************************************
 //  GLOBAL VARIABLES

src/devices/bus/spc1000/vdp.h

@@ -21,13 +21,11 @@ public:
 	// construction/destruction
 	spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
+protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
-
-public:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	virtual DECLARE_READ8_MEMBER(read) override;
 	virtual DECLARE_WRITE8_MEMBER(write) override;

src/devices/bus/tiki100/8088.cpp

@@ -65,24 +65,13 @@ ADDRESS_MAP_END
 //  MACHINE_CONFIG_START( tiki100_8088 )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( tiki100_8088 )
+MACHINE_CONFIG_MEMBER( tiki100_8088_device::device_add_mconfig )
 	MCFG_CPU_ADD(I8088_TAG, I8088, 6000000)
 	MCFG_CPU_PROGRAM_MAP(i8088_mem)
 	MCFG_CPU_IO_MAP(i8088_io)
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor tiki100_8088_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( tiki100_8088 );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/tiki100/8088.h

@@ -29,10 +29,6 @@ public:
 	// construction/destruction
 	tiki100_8088_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;
-
 	DECLARE_READ8_MEMBER( read );
 	DECLARE_WRITE8_MEMBER( write );
 
@@ -40,6 +36,8 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_tiki100bus_card_interface overrides
 	virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override;

src/devices/bus/tiki100/hdc.cpp

@@ -30,7 +30,7 @@ DEFINE_DEVICE_TYPE(TIKI100_HDC, tiki100_hdc_device, "tiki100_hdc", "TIKI-100 Win
 //  MACHINE_CONFIG_START( tiki100_hdc )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( tiki100_hdc )
+MACHINE_CONFIG_MEMBER( tiki100_hdc_device::device_add_mconfig )
 	MCFG_DEVICE_ADD(WD1010_TAG, WD2010, 5000000)
 	//MCFG_WD2010_OUT_INTRQ_CB()
 	MCFG_WD2010_IN_DRDY_CB(VCC)
@@ -44,17 +44,6 @@ static MACHINE_CONFIG_START( tiki100_hdc )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor tiki100_hdc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( tiki100_hdc );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/tiki100/hdc.h

@@ -29,13 +29,11 @@ public:
 	// construction/destruction
 	tiki100_hdc_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;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_tiki100bus_card_interface overrides
 	virtual uint8_t iorq_r(address_space &space, offs_t offset, uint8_t data) override;

src/devices/bus/tvc/hbf.cpp

@@ -22,12 +22,6 @@ static SLOT_INTERFACE_START( tvc_hbf_floppies )
 	SLOT_INTERFACE( "525qd", FLOPPY_525_QD )
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START(tvc_hbf)
-	MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
-	MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
-	MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
-MACHINE_CONFIG_END
-
 ROM_START( tvc_hbf )
 	ROM_REGION(0x4000, "hbf", 0)
 	ROM_DEFAULT_BIOS("basic")
@@ -86,13 +80,15 @@ void tvc_hbf_device::device_reset()
 }
 
 //-------------------------------------------------
-//  device_mconfig_additions
+//  device_add_mconfig
 //-------------------------------------------------
 
-machine_config_constructor tvc_hbf_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER(tvc_hbf_device::device_add_mconfig)
-{
+	MCFG_FD1793_ADD("fdc", XTAL_16MHz / 16)
-	return MACHINE_CONFIG_NAME( tvc_hbf );
+	MCFG_FLOPPY_DRIVE_ADD("fdc:0", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
-}
+	MCFG_FLOPPY_DRIVE_ADD("fdc:1", tvc_hbf_floppies, "525qd", tvc_hbf_device::floppy_formats)
+MACHINE_CONFIG_END
+
 
 //-------------------------------------------------
 //  device_rom_region

src/devices/bus/tvc/hbf.h

@@ -24,16 +24,12 @@ public:
 	// construction/destruction
 	tvc_hbf_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;
-
-	DECLARE_FLOPPY_FORMATS( floppy_formats );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 
 	// tvcexp_interface overrides
 	virtual uint8_t id_r() override { return 0x02; } // ID_A to GND, ID_B to VCC
@@ -43,6 +39,8 @@ protected:
 	virtual DECLARE_WRITE8_MEMBER(io_write) override;
 
 private:
+	DECLARE_FLOPPY_FORMATS( floppy_formats );
+
 	// internal state
 	required_device<fd1793_device>   m_fdc;
 

src/devices/bus/vip/vp550.cpp

@@ -50,7 +50,7 @@ DEFINE_DEVICE_TYPE(VP550, vp550_device, "vp550", "VP-550 Super Sound")
 //  MACHINE_CONFIG_START( vp550 )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( vp550 )
+MACHINE_CONFIG_MEMBER( vp550_device::device_add_mconfig )
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
 	MCFG_CDP1863_ADD(CDP1863_A_TAG, 0, 0)
@@ -61,17 +61,6 @@ static MACHINE_CONFIG_START( vp550 )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor vp550_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( vp550 );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE
@@ -85,7 +74,8 @@ vp550_device::vp550_device(const machine_config &mconfig, const char *tag, devic
 	device_t(mconfig, VP550, tag, owner, clock),
 	device_vip_expansion_card_interface(mconfig, *this),
 	m_pfg_a(*this, CDP1863_A_TAG),
-	m_pfg_b(*this, CDP1863_B_TAG), m_sync_timer(nullptr)
+	m_pfg_b(*this, CDP1863_B_TAG),
+	m_sync_timer(nullptr)
 {
 }
 

src/devices/bus/vip/vp550.h

@@ -29,19 +29,11 @@ public:
 	// construction/destruction
 	vp550_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;
-
-	// not really public
-	DECLARE_WRITE8_MEMBER( octave_w );
-	DECLARE_WRITE8_MEMBER( vlmna_w );
-	DECLARE_WRITE8_MEMBER( vlmnb_w );
-	DECLARE_WRITE8_MEMBER( sync_w );
-
 protected:
 	// device-level overrides
 	virtual void device_start() 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;
 
 	// device_vip_expansion_card_interface overrides
 	virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
@@ -50,6 +42,11 @@ protected:
 	virtual void vip_run_w(int state) override;
 
 private:
+	DECLARE_WRITE8_MEMBER( octave_w );
+	DECLARE_WRITE8_MEMBER( vlmna_w );
+	DECLARE_WRITE8_MEMBER( vlmnb_w );
+	DECLARE_WRITE8_MEMBER( sync_w );
+
 	required_device<cdp1863_device> m_pfg_a;
 	required_device<cdp1863_device> m_pfg_b;
 

src/devices/bus/vip/vp575.cpp

@@ -45,7 +45,7 @@ void vp575_device::update_interrupts()
 //  MACHINE_CONFIG_START( vp575 )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( vp575 )
+MACHINE_CONFIG_MEMBER( vp575_device::device_add_mconfig )
 	MCFG_VIP_EXPANSION_SLOT_ADD("exp1", XTAL_3_52128MHz/2, vip_expansion_cards, nullptr)
 	MCFG_VIP_EXPANSION_SLOT_INT_CALLBACK(WRITELINE(vp575_device, exp1_int_w))
 	MCFG_VIP_EXPANSION_SLOT_DMA_OUT_CALLBACK(WRITELINE(vp575_device, exp1_dma_out_w))
@@ -73,17 +73,6 @@ static MACHINE_CONFIG_START( vp575 )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor vp575_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( vp575 );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/vip/vp575.h

@@ -28,10 +28,29 @@ public:
 	// construction/destruction
 	vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	// optional information overrides
+protected:
-	virtual machine_config_constructor device_mconfig_additions() const override;
+	// device-level overrides
+	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+
+	// device_vip_expansion_card_interface overrides
+	virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
+	virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
+	virtual uint8_t vip_io_r(address_space &space, offs_t offset) override;
+	virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
+	virtual uint8_t vip_dma_r(address_space &space, offs_t offset) override;
+	virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override;
+	virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
+	virtual int vip_ef1_r() override;
+	virtual int vip_ef3_r() override;
+	virtual int vip_ef4_r() override;
+	virtual void vip_sc_w(int data) override;
+	virtual void vip_q_w(int state) override;
+	virtual void vip_run_w(int state) override;
+
+private:
+	static constexpr unsigned MAX_SLOTS = 5;
 
-	// not really public
 	DECLARE_WRITE_LINE_MEMBER( exp1_int_w ) { m_int[0] = state; update_interrupts(); }
 	DECLARE_WRITE_LINE_MEMBER( exp2_int_w ) { m_int[1] = state; update_interrupts(); }
 	DECLARE_WRITE_LINE_MEMBER( exp3_int_w ) { m_int[2] = state; update_interrupts(); }
@@ -52,28 +71,6 @@ public:
 
 	void update_interrupts();
 
-protected:
-	// device-level overrides
-	virtual void device_start() override;
-
-	// device_vip_expansion_card_interface overrides
-	virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override;
-	virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
-	virtual uint8_t vip_io_r(address_space &space, offs_t offset) override;
-	virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;
-	virtual uint8_t vip_dma_r(address_space &space, offs_t offset) override;
-	virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override;
-	virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override;
-	virtual int vip_ef1_r() override;
-	virtual int vip_ef3_r() override;
-	virtual int vip_ef4_r() override;
-	virtual void vip_sc_w(int data) override;
-	virtual void vip_q_w(int state) override;
-	virtual void vip_run_w(int state) override;
-
-private:
-	static constexpr unsigned MAX_SLOTS = 5;
-
 	required_device_array<vip_expansion_slot_device, MAX_SLOTS> m_expansion_slot;
 
 	int m_int[MAX_SLOTS];

src/devices/bus/vip/vp590.cpp

@@ -53,7 +53,7 @@ READ_LINE_MEMBER( vp590_device::gd_r )
 //  MACHINE_CONFIG_START( vp590 )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( vp590 )
+MACHINE_CONFIG_MEMBER( vp590_device::device_add_mconfig )
 	MCFG_DEVICE_ADD(CDP1862_TAG, CDP1862, CPD1862_CLOCK)
 	MCFG_CDP1861_RD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, rd_r))
 	MCFG_CDP1861_BD_CALLBACK(DEVREADLINE(DEVICE_SELF, vp590_device, bd_r))
@@ -64,17 +64,6 @@ static MACHINE_CONFIG_START( vp590 )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor vp590_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( vp590 );
-}
-
-
 //-------------------------------------------------
 //  INPUT_PORTS( vp590 )
 //-------------------------------------------------

src/devices/bus/vip/vp590.h

@@ -30,18 +30,11 @@ public:
 	// construction/destruction
 	vp590_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_READ_LINE_MEMBER( rd_r );
-	DECLARE_READ_LINE_MEMBER( bd_r );
-	DECLARE_READ_LINE_MEMBER( gd_r );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual ioport_constructor device_input_ports() const override;
 
 	// device_vip_expansion_card_interface overrides
 	virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override;
@@ -52,6 +45,10 @@ protected:
 	virtual int vip_ef4_r() override;
 
 private:
+	DECLARE_READ_LINE_MEMBER( rd_r );
+	DECLARE_READ_LINE_MEMBER( bd_r );
+	DECLARE_READ_LINE_MEMBER( gd_r );
+
 	required_device<cdp1862_device> m_cgc;
 	optional_shared_ptr<uint8_t> m_color_ram;
 	required_ioport m_j1;

src/devices/bus/vip/vp595.cpp

@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(VP595, vp595_device, "vp595", "VP-595 Simple Sound")
 //  MACHINE_CONFIG_START( vp595 )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( vp595 )
+MACHINE_CONFIG_MEMBER( vp595_device::device_add_mconfig )
 	MCFG_SPEAKER_STANDARD_MONO("mono")
 
 	MCFG_CDP1863_ADD(CDP1863_TAG, 0, CDP1863_XTAL)
@@ -41,17 +41,6 @@ static MACHINE_CONFIG_START( vp595 )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor vp595_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( vp595 );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/vip/vp595.h

@@ -29,12 +29,10 @@ public:
 	// construction/destruction
 	vp595_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_add_mconfig(machine_config &config) override;
 
 	// device_vip_expansion_card_interface overrides
 	virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override;

src/devices/bus/vip/vp620.cpp

@@ -36,23 +36,12 @@ void vp620_device::kb_w(uint8_t data)
 //  MACHINE_CONFIG_START( vp620 )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( vp620 )
+MACHINE_CONFIG_MEMBER( vp620_device::device_add_mconfig )
 	MCFG_DEVICE_ADD("keyboard", GENERIC_KEYBOARD, 0)
 	MCFG_GENERIC_KEYBOARD_CB(PUT(vp620_device, kb_w))
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor vp620_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( vp620 );
-}
-
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/vip/vp620.h

@@ -29,21 +29,18 @@ public:
 	// construction/destruction
 	vp620_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;
-
-	// not really public
-	void kb_w(uint8_t data);
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_vip_byteio_port_interface overrides
 	virtual uint8_t vip_in_r() override;
 	virtual int vip_ef4_r() override;
 
 private:
+	void kb_w(uint8_t data);
+
 	uint8_t m_keydata;
 	int m_keystb;
 };

src/devices/bus/vtech/ioexp/printer.cpp

@@ -24,17 +24,12 @@ DEFINE_DEVICE_TYPE(VTECH_PRINTER_INTERFACE, vtech_printer_interface_device, "vte
 //  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( printer_interface )
+MACHINE_CONFIG_MEMBER( vtech_printer_interface_device::device_add_mconfig )
 	MCFG_CENTRONICS_ADD("centronics", centronics_devices, "printer")
 	MCFG_CENTRONICS_BUSY_HANDLER(WRITELINE(vtech_printer_interface_device, busy_w))
 	MCFG_CENTRONICS_OUTPUT_LATCH_ADD("latch", "centronics")
 MACHINE_CONFIG_END
 
-machine_config_constructor vtech_printer_interface_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( printer_interface );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/vtech/ioexp/printer.h

@@ -29,16 +29,16 @@ public:
 	// construction/destruction
 	vtech_printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	DECLARE_WRITE_LINE_MEMBER( busy_w );
-	DECLARE_READ8_MEMBER( busy_r );
-	DECLARE_WRITE8_MEMBER( strobe_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_WRITE_LINE_MEMBER( busy_w );
+	DECLARE_READ8_MEMBER( busy_r );
+	DECLARE_WRITE8_MEMBER( strobe_w );
+
 	required_device<centronics_device> m_centronics;
 	required_device<output_latch_device> m_latch;
 

src/devices/bus/vtech/memexp/floppy.cpp

@@ -49,16 +49,12 @@ static SLOT_INTERFACE_START( laser_floppies )
 	SLOT_INTERFACE("525", FLOPPY_525_SSSD)
 SLOT_INTERFACE_END
 
-static MACHINE_CONFIG_START( floppy_controller )
+MACHINE_CONFIG_MEMBER( vtech_floppy_controller_device::device_add_mconfig )
 	MCFG_MEMEXP_SLOT_ADD("mem")
 	MCFG_FLOPPY_DRIVE_ADD("0", laser_floppies, "525", floppy_image_device::default_floppy_formats)
 	MCFG_FLOPPY_DRIVE_ADD("1", laser_floppies, "525", floppy_image_device::default_floppy_formats)
 MACHINE_CONFIG_END
 
-machine_config_constructor vtech_floppy_controller_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( floppy_controller );
-}
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/vtech/memexp/floppy.h

@@ -30,6 +30,13 @@ public:
 	// construction/destruction
 	vtech_floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
+protected:
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual void device_start() override;
+	virtual void device_reset() override;
+
+private:
 	DECLARE_ADDRESS_MAP(map, 8);
 
 	DECLARE_WRITE8_MEMBER(latch_w);
@@ -37,12 +44,6 @@ public:
 	DECLARE_READ8_MEMBER(rd_r);
 	DECLARE_READ8_MEMBER(wpt_r);
 
-protected:
-	virtual const tiny_rom_entry *device_rom_region() const override;
-	virtual machine_config_constructor device_mconfig_additions() const override;
-	virtual void device_start() override;
-	virtual void device_reset() override;
-
 	void index_callback(floppy_image_device *floppy, int state);
 	void update_latching_inverter();
 	void flush_writes(bool keep_margin = false);

src/devices/bus/vtech/memexp/rs232.cpp

@@ -35,16 +35,11 @@ const tiny_rom_entry *vtech_rs232_interface_device::device_rom_region() const
 //  machine configurations
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( rs232 )
+MACHINE_CONFIG_MEMBER( vtech_rs232_interface_device::device_add_mconfig )
 	MCFG_RS232_PORT_ADD("rs232", default_rs232_devices, nullptr)
 	MCFG_RS232_RXD_HANDLER(WRITELINE(vtech_rs232_interface_device, rs232_rx_w))
 MACHINE_CONFIG_END
 
-machine_config_constructor vtech_rs232_interface_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( rs232 );
-}
-
 
 //**************************************************************************
 //  LIVE DEVICE

src/devices/bus/vtech/memexp/rs232.h

@@ -27,17 +27,17 @@ public:
 	// construction/destruction
 	vtech_rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	DECLARE_WRITE_LINE_MEMBER( rs232_rx_w );
-	DECLARE_READ8_MEMBER( receive_data_r );
-	DECLARE_WRITE8_MEMBER( transmit_data_w );
-
 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;
 
 private:
+	DECLARE_WRITE_LINE_MEMBER( rs232_rx_w );
+	DECLARE_READ8_MEMBER( receive_data_r );
+	DECLARE_WRITE8_MEMBER( transmit_data_w );
+
 	required_device<rs232_port_device> m_rs232;
 
 	int m_rx;

src/devices/bus/wangpc/lic.cpp

@@ -46,23 +46,13 @@ const tiny_rom_entry *wangpc_lic_device::device_rom_region() const
 }
 
 
-//-------------------------------------------------
-//  MACHINE_CONFIG_START( wangpc_lic )
-//-------------------------------------------------
-
-static MACHINE_CONFIG_START( wangpc_lic )
-MACHINE_CONFIG_END
-
-
 //-------------------------------------------------
 //  machine_config_additions - device-specific
 //  machine configurations
 //-------------------------------------------------
 
-machine_config_constructor wangpc_lic_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER( wangpc_lic_device::device_add_mconfig )
-{
+MACHINE_CONFIG_END
-	return MACHINE_CONFIG_NAME( wangpc_lic );
-}
 
 
 

src/devices/bus/wangpc/lic.h

@@ -28,14 +28,12 @@ public:
 	// construction/destruction
 	wangpc_lic_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;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;

src/devices/bus/wangpc/lvc.cpp

@@ -116,7 +116,7 @@ WRITE_LINE_MEMBER( wangpc_lvc_device::vsync_w )
 //  MACHINE_CONFIG_START( wangpc_lvc )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( wangpc_lvc )
+MACHINE_CONFIG_MEMBER( wangpc_lvc_device::device_add_mconfig )
 	MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
 	MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
 	MCFG_SCREEN_SIZE(80*8, 25*9)
@@ -132,17 +132,6 @@ static MACHINE_CONFIG_START( wangpc_lvc )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor wangpc_lvc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( wangpc_lvc );
-}
-
-
 
 //**************************************************************************
 //  INLINE HELPERS

src/devices/bus/wangpc/lvc.h

@@ -29,17 +29,11 @@ public:
 	// construction/destruction
 	wangpc_lvc_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;
-
-	// not really public
-	MC6845_UPDATE_ROW( crtc_update_row );
-	DECLARE_WRITE_LINE_MEMBER( vsync_w );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
@@ -48,6 +42,9 @@ protected:
 	virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
 
 private:
+	MC6845_UPDATE_ROW( crtc_update_row );
+	DECLARE_WRITE_LINE_MEMBER( vsync_w );
+
 	inline void set_irq(int state);
 
 	required_device<mc6845_device> m_crtc;

src/devices/bus/wangpc/mcc.cpp

@@ -55,23 +55,12 @@ DEFINE_DEVICE_TYPE(WANGPC_MCC, wangpc_mcc_device, "wangpc_mcc", "Wang PC-PM043 M
 //  MACHINE_CONFIG_START( wangpc_mcc )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( wangpc_mcc )
+MACHINE_CONFIG_MEMBER( wangpc_mcc_device::device_add_mconfig )
 	MCFG_Z80SIO2_ADD(Z80SIO2_TAG, 4000000, 0, 0, 0, 0)
 	MCFG_Z80DART_ADD(Z80DART_TAG, 4000000, 0, 0, 0, 0)
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor wangpc_mcc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( wangpc_mcc );
-}
-
-
 
 //**************************************************************************
 //  INLINE HELPERS

src/devices/bus/wangpc/mcc.h

@@ -29,13 +29,11 @@ public:
 	// construction/destruction
 	wangpc_mcc_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;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;

src/devices/bus/wangpc/mvc.cpp

@@ -136,7 +136,7 @@ WRITE_LINE_MEMBER( wangpc_mvc_device::vsync_w )
 //  MACHINE_CONFIG_START( wangpc_mvc )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( wangpc_mvc )
+MACHINE_CONFIG_MEMBER( wangpc_mvc_device::device_add_mconfig )
 	MCFG_SCREEN_ADD(SCREEN_TAG, RASTER)
 	MCFG_SCREEN_UPDATE_DEVICE(MC6845_TAG, mc6845_device, screen_update)
 	MCFG_SCREEN_SIZE(80*10, 25*12)
@@ -152,17 +152,6 @@ static MACHINE_CONFIG_START( wangpc_mvc )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor wangpc_mvc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( wangpc_mvc );
-}
-
-
 
 //**************************************************************************
 //  INLINE HELPERS

src/devices/bus/wangpc/mvc.h

@@ -29,17 +29,11 @@ public:
 	// construction/destruction
 	wangpc_mvc_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;
-
-	// not really public
-	MC6845_UPDATE_ROW( crtc_update_row );
-	DECLARE_WRITE_LINE_MEMBER( vsync_w );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
@@ -48,6 +42,9 @@ protected:
 	virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override;
 
 private:
+	MC6845_UPDATE_ROW( crtc_update_row );
+	DECLARE_WRITE_LINE_MEMBER( vsync_w );
+
 	inline void set_irq(int state);
 
 	required_device<mc6845_device> m_crtc;

src/devices/bus/wangpc/rtc.cpp

@@ -103,7 +103,7 @@ static const z80_daisy_config wangpc_rtc_daisy_chain[] =
 //  MACHINE_CONFIG_START( wangpc_rtc )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( wangpc_rtc )
+MACHINE_CONFIG_MEMBER( wangpc_rtc_device::device_add_mconfig )
 	MCFG_CPU_ADD(Z80_TAG, Z80, 2000000)
 	MCFG_Z80_DAISY_CHAIN(wangpc_rtc_daisy_chain)
 	MCFG_CPU_PROGRAM_MAP(wangpc_rtc_mem)
@@ -122,17 +122,6 @@ static MACHINE_CONFIG_START( wangpc_rtc )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor wangpc_rtc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( wangpc_rtc );
-}
-
-
 //-------------------------------------------------
 //  INPUT_PORTS( wangpc_rtc )
 //-------------------------------------------------

src/devices/bus/wangpc/rtc.h

@@ -32,15 +32,13 @@ public:
 	// construction/destruction
 	wangpc_rtc_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;
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	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_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;

src/devices/bus/wangpc/tig.cpp

@@ -112,7 +112,7 @@ UPD7220_DISPLAY_PIXELS_MEMBER( wangpc_tig_device::hgdc_display_pixels )
 //  MACHINE_CONFIG_START( wangpc_tig )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( wangpc_tig )
+MACHINE_CONFIG_MEMBER( wangpc_tig_device::device_add_mconfig )
 	MCFG_SCREEN_ADD_MONOCHROME(SCREEN_TAG, RASTER, rgb_t::green())
 	MCFG_SCREEN_UPDATE_DEVICE(DEVICE_SELF, wangpc_tig_device, screen_update)
 	MCFG_SCREEN_SIZE(80*10, 25*12)
@@ -134,17 +134,6 @@ static MACHINE_CONFIG_START( wangpc_tig )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor wangpc_tig_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( wangpc_tig );
-}
-
-
 //**************************************************************************
 //  LIVE DEVICE
 //**************************************************************************

src/devices/bus/wangpc/tig.h

@@ -29,18 +29,12 @@ public:
 	// construction/destruction
 	wangpc_tig_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;
-	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
-
-	UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text );
-	UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
-
 protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;
@@ -50,6 +44,11 @@ protected:
 	virtual bool wangpcbus_have_dack(int line) override;
 
 private:
+	uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect);
+
+	UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text );
+	UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels );
+
 	// internal state
 	required_device<upd7220_device> m_hgdc0;
 	required_device<upd7220_device> m_hgdc1;

src/devices/bus/wangpc/wdc.cpp

@@ -90,7 +90,7 @@ ADDRESS_MAP_END
 //  MACHINE_CONFIG_START( wangpc_wdc )
 //-------------------------------------------------
 
-static MACHINE_CONFIG_START( wangpc_wdc )
+MACHINE_CONFIG_MEMBER( wangpc_wdc_device::device_add_mconfig )
 	MCFG_CPU_ADD(Z80_TAG, Z80, 2000000) // XTAL_10MHz / ?
 	//MCFG_Z80_DAISY_CHAIN(wangpc_wdc_daisy_chain)
 	MCFG_CPU_PROGRAM_MAP(wangpc_wdc_mem)
@@ -103,17 +103,6 @@ static MACHINE_CONFIG_START( wangpc_wdc )
 MACHINE_CONFIG_END
 
 
-//-------------------------------------------------
-//  machine_config_additions - device-specific
-//  machine configurations
-//-------------------------------------------------
-
-machine_config_constructor wangpc_wdc_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( wangpc_wdc );
-}
-
-
 
 //**************************************************************************
 //  INLINE HELPERS

src/devices/bus/wangpc/wdc.h

@@ -31,10 +31,6 @@ public:
 	// construction/destruction
 	wangpc_wdc_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;
-
 	// not really public
 	DECLARE_READ8_MEMBER( port_r );
 	DECLARE_WRITE8_MEMBER( status_w );
@@ -51,6 +47,8 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
+	virtual void device_add_mconfig(machine_config &config) override;
 
 	// device_wangpcbus_card_interface overrides
 	virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override;

src/devices/bus/x68k/x68k_neptunex.cpp

@@ -5,9 +5,10 @@
  */
 
 #include "emu.h"
-#include "machine/dp8390.h"
 #include "x68k_neptunex.h"
 
+#include "machine/dp8390.h"
+
 
 //**************************************************************************
 //  DEVICE DEFINITIONS
@@ -16,18 +17,13 @@
 DEFINE_DEVICE_TYPE(X68K_NEPTUNEX, x68k_neptune_device, "x68k_neptunex", "Neptune-X")
 
 // device machine config
-static MACHINE_CONFIG_START( x68k_neptunex )
+MACHINE_CONFIG_MEMBER( x68k_neptune_device::device_add_mconfig )
 	MCFG_DEVICE_ADD("dp8390d", DP8390D, 0)
 	MCFG_DP8390D_IRQ_CB(WRITELINE(x68k_neptune_device, x68k_neptune_irq_w))
 	MCFG_DP8390D_MEM_READ_CB(READ8(x68k_neptune_device, x68k_neptune_mem_read))
 	MCFG_DP8390D_MEM_WRITE_CB(WRITE8(x68k_neptune_device, x68k_neptune_mem_write))
 MACHINE_CONFIG_END
 
-machine_config_constructor x68k_neptune_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( x68k_neptunex );
-}
-
 x68k_neptune_device::x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, X68K_NEPTUNEX, tag, owner, clock)
 	, device_x68k_expansion_card_interface(mconfig, *this)

src/devices/bus/x68k/x68k_neptunex.h

@@ -27,22 +27,20 @@ public:
 	// construction/destruction
 	x68k_neptune_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;
-
-	DECLARE_READ8_MEMBER(x68k_neptune_mem_read);
-	DECLARE_WRITE8_MEMBER(x68k_neptune_mem_write);
 	DECLARE_READ16_MEMBER(x68k_neptune_port_r);
 	DECLARE_WRITE16_MEMBER(x68k_neptune_port_w);
 
-	void x68k_neptune_irq_w(int state);
-
 protected:
 	// device-level overrides
+	virtual void device_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 	virtual void device_reset() override;
 
 private:
+	DECLARE_READ8_MEMBER(x68k_neptune_mem_read);
+	DECLARE_WRITE8_MEMBER(x68k_neptune_mem_write);
+	void x68k_neptune_irq_w(int state);
+
 	x68k_expansion_slot_device *m_slot;
 
 	required_device<dp8390d_device> m_dp8390;

src/devices/bus/x68k/x68k_scsiext.cpp

@@ -9,10 +9,12 @@
  */
 
 #include "emu.h"
+#include "x68k_scsiext.h"
+
 #include "bus/scsi/scsi.h"
 #include "bus/scsi/scsihd.h"
 #include "machine/mb89352.h"
-#include "x68k_scsiext.h"
+
 
 //**************************************************************************
 //  DEVICE DEFINITIONS
@@ -35,7 +37,7 @@ const tiny_rom_entry *x68k_scsiext_device::device_rom_region() const
 }
 
 // device machine config
-static MACHINE_CONFIG_START( x68k_scsiext )
+MACHINE_CONFIG_MEMBER( x68k_scsiext_device::device_add_mconfig )
 	MCFG_DEVICE_ADD("scsi", SCSI_PORT, 0)
 	MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_0)
 	MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE2, "harddisk", SCSIHD, SCSI_ID_1)
@@ -51,11 +53,6 @@ static MACHINE_CONFIG_START( x68k_scsiext )
 	MCFG_MB89352A_DRQ_CB(WRITELINE(x68k_scsiext_device, drq_w))
 MACHINE_CONFIG_END
 
-machine_config_constructor x68k_scsiext_device::device_mconfig_additions() const
-{
-	return MACHINE_CONFIG_NAME( x68k_scsiext );
-}
-
 x68k_scsiext_device::x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
 	: device_t(mconfig, X68K_SCSIEXT, tag, owner, clock)
 	, device_x68k_expansion_card_interface(mconfig, *this)

src/devices/bus/x68k/x68k_scsiext.h

@@ -21,12 +21,6 @@ public:
 	// construction/destruction
 	x68k_scsiext_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;
-
-	void irq_w(int state);
-	void drq_w(int state);
 	DECLARE_READ8_MEMBER(register_r);
 	DECLARE_WRITE8_MEMBER(register_w);
 
@@ -34,8 +28,13 @@ protected:
 	// device-level overrides
 	virtual void device_start() override;
 	virtual void device_reset() override;
+	virtual void device_add_mconfig(machine_config &config) override;
+	virtual const tiny_rom_entry *device_rom_region() const override;
 
 private:
+	void irq_w(int state);
+	void drq_w(int state);
+
 	x68k_expansion_slot_device *m_slot;
 
 	required_device<mb89352_device> m_spc;

src/devices/bus/z88/flash.cpp

@@ -24,14 +24,6 @@
 
 DEFINE_DEVICE_TYPE(Z88_1024K_FLASH, z88_1024k_flash_device, "z88_1024k_flash", "Z88 1024KB Flash")
 
-//-------------------------------------------------
-//  MACHINE_CONFIG_START( z88_flash )
-//-------------------------------------------------
-
-static MACHINE_CONFIG_START(z88_flash)
-	MCFG_INTEL_E28F008SA_ADD(FLASH_TAG)
-MACHINE_CONFIG_END
-
 
 //**************************************************************************
 //  LIVE DEVICE
@@ -58,13 +50,12 @@ void z88_1024k_flash_device::device_start()
 
 
 //-------------------------------------------------
-//  device_mconfig_additions
+//  device_add_mconfig
 //-------------------------------------------------
 
-machine_config_constructor z88_1024k_flash_device::device_mconfig_additions() const
+MACHINE_CONFIG_MEMBER(z88_1024k_flash_device::device_add_mconfig)
-{
+	MCFG_INTEL_E28F008SA_ADD(FLASH_TAG)
-	return MACHINE_CONFIG_NAME( z88_flash );
+MACHINE_CONFIG_END
-}
 
 /*-------------------------------------------------
     get_cart_base

src/devices/bus/z88/flash.h

@@ -21,11 +21,9 @@ public:
 	// construction/destruction
 	z88_1024k_flash_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_add_mconfig(machine_config &config) override;
 	virtual void device_start() override;
 
 	// z88cart_interface overrides