From f881dd18025220d9b69f0f3e5680fba2bf257ee0 Mon Sep 17 00:00:00 2001 From: AJR Date: Sat, 25 May 2019 08:24:19 -0400 Subject: Fix clang error: reference to non-static member function must be called; did you mean to call it with no arguments? (nw) --- src/mame/machine/hpc3.cpp | 28 ++++++++++++++-------------- src/mame/machine/hpc3.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mame/machine/hpc3.cpp b/src/mame/machine/hpc3.cpp index 6f276f5f0f4..ef2117a842f 100644 --- a/src/mame/machine/hpc3.cpp +++ b/src/mame/machine/hpc3.cpp @@ -525,37 +525,37 @@ WRITE32_MEMBER(hpc3_base_device::hd_enet_w) } } -template +template READ32_MEMBER(hpc3_base_device::fifo_r) { uint32_t ret = 0; - if (type == FIFO_PBUS) + if (Type == FIFO_PBUS) ret = m_pbus_fifo[offset >> 1]; - else if (type == FIFO_SCSI0) + else if (Type == FIFO_SCSI0) ret = m_scsi_fifo[0][offset >> 1]; - else if (type == FIFO_SCSI1) + else if (Type == FIFO_SCSI1) ret = m_scsi_fifo[1][offset >> 1]; - else if (type == FIFO_ENET_RECV) + else if (Type == FIFO_ENET_RECV) ret = m_enet_fifo[ENET_RECV][offset >> 1]; - else if (type == FIFO_ENET_XMIT) + else if (Type == FIFO_ENET_XMIT) ret = m_enet_fifo[ENET_XMIT][offset >> 1]; - logerror("Reading %08x from %d FIFO offset %08x (%08x)\n", ret, type, offset, offset >> 1); + logerror("Reading %08x from %d FIFO offset %08x (%08x)\n", ret, Type, offset, offset >> 1); return ret; } -template +template WRITE32_MEMBER(hpc3_base_device::fifo_w) { - logerror("Writing %08x to %d FIFO offset %08x (%08x)\n", data, type, offset, offset >> 2); - if (type == FIFO_PBUS) + logerror("Writing %08x to %d FIFO offset %08x (%08x)\n", data, Type, offset, offset >> 2); + if (Type == FIFO_PBUS) m_pbus_fifo[offset >> 2] = data; - else if (type == FIFO_SCSI0) + else if (Type == FIFO_SCSI0) m_scsi_fifo[0][offset >> 1] = data; - else if (type == FIFO_SCSI1) + else if (Type == FIFO_SCSI1) m_scsi_fifo[1][offset >> 1] = data; - else if (type == FIFO_ENET_RECV) + else if (Type == FIFO_ENET_RECV) m_enet_fifo[ENET_RECV][offset >> 2] = data; - else if (type == FIFO_ENET_XMIT) + else if (Type == FIFO_ENET_XMIT) m_enet_fifo[ENET_XMIT][offset >> 2] = data; } diff --git a/src/mame/machine/hpc3.h b/src/mame/machine/hpc3.h index 494b244d1a9..df72fbe424a 100644 --- a/src/mame/machine/hpc3.h +++ b/src/mame/machine/hpc3.h @@ -62,8 +62,8 @@ protected: DECLARE_WRITE32_MEMBER(hd_enet_w); template DECLARE_READ32_MEMBER(hd_r); template DECLARE_WRITE32_MEMBER(hd_w); - template DECLARE_READ32_MEMBER(fifo_r); - template DECLARE_WRITE32_MEMBER(fifo_w); + template DECLARE_READ32_MEMBER(fifo_r); + template DECLARE_WRITE32_MEMBER(fifo_w); DECLARE_READ32_MEMBER(intstat_r); DECLARE_READ32_MEMBER(eeprom_r); DECLARE_WRITE32_MEMBER(eeprom_w); -- cgit v1.2.3