diff options
Diffstat (limited to 'src/devices/bus/ieee488/c2040.h')
-rw-r--r-- | src/devices/bus/ieee488/c2040.h | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h index 7289c99c43e..3c6eef7df60 100644 --- a/src/devices/bus/ieee488/c2040.h +++ b/src/devices/bus/ieee488/c2040.h @@ -32,11 +32,6 @@ public: // construction/destruction c2040_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; - virtual machine_config_constructor device_mconfig_additions() const override; - virtual ioport_constructor device_input_ports() const override; - DECLARE_READ8_MEMBER( dio_r ); DECLARE_WRITE8_MEMBER( dio_w ); DECLARE_READ8_MEMBER( riot1_pa_r ); @@ -45,8 +40,6 @@ public: DECLARE_WRITE8_MEMBER( riot1_pb_w ); DECLARE_WRITE8_MEMBER( via_pb_w ); - DECLARE_FLOPPY_FORMATS( floppy_formats ); - protected: c2040_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -54,6 +47,11 @@ protected: virtual void device_start() override; virtual void device_reset() override; + // optional information overrides + virtual const tiny_rom_entry *device_rom_region() const override; + virtual void device_add_mconfig(machine_config &config) override; + virtual ioport_constructor device_input_ports() const override; + // device_ieee488_interface overrides virtual void ieee488_atn(int state) override; virtual void ieee488_ifc(int state) override; @@ -68,6 +66,8 @@ protected: inline void update_ieee_signals(); + DECLARE_FLOPPY_FORMATS( floppy_formats ); + required_device<m6502_device> m_maincpu; required_device<m6504_device> m_fdccpu; required_device<mos6532_new_device> m_riot0; @@ -96,10 +96,12 @@ public: // construction/destruction c3040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; +private: DECLARE_FLOPPY_FORMATS( floppy_formats ); }; @@ -112,10 +114,12 @@ public: // construction/destruction c4040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +protected: // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; - virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_add_mconfig(machine_config &config) override; +private: DECLARE_FLOPPY_FORMATS( floppy_formats ); }; |