From 6773fe7c6130b82a1367410a859d5cd9cfa4005b Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 28 Apr 2020 22:11:24 -0400 Subject: [PATCH] 315-5838_317-0229_comp.*: Fix handlers (nw) Regrettably, offset must be included whenever mem_mask is specified to avoid ambiguity in overloaded calls. --- src/mame/drivers/stv.cpp | 4 ++-- src/mame/machine/315-5838_317-0229_comp.cpp | 6 +++--- src/mame/machine/315-5838_317-0229_comp.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mame/drivers/stv.cpp b/src/mame/drivers/stv.cpp index 3af07b329db..fcde8cc3bc6 100644 --- a/src/mame/drivers/stv.cpp +++ b/src/mame/drivers/stv.cpp @@ -840,11 +840,11 @@ WRITE32_MEMBER(stv_state::decathlt_prot_srcaddr_w) if ((offs & 0x7fffff) == 0x7FFFF0) { - m_5838crypt->srcaddr_w(data, mem_mask); + m_5838crypt->srcaddr_w(offs, data, mem_mask); } else if ((offs & 0x7fffff) == 0x7FFFF4) { - m_5838crypt->data_w(data, mem_mask); + m_5838crypt->data_w(offs, data, mem_mask); } } diff --git a/src/mame/machine/315-5838_317-0229_comp.cpp b/src/mame/machine/315-5838_317-0229_comp.cpp index 6896680c324..202e180145b 100644 --- a/src/mame/machine/315-5838_317-0229_comp.cpp +++ b/src/mame/machine/315-5838_317-0229_comp.cpp @@ -354,7 +354,7 @@ void sega_315_5838_comp_device::write_prot_data(uint32_t data, uint32_t mem_mask } } -void sega_315_5838_comp_device::data_w_doa(uint32_t data, uint32_t mem_mask) { write_prot_data(data, mem_mask, 1); } -void sega_315_5838_comp_device::data_w(uint32_t data, uint32_t mem_mask) { write_prot_data(data, mem_mask, 0); } -void sega_315_5838_comp_device::srcaddr_w(uint32_t data, uint32_t mem_mask) { set_prot_addr(data, mem_mask); } +void sega_315_5838_comp_device::data_w_doa(offs_t offset, uint32_t data, uint32_t mem_mask) { write_prot_data(data, mem_mask, 1); } +void sega_315_5838_comp_device::data_w(offs_t offset, uint32_t data, uint32_t mem_mask) { write_prot_data(data, mem_mask, 0); } +void sega_315_5838_comp_device::srcaddr_w(offs_t offset, uint32_t data, uint32_t mem_mask) { set_prot_addr(data, mem_mask); } diff --git a/src/mame/machine/315-5838_317-0229_comp.h b/src/mame/machine/315-5838_317-0229_comp.h index 2be3f5133a4..7f777c899b5 100644 --- a/src/mame/machine/315-5838_317-0229_comp.h +++ b/src/mame/machine/315-5838_317-0229_comp.h @@ -18,9 +18,9 @@ public: uint16_t data_r(); - void data_w_doa(uint32_t data, uint32_t mem_mask = ~0); - void data_w(uint32_t data, uint32_t mem_mask = ~0); - void srcaddr_w(uint32_t data, uint32_t mem_mask = ~0); + void data_w_doa(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void data_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + void srcaddr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); void debug_helper(int id);