diff options
Diffstat (limited to 'src/devices/machine')
-rw-r--r-- | src/devices/machine/40105.h | 12 | ||||
-rw-r--r-- | src/devices/machine/cs4031.h | 36 | ||||
-rw-r--r-- | src/devices/machine/ldv1000.h | 4 | ||||
-rw-r--r-- | src/devices/machine/mpu401.h | 6 | ||||
-rw-r--r-- | src/devices/machine/nscsi_cb.h | 30 | ||||
-rw-r--r-- | src/devices/machine/tms1024.h | 2 | ||||
-rw-r--r-- | src/devices/machine/wd7600.h | 36 |
7 files changed, 63 insertions, 63 deletions
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h index 47a8ce0b1ab..04495bfa352 100644 --- a/src/devices/machine/40105.h +++ b/src/devices/machine/40105.h @@ -32,13 +32,13 @@ ///************************************************************************* #define MCFG_40105_DATA_IN_READY_CB(_dir) \ - downcast<cmos_40105_device *>(device)->set_dir_callback(DEVCB_##_dir); + devcb = &downcast<cmos_40105_device *>(device)->set_dir_callback(DEVCB_##_dir); #define MCFG_40105_DATA_OUT_READY_CB(_dor) \ - downcast<cmos_40105_device *>(device)->set_dor_callback(DEVCB_##_dor); + devcb = &downcast<cmos_40105_device *>(device)->set_dor_callback(DEVCB_##_dor); #define MCFG_40105_DATA_OUT_CB(_out) \ - downcast<cmos_40105_device *>(device)->set_data_out_callback(DEVCB_##_out); + devcb = &downcast<cmos_40105_device *>(device)->set_data_out_callback(DEVCB_##_out); @@ -54,9 +54,9 @@ public: // construction/destruction cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); - template<class _dir> void set_dir_callback(_dir dir) { m_write_dir.set_callback(dir); } - template<class _dor> void set_dor_callback(_dor dor) { m_write_dor.set_callback(dor); } - template<class _out> void set_data_out_callback(_out out) { m_write_q.set_callback(out); } + template<class _dir> devcb_base &set_dir_callback(_dir dir) { return m_write_dir.set_callback(dir); } + template<class _dor> devcb_base &set_dor_callback(_dor dor) { return m_write_dor.set_callback(dor); } + template<class _out> devcb_base &set_data_out_callback(_out out) { return m_write_q.set_callback(out); } u8 read(); void write(u8 data); diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h index 629f3ecd6c3..9a128f67913 100644 --- a/src/devices/machine/cs4031.h +++ b/src/devices/machine/cs4031.h @@ -45,31 +45,31 @@ cs4031_device::static_set_keybctag(*device, _keybctag); #define MCFG_CS4031_IOR(_ior) \ - downcast<cs4031_device *>(device)->set_ior_callback(DEVCB_##_ior); + devcb = &downcast<cs4031_device *>(device)->set_ior_callback(DEVCB_##_ior); #define MCFG_CS4031_IOW(_iow) \ - downcast<cs4031_device *>(device)->set_iow_callback(DEVCB_##_iow); + devcb = &downcast<cs4031_device *>(device)->set_iow_callback(DEVCB_##_iow); #define MCFG_CS4031_TC(_tc) \ - downcast<cs4031_device *>(device)->set_tc_callback(DEVCB_##_tc); + devcb = &downcast<cs4031_device *>(device)->set_tc_callback(DEVCB_##_tc); #define MCFG_CS4031_HOLD(_hold) \ - downcast<cs4031_device *>(device)->set_hold_callback(DEVCB_##_hold); + devcb = &downcast<cs4031_device *>(device)->set_hold_callback(DEVCB_##_hold); #define MCFG_CS4031_NMI(_nmi) \ - downcast<cs4031_device *>(device)->set_nmi_callback(DEVCB_##_nmi); + devcb = &downcast<cs4031_device *>(device)->set_nmi_callback(DEVCB_##_nmi); #define MCFG_CS4031_INTR(_intr) \ - downcast<cs4031_device *>(device)->set_intr_callback(DEVCB_##_intr); + devcb = &downcast<cs4031_device *>(device)->set_intr_callback(DEVCB_##_intr); #define MCFG_CS4031_CPURESET(_cpureset) \ - downcast<cs4031_device *>(device)->set_cpureset_callback(DEVCB_##_cpureset); + devcb = &downcast<cs4031_device *>(device)->set_cpureset_callback(DEVCB_##_cpureset); #define MCFG_CS4031_A20M(_a20m) \ - downcast<cs4031_device *>(device)->set_a20m_callback(DEVCB_##_a20m); + devcb = &downcast<cs4031_device *>(device)->set_a20m_callback(DEVCB_##_a20m); #define MCFG_CS4031_SPKR(_spkr) \ - downcast<cs4031_device *>(device)->set_spkr_callback(DEVCB_##_spkr); + devcb = &downcast<cs4031_device *>(device)->set_spkr_callback(DEVCB_##_spkr); //************************************************************************** @@ -88,15 +88,15 @@ public: virtual machine_config_constructor device_mconfig_additions() const override; // callbacks - template<class _ior> void set_ior_callback(_ior ior) { m_read_ior.set_callback(ior); } - template<class _iow> void set_iow_callback(_iow iow) { m_write_iow.set_callback(iow); } - template<class _tc> void set_tc_callback(_tc tc) { m_write_tc.set_callback(tc); } - template<class _hold> void set_hold_callback(_hold hold) { m_write_hold.set_callback(hold); } - template<class _cpureset> void set_cpureset_callback(_cpureset cpureset) { m_write_cpureset.set_callback(cpureset); } - template<class _nmi> void set_nmi_callback(_nmi nmi) { m_write_nmi.set_callback(nmi); } - template<class _intr> void set_intr_callback(_intr intr) { m_write_intr.set_callback(intr); } - template<class _a20m> void set_a20m_callback(_a20m a20m) { m_write_a20m.set_callback(a20m); } - template<class _spkr> void set_spkr_callback(_spkr spkr) { m_write_spkr.set_callback(spkr); } + template<class _ior> devcb_base &set_ior_callback(_ior ior) { return m_read_ior.set_callback(ior); } + template<class _iow> devcb_base &set_iow_callback(_iow iow) { return m_write_iow.set_callback(iow); } + template<class _tc> devcb_base &set_tc_callback(_tc tc) { return m_write_tc.set_callback(tc); } + template<class _hold> devcb_base &set_hold_callback(_hold hold) { return m_write_hold.set_callback(hold); } + template<class _cpureset> devcb_base &set_cpureset_callback(_cpureset cpureset) { return m_write_cpureset.set_callback(cpureset); } + template<class _nmi> devcb_base &set_nmi_callback(_nmi nmi) { return m_write_nmi.set_callback(nmi); } + template<class _intr> devcb_base &set_intr_callback(_intr intr) { return m_write_intr.set_callback(intr); } + template<class _a20m> devcb_base &set_a20m_callback(_a20m a20m) { return m_write_a20m.set_callback(a20m); } + template<class _spkr> devcb_base &set_spkr_callback(_spkr spkr) { return m_write_spkr.set_callback(spkr); } // not really public DECLARE_READ8_MEMBER( dma_read_byte ); diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h index ea543159a33..a8cadf1f9a8 100644 --- a/src/devices/machine/ldv1000.h +++ b/src/devices/machine/ldv1000.h @@ -27,7 +27,7 @@ MCFG_DEVICE_ADD(_tag, PIONEER_LDV1000, 0) #define MCFG_LASERDISC_LDV1000_COMMAND_STROBE_CB(_cb) \ - downcast<pioneer_ldv1000_device *>(device)->set_command_strobe_callback(DEVCB_##_cb); + devcb = &downcast<pioneer_ldv1000_device *>(device)->set_command_strobe_callback(DEVCB_##_cb); @@ -53,7 +53,7 @@ public: // construction/destruction pioneer_ldv1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template<class _cmd_strobe_cb> void set_command_strobe_callback(_cmd_strobe_cb latch) { m_command_strobe_cb.set_callback(latch); } + template<class _cmd_strobe_cb> devcb_base &set_command_strobe_callback(_cmd_strobe_cb latch) { return m_command_strobe_cb.set_callback(latch); } // input and output void data_w(uint8_t data); diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h index cf98056cc81..3717477a43c 100644 --- a/src/devices/machine/mpu401.h +++ b/src/devices/machine/mpu401.h @@ -13,7 +13,7 @@ MCFG_IRQ_FUNC(_irqf) #define MCFG_IRQ_FUNC(_irqf) \ - downcast<mpu401_device *>(device)->set_irqf(DEVCB_##_irqf); + devcb = &downcast<mpu401_device *>(device)->set_irqf(DEVCB_##_irqf); //************************************************************************** // TYPE DEFINITIONS @@ -30,9 +30,9 @@ public: required_device<m6801_cpu_device> m_ourcpu; - template<class _write> void set_irqf(_write wr) + template<class _write> devcb_base &set_irqf(_write wr) { - write_irq.set_callback(wr); + return write_irq.set_callback(wr); } devcb_write_line write_irq; diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h index 4fab2021fe1..1699de18f4b 100644 --- a/src/devices/machine/nscsi_cb.h +++ b/src/devices/machine/nscsi_cb.h @@ -7,22 +7,22 @@ #include "machine/nscsi_bus.h" #define MCFG_NSCSICB_RST_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_rst_callback(DEVCB_##_line); + devcb = &downcast<nscsi_callback_device *>(device)->set_rst_callback(DEVCB_##_line); #define MCFG_NSCSICB_ATN_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_atn_callback(DEVCB_##_line); + devcb = &downcast<nscsi_callback_device *>(device)->set_atn_callback(DEVCB_##_line); #define MCFG_NSCSICB_ACK_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_ack_callback(DEVCB_##_line); + devcb = &downcast<nscsi_callback_device *>(device)->set_ack_callback(DEVCB_##_line); #define MCFG_NSCSICB_REQ_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_req_callback(DEVCB_##_line); + devcb = &downcast<nscsi_callback_device *>(device)->set_req_callback(DEVCB_##_line); #define MCFG_NSCSICB_MSG_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_msg_callback(DEVCB_##_line); + devcb = &downcast<nscsi_callback_device *>(device)->set_msg_callback(DEVCB_##_line); #define MCFG_NSCSICB_IO_HANDLER(_line) \ - downcast<nscsi_callback_device *>(device)->set_io_callback(DEVCB_##_line); + devcb = &downcast<nscsi_callback_device *>(device)->set_io_callback(DEVCB_##_line); #define MCFG_NSCSICB_CD_HANDLER(_line) \ downcast<nscsi_callback_device *>(device)->set_cd_callback(DEVCB_##_line); @@ -38,15 +38,15 @@ class nscsi_callback_device : public nscsi_device public: nscsi_callback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template<class _line> void set_rst_callback(_line line) { m_write_rst.set_callback(line); } - template<class _line> void set_atn_callback(_line line) { m_write_atn.set_callback(line); } - template<class _line> void set_ack_callback(_line line) { m_write_ack.set_callback(line); } - template<class _line> void set_req_callback(_line line) { m_write_req.set_callback(line); } - template<class _line> void set_msg_callback(_line line) { m_write_msg.set_callback(line); } - template<class _line> void set_io_callback(_line line) { m_write_io.set_callback(line); } - template<class _line> void set_cd_callback(_line line) { m_write_cd.set_callback(line); } - template<class _line> void set_sel_callback(_line line) { m_write_sel.set_callback(line); } - template<class _line> void set_bsy_callback(_line line) { m_write_bsy.set_callback(line); } + template<class _line> devcb_base &set_rst_callback(_line line) { return m_write_rst.set_callback(line); } + template<class _line> devcb_base &set_atn_callback(_line line) { return m_write_atn.set_callback(line); } + template<class _line> devcb_base &set_ack_callback(_line line) { return m_write_ack.set_callback(line); } + template<class _line> devcb_base &set_req_callback(_line line) { return m_write_req.set_callback(line); } + template<class _line> devcb_base &set_msg_callback(_line line) { return m_write_msg.set_callback(line); } + template<class _line> devcb_base &set_io_callback(_line line) { return m_write_io.set_callback(line); } + template<class _line> devcb_base &set_cd_callback(_line line) { return m_write_cd.set_callback(line); } + template<class _line> devcb_base &set_sel_callback(_line line) { return m_write_sel.set_callback(line); } + template<class _line> devcb_base &set_bsy_callback(_line line) { return m_write_bsy.set_callback(line); } virtual void scsi_ctrl_changed() override; diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h index af1a428d9f1..54524d27939 100644 --- a/src/devices/machine/tms1024.h +++ b/src/devices/machine/tms1024.h @@ -17,7 +17,7 @@ // 4-bit ports (3210 = DCBA) // valid ports: 4-7 for TMS1024, 1-7 for TMS1025 #define MCFG_TMS1024_WRITE_PORT_CB(X, _devcb) \ - tms1024_device::set_write_port##X##_callback(*device, DEVCB_##_devcb); + devcb = &tms1024_device::set_write_port##X##_callback(*device, DEVCB_##_devcb); enum { diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h index 8363018d30d..fa3a4323e0d 100644 --- a/src/devices/machine/wd7600.h +++ b/src/devices/machine/wd7600.h @@ -26,31 +26,31 @@ wd7600_device::static_set_keybctag(*device, _keybctag); #define MCFG_WD7600_IOR(_ior) \ - downcast<wd7600_device *>(device)->set_ior_callback(DEVCB_##_ior); + devcb = &downcast<wd7600_device *>(device)->set_ior_callback(DEVCB_##_ior); #define MCFG_WD7600_IOW(_iow) \ - downcast<wd7600_device *>(device)->set_iow_callback(DEVCB_##_iow); + devcb = &downcast<wd7600_device *>(device)->set_iow_callback(DEVCB_##_iow); #define MCFG_WD7600_TC(_tc) \ - downcast<wd7600_device *>(device)->set_tc_callback(DEVCB_##_tc); + devcb = &downcast<wd7600_device *>(device)->set_tc_callback(DEVCB_##_tc); #define MCFG_WD7600_HOLD(_hold) \ - downcast<wd7600_device *>(device)->set_hold_callback(DEVCB_##_hold); + devcb = &downcast<wd7600_device *>(device)->set_hold_callback(DEVCB_##_hold); #define MCFG_WD7600_NMI(_nmi) \ - downcast<wd7600_device *>(device)->set_nmi_callback(DEVCB_##_nmi); + devcb = &downcast<wd7600_device *>(device)->set_nmi_callback(DEVCB_##_nmi); #define MCFG_WD7600_INTR(_intr) \ - downcast<wd7600_device *>(device)->set_intr_callback(DEVCB_##_intr); + devcb = &downcast<wd7600_device *>(device)->set_intr_callback(DEVCB_##_intr); #define MCFG_WD7600_CPURESET(_cpureset) \ - downcast<wd7600_device *>(device)->set_cpureset_callback(DEVCB_##_cpureset); + devcb = &downcast<wd7600_device *>(device)->set_cpureset_callback(DEVCB_##_cpureset); #define MCFG_WD7600_A20M(_a20m) \ - downcast<wd7600_device *>(device)->set_a20m_callback(DEVCB_##_a20m); + devcb = &downcast<wd7600_device *>(device)->set_a20m_callback(DEVCB_##_a20m); #define MCFG_WD7600_SPKR(_spkr) \ - downcast<wd7600_device *>(device)->set_spkr_callback(DEVCB_##_spkr); + devcb = &downcast<wd7600_device *>(device)->set_spkr_callback(DEVCB_##_spkr); //************************************************************************** @@ -69,15 +69,15 @@ public: virtual machine_config_constructor device_mconfig_additions() const override; // callbacks - template<class _ior> void set_ior_callback(_ior ior) { m_read_ior.set_callback(ior); } - template<class _iow> void set_iow_callback(_iow iow) { m_write_iow.set_callback(iow); } - template<class _tc> void set_tc_callback(_tc tc) { m_write_tc.set_callback(tc); } - template<class _hold> void set_hold_callback(_hold hold) { m_write_hold.set_callback(hold); } - template<class _cpureset> void set_cpureset_callback(_cpureset cpureset) { m_write_cpureset.set_callback(cpureset); } - template<class _nmi> void set_nmi_callback(_nmi nmi) { m_write_nmi.set_callback(nmi); } - template<class _intr> void set_intr_callback(_intr intr) { m_write_intr.set_callback(intr); } - template<class _a20m> void set_a20m_callback(_a20m a20m) { m_write_a20m.set_callback(a20m); } - template<class _spkr> void set_spkr_callback(_spkr spkr) { m_write_spkr.set_callback(spkr); } + template<class _ior> devcb_base &set_ior_callback(_ior ior) { return m_read_ior.set_callback(ior); } + template<class _iow> devcb_base &set_iow_callback(_iow iow) { return m_write_iow.set_callback(iow); } + template<class _tc> devcb_base &set_tc_callback(_tc tc) { return m_write_tc.set_callback(tc); } + template<class _hold> devcb_base &set_hold_callback(_hold hold) { return m_write_hold.set_callback(hold); } + template<class _cpureset> devcb_base &set_cpureset_callback(_cpureset cpureset) { return m_write_cpureset.set_callback(cpureset); } + template<class _nmi> devcb_base &set_nmi_callback(_nmi nmi) { return m_write_nmi.set_callback(nmi); } + template<class _intr> devcb_base &set_intr_callback(_intr intr) { return m_write_intr.set_callback(intr); } + template<class _a20m> devcb_base &set_a20m_callback(_a20m a20m) { return m_write_a20m.set_callback(a20m); } + template<class _spkr> devcb_base &set_spkr_callback(_spkr spkr) { return m_write_spkr.set_callback(spkr); } // inline configuration static void static_set_cputag(device_t &device, const char *tag); |