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/nsc810.h | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/nsc810.h')
-rw-r--r-- | src/devices/machine/nsc810.h | 63 |
1 files changed, 39 insertions, 24 deletions
diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h index 520591208f7..bebeb8f82a6 100644 --- a/src/devices/machine/nsc810.h +++ b/src/devices/machine/nsc810.h @@ -16,38 +16,24 @@ class nsc810_device : public device_t { public: // construction/destruction - nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, uint32_t clk0, uint32_t clk1) - : nsc810_device(mconfig, tag, owner, clock) - { - set_timer0_clock(clk0); - set_timer1_clock(clk1); - } - - nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, const XTAL &clk0, const XTAL &clk1) - : nsc810_device(mconfig, tag, owner, clock) - { - set_timer0_clock(clk0.value()); - set_timer1_clock(clk1.value()); - } - nsc810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - auto portA_read_callback() { return m_portA_r.bind(); } - auto portB_read_callback() { return m_portB_r.bind(); } - auto portC_read_callback() { return m_portC_r.bind(); } - auto portA_write_callback() { return m_portA_w.bind(); } - auto portB_write_callback() { return m_portB_w.bind(); } - auto portC_write_callback() { return m_portC_w.bind(); } - auto timer0_callback() { return m_timer0_out.bind(); } - auto timer1_callback() { return m_timer1_out.bind(); } + template <class Object> devcb_base &set_portA_read_callback(Object &&cb) { return m_portA_r.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_portB_read_callback(Object &&cb) { return m_portB_r.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_portC_read_callback(Object &&cb) { return m_portC_r.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_portA_write_callback(Object &&cb) { return m_portA_w.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_portB_write_callback(Object &&cb) { return m_portB_w.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_portC_write_callback(Object &&cb) { return m_portC_w.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_timer0_callback(Object &&cb) { return m_timer0_out.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_timer1_callback(Object &&cb) { return m_timer1_out.set_callback(std::forward<Object>(cb)); } void set_timer0_clock(uint32_t clk) { m_timer0_clock = clk; } void set_timer0_clock(const XTAL &clk) { set_timer0_clock(clk.value()); } void set_timer1_clock(uint32_t clk) { m_timer1_clock = clk; } void set_timer1_clock(const XTAL &clk) { set_timer1_clock(clk.value()); } - uint8_t read(offs_t offset); - void write(offs_t offset, uint8_t data); + DECLARE_READ8_MEMBER(read); + DECLARE_WRITE8_MEMBER(write); protected: virtual void device_start() override; @@ -116,6 +102,35 @@ private: }; }; +#define MCFG_NSC810_ADD(_tag, _t0clk, _t1clk) \ + MCFG_DEVICE_ADD(_tag, NSC810, 0) \ + downcast<nsc810_device *>(device)->set_timer0_clock(_t0clk); \ + downcast<nsc810_device *>(device)->set_timer1_clock(_t1clk); + +#define MCFG_NSC810_PORTA_READ(_read) \ + downcast<nsc810_device &>(*device).set_portA_read_callback(DEVCB_##_read); + +#define MCFG_NSC810_PORTB_READ(_read) \ + downcast<nsc810_device &>(*device).set_portB_read_callback(DEVCB_##_read); + +#define MCFG_NSC810_PORTC_READ(_read) \ + downcast<nsc810_device &>(*device).set_portC_read_callback(DEVCB_##_read); + +#define MCFG_NSC810_PORTA_WRITE(_write) \ + downcast<nsc810_device &>(*device).set_portA_write_callback(DEVCB_##_write); + +#define MCFG_NSC810_PORTB_WRITE(_write) \ + downcast<nsc810_device &>(*device).set_portB_write_callback(DEVCB_##_write); + +#define MCFG_NSC810_PORTC_WRITE(_write) \ + downcast<nsc810_device &>(*device).set_portC_write_callback(DEVCB_##_write); + +#define MCFG_NSC810_TIMER0_OUT(_write) \ + downcast<nsc810_device &>(*device).set_timer0_callback(DEVCB_##_write); + +#define MCFG_NSC810_TIMER1_OUT(_write) \ + downcast<nsc810_device &>(*device).set_timer1_callback(DEVCB_##_write); + // device type definition DECLARE_DEVICE_TYPE(NSC810, nsc810_device) |