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/video/tlc34076.cpp | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/video/tlc34076.cpp')
-rw-r--r-- | src/devices/video/tlc34076.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/video/tlc34076.cpp b/src/devices/video/tlc34076.cpp index c33b302a3b8..37dd95a40b1 100644 --- a/src/devices/video/tlc34076.cpp +++ b/src/devices/video/tlc34076.cpp @@ -127,7 +127,7 @@ void tlc34076_device::update_pen(uint8_t i) // read - read access //------------------------------------------------- -READ8_MEMBER( tlc34076_device::read ) +u8 tlc34076_device::read(offs_t offset) { uint8_t result; @@ -161,7 +161,7 @@ READ8_MEMBER( tlc34076_device::read ) // write - write access //------------------------------------------------- -WRITE8_MEMBER( tlc34076_device::write ) +void tlc34076_device::write(offs_t offset, u8 data) { // uint8_t oldval; |