diff options
author | 2019-03-25 22:44:58 +0100 | |
---|---|---|
committer | 2019-03-25 22:44:58 +0100 | |
commit | c24473ddff715ecec2e258a6eb38960cf8c8e98e (patch) | |
tree | 8ea44b6396a6129913c0aac13859b5de9965e972 /src/devices/sound/ymz280b.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/sound/ymz280b.cpp')
-rw-r--r-- | src/devices/sound/ymz280b.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/sound/ymz280b.cpp b/src/devices/sound/ymz280b.cpp index ce2754e97fa..1ab3cd9b6a9 100644 --- a/src/devices/sound/ymz280b.cpp +++ b/src/devices/sound/ymz280b.cpp @@ -890,7 +890,7 @@ int ymz280b_device::compute_status() ***********************************************************************************************/ -READ8_MEMBER( ymz280b_device::read ) +u8 ymz280b_device::read(offs_t offset) { if ((offset & 1) == 0) { @@ -908,7 +908,7 @@ READ8_MEMBER( ymz280b_device::read ) } -WRITE8_MEMBER( ymz280b_device::write ) +void ymz280b_device::write(offs_t offset, u8 data) { if ((offset & 1) == 0) m_current_register = data; |