From 7e725b0217a04676a5c03793a57092a98ae73af2 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 21 Mar 2023 06:49:33 +1100 Subject: machine/i82371sb.cpp: Object finders aren't resolved at config complete time, duh. --- src/devices/machine/i82371sb.cpp | 11 +++++++---- src/mame/jaleco/tetrisp2_v.cpp | 8 ++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/devices/machine/i82371sb.cpp b/src/devices/machine/i82371sb.cpp index f2a49e416d6..7db9389d2f5 100644 --- a/src/devices/machine/i82371sb.cpp +++ b/src/devices/machine/i82371sb.cpp @@ -132,8 +132,9 @@ void i82371sb_isa_device::device_add_mconfig(machine_config &config) void i82371sb_isa_device::device_config_complete() { - m_isabus->set_memspace(m_maincpu, AS_PROGRAM); - m_isabus->set_iospace(m_maincpu, AS_IO); + auto isabus = m_isabus.finder_target(); + isabus.first.subdevice(isabus.second)->set_memspace(m_maincpu, AS_PROGRAM); + isabus.first.subdevice(isabus.second)->set_iospace(m_maincpu, AS_IO); pci_device::device_config_complete(); } @@ -979,8 +980,10 @@ void i82371sb_ide_device::device_add_mconfig(machine_config &config) void i82371sb_ide_device::device_config_complete() { - m_ide1->set_bus_master_space(m_maincpu, AS_PROGRAM); - m_ide2->set_bus_master_space(m_maincpu, AS_PROGRAM); + auto ide1 = m_ide1.finder_target(); + auto ide2 = m_ide2.finder_target(); + ide1.first.subdevice(ide1.second)->set_bus_master_space(m_maincpu, AS_PROGRAM); + ide2.first.subdevice(ide2.second)->set_bus_master_space(m_maincpu, AS_PROGRAM); pci_device::device_config_complete(); } diff --git a/src/mame/jaleco/tetrisp2_v.cpp b/src/mame/jaleco/tetrisp2_v.cpp index 79cc89e5b34..6d60d22ba43 100644 --- a/src/mame/jaleco/tetrisp2_v.cpp +++ b/src/mame/jaleco/tetrisp2_v.cpp @@ -125,8 +125,8 @@ void rocknms_state::rocknms_sub_priority_w(offs_t offset, u16 data, u16 mem_mask TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_bg) { - u16 code_hi = m_vram_bg[ 2 * tile_index + 0]; - u16 code_lo = m_vram_bg[ 2 * tile_index + 1]; + u16 code_hi = m_vram_bg[2 * tile_index + 0]; + u16 code_lo = m_vram_bg[2 * tile_index + 1]; tileinfo.set(0, code_hi, code_lo & 0xf, @@ -145,8 +145,8 @@ void tetrisp2_state::tetrisp2_vram_bg_w(offs_t offset, u16 data, u16 mem_mask) TILE_GET_INFO_MEMBER(tetrisp2_state::get_tile_info_fg) { - u16 code_hi = m_vram_fg[ 2 * tile_index + 0]; - u16 code_lo = m_vram_fg[ 2 * tile_index + 1]; + u16 code_hi = m_vram_fg[2 * tile_index + 0]; + u16 code_lo = m_vram_fg[2 * tile_index + 1]; tileinfo.set(2, code_hi, code_lo & 0xf, -- cgit v1.2.3