diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/machine/i8271.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/i8271.h')
-rw-r--r-- | src/devices/machine/i8271.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h index 88e9a6146e6..701085f58d4 100644 --- a/src/devices/machine/i8271.h +++ b/src/devices/machine/i8271.h @@ -24,10 +24,10 @@ public: auto hdl_wr_callback() { return hdl_cb.bind(); } auto opt_wr_callback() { return opt_cb.bind(); } - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); - uint8_t data_r(); - void data_w(uint8_t data); + DECLARE_READ8_MEMBER(read); + DECLARE_WRITE8_MEMBER(write); + DECLARE_READ8_MEMBER (data_r); + DECLARE_WRITE8_MEMBER(data_w); void ready_w(bool val); @@ -228,11 +228,11 @@ private: C_INCOMPLETE }; - uint8_t sr_r(); - uint8_t rr_r(); - void reset_w(uint8_t data) { if(data == 1) soft_reset(); } - void cmd_w(uint8_t data); - void param_w(uint8_t data); + DECLARE_READ8_MEMBER (sr_r); + DECLARE_READ8_MEMBER (rr_r); + DECLARE_WRITE8_MEMBER(reset_w) { if(data == 1) soft_reset(); } + DECLARE_WRITE8_MEMBER(cmd_w); + DECLARE_WRITE8_MEMBER(param_w); void delay_cycles(emu_timer *tm, int cycles); void set_drq(bool state); |