summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author mooglyguy <therealmogminer@gmail.com>2018-12-07 00:52:06 +0100
committer mooglyguy <therealmogminer@gmail.com>2018-12-07 00:52:19 +0100
commita5550ae126b9745c587fefc732ea10b85284969a (patch)
tree16c3e02c0d16a68f3949e05194df11332d0dfe1e
parent722fd906904b4d98a9b6de4efca8bc989634329a (diff)
Fix build, and start removing MCFG from tms32031, nw
-rw-r--r--src/devices/cpu/tms32031/tms32031.h4
-rw-r--r--src/devices/sound/swp30.h2
-rw-r--r--src/mame/audio/cage.cpp6
-rw-r--r--src/mame/drivers/gaelco3d.cpp9
-rw-r--r--src/mame/drivers/midvunit.cpp9
-rw-r--r--src/mame/includes/gaelco3d.h11
-rw-r--r--src/mame/includes/midvunit.h2
7 files changed, 23 insertions, 20 deletions
diff --git a/src/devices/cpu/tms32031/tms32031.h b/src/devices/cpu/tms32031/tms32031.h
index 3188f8250d7..dc49c8b8ed1 100644
--- a/src/devices/cpu/tms32031/tms32031.h
+++ b/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);
diff --git a/src/devices/sound/swp30.h b/src/devices/sound/swp30.h
index 8a46f293077..56e24b453f0 100644
--- a/src/devices/sound/swp30.h
+++ b/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];
diff --git a/src/mame/audio/cage.cpp b/src/mame/audio/cage.cpp
index a3a24263ea9..6d4167b254f 100644
--- a/src/mame/audio/cage.cpp
+++ b/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)
- MCFG_DEVICE_PROGRAM_MAP(cage_map)
- MCFG_TMS3203X_MCBL(true)
+ TMS32031(config, m_cpu, 33868800);
+ m_cpu->set_addrmap(AS_PROGRAM, &atari_cage_device::cage_map);
+ 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)
diff --git a/src/mame/drivers/gaelco3d.cpp b/src/mame/drivers/gaelco3d.cpp
index 0b735489ccd..b64f2b9f351 100644
--- a/src/mame/drivers/gaelco3d.cpp
+++ b/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)
- MCFG_DEVICE_PROGRAM_MAP(tms_map)
- MCFG_TMS3203X_MCBL(true)
- MCFG_TMS3203X_IACK_CB(WRITE8(*this, gaelco3d_state, tms_iack_w))
+ TMS32031(config, m_tms, 60000000);
+ m_tms->set_addrmap(AS_PROGRAM, &gaelco3d_state::tms_map);
+ m_tms->set_mcbl_mode(true);
+ 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))
diff --git a/src/mame/drivers/midvunit.cpp b/src/mame/drivers/midvunit.cpp
index c3c64e93d67..7a019dc7b9f 100644
--- a/src/mame/drivers/midvunit.cpp
+++ b/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)
- MCFG_DEVICE_PROGRAM_MAP(midvunit_map)
+ TMS32031(config, m_maincpu, CPU_CLOCK);
+ 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")
- MCFG_DEVICE_PROGRAM_MAP(midvplus_map)
- MCFG_TMS3203X_XF1_CB(WRITE8(*this, midvunit_state, midvplus_xf1_w))
+ m_maincpu->set_addrmap(AS_PROGRAM, &midvunit_state::midvplus_map);
+ m_maincpu->xf1().set(FUNC(midvunit_state::midvplus_xf1_w));
MCFG_MACHINE_RESET_OVERRIDE(midvunit_state,midvplus)
config.device_remove("nvram");
diff --git a/src/mame/includes/gaelco3d.h b/src/mame/includes/gaelco3d.h
index 5d1e74a831a..9ed14ef3872 100644
--- a/src/mame/includes/gaelco3d.h
+++ b/src/mame/includes/gaelco3d.h
@@ -12,14 +12,15 @@
#pragma once
-#include "sound/dmadac.h"
-#include "video/poly.h"
+#include "cpu/adsp2100/adsp2100.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;
diff --git a/src/mame/includes/midvunit.h b/src/mame/includes/midvunit.h
index a0268a49177..1b340276749 100644
--- a/src/mame/includes/midvunit.h
+++ b/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;