From f1dd0d0651b6f04240c23739279e704c1c7bfabc Mon Sep 17 00:00:00 2001 From: Patrick Mackinlay Date: Wed, 13 Sep 2023 17:13:26 +0700 Subject: [PATCH] bus/vme: avoid breaking listxml --- src/devices/bus/vme/vme.cpp | 1 + src/mame/sgi/ip4.cpp | 3 +++ 2 files changed, 4 insertions(+) diff --git a/src/devices/bus/vme/vme.cpp b/src/devices/bus/vme/vme.cpp index 7b7b8212ded..d154edaf310 100644 --- a/src/devices/bus/vme/vme.cpp +++ b/src/devices/bus/vme/vme.cpp @@ -263,6 +263,7 @@ device_vme_card_interface::device_vme_card_interface(machine_config const &mconf void device_vme_card_interface::interface_config_complete() { // route bus errors to the card when it is the bus master + if (m_slot) // HACK: avoid breaking listxml until proper fix can be identified m_slot->berr().append( [this](int state) { diff --git a/src/mame/sgi/ip4.cpp b/src/mame/sgi/ip4.cpp index b263d6289ec..6e9abeba3c3 100644 --- a/src/mame/sgi/ip4.cpp +++ b/src/mame/sgi/ip4.cpp @@ -283,6 +283,8 @@ void sgi_ip4_device::device_add_mconfig(machine_config &config) void sgi_ip4_device::device_config_complete() { + if (owner() && owner()->owner()) + { // TODO: ACFAIL -> vme_irq<0> device_vme_card_interface::vme_irq<1>().append(*this, FUNC(sgi_ip4_device::vme_irq<1>)); device_vme_card_interface::vme_irq<2>().append(*this, FUNC(sgi_ip4_device::vme_irq<2>)); @@ -293,6 +295,7 @@ void sgi_ip4_device::device_config_complete() device_vme_card_interface::vme_irq<7>().append(*this, FUNC(sgi_ip4_device::vme_irq<7>)); vme_berr().set_inputline(m_cpu, INPUT_LINE_IRQ5).invert(); + } } void sgi_ip4_device::device_start()