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/machine/tms9914.h | |
parent | 009cba4fb8102102168ef32870892438327f3705 (diff) | |
parent | 598cd5227223c3b04ca31f0dbc1981256d9ea3ff (diff) |
conflict resolution (nw)
Diffstat (limited to 'src/devices/machine/tms9914.h')
-rw-r--r-- | src/devices/machine/tms9914.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/devices/machine/tms9914.h b/src/devices/machine/tms9914.h index 14df9d80647..9fda5aa2ebb 100644 --- a/src/devices/machine/tms9914.h +++ b/src/devices/machine/tms9914.h @@ -83,8 +83,9 @@ public: DECLARE_WRITE_LINE_MEMBER(atn_w); DECLARE_WRITE_LINE_MEMBER(ren_w); - DECLARE_WRITE8_MEMBER(reg8_w); - DECLARE_READ8_MEMBER(reg8_r); + // Register access + void write(offs_t offset, uint8_t data); + uint8_t read(offs_t offset); // CONT output: true when 9914 is current controller-in-charge DECLARE_READ_LINE_MEMBER(cont_r); |