From 3b84dbc66ecb213d8b8da85ec2ac690630454f00 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Tue, 29 Jan 2019 19:36:22 +0100 Subject: [PATCH] nscsi_cb: removed MCFG macros. This device is unused (nw) --- src/devices/machine/nscsi_cb.h | 46 +++++++--------------------------- 1 file changed, 9 insertions(+), 37 deletions(-) diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h index b5156935a98..575e8f19298 100644 --- a/src/devices/machine/nscsi_cb.h +++ b/src/devices/machine/nscsi_cb.h @@ -8,48 +8,20 @@ #include "machine/nscsi_bus.h" -#define MCFG_NSCSICB_RST_HANDLER(_line) \ - downcast(device)->set_rst_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_ATN_HANDLER(_line) \ - downcast(device)->set_atn_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_ACK_HANDLER(_line) \ - downcast(device)->set_ack_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_REQ_HANDLER(_line) \ - downcast(device)->set_req_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_MSG_HANDLER(_line) \ - downcast(device)->set_msg_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_IO_HANDLER(_line) \ - downcast(device)->set_io_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_CD_HANDLER(_line) \ - downcast(device)->set_cd_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_SEL_HANDLER(_line) \ - downcast(device)->set_sel_callback(DEVCB_##_line); - -#define MCFG_NSCSICB_BSY_HANDLER(_line) \ - downcast(device)->set_bsy_callback(DEVCB_##_line); - - 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 devcb_base &set_rst_callback(Line &&cb) { return m_write_rst.set_callback(std::forward(cb)); } - template devcb_base &set_atn_callback(Line &&cb) { return m_write_atn.set_callback(std::forward(cb)); } - template devcb_base &set_ack_callback(Line &&cb) { return m_write_ack.set_callback(std::forward(cb)); } - template devcb_base &set_req_callback(Line &&cb) { return m_write_req.set_callback(std::forward(cb)); } - template devcb_base &set_msg_callback(Line &&cb) { return m_write_msg.set_callback(std::forward(cb)); } - template devcb_base &set_io_callback(Line &&cb) { return m_write_io.set_callback(std::forward(cb)); } - template devcb_base &set_cd_callback(Line &&cb) { return m_write_cd.set_callback(std::forward(cb)); } - template devcb_base &set_sel_callback(Line &&cb) { return m_write_sel.set_callback(std::forward(cb)); } - template devcb_base &set_bsy_callback(Line &&cb) { return m_write_bsy.set_callback(std::forward(cb)); } + auto rst_callback() { return m_write_rst.bind(); } + auto atn_callback() { return m_write_atn.bind(); } + auto ack_callback() { return m_write_ack.bind(); } + auto req_callback() { return m_write_req.bind(); } + auto msg_callback() { return m_write_msg.bind(); } + auto io_callback() { return m_write_io.bind(); } + auto cd_callback() { return m_write_cd.bind(); } + auto sel_callback() { return m_write_sel.bind(); } + auto bsy_callback() { return m_write_bsy.bind(); } virtual void scsi_ctrl_changed() override;