diff options
author | 2019-03-26 11:13:37 +1100 | |
---|---|---|
committer | 2019-03-26 11:13:37 +1100 | |
commit | 97b67170277437131adf6ed4d60139c172529e4f (patch) | |
tree | 7a5cbf608f191075f1612b1af15832c206a3fe2d /src/devices/machine/i8155.h | |
parent | b380514764cf857469bae61c11143a19f79a74c5 (diff) |
(nw) Clean up the mess on master
This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and
c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at
598cd5227223c3b04ca31f0dbc1981256d9ea3ff.
Before pushing, please check that what you're about to push is sane.
Check your local commit log and ensure there isn't anything out-of-place
before pushing to mainline. When things like this happen, it wastes
everyone's time. I really don't need this in a week when real work⢠is
busting my balls and I'm behind where I want to be with preparing for
MAME release.
Diffstat (limited to 'src/devices/machine/i8155.h')
-rw-r--r-- | src/devices/machine/i8155.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h index a17692211e6..2d6e49b2063 100644 --- a/src/devices/machine/i8155.h +++ b/src/devices/machine/i8155.h @@ -55,15 +55,15 @@ public: auto out_pc_callback() { return m_out_pc_cb.bind(); } auto out_to_callback() { return m_out_to_cb.bind(); } - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( memory_r ); - DECLARE_WRITE8_MEMBER( memory_w ); + uint8_t memory_r(offs_t offset); + void memory_w(offs_t offset, uint8_t data); - DECLARE_WRITE8_MEMBER( ale_w ); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + void ale_w(offs_t offset, uint8_t data); + uint8_t data_r(); + void data_w(uint8_t data); protected: i8155_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); |