diff options
Diffstat (limited to 'src/devices/bus/compucolor/floppy.h')
-rw-r--r-- | src/devices/bus/compucolor/floppy.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h index 22a716457f3..69c6524ab01 100644 --- a/src/devices/bus/compucolor/floppy.h +++ b/src/devices/bus/compucolor/floppy.h @@ -6,10 +6,10 @@ *********************************************************************/ -#pragma once +#ifndef MAME_BUS_COMPUCOLOR_FLOPPY_H +#define MAME_BUS_COMPUCOLOR_FLOPPY_H -#ifndef __COMPCLR_FLP__ -#define __COMPCLR_FLP__ +#pragma once #include "bus/rs232/rs232.h" #include "formats/ccvf_dsk.h" @@ -36,12 +36,12 @@ class device_compucolor_floppy_port_interface : public device_rs232_port_interface { public: - device_compucolor_floppy_port_interface(const machine_config &mconfig, device_t &device); - virtual ~device_compucolor_floppy_port_interface() { } - virtual void rw_w(int state) = 0; virtual void stepper_w(uint8_t data) = 0; virtual void select_w(int state) = 0; + +protected: + device_compucolor_floppy_port_interface(const machine_config &mconfig, device_t &device); }; @@ -51,7 +51,6 @@ class compucolor_floppy_port_device : public rs232_port_device { public: compucolor_floppy_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual ~compucolor_floppy_port_device() { } DECLARE_WRITE_LINE_MEMBER( rw_w ) { if (m_dev) m_dev->rw_w(state); } void stepper_w(uint8_t data) { if (m_dev) m_dev->stepper_w(data); } @@ -69,8 +68,7 @@ private: // ======================> compucolor_floppy_device -class compucolor_floppy_device : public device_t, - public device_compucolor_floppy_port_interface +class compucolor_floppy_device : public device_t, public device_compucolor_floppy_port_interface { public: // construction/destruction @@ -113,11 +111,11 @@ private: // device type definition -extern const device_type COMPUCOLOR_FLOPPY_PORT; -extern const device_type COMPUCOLOR_FLOPPY; +DECLARE_DEVICE_TYPE(COMPUCOLOR_FLOPPY_PORT, compucolor_floppy_port_device) +DECLARE_DEVICE_TYPE(COMPUCOLOR_FLOPPY, compucolor_floppy_device) // slot devices SLOT_INTERFACE_EXTERN( compucolor_floppy_port_devices ); -#endif +#endif // MAME_BUS_COMPUCOLOR_FLOPPY_H |