Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-06-07 13:23:50 +03:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

removed last remaining use of driver_data() (nw)

Browse Source
This commit is contained in:
smf- 2020-04-01 15:48:18 +01:00
parent 2eac30e284
commit a493bd892d
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/machine.h
View File

@ -188,7 +188,6 @@ public:
tilemap_manager &tilemap() const { assert(m_tilemap != nullptr); return *m_tilemap; } 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; } 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; } debugger_manager &debugger() const { assert(m_debugger != nullptr); return *m_debugger; }
driver_device *driver_data() const { return &downcast<driver_device &>(root_device()); }
template <class DriverClass> DriverClass *driver_data() const { return &downcast<DriverClass &>(root_device()); } template <class DriverClass> DriverClass *driver_data() const { return &downcast<DriverClass &>(root_device()); }
machine_phase phase() const { return m_current_phase; } machine_phase phase() const { return m_current_phase; }
bool paused() const { return m_paused || (m_current_phase != machine_phase::RUNNING); } bool paused() const { return m_paused || (m_current_phase != machine_phase::RUNNING); }

2
src/mame/machine/3dom2.cpp
View File

@ -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(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(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(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(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(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); 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);

19
src/mame/video/3dom2_te.cpp
View File

@ -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 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 unit = (offset >> 11) & 7;
uint32_t reg = offset & 0x1ff; uint32_t reg = offset & 0x1ff;
@ -828,7 +817,7 @@ READ32_MEMBER( m2_te_device::read )
return 0; 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 unit = (offset >> 11) & 7;
uint32_t reg = offset & 0x1ff; uint32_t reg = offset & 0x1ff;
@ -3334,8 +3323,6 @@ void m2_te_device::illegal_inst()
void m2_te_device::execute() void m2_te_device::execute()
{ {
address_space &space = machine().driver_data()->generic_space();
#if TEST_TIMING #if TEST_TIMING
memset(g_statistics, 0, sizeof(g_statistics)); memset(g_statistics, 0, sizeof(g_statistics));
#endif #endif
@ -3353,7 +3340,7 @@ void m2_te_device::execute()
while (cnt-- >= 0) while (cnt-- >= 0)
{ {
write(space, offs >> 2, irp_fetch(), 0xffffffff); write(offs >> 2, irp_fetch());
offs += 4; offs += 4;
if (m_state != TE_RUNNING) if (m_state != TE_RUNNING)

5
src/mame/video/3dom2_te.h
View File

@ -32,8 +32,8 @@ public:
auto listend_int_handler() { return m_listend_int_handler.bind(); } auto listend_int_handler() { return m_listend_int_handler.bind(); }
auto winclip_int_handler() { return m_winclip_int_handler.bind(); } auto winclip_int_handler() { return m_winclip_int_handler.bind(); }
DECLARE_READ32_MEMBER(read); uint32_t read(offs_t offset);
DECLARE_WRITE32_MEMBER(write); void write(offs_t offset, uint32_t data);
uint32_t *tram_ptr() const { return &m_tram[0]; } uint32_t *tram_ptr() const { return &m_tram[0]; }
@ -48,7 +48,6 @@ public:
protected: protected:
virtual void device_start() override; virtual void device_start() override;
virtual void device_reset() 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; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
private: private: