From a493bd892d62bc5ebe0b35fd81f6aeca379e606e Mon Sep 17 00:00:00 2001 From: smf- Date: Wed, 1 Apr 2020 15:48:18 +0100 Subject: removed last remaining use of driver_data() (nw) --- src/emu/machine.h | 1 - src/mame/machine/3dom2.cpp | 2 +- src/mame/video/3dom2_te.cpp | 19 +++---------------- src/mame/video/3dom2_te.h | 5 ++--- 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/src/emu/machine.h b/src/emu/machine.h index d054ee861c7..205988fbbe6 100644 --- a/src/emu/machine.h +++ b/src/emu/machine.h @@ -188,7 +188,6 @@ public: tilemap_manager &tilemap() const { assert(m_tilemap != nullptr); return *m_tilemap; } debug_view_manager &debug_view() const { assert(m_debug_view != nullptr); return *m_debug_view; } debugger_manager &debugger() const { assert(m_debugger != nullptr); return *m_debugger; } - driver_device *driver_data() const { return &downcast(root_device()); } template DriverClass *driver_data() const { return &downcast(root_device()); } machine_phase phase() const { return m_current_phase; } bool paused() const { return m_paused || (m_current_phase != machine_phase::RUNNING); } diff --git a/src/mame/machine/3dom2.cpp b/src/mame/machine/3dom2.cpp index 34082c729c4..e90a307dd67 100644 --- a/src/mame/machine/3dom2.cpp +++ b/src/mame/machine/3dom2.cpp @@ -472,7 +472,7 @@ void m2_bda_device::configure_ppc_address_map(address_space &space) space.install_readwrite_handler(POWERBUS_BASE, POWERBUS_BASE + DEVICE_MASK,read32_delegate(*m_powerbus, FUNC(m2_powerbus_device::read)), write32_delegate(*m_powerbus, FUNC(m2_powerbus_device::write)), 0xffffffffffffffffULL); space.install_readwrite_handler(MEMCTL_BASE, MEMCTL_BASE + DEVICE_MASK, read32_delegate(*m_memctl, FUNC(m2_memctl_device::read)), write32_delegate(*m_memctl, FUNC(m2_memctl_device::write)), 0xffffffffffffffffULL); space.install_readwrite_handler(VDU_BASE, VDU_BASE + DEVICE_MASK, read32_delegate(*m_vdu, FUNC(m2_vdu_device::read)), write32_delegate(*m_vdu, FUNC(m2_vdu_device::write)), 0xffffffffffffffffULL); - space.install_readwrite_handler(TE_BASE, TE_BASE + DEVICE_MASK, read32_delegate(*m_te, FUNC(m2_te_device::read)), write32_delegate(*m_te, FUNC(m2_te_device::write)), 0xffffffffffffffffULL); + space.install_readwrite_handler(TE_BASE, TE_BASE + DEVICE_MASK, read32sm_delegate(*m_te, FUNC(m2_te_device::read)), write32sm_delegate(*m_te, FUNC(m2_te_device::write)), 0xffffffffffffffffULL); space.install_readwrite_handler(DSP_BASE, DSP_BASE + DEVICE_MASK, read32_delegate(*m_dspp, FUNC(dspp_device::read)), write32_delegate(*m_dspp, FUNC(dspp_device::write)), 0xffffffffffffffffULL); space.install_readwrite_handler(CTRLPORT_BASE, CTRLPORT_BASE + DEVICE_MASK,read32_delegate(*m_ctrlport, FUNC(m2_ctrlport_device::read)), write32_delegate(*m_ctrlport, FUNC(m2_ctrlport_device::write)), 0xffffffffffffffffULL); space.install_readwrite_handler(MPEG_BASE, MPEG_BASE + DEVICE_MASK, read32_delegate(*m_mpeg, FUNC(m2_mpeg_device::read)), write32_delegate(*m_mpeg, FUNC(m2_mpeg_device::write)), 0xffffffffffffffffULL); diff --git a/src/mame/video/3dom2_te.cpp b/src/mame/video/3dom2_te.cpp index 5b6d6b633e5..7aa79a67924 100644 --- a/src/mame/video/3dom2_te.cpp +++ b/src/mame/video/3dom2_te.cpp @@ -757,22 +757,11 @@ void m2_te_device::device_reset() } -//------------------------------------------------- -// device_post_load - device-specific post-load -//------------------------------------------------- - -void m2_te_device::device_post_load() -{ - -} - - - /*************************************************************************** PUBLIC FUNCTIONS ***************************************************************************/ -READ32_MEMBER( m2_te_device::read ) +uint32_t m2_te_device::read(offs_t offset) { uint32_t unit = (offset >> 11) & 7; uint32_t reg = offset & 0x1ff; @@ -828,7 +817,7 @@ READ32_MEMBER( m2_te_device::read ) return 0; } -WRITE32_MEMBER( m2_te_device::write ) +void m2_te_device::write(offs_t offset, uint32_t data) { uint32_t unit = (offset >> 11) & 7; uint32_t reg = offset & 0x1ff; @@ -3334,8 +3323,6 @@ void m2_te_device::illegal_inst() void m2_te_device::execute() { - address_space &space = machine().driver_data()->generic_space(); - #if TEST_TIMING memset(g_statistics, 0, sizeof(g_statistics)); #endif @@ -3353,7 +3340,7 @@ void m2_te_device::execute() while (cnt-- >= 0) { - write(space, offs >> 2, irp_fetch(), 0xffffffff); + write(offs >> 2, irp_fetch()); offs += 4; if (m_state != TE_RUNNING) diff --git a/src/mame/video/3dom2_te.h b/src/mame/video/3dom2_te.h index bf318dfe9af..cf8d84cbf8b 100644 --- a/src/mame/video/3dom2_te.h +++ b/src/mame/video/3dom2_te.h @@ -32,8 +32,8 @@ public: auto listend_int_handler() { return m_listend_int_handler.bind(); } auto winclip_int_handler() { return m_winclip_int_handler.bind(); } - DECLARE_READ32_MEMBER(read); - DECLARE_WRITE32_MEMBER(write); + uint32_t read(offs_t offset); + void write(offs_t offset, uint32_t data); uint32_t *tram_ptr() const { return &m_tram[0]; } @@ -48,7 +48,6 @@ public: protected: virtual void device_start() override; virtual void device_reset() override; - virtual void device_post_load() override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: -- cgit v1.2.3