devices\machine: removed some orphaned macros (nw)

src/devices/machine/gen_fifo.h

@@ -72,13 +72,6 @@
  */
 
 
-#define MCFG_GENERIC_FIFO_EMPTY_CALLBACK(_devcb) \
-	downcast<screen_device &>(*device).set_empty_cb(DEVCB_##_devcb);
-
-#define MCFG_GENERIC_FIFO_FULL_CALLBACK(_devcb) \
-	downcast<screen_device &>(*device).set_full_cb(DEVCB_##_devcb);
-
-
 template<typename T> class generic_fifo_device_base : public device_t {
 public:
 	/* The general setup.  Call be called multiple times, clears the fifo. */
@@ -118,8 +111,8 @@ public:
 	void clear();
 
 	/* Callbacks signalling empty (true)/nonempty (false) and full (true)/nonfull (false) */
-	template<class Object> devcb_base &set_empty_cb(Object &&object) { return m_empty_cb.set_callback(std::forward<Object>(object)); }
+	auto empty_cb() { return m_empty_cb.bind(); }
-	template<class Object> devcb_base &set_full_cb(Object &&object) { return m_full_cb.set_callback(std::forward<Object>(object)); }
+	auto full_cb() { return m_full_cb.bind(); }
 
 	/* Get the fifo current size - Note that real hardware usually
 	   can't do that.  May be bigger that the fifo size if some extra

src/devices/machine/ncr5380.h

@@ -36,8 +36,6 @@ enum
 
 // device stuff
 
-#define MCFG_NCR5380_IRQ_CB(_devcb) \
-	downcast<ncr5380_device &>(*device).set_irq_callback(DEVCB_##_devcb);
 
 class ncr5380_device : public legacy_scsi_host_adapter
 {
@@ -45,7 +43,6 @@ public:
 	// construction/destruction
 	ncr5380_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	template <class Object> devcb_base &set_irq_callback(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); }
 	auto irq_callback() { return m_irq_cb.bind(); }
 
 	// our API

src/devices/machine/ncr5380n.h

@@ -15,11 +15,6 @@
 
 #include "machine/nscsi_bus.h"
 
-#define MCFG_NCR5380N_IRQ_HANDLER(_devcb) \
-	downcast<ncr5380n_device &>(*device).set_irq_handler(DEVCB_##_devcb);
-
-#define MCFG_NCR5380N_DRQ_HANDLER(_devcb) \
-	downcast<ncr5380n_device &>(*device).set_drq_handler(DEVCB_##_devcb);
 
 class ncr5380n_device : public nscsi_device
 {
@@ -27,9 +22,6 @@ public:
 	ncr5380n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
 	// configuration helpers
-	template <class Object> devcb_base &set_irq_handler(Object &&cb) { return m_irq_handler.set_callback(std::forward<Object>(cb)); }
-	template <class Object> devcb_base &set_drq_handler(Object &&cb) { return m_drq_handler.set_callback(std::forward<Object>(cb)); }
-
 	auto irq_handler() { return m_irq_handler.bind(); }
 	auto drq_handler() { return m_drq_handler.bind(); }
 

src/devices/machine/ncr5385.h

@@ -44,14 +44,6 @@
 #pragma once
 
 
-
-//**************************************************************************
-//  INTERFACE CONFIGURATION MACROS
-//**************************************************************************
-
-#define MCFG_NCR5385_INT_CB(_int) \
-	downcast<ncr5385_device &>(*device).set_int_callback(DEVCB_##_int);
-
 //**************************************************************************
 //  TYPE DEFINITIONS
 //**************************************************************************
@@ -64,7 +56,6 @@ public:
 	// construction/destruction
 	ncr5385_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	template <class Object> devcb_base &set_int_callback(Object &&cb)   { return m_int.set_callback(std::forward<Object>(cb)); }
 	auto irq() { return m_int.bind(); }
 
 	DECLARE_WRITE8_MEMBER(write);

src/devices/machine/ncr539x.h

@@ -14,11 +14,6 @@
 
 // device stuff
 
-#define MCFG_NCR539X_OUT_IRQ_CB(_devcb) \
-	downcast<ncr539x_device &>(*device).set_out_irq_callback(DEVCB_##_devcb);
-
-#define MCFG_NCR539X_OUT_DRQ_CB(_devcb) \
-	downcast<ncr539x_device &>(*device).set_out_drq_callback(DEVCB_##_devcb);
 
 class ncr539x_device : public legacy_scsi_host_adapter
 {
@@ -26,8 +21,6 @@ public:
 	// construction/destruction
 	ncr539x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
 
-	template <class Object> devcb_base &set_out_irq_callback(Object &&cb) { return m_out_irq_cb.set_callback(std::forward<Object>(cb)); }
-	template <class Object> devcb_base &set_out_drq_callback(Object &&cb) { return m_out_drq_cb.set_callback(std::forward<Object>(cb)); }
 	auto irq_callback() { return m_out_irq_cb.bind(); }
 	auto drq_callback() { return m_out_drq_cb.bind(); }
 

src/mame/drivers/lb186.cpp

@@ -116,9 +116,9 @@ void lb186_state::ncr5380(device_t *device)
 {
 	devcb_base *devcb;
 	(void)devcb;
-	MCFG_DEVICE_CLOCK(10000000)
+	downcast<ncr5380n_device &>(*device).set_clock(10000000);
-	MCFG_NCR5380N_IRQ_HANDLER(WRITELINE(":maincpu", i80186_cpu_device, int1_w))
+	downcast<ncr5380n_device &>(*device).irq_handler().set(":maincpu", FUNC(i80186_cpu_device::int1_w));
-	MCFG_NCR5380N_DRQ_HANDLER(WRITELINE(":maincpu", i80186_cpu_device, drq0_w))
+	downcast<ncr5380n_device &>(*device).drq_handler().set(":maincpu", FUNC(i80186_cpu_device::drq0_w));
 }
 
 static void scsi_devices(device_slot_interface &device)

src/mame/drivers/sun3.cpp

@@ -319,8 +319,8 @@ void sun3_state::ncr5380(device_t *device)
 {
 	devcb_base *devcb;
 	(void)devcb;
-	MCFG_DEVICE_CLOCK(10000000)
+	downcast<ncr5380n_device &>(*device).set_clock(10000000);
-//  MCFG_NCR5380N_DRQ_HANDLER(WRITELINE(*this, sun3_state, drq_w))
+//  downcast<ncr5380n_device &>(*device).drq_handler().set(FUNC(sun3_state::drq_w));
 }
 
 static void scsi_devices(device_slot_interface &device)

src/mame/drivers/sun3x.cpp

@@ -623,8 +623,7 @@ MACHINE_CONFIG_START(sun3x_state::sun3_80)
 	MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE1, "harddisk", SCSIHD, SCSI_ID_6)
 	MCFG_SCSIDEV_ADD("scsi:" SCSI_PORT_DEVICE2, "harddisk", SCSIHD, SCSI_ID_5)
 
-	MCFG_DEVICE_ADD(ESP_TAG, NCR539X, 20000000/2)
+	NCR539X(config, ESP_TAG, 20000000/2).set_scsi_port("scsi");
-	MCFG_LEGACY_SCSI_PORT("scsi")
 
 	N82077AA(config, m_fdc, n82077aa_device::MODE_PS2);
 	MCFG_FLOPPY_DRIVE_ADD("fdc:0", sun_floppies, "35hd", sun3x_state::floppy_formats)