diff options
Diffstat (limited to 'src/devices/bus/kc/d004.h')
-rw-r--r-- | src/devices/bus/kc/d004.h | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 521289a076d..bbac3463866 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -1,9 +1,9 @@ // license:BSD-3-Clause // copyright-holders:Sandro Ronco -#pragma once +#ifndef MAME_BUS_KC_D004_H +#define MAME_BUS_KC_D004_H -#ifndef __KC_D004_H__ -#define __KC_D004_H__ +#pragma once #include "kc.h" #include "machine/z80ctc.h" @@ -26,7 +26,6 @@ class kc_d004_device : public: // construction/destruction kc_d004_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - kc_d004_device(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); // optional information overrides virtual machine_config_constructor device_mconfig_additions() const override; @@ -34,7 +33,15 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); + DECLARE_READ8_MEMBER(hw_input_gate_r); + DECLARE_WRITE8_MEMBER(fdd_select_w); + DECLARE_WRITE8_MEMBER(hw_terminal_count_w); + + DECLARE_WRITE_LINE_MEMBER( fdc_irq ); + protected: + kc_d004_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -47,13 +54,6 @@ protected: virtual void io_read(offs_t offset, uint8_t &data) override; virtual void io_write(offs_t offset, uint8_t data) override; -public: - DECLARE_READ8_MEMBER(hw_input_gate_r); - DECLARE_WRITE8_MEMBER(fdd_select_w); - DECLARE_WRITE8_MEMBER(hw_terminal_count_w); - - DECLARE_WRITE_LINE_MEMBER( fdc_irq ); - private: static const device_timer_id TIMER_RESET = 0; @@ -91,14 +91,13 @@ public: virtual machine_config_constructor device_mconfig_additions() const override; virtual const tiny_rom_entry *device_rom_region() const override; + DECLARE_READ8_MEMBER(gide_r); + DECLARE_WRITE8_MEMBER(gide_w); + protected: // device-level overrides virtual void device_reset() override; -public: - DECLARE_READ8_MEMBER(gide_r); - DECLARE_WRITE8_MEMBER(gide_w); - private: required_device<ata_interface_device> m_ata; @@ -107,7 +106,7 @@ private: }; // device type definition -extern const device_type KC_D004; -extern const device_type KC_D004_GIDE; +DECLARE_DEVICE_TYPE(KC_D004, kc_d004_device) +DECLARE_DEVICE_TYPE(KC_D004_GIDE, kc_d004_gide_device) -#endif /* __KC_D004_H__ */ +#endif // MAME_BUS_KC_D004_H |