From 97b67170277437131adf6ed4d60139c172529e4f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 26 Mar 2019 11:13:37 +1100 Subject: (nw) Clean up the mess on master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release. --- src/devices/bus/svi3x8/slot/slot.cpp | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/devices/bus/svi3x8/slot/slot.cpp') diff --git a/src/devices/bus/svi3x8/slot/slot.cpp b/src/devices/bus/svi3x8/slot/slot.cpp index c345d864f4b..eb2137ce629 100644 --- a/src/devices/bus/svi3x8/slot/slot.cpp +++ b/src/devices/bus/svi3x8/slot/slot.cpp @@ -20,11 +20,11 @@ DEFINE_DEVICE_TYPE(SVI_SLOT_BUS, svi_slot_bus_device, "svislotbus", "SVI Slot Bu // svi_slot_bus_device - constructor //------------------------------------------------- -svi_slot_bus_device::svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, SVI_SLOT_BUS, tag, owner, clock), - m_int_handler(*this), - m_romdis_handler(*this), - m_ramdis_handler(*this) +svi_slot_bus_device::svi_slot_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SVI_SLOT_BUS, tag, owner, clock) + , m_int_handler(*this) + , m_romdis_handler(*this) + , m_ramdis_handler(*this) { } @@ -71,14 +71,14 @@ void svi_slot_bus_device::add_card(device_svi_slot_interface *card) // mreq_r - memory read from slot //------------------------------------------------- -READ8_MEMBER( svi_slot_bus_device::mreq_r ) +uint8_t svi_slot_bus_device::mreq_r(offs_t offset) { device_svi_slot_interface *entry = m_dev.first(); uint8_t data = 0xff; while (entry) { - data &= entry->mreq_r(space, offset); + data &= entry->mreq_r(offset); entry = entry->next(); } @@ -89,13 +89,13 @@ READ8_MEMBER( svi_slot_bus_device::mreq_r ) // mreq_w - memory write to slot //------------------------------------------------- -WRITE8_MEMBER( svi_slot_bus_device::mreq_w ) +void svi_slot_bus_device::mreq_w(offs_t offset, uint8_t data) { device_svi_slot_interface *entry = m_dev.first(); while (entry) { - entry->mreq_w(space, offset, data); + entry->mreq_w(offset, data); entry = entry->next(); } } @@ -104,14 +104,14 @@ WRITE8_MEMBER( svi_slot_bus_device::mreq_w ) // iorq_r - memory read from slot //------------------------------------------------- -READ8_MEMBER( svi_slot_bus_device::iorq_r ) +uint8_t svi_slot_bus_device::iorq_r(offs_t offset) { device_svi_slot_interface *entry = m_dev.first(); uint8_t data = 0xff; while (entry) { - data &= entry->iorq_r(space, offset); + data &= entry->iorq_r(offset); entry = entry->next(); } @@ -122,13 +122,13 @@ READ8_MEMBER( svi_slot_bus_device::iorq_r ) // iorq_w - memory write to slot //------------------------------------------------- -WRITE8_MEMBER( svi_slot_bus_device::iorq_w ) +void svi_slot_bus_device::iorq_w(offs_t offset, uint8_t data) { device_svi_slot_interface *entry = m_dev.first(); while (entry) { - entry->iorq_w(space, offset, data); + entry->iorq_w(offset, data); entry = entry->next(); } } @@ -204,10 +204,9 @@ DEFINE_DEVICE_TYPE(SVI_SLOT, svi_slot_device, "svislot", "SVI Slot") // svi_slot_device - constructor //------------------------------------------------- -svi_slot_device::svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : - device_t(mconfig, SVI_SLOT, tag, owner, clock), - device_slot_interface(mconfig, *this), - m_bus_tag(nullptr) +svi_slot_device::svi_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) + : device_t(mconfig, SVI_SLOT, tag, owner, clock) + , device_slot_interface(mconfig, *this) { } @@ -221,7 +220,7 @@ void svi_slot_device::device_start() if (dev) { - svi_slot_bus_device *bus = downcast(m_owner->subdevice(m_bus_tag)); + svi_slot_bus_device *bus = downcast(owner()->subdevice(SVIBUS_TAG)); bus->add_card(dev); } } -- cgit v1.2.3