Fix build, and start removing MCFG from tms32031, nw

src/devices/cpu/tms32031/tms32031.h

@@ -147,6 +147,10 @@ public:
 	template <class Object> devcb_base &set_xf1_callback(Object &&cb) { return m_xf1_cb.set_callback(std::forward<Object>(cb)); }
 	template <class Object> devcb_base &set_iack_callback(Object &&cb) { return m_iack_cb.set_callback(std::forward<Object>(cb)); }
 	template <class Object> devcb_base &set_holda_callback(Object &&cb) { return m_holda_cb.set_callback(std::forward<Object>(cb)); }
+	auto xf0() { return m_xf0_cb.bind(); }
+	auto xf1() { return m_xf1_cb.bind(); }
+	auto iack() { return m_iack_cb.bind(); }
+	auto holda() { return m_holda_cb.bind(); }
 
 	// public interfaces
 	static float fp_to_float(uint32_t floatdata);

src/devices/sound/swp30.h

@@ -37,7 +37,7 @@ private:
 
 	u16 m_program_pfp[0x180], m_program_pint[0x80], m_program_plfo[0x80];
 
-	u16 m_volume[0x40], m_freq[0x40], m_pan[0x40], m_dry_rev[0x40];//, m_cho_var[0x40];
+	u16 m_volume[0x40], m_freq[0x40], m_pan[0x40], m_dry_rev[0x40], m_cho_var[0x40];
 	u16 m_envelope[0x40][3];
 	u16 m_lpf_cutoff[0x40], m_lpf_cutoff_inc[0x40], m_lpf_reso[0x40], m_hpf_cutoff[0x40];
 	s16 m_eq_filter[0x40][6];

src/mame/audio/cage.cpp

@@ -615,9 +615,9 @@ void atari_cage_seattle_device::cage_map_seattle(address_map &map)
 MACHINE_CONFIG_START(atari_cage_device::device_add_mconfig)
 
 	/* basic machine hardware */
-	MCFG_DEVICE_ADD("cpu", TMS32031, 33868800)
+	TMS32031(config, m_cpu, 33868800);
-	MCFG_DEVICE_PROGRAM_MAP(cage_map)
+	m_cpu->set_addrmap(AS_PROGRAM, &atari_cage_device::cage_map);
-	MCFG_TMS3203X_MCBL(true)
+	m_cpu->set_mcbl_mode(true);
 
 	MCFG_TIMER_DEVICE_ADD("cage_dma_timer", DEVICE_SELF, atari_cage_device, dma_timer_callback)
 	MCFG_TIMER_DEVICE_ADD("cage_timer0", DEVICE_SELF, atari_cage_device, cage_timer_callback)

src/mame/drivers/gaelco3d.cpp

@@ -149,7 +149,6 @@ REF. 970429
 #include "includes/gaelco3d.h"
 
 #include "cpu/m68000/m68000.h"
-#include "cpu/tms32031/tms32031.h"
 #include "emupal.h"
 
 #include "speaker.h"
@@ -929,10 +928,10 @@ MACHINE_CONFIG_START(gaelco3d_state::gaelco3d)
 	MCFG_DEVICE_PROGRAM_MAP(main_map)
 	MCFG_DEVICE_VBLANK_INT_DRIVER("screen", gaelco3d_state,  vblank_gen)
 
-	MCFG_DEVICE_ADD(m_tms, TMS32031, 60000000)
+	TMS32031(config, m_tms, 60000000);
-	MCFG_DEVICE_PROGRAM_MAP(tms_map)
+	m_tms->set_addrmap(AS_PROGRAM, &gaelco3d_state::tms_map);
-	MCFG_TMS3203X_MCBL(true)
+	m_tms->set_mcbl_mode(true);
-	MCFG_TMS3203X_IACK_CB(WRITE8(*this, gaelco3d_state, tms_iack_w))
+	m_tms->iack().set(FUNC(gaelco3d_state::tms_iack_w));
 
 	MCFG_DEVICE_ADD(m_adsp, ADSP2115, 16000000)
 	MCFG_ADSP21XX_SPORT_TX_CB(WRITE32(*this, gaelco3d_state, adsp_tx_callback))

src/mame/drivers/midvunit.cpp

@@ -1066,8 +1066,8 @@ INPUT_PORTS_END
 MACHINE_CONFIG_START(midvunit_state::midvcommon)
 
 	/* basic machine hardware */
-	MCFG_DEVICE_ADD("maincpu", TMS32031, CPU_CLOCK)
+	TMS32031(config, m_maincpu, CPU_CLOCK);
-	MCFG_DEVICE_PROGRAM_MAP(midvunit_map)
+	m_maincpu->set_addrmap(AS_PROGRAM, &midvunit_state::midvunit_map);
 
 	NVRAM(config, "nvram", nvram_device::DEFAULT_ALL_1);
 
@@ -1122,9 +1122,8 @@ MACHINE_CONFIG_START(midvunit_state::midvplus)
 	midvcommon(config);
 
 	/* basic machine hardware */
-	MCFG_DEVICE_MODIFY("maincpu")
+	m_maincpu->set_addrmap(AS_PROGRAM, &midvunit_state::midvplus_map);
-	MCFG_DEVICE_PROGRAM_MAP(midvplus_map)
+	m_maincpu->xf1().set(FUNC(midvunit_state::midvplus_xf1_w));
-	MCFG_TMS3203X_XF1_CB(WRITE8(*this, midvunit_state, midvplus_xf1_w))
 
 	MCFG_MACHINE_RESET_OVERRIDE(midvunit_state,midvplus)
 	config.device_remove("nvram");

src/mame/includes/gaelco3d.h

@@ -12,14 +12,15 @@
 
 #pragma once
 
-#include "sound/dmadac.h"
+#include "cpu/adsp2100/adsp2100.h"
-#include "video/poly.h"
+#include "cpu/tms32031/tms32031.h"
+#include "machine/74259.h"
 #include "machine/eepromser.h"
 #include "machine/gaelco3d.h"
 #include "machine/gen_latch.h"
-#include "machine/74259.h"
 #include "machine/timer.h"
-#include "cpu/adsp2100/adsp2100.h"
+#include "sound/dmadac.h"
+#include "video/poly.h"
 #include "screen.h"
 
 #define SOUND_CHANNELS  4
@@ -109,7 +110,7 @@ private:
 	required_device<cpu_device> m_maincpu;
 	required_device<adsp21xx_device> m_adsp;
 	required_device<eeprom_serial_93cxx_device> m_eeprom;
-	required_device<cpu_device> m_tms;
+	required_device<tms32031_device> m_tms;
 	required_device_array<dmadac_sound_device, SOUND_CHANNELS> m_dmadac;
 	required_device<gaelco_serial_device> m_serial;
 	required_device<screen_device> m_screen;

src/mame/includes/midvunit.h

@@ -173,7 +173,7 @@ private:
 	DECLARE_MACHINE_RESET(midvplus);
 	uint32_t screen_update_midvunit(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect);
 	TIMER_CALLBACK_MEMBER(scanline_timer_cb);
-	required_device<cpu_device> m_maincpu;
+	required_device<tms32031_device> m_maincpu;
 	required_device<watchdog_timer_device> m_watchdog;
 	required_device<palette_device> m_palette;
 	optional_device<adc0844_device> m_adc;