diff options
Diffstat (limited to 'src/devices/bus/ieee488/c2040fdc.h')
-rw-r--r-- | src/devices/bus/ieee488/c2040fdc.h | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index 45690295b9a..bbbd799182c 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -6,10 +6,10 @@ **********************************************************************/ -#pragma once +#ifndef MAME_BUS_IEEE488_C2040FDC_H +#define MAME_BUS_IEEE488_C2040FDC_H -#ifndef __C2040_FLOPPY__ -#define __C2040_FLOPPY__ +#pragma once #include "formats/c3040_dsk.h" #include "formats/c4040_dsk.h" @@ -24,13 +24,13 @@ //************************************************************************** #define MCFG_C2040_SYNC_CALLBACK(_write) \ - devcb = &c2040_fdc_t::set_sync_wr_callback(*device, DEVCB_##_write); + devcb = &c2040_fdc_device::set_sync_wr_callback(*device, DEVCB_##_write); #define MCFG_C2040_READY_CALLBACK(_write) \ - devcb = &c2040_fdc_t::set_ready_wr_callback(*device, DEVCB_##_write); + devcb = &c2040_fdc_device::set_ready_wr_callback(*device, DEVCB_##_write); #define MCFG_C2040_ERROR_CALLBACK(_write) \ - devcb = &c2040_fdc_t::set_error_wr_callback(*device, DEVCB_##_write); + devcb = &c2040_fdc_device::set_error_wr_callback(*device, DEVCB_##_write); @@ -38,17 +38,17 @@ // TYPE DEFINITIONS //************************************************************************** -// ======================> c2040_fdc_t +// ======================> c2040_fdc_device -class c2040_fdc_t : public device_t +class c2040_fdc_device : public device_t { public: // construction/destruction - c2040_fdc_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + c2040_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template<class _Object> static devcb_base &set_sync_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_sync.set_callback(object); } - template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_ready.set_callback(object); } - template<class _Object> static devcb_base &set_error_wr_callback(device_t &device, _Object object) { return downcast<c2040_fdc_t &>(device).m_write_error.set_callback(object); } + template <class Object> static devcb_base &set_sync_wr_callback(device_t &device, Object &&cb) { return downcast<c2040_fdc_device &>(device).m_write_sync.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_ready_wr_callback(device_t &device, Object &&cb) { return downcast<c2040_fdc_device &>(device).m_write_ready.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_error_wr_callback(device_t &device, Object &&cb) { return downcast<c2040_fdc_device &>(device).m_write_error.set_callback(std::forward<Object>(cb)); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -161,8 +161,6 @@ protected: // device type definition -extern const device_type C2040_FDC; - - +DECLARE_DEVICE_TYPE(C2040_FDC, c2040_fdc_device) -#endif +#endif // MAME_BUS_IEEE488_C2040FDC_H |