From d0ffaeeeec58e5e7e80f6bf0950254b94eef586b Mon Sep 17 00:00:00 2001
From: Olivier Galibert <galibert@pobox.com>
Date: Sat, 27 Feb 2021 22:06:09 +0100
Subject: [PATCH] emuview: Fix init_handlers in specific cases, fix mapping
 ioports in views

---
 src/emu/emumem_hedr.ipp  | 2 +-
 src/emu/emumem_hedw.ipp  | 2 +-
 src/emu/emumem_mview.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/emu/emumem_hedr.ipp b/src/emu/emumem_hedr.ipp
index b9dd5089242..5af8664932b 100644
--- a/src/emu/emumem_hedr.ipp
+++ b/src/emu/emumem_hedr.ipp
@@ -570,7 +570,7 @@ template<int HighBits, int Width, int AddrShift, endianness_t Endian> void handl
 		u32 dt = lowbits - LowBits;
 		u32 ne = 1 << dt;
 		for(offs_t entry = start_entry; entry <= end_entry; entry++) {
-			m_u_dispatch[entry]->ref(ne);
+			dispatch[entry]->ref(ne);
 			u32 e0 = (entry << dt) & BITMASK;
 			for(offs_t e = 0; e != ne; e++) {
 				m_u_dispatch[e0 | e] = dispatch[entry];
diff --git a/src/emu/emumem_hedw.ipp b/src/emu/emumem_hedw.ipp
index ec624d575b1..1c0a791c569 100644
--- a/src/emu/emumem_hedw.ipp
+++ b/src/emu/emumem_hedw.ipp
@@ -576,7 +576,7 @@ template<int HighBits, int Width, int AddrShift, endianness_t Endian> void handl
 		u32 dt = lowbits - LowBits;
 		u32 ne = 1 << dt;
 		for(offs_t entry = start_entry; entry <= end_entry; entry++) {
-			m_u_dispatch[entry]->ref(ne);
+			dispatch[entry]->ref(ne);
 			u32 e0 = (entry << dt) & BITMASK;
 			for(offs_t e = 0; e != ne; e++) {
 				m_u_dispatch[e0 | e] = dispatch[entry];
diff --git a/src/emu/emumem_mview.cpp b/src/emu/emumem_mview.cpp
index c55984b1164..34e6883b3c0 100644
--- a/src/emu/emumem_mview.cpp
+++ b/src/emu/emumem_mview.cpp
@@ -974,7 +974,7 @@ template<int Level, int Width, int AddrShift, endianness_t Endian> void memory_v
 	if (rtag != "")
 	{
 		// find the port
-		ioport_port *port = m_view.m_device.owner()->ioport(rtag);
+		ioport_port *port = m_view.m_device.ioport(rtag);
 		if (port == nullptr)
 			throw emu_fatalerror("Attempted to map non-existent port '%s' for read in space %s of device '%s'\n", rtag, m_view.m_name, m_view.m_device.tag());
 
@@ -986,7 +986,7 @@ template<int Level, int Width, int AddrShift, endianness_t Endian> void memory_v
 	if (wtag != "")
 	{
 		// find the port
-		ioport_port *port = m_view.m_device.owner()->ioport(wtag);
+		ioport_port *port = m_view.m_device.ioport(wtag);
 		if (port == nullptr)
 			fatalerror("Attempted to map non-existent port '%s' for write in space %s of device '%s'\n", wtag, m_view.m_name, m_view.m_device.tag());