From 7dc0080e1f881091d82711ad7d5ee406c7f8bfe3 Mon Sep 17 00:00:00 2001 From: cam900 Date: Mon, 1 Apr 2019 10:38:09 +0900 Subject: [PATCH] decbac06.cpp : Simplify handlers --- src/mame/video/decbac06.cpp | 24 ++++++++++++------------ src/mame/video/decbac06.h | 18 +++++++++--------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/mame/video/decbac06.cpp b/src/mame/video/decbac06.cpp index 68d3e889124..5bc80cf5e4c 100644 --- a/src/mame/video/decbac06.cpp +++ b/src/mame/video/decbac06.cpp @@ -459,7 +459,7 @@ void deco_bac06_device::pf_control_0_w(offs_t offset, u16 data, u16 mem_mask) } } -u16 deco_bac06_device::pf_control_1_r(offs_t offset, u16 mem_mask) +u16 deco_bac06_device::pf_control_1_r(offs_t offset) { offset &= 7; return m_pf_control_1[offset]; @@ -484,7 +484,7 @@ void deco_bac06_device::pf_data_w(offs_t offset, u16 data, u16 mem_mask) } } -u16 deco_bac06_device::pf_data_r(offs_t offset, u16 mem_mask) +u16 deco_bac06_device::pf_data_r(offs_t offset) { if (m_rambank&1) offset+=0x1000; @@ -502,9 +502,9 @@ void deco_bac06_device::pf_data_8bit_w(offs_t offset, u8 data) u8 deco_bac06_device::pf_data_8bit_r(offs_t offset) { if (offset&1) /* MSB */ - return pf_data_r(offset/2,0x00ff); + return pf_data_r(offset/2); else - return pf_data_r(offset/2,0xff00)>>8; + return pf_data_r(offset/2)>>8; } void deco_bac06_device::pf_rowscroll_w(offs_t offset, u16 data, u16 mem_mask) @@ -517,12 +517,12 @@ void deco_bac06_device::pf_colscroll_w(offs_t offset, u16 data, u16 mem_mask) COMBINE_DATA(&m_pf_colscroll[offset]); } -u16 deco_bac06_device::pf_rowscroll_r(offs_t offset, u16 mem_mask) +u16 deco_bac06_device::pf_rowscroll_r(offs_t offset) { return m_pf_rowscroll[offset]; } -u16 deco_bac06_device::pf_colscroll_r(offs_t offset, u16 mem_mask) +u16 deco_bac06_device::pf_colscroll_r(offs_t offset) { return m_pf_colscroll[offset]; } @@ -540,9 +540,9 @@ void deco_bac06_device::pf_control0_8bit_w(offs_t offset, u8 data) u8 deco_bac06_device::pf_control1_8bit_r(offs_t offset) { if (offset&1) - return pf_control_1_r(offset/2,0x00ff); + return pf_control_1_r(offset/2); else - return pf_control_1_r(offset/2,0xff00)>>8; + return pf_control_1_r(offset/2)>>8; } /* used by dec8.cpp */ @@ -567,9 +567,9 @@ void deco_bac06_device::pf_control1_8bit_w(offs_t offset, u8 data) u8 deco_bac06_device::pf_rowscroll_8bit_r(offs_t offset) { if (offset&1) - return pf_rowscroll_r(offset/2,0x00ff); + return pf_rowscroll_r(offset/2); else - return pf_rowscroll_r(offset/2,0xff00)>>8; + return pf_rowscroll_r(offset/2)>>8; } @@ -584,9 +584,9 @@ void deco_bac06_device::pf_rowscroll_8bit_w(offs_t offset, u8 data) u8 deco_bac06_device::pf_rowscroll_8bit_swap_r(offs_t offset) { if (offset&1) - return pf_rowscroll_r(offset/2,0xff00)>>8; + return pf_rowscroll_r(offset/2)>>8; else - return pf_rowscroll_r(offset/2,0x00ff); + return pf_rowscroll_r(offset/2); } void deco_bac06_device::pf_rowscroll_8bit_swap_w(offs_t offset, u8 data) diff --git a/src/mame/video/decbac06.h b/src/mame/video/decbac06.h index a73f5a6a77f..2273a695c55 100644 --- a/src/mame/video/decbac06.h +++ b/src/mame/video/decbac06.h @@ -69,16 +69,16 @@ public: /* 16-bit accessors */ - void pf_control_0_w(offs_t offset, u16 data, u16 mem_mask); - u16 pf_control_1_r(offs_t offset, u16 mem_mask); - void pf_control_1_w(offs_t offset, u16 data, u16 mem_mask); + void pf_control_0_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 pf_control_1_r(offs_t offset); + void pf_control_1_w(offs_t offset, u16 data, u16 mem_mask = ~0); - void pf_data_w(offs_t offset, u16 data, u16 mem_mask); - u16 pf_data_r(offs_t offset, u16 mem_mask); - void pf_rowscroll_w(offs_t offset, u16 data, u16 mem_mask); - u16 pf_rowscroll_r(offs_t offset, u16 mem_mask); - void pf_colscroll_w(offs_t offset, u16 data, u16 mem_mask); - u16 pf_colscroll_r(offs_t offset, u16 mem_mask); + void pf_data_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 pf_data_r(offs_t offset); + void pf_rowscroll_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 pf_rowscroll_r(offs_t offset); + void pf_colscroll_w(offs_t offset, u16 data, u16 mem_mask = ~0); + u16 pf_colscroll_r(offs_t offset); /* 8-bit accessors */