diff options
Diffstat (limited to 'src/devices/bus/ql/sandy_superqboard.h')
-rw-r--r-- | src/devices/bus/ql/sandy_superqboard.h | 48 |
1 files changed, 23 insertions, 25 deletions
diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index a1982c38ede..7c18f96421d 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -6,10 +6,10 @@ **********************************************************************/ -#pragma once +#ifndef MAME_BUS_QL_SANDY_SUPERQBOARD_H +#define MAME_BUS_QL_SANDY_SUPERQBOARD_H -#ifndef __SANDY_SUPERQBOARD__ -#define __SANDY_SUPERQBOARD__ +#pragma once #include "exp.h" #include "bus/centronics/ctronics.h" @@ -22,15 +22,13 @@ // TYPE DEFINITIONS //************************************************************************** -// ======================> sandy_superqboard_t +// ======================> sandy_superqboard_device -class sandy_superqboard_t : public device_t, - public device_ql_expansion_card_interface +class sandy_superqboard_device : public device_t, public device_ql_expansion_card_interface { public: // construction/destruction - sandy_superqboard_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source, int ram_size); + sandy_superqboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -44,6 +42,8 @@ public: DECLARE_INPUT_CHANGED_MEMBER( mouse_y_changed ); protected: + sandy_superqboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int ram_size); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -67,7 +67,7 @@ private: void check_interrupt(); - required_device<wd1772_t> m_fdc; + required_device<wd1772_device> m_fdc; required_device<floppy_connector> m_floppy0; required_device<floppy_connector> m_floppy1; required_device<centronics_device> m_centronics; @@ -84,36 +84,36 @@ private: }; -// ======================> sandy_superqboard_512k_t +// ======================> sandy_superqboard_512k_device -class sandy_superqboard_512k_t : public sandy_superqboard_t +class sandy_superqboard_512k_device : public sandy_superqboard_device { public: // construction/destruction - sandy_superqboard_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sandy_superqboard_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; -// ======================> sandy_superqmouse_t +// ======================> sandy_superqmouse_device -class sandy_superqmouse_t : public sandy_superqboard_t +class sandy_superqmouse_device : public sandy_superqboard_device { public: // construction/destruction - sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sandy_superqmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; }; -// ======================> sandy_superqmouse_512k_t +// ======================> sandy_superqmouse_512k_device -class sandy_superqmouse_512k_t : public sandy_superqboard_t +class sandy_superqmouse_512k_device : public sandy_superqboard_device { public: // construction/destruction - sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sandy_superqmouse_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; @@ -121,11 +121,9 @@ public: // device type definition -extern const device_type SANDY_SUPERQBOARD; -extern const device_type SANDY_SUPERQBOARD_512K; -extern const device_type SANDY_SUPERQMOUSE; -extern const device_type SANDY_SUPERQMOUSE_512K; - - +DECLARE_DEVICE_TYPE(SANDY_SUPERQBOARD, sandy_superqboard_device) +DECLARE_DEVICE_TYPE(SANDY_SUPERQBOARD_512K, sandy_superqboard_512k_device) +DECLARE_DEVICE_TYPE(SANDY_SUPERQMOUSE, sandy_superqmouse_device) +DECLARE_DEVICE_TYPE(SANDY_SUPERQMOUSE_512K, sandy_superqmouse_512k_device) -#endif +#endif // MAME_BUS_QL_SANDY_SUPERQBOARD_H |