diff options
author | 2015-12-05 20:32:27 +0100 | |
---|---|---|
committer | 2015-12-05 21:20:53 +0100 | |
commit | 1c4865d66ff88a6891ebdde4580c3d61ee46ffa2 (patch) | |
tree | 268936fc8389b1a2adb8bfc3fa3006f12a4ccc95 /src | |
parent | e8516832e941e39fa1db11211249afa9f015e7bb (diff) |
override part 1 (nw)
Diffstat (limited to 'src')
975 files changed, 7400 insertions, 7399 deletions
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h index ecdb440f948..e9726073ddb 100644 --- a/src/devices/bus/a1bus/a1bus.h +++ b/src/devices/bus/a1bus/a1bus.h @@ -53,7 +53,7 @@ public: a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag); @@ -94,8 +94,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state cpu_device *m_maincpu; diff --git a/src/devices/bus/a1bus/a1cassette.h b/src/devices/bus/a1bus/a1cassette.h index e8d656c1c3a..482704b31cf 100644 --- a/src/devices/bus/a1bus/a1cassette.h +++ b/src/devices/bus/a1bus/a1cassette.h @@ -28,8 +28,8 @@ public: a1bus_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; optional_device<cassette_image_device> m_cassette; @@ -37,8 +37,8 @@ public: DECLARE_WRITE8_MEMBER(cassette_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void cassette_toggle_output(); diff --git a/src/devices/bus/a1bus/a1cffa.h b/src/devices/bus/a1bus/a1cffa.h index a1dc4258cbc..d395468891b 100644 --- a/src/devices/bus/a1bus/a1cffa.h +++ b/src/devices/bus/a1bus/a1cffa.h @@ -29,8 +29,8 @@ public: a1bus_cffa_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; required_device<ata_interface_device> m_ata; @@ -38,8 +38,8 @@ public: DECLARE_WRITE8_MEMBER(cffa_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 *m_rom; diff --git a/src/devices/bus/a2bus/a2alfam2.h b/src/devices/bus/a2bus/a2alfam2.h index ab2ee9e38a4..b02792afe9a 100644 --- a/src/devices/bus/a2bus/a2alfam2.h +++ b/src/devices/bus/a2bus/a2alfam2.h @@ -28,7 +28,7 @@ public: a2bus_sn76489_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<sn76489_device> m_sn1; required_device<sn76489_device> m_sn2; @@ -36,13 +36,13 @@ public: optional_device<sn76489_device> m_sn4; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; private: UINT8 m_latch0, m_latch1, m_latch2, m_latch3; @@ -62,7 +62,7 @@ class a2bus_aesms_device : public a2bus_sn76489_device public: a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2applicard.h b/src/devices/bus/a2bus/a2applicard.h index b015d84fe6a..e1bb4b4d685 100644 --- a/src/devices/bus/a2bus/a2applicard.h +++ b/src/devices/bus/a2bus/a2applicard.h @@ -28,7 +28,7 @@ public: a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( dma_r ); DECLARE_WRITE8_MEMBER( dma_w ); @@ -36,14 +36,14 @@ public: DECLARE_WRITE8_MEMBER( z80_io_w ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual const rom_entry *device_rom_region() const override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; required_device<cpu_device> m_z80; diff --git a/src/devices/bus/a2bus/a2arcadebd.h b/src/devices/bus/a2bus/a2arcadebd.h index 060e1c82007..1268244ca9f 100644 --- a/src/devices/bus/a2bus/a2arcadebd.h +++ b/src/devices/bus/a2bus/a2arcadebd.h @@ -30,17 +30,17 @@ public: a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; required_device<tms9918a_device> m_tms; required_device<ay8910_device> m_ay; diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 20b941b6d06..07d4e57781d 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -67,7 +67,7 @@ public: a2bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_a2bus_slot(device_t &device, const char *tag, const char *slottag); @@ -116,8 +116,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state cpu_device *m_maincpu; diff --git a/src/devices/bus/a2bus/a2cffa.h b/src/devices/bus/a2bus/a2cffa.h index a719861efa9..4215bde504f 100644 --- a/src/devices/bus/a2bus/a2cffa.h +++ b/src/devices/bus/a2bus/a2cffa.h @@ -29,19 +29,19 @@ public: a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; required_device<ata_interface_device> m_ata; @@ -61,22 +61,22 @@ public: protected: // device_config_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; }; class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface { public: a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device_config_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h index 4c9ade900ab..e7751089e33 100644 --- a/src/devices/bus/a2bus/a2corvus.h +++ b/src/devices/bus/a2bus/a2corvus.h @@ -30,20 +30,20 @@ public: a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; required_device<corvus_hdc_t> m_corvushd; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; private: UINT8 *m_rom; diff --git a/src/devices/bus/a2bus/a2diskii.h b/src/devices/bus/a2bus/a2diskii.h index 15e47316fe7..9e01464893e 100644 --- a/src/devices/bus/a2bus/a2diskii.h +++ b/src/devices/bus/a2bus/a2diskii.h @@ -28,17 +28,17 @@ public: a2bus_floppy_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; required_device<applefdc_base_device> m_fdc; @@ -57,7 +57,7 @@ class a2bus_iwmflop_device: public a2bus_floppy_device public: a2bus_iwmflop_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h index 462731449bb..28cfa664be0 100644 --- a/src/devices/bus/a2bus/a2diskiing.h +++ b/src/devices/bus/a2bus/a2diskiing.h @@ -31,19 +31,19 @@ public: a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; private: required_device<diskii_fdc> m_wozfdc; diff --git a/src/devices/bus/a2bus/a2dx1.h b/src/devices/bus/a2bus/a2dx1.h index 99b9d98193a..ce349ab15d9 100644 --- a/src/devices/bus/a2bus/a2dx1.h +++ b/src/devices/bus/a2bus/a2dx1.h @@ -29,18 +29,18 @@ public: a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<dac_device> m_dac; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; private: UINT8 m_volume, m_lastdac; diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h index 47babc64bab..06d83a9435d 100644 --- a/src/devices/bus/a2bus/a2eauxslot.h +++ b/src/devices/bus/a2bus/a2eauxslot.h @@ -51,7 +51,7 @@ public: a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_a2eauxslot_slot(device_t &device, const char *tag, const char *slottag); @@ -90,8 +90,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state cpu_device *m_maincpu; diff --git a/src/devices/bus/a2bus/a2echoii.h b/src/devices/bus/a2bus/a2echoii.h index 9413ce3a900..70a83b5fd8b 100644 --- a/src/devices/bus/a2bus/a2echoii.h +++ b/src/devices/bus/a2bus/a2echoii.h @@ -29,18 +29,18 @@ public: a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<tms5220_device> m_tms; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h index ba14f5f0ad3..01c56a7a714 100644 --- a/src/devices/bus/a2bus/a2eext80col.h +++ b/src/devices/bus/a2bus/a2eext80col.h @@ -28,14 +28,14 @@ public: a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); - - virtual UINT8 read_auxram(UINT16 offset); - virtual void write_auxram(UINT16 offset, UINT8 data); - virtual UINT8 *get_vram_ptr(); - virtual UINT8 *get_auxbank_ptr(); - virtual bool allow_dhr() { return true; } + virtual void device_start() override; + virtual void device_reset() override; + + virtual UINT8 read_auxram(UINT16 offset) override; + virtual void write_auxram(UINT16 offset, UINT8 data) override; + virtual UINT8 *get_vram_ptr() override; + virtual UINT8 *get_auxbank_ptr() override; + virtual bool allow_dhr() override { return true; } private: UINT8 m_ram[64*1024]; diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h index 93b120bb59d..7978a405512 100644 --- a/src/devices/bus/a2bus/a2eramworks3.h +++ b/src/devices/bus/a2bus/a2eramworks3.h @@ -28,15 +28,15 @@ public: a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); - - virtual UINT8 read_auxram(UINT16 offset); - virtual void write_auxram(UINT16 offset, UINT8 data); - virtual UINT8 *get_vram_ptr(); - virtual UINT8 *get_auxbank_ptr(); - virtual bool allow_dhr() { return true; } - virtual void write_c07x(address_space &space, UINT8 offset, UINT8 data); + virtual void device_start() override; + virtual void device_reset() override; + + virtual UINT8 read_auxram(UINT16 offset) override; + virtual void write_auxram(UINT16 offset, UINT8 data) override; + virtual UINT8 *get_vram_ptr() override; + virtual UINT8 *get_auxbank_ptr() override; + virtual bool allow_dhr() override { return true; } + virtual void write_c07x(address_space &space, UINT8 offset, UINT8 data) override; private: UINT8 m_ram[8*1024*1024]; diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h index bcab4bab704..3c76459e951 100644 --- a/src/devices/bus/a2bus/a2estd80col.h +++ b/src/devices/bus/a2bus/a2estd80col.h @@ -28,14 +28,14 @@ public: a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); - - virtual UINT8 read_auxram(UINT16 offset); - virtual void write_auxram(UINT16 offset, UINT8 data); - virtual UINT8 *get_vram_ptr(); - virtual UINT8 *get_auxbank_ptr(); - virtual bool allow_dhr() { return false; } // we don't allow DHR + virtual void device_start() override; + virtual void device_reset() override; + + virtual UINT8 read_auxram(UINT16 offset) override; + virtual void write_auxram(UINT16 offset, UINT8 data) override; + virtual UINT8 *get_vram_ptr() override; + virtual UINT8 *get_auxbank_ptr() override; + virtual bool allow_dhr() override { return false; } // we don't allow DHR private: UINT8 m_ram[2*1024]; diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h index 2deada2e051..d4d07ce04ea 100644 --- a/src/devices/bus/a2bus/a2hsscsi.h +++ b/src/devices/bus/a2bus/a2hsscsi.h @@ -29,8 +29,8 @@ public: a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; required_device<ncr5380n_device> m_ncr5380; required_device<nscsi_bus_device> m_scsibus; @@ -38,16 +38,16 @@ public: DECLARE_WRITE_LINE_MEMBER( drq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; private: UINT8 *m_rom; diff --git a/src/devices/bus/a2bus/a2lang.h b/src/devices/bus/a2bus/a2lang.h index b97ae92a5b1..2fd14b5bd86 100644 --- a/src/devices/bus/a2bus/a2lang.h +++ b/src/devices/bus/a2bus/a2lang.h @@ -28,11 +28,11 @@ public: a2bus_lang_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; private: void langcard_touch(offs_t offset); diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h index 283d13be62c..5f48b165a12 100644 --- a/src/devices/bus/a2bus/a2mcms.h +++ b/src/devices/bus/a2bus/a2mcms.h @@ -39,11 +39,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: sound_stream *m_stream; @@ -69,7 +69,7 @@ public: a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // comms from card 2 (oscillator parameter writes) mcms_device *get_engine(void); @@ -79,14 +79,14 @@ public: required_device<mcms_device> m_mcms; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800() { return false; } + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override { return false; } }; // card 2 @@ -100,14 +100,14 @@ public: a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800() { return false; } + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override { return false; } private: a2bus_mcms1_device *m_card1; // card 1 for passthrough diff --git a/src/devices/bus/a2bus/a2memexp.h b/src/devices/bus/a2bus/a2memexp.h index e7167569c67..8ce49163db1 100644 --- a/src/devices/bus/a2bus/a2memexp.h +++ b/src/devices/bus/a2bus/a2memexp.h @@ -27,22 +27,22 @@ public: a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; bool m_isramfactor; UINT8 m_bankhior; int m_addrmask; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; private: UINT8 *m_rom; @@ -62,7 +62,7 @@ class a2bus_ramfactor_device : public a2bus_memexp_device public: a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2midi.h b/src/devices/bus/a2bus/a2midi.h index f7023eba570..9f3abfe0f7f 100644 --- a/src/devices/bus/a2bus/a2midi.h +++ b/src/devices/bus/a2bus/a2midi.h @@ -29,18 +29,18 @@ public: a2bus_midi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); DECLARE_WRITE_LINE_MEMBER( ptm_irq_w ); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; required_device<ptm6840_device> m_ptm; required_device<acia6850_device> m_acia; diff --git a/src/devices/bus/a2bus/a2mockingboard.h b/src/devices/bus/a2bus/a2mockingboard.h index eb297bc9605..4e7025bbe59 100644 --- a/src/devices/bus/a2bus/a2mockingboard.h +++ b/src/devices/bus/a2bus/a2mockingboard.h @@ -30,7 +30,7 @@ public: a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( via1_irq_w ); DECLARE_WRITE_LINE_MEMBER( via2_irq_w ); @@ -40,14 +40,14 @@ public: DECLARE_WRITE8_MEMBER(via2_out_b); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; required_device<via6522_device> m_via1; required_device<via6522_device> m_via2; @@ -73,7 +73,7 @@ class a2bus_phasor_device : public a2bus_ayboard_device public: a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; class a2bus_echoplus_device : public a2bus_ayboard_device @@ -81,12 +81,12 @@ class a2bus_echoplus_device : public a2bus_ayboard_device public: a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; required_device<tms5220_device> m_tms; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2pic.h b/src/devices/bus/a2bus/a2pic.h index 172ec603502..997e4a342a6 100644 --- a/src/devices/bus/a2bus/a2pic.h +++ b/src/devices/bus/a2bus/a2pic.h @@ -28,22 +28,22 @@ public: a2bus_pic_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; required_ioport m_dsw1; DECLARE_WRITE_LINE_MEMBER( ack_w ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; required_device<centronics_device> m_ctx; required_device<input_buffer_device> m_ctx_data_in; diff --git a/src/devices/bus/a2bus/a2sam.h b/src/devices/bus/a2bus/a2sam.h index 3c2076921ef..5574a75c27c 100644 --- a/src/devices/bus/a2bus/a2sam.h +++ b/src/devices/bus/a2bus/a2sam.h @@ -29,17 +29,17 @@ public: a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<dac_device> m_dac; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h index 660a6d4c7b0..b6132577846 100644 --- a/src/devices/bus/a2bus/a2scsi.h +++ b/src/devices/bus/a2bus/a2scsi.h @@ -29,8 +29,8 @@ public: a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; required_device<ncr5380n_device> m_ncr5380; required_device<nscsi_bus_device> m_scsibus; @@ -38,16 +38,16 @@ public: DECLARE_WRITE_LINE_MEMBER( drq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; private: UINT8 *m_rom; diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h index 5c1064479e2..906d8e14c12 100644 --- a/src/devices/bus/a2bus/a2softcard.h +++ b/src/devices/bus/a2bus/a2softcard.h @@ -28,18 +28,18 @@ public: a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( dma_r ); DECLARE_WRITE8_MEMBER( dma_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; required_device<cpu_device> m_z80; diff --git a/src/devices/bus/a2bus/a2ssc.h b/src/devices/bus/a2bus/a2ssc.h index 8a19b0f49d2..bca78273307 100644 --- a/src/devices/bus/a2bus/a2ssc.h +++ b/src/devices/bus/a2bus/a2ssc.h @@ -28,22 +28,22 @@ public: a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; required_ioport m_dsw1, m_dsw2; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; required_device<mos6551_device> m_acia; diff --git a/src/devices/bus/a2bus/a2swyft.h b/src/devices/bus/a2bus/a2swyft.h index a7903f29de7..564a76ac6b9 100644 --- a/src/devices/bus/a2bus/a2swyft.h +++ b/src/devices/bus/a2bus/a2swyft.h @@ -27,18 +27,18 @@ public: a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_start(); - virtual void device_reset(); - - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_inh_rom(address_space &space, UINT16 offset); - virtual UINT16 inh_start() { return 0xd000; } - virtual UINT16 inh_end() { return 0xffff; } - virtual int inh_type(); + virtual void device_start() override; + virtual void device_reset() override; + + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override; + virtual UINT16 inh_start() override { return 0xd000; } + virtual UINT16 inh_end() override { return 0xffff; } + virtual int inh_type() override; private: UINT8 *m_rom; diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h index 72ea1b47953..763aec5f9df 100644 --- a/src/devices/bus/a2bus/a2themill.h +++ b/src/devices/bus/a2bus/a2themill.h @@ -28,19 +28,19 @@ public: a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( dma_r ); DECLARE_WRITE8_MEMBER( dma_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual bool take_c800(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual bool take_c800() override; required_device<cpu_device> m_6809; diff --git a/src/devices/bus/a2bus/a2thunderclock.h b/src/devices/bus/a2bus/a2thunderclock.h index 23b9e66981c..55ab8fe4389 100644 --- a/src/devices/bus/a2bus/a2thunderclock.h +++ b/src/devices/bus/a2bus/a2thunderclock.h @@ -29,20 +29,20 @@ public: a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_WRITE_LINE_MEMBER( upd_dataout_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; required_device<upd1990a_device> m_upd1990ac; diff --git a/src/devices/bus/a2bus/a2ultraterm.h b/src/devices/bus/a2bus/a2ultraterm.h index a9f9745f2cc..cbd435106cf 100644 --- a/src/devices/bus/a2bus/a2ultraterm.h +++ b/src/devices/bus/a2bus/a2ultraterm.h @@ -28,7 +28,7 @@ public: a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER(vsync_changed); MC6845_UPDATE_ROW(crtc_update_row); @@ -39,16 +39,16 @@ public: UINT8 m_ctrl1, m_ctrl2; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; required_device<mc6845_device> m_crtc; @@ -61,7 +61,7 @@ class a2bus_ultraterm_device : public a2bus_videx160_device public: a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; class a2bus_ultratermenh_device : public a2bus_videx160_device @@ -69,7 +69,7 @@ class a2bus_ultratermenh_device : public a2bus_videx160_device public: a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2videoterm.h b/src/devices/bus/a2bus/a2videoterm.h index 3452430e4dc..654103879ec 100644 --- a/src/devices/bus/a2bus/a2videoterm.h +++ b/src/devices/bus/a2bus/a2videoterm.h @@ -28,7 +28,7 @@ public: a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER(vsync_changed); MC6845_UPDATE_ROW(crtc_update_row); @@ -38,16 +38,16 @@ public: int m_framecnt; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual void write_cnxx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; required_device<mc6845_device> m_crtc; @@ -62,7 +62,7 @@ class a2bus_videoterm_device : public a2bus_videx80_device public: a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; class a2bus_ap16_device : public a2bus_videx80_device @@ -70,9 +70,9 @@ class a2bus_ap16_device : public a2bus_videx80_device public: a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; }; @@ -81,9 +81,9 @@ class a2bus_ap16alt_device : public a2bus_videx80_device public: a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; }; class a2bus_vtc1_device : public a2bus_videx80_device @@ -91,7 +91,7 @@ class a2bus_vtc1_device : public a2bus_videx80_device public: a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; class a2bus_vtc2_device : public a2bus_videx80_device @@ -99,7 +99,7 @@ class a2bus_vtc2_device : public a2bus_videx80_device public: a2bus_vtc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; class a2bus_aevm80_device : public a2bus_videx80_device @@ -107,7 +107,7 @@ class a2bus_aevm80_device : public a2bus_videx80_device public: a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2vulcan.h b/src/devices/bus/a2bus/a2vulcan.h index 9a0f998db84..25871c70fcb 100644 --- a/src/devices/bus/a2bus/a2vulcan.h +++ b/src/devices/bus/a2bus/a2vulcan.h @@ -28,18 +28,18 @@ public: a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; required_device<ata_interface_device> m_ata; @@ -56,10 +56,10 @@ class a2bus_vulcan_device : public a2bus_vulcanbase_device { public: a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_start(); + virtual void device_start() override; protected: }; @@ -68,7 +68,7 @@ class a2bus_vulcangold_device : public a2bus_vulcanbase_device { public: a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/a2bus/a2zipdrive.h b/src/devices/bus/a2bus/a2zipdrive.h index c645f8fe54a..43af97dd532 100644 --- a/src/devices/bus/a2bus/a2zipdrive.h +++ b/src/devices/bus/a2bus/a2zipdrive.h @@ -30,18 +30,18 @@ public: a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h index 2299f77cbd7..256ebd45ca3 100644 --- a/src/devices/bus/a2bus/corvfdc01.h +++ b/src/devices/bus/a2bus/corvfdc01.h @@ -30,8 +30,8 @@ public: a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_WRITE_LINE_MEMBER(intrq_w); DECLARE_WRITE_LINE_MEMBER(drq_w); @@ -39,13 +39,13 @@ public: DECLARE_FLOPPY_FORMATS(corv_floppy_formats); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; required_device<fd1793_t> m_wdfdc; required_device<floppy_connector> m_con1; diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h index 982c0486160..b47aba0b10f 100644 --- a/src/devices/bus/a2bus/corvfdc02.h +++ b/src/devices/bus/a2bus/corvfdc02.h @@ -30,8 +30,8 @@ public: a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_WRITE_LINE_MEMBER(intrq_w); DECLARE_WRITE_LINE_MEMBER(drq_w); @@ -39,14 +39,14 @@ public: DECLARE_FLOPPY_FORMATS(corv_floppy_formats); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; required_device<upd765a_device> m_fdc; required_device<floppy_connector> m_con1; diff --git a/src/devices/bus/a2bus/ezcgi.h b/src/devices/bus/a2bus/ezcgi.h index 05192f97b5c..275ec0fd77e 100644 --- a/src/devices/bus/a2bus/ezcgi.h +++ b/src/devices/bus/a2bus/ezcgi.h @@ -32,17 +32,17 @@ public: a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; required_device<tms9918a_device> m_tms; }; @@ -57,17 +57,17 @@ public: a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; required_device<v9938_device> m_tms; }; @@ -82,17 +82,17 @@ public: a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( tms_irq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; required_device<v9958_device> m_tms; }; diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h index de754f3b368..55c46f63730 100644 --- a/src/devices/bus/a2bus/laser128.h +++ b/src/devices/bus/a2bus/laser128.h @@ -28,19 +28,19 @@ public: a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); - virtual void write_c800(address_space &space, UINT16 offset, UINT8 data); - virtual bool take_c800(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; + virtual void write_c800(address_space &space, UINT16 offset, UINT8 data) override; + virtual bool take_c800() override; private: UINT8 *m_rom; diff --git a/src/devices/bus/a2bus/mouse.h b/src/devices/bus/a2bus/mouse.h index b6065897731..669487f1ec4 100644 --- a/src/devices/bus/a2bus/mouse.h +++ b/src/devices/bus/a2bus/mouse.h @@ -30,10 +30,10 @@ public: a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ8_MEMBER(pia_in_a); DECLARE_READ8_MEMBER(pia_in_b); @@ -55,13 +55,13 @@ public: DECLARE_WRITE8_MEMBER(mcu_timer_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; required_device<pia6821_device> m_pia; required_device<m68705_device> m_mcu; diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h index 4d2eb0da497..c70f188c955 100644 --- a/src/devices/bus/a2bus/ramcard128k.h +++ b/src/devices/bus/a2bus/ramcard128k.h @@ -28,17 +28,17 @@ public: a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_inh_rom(address_space &space, UINT16 offset); - virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data); - virtual UINT16 inh_start() { return 0xd000; } - virtual UINT16 inh_end() { return 0xffff; } - virtual int inh_type(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override; + virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) override; + virtual UINT16 inh_start() override { return 0xd000; } + virtual UINT16 inh_end() override { return 0xffff; } + virtual int inh_type() override; private: void do_io(int offset); diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h index 1de1cdaa85c..b604801a362 100644 --- a/src/devices/bus/a2bus/ramcard16k.h +++ b/src/devices/bus/a2bus/ramcard16k.h @@ -28,17 +28,17 @@ public: a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_inh_rom(address_space &space, UINT16 offset); - virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data); - virtual UINT16 inh_start() { return 0xd000; } - virtual UINT16 inh_end() { return 0xffff; } - virtual int inh_type(); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_inh_rom(address_space &space, UINT16 offset) override; + virtual void write_inh_rom(address_space &space, UINT16 offset, UINT8 data) override; + virtual UINT16 inh_start() override { return 0xd000; } + virtual UINT16 inh_end() override { return 0xffff; } + virtual int inh_type() override; private: void do_io(int offset); diff --git a/src/devices/bus/a2bus/timemasterho.h b/src/devices/bus/a2bus/timemasterho.h index cf26d3cded8..d1442593efc 100644 --- a/src/devices/bus/a2bus/timemasterho.h +++ b/src/devices/bus/a2bus/timemasterho.h @@ -30,9 +30,9 @@ public: a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE8_MEMBER(pia_out_a); DECLARE_WRITE8_MEMBER(pia_out_b); @@ -40,14 +40,14 @@ public: DECLARE_WRITE_LINE_MEMBER(pia_irqb_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // overrides of standard a2bus slot functions - virtual UINT8 read_c0nx(address_space &space, UINT8 offset); - virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data); - virtual UINT8 read_cnxx(address_space &space, UINT8 offset); - virtual UINT8 read_c800(address_space &space, UINT16 offset); + virtual UINT8 read_c0nx(address_space &space, UINT8 offset) override; + virtual void write_c0nx(address_space &space, UINT8 offset, UINT8 data) override; + virtual UINT8 read_cnxx(address_space &space, UINT8 offset) override; + virtual UINT8 read_c800(address_space &space, UINT16 offset) override; required_device<pia6821_device> m_pia; required_device<msm5832_device> m_msm5832; diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h index 3db230fa2b3..4d006c7d94d 100644 --- a/src/devices/bus/a7800/a78_slot.h +++ b/src/devices/bus/a7800/a78_slot.h @@ -90,31 +90,31 @@ public: virtual ~a78_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_cart_type() { return m_type; }; int identify_cart_type(UINT8 *ROM, UINT32 len); bool has_cart() { return m_cart != nullptr; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "a7800_cart"; } - virtual const char *file_extensions() const { return "bin,a78"; } - virtual device_image_partialhash_func get_partial_hash() const { return &a78_partialhash; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "a7800_cart"; } + virtual const char *file_extensions() const override { return "bin,a78"; } + virtual device_image_partialhash_func get_partial_hash() const override { return &a78_partialhash; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_04xx); diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h index 75f980fbffd..926f8d59789 100644 --- a/src/devices/bus/a7800/cpuwiz.h +++ b/src/devices/bus/a7800/cpuwiz.h @@ -17,8 +17,8 @@ public: a78_versaboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -53,11 +53,11 @@ public: a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } + virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } protected: required_device<pokey_device> m_pokey450; diff --git a/src/devices/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h index 9677e72cdb0..2223038f37b 100644 --- a/src/devices/bus/a7800/hiscore.h +++ b/src/devices/bus/a7800/hiscore.h @@ -16,7 +16,7 @@ public: a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read_04xx); diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h index 0de17b2a952..bf0d5b6d926 100644 --- a/src/devices/bus/a7800/rom.h +++ b/src/devices/bus/a7800/rom.h @@ -18,8 +18,8 @@ public: a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -36,7 +36,7 @@ public: a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -57,8 +57,8 @@ public: a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -78,7 +78,7 @@ public: a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -128,8 +128,8 @@ public: a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -149,8 +149,8 @@ public: a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_40xx); @@ -171,11 +171,11 @@ public: // construction/destruction a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } + virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } protected: required_device<pokey_device> m_pokey450; @@ -190,11 +190,11 @@ public: // construction/destruction a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } + virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } protected: required_device<pokey_device> m_pokey450; @@ -209,11 +209,11 @@ public: // construction/destruction a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } + virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } protected: required_device<pokey_device> m_pokey450; @@ -228,11 +228,11 @@ public: // construction/destruction a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } + virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(space, offset & 0x0f); else return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(space, offset & 0x0f, data); } protected: required_device<pokey_device> m_pokey450; diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h index 44173e70390..73fd605bfad 100644 --- a/src/devices/bus/a7800/xboard.h +++ b/src/devices/bus/a7800/xboard.h @@ -19,9 +19,9 @@ public: a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_04xx); @@ -45,9 +45,9 @@ public: a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_04xx); diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h index 8602748ff22..95948109653 100644 --- a/src/devices/bus/a800/a800_slot.h +++ b/src/devices/bus/a800/a800_slot.h @@ -90,30 +90,30 @@ public: virtual ~a800_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_cart_type() { return m_type; }; int identify_cart_type(UINT8 *header); bool has_cart() { return m_cart != nullptr; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "a8bit_cart"; } - virtual const char *file_extensions() const { return "bin,rom,car"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "a8bit_cart"; } + virtual const char *file_extensions() const override { return "bin,rom,car"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_80xx); @@ -139,10 +139,10 @@ public: a5200_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~a5200_cart_slot_device(); - virtual const char *file_extensions() const { return "bin,rom,car,a52"; } + virtual const char *file_extensions() const override { return "bin,rom,car,a52"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; }; // ======================> xegs_cart_slot_device @@ -154,10 +154,10 @@ public: xegs_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~xegs_cart_slot_device(); - virtual const char *file_extensions() const { return "bin,rom,car"; } + virtual const char *file_extensions() const override { return "bin,rom,car"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; }; // device type definition diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h index 29e548946d4..0a06c0c93b8 100644 --- a/src/devices/bus/a800/a8sio.h +++ b/src/devices/bus/a800/a8sio.h @@ -58,7 +58,7 @@ public: a8sio_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag); @@ -102,8 +102,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; devcb_write_line m_out_clock_in_cb; // pin 1 devcb_write_line m_out_data_in_cb; // pin 3 diff --git a/src/devices/bus/a800/cassette.h b/src/devices/bus/a800/cassette.h index d9b59568864..879d5a9b2a9 100644 --- a/src/devices/bus/a800/cassette.h +++ b/src/devices/bus/a800/cassette.h @@ -31,14 +31,14 @@ public: a8sio_cassette_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE_LINE_MEMBER( motor_w ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; required_device<cassette_image_device> m_cassette; emu_timer *m_read_timer; diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h index f781c8f5182..04c8ed5485c 100644 --- a/src/devices/bus/a800/oss.h +++ b/src/devices/bus/a800/oss.h @@ -15,8 +15,8 @@ public: a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -35,8 +35,8 @@ public: a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -55,8 +55,8 @@ public: a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -75,8 +75,8 @@ public: a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h index a1e6cde0925..f52f943ad99 100644 --- a/src/devices/bus/a800/rom.h +++ b/src/devices/bus/a800/rom.h @@ -17,8 +17,8 @@ public: a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); }; @@ -33,8 +33,8 @@ public: a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_80xx); @@ -53,8 +53,8 @@ public: a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -73,8 +73,8 @@ public: a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -93,8 +93,8 @@ public: a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); }; @@ -109,8 +109,8 @@ public: a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -144,8 +144,8 @@ public: a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -164,8 +164,8 @@ public: xegs_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); @@ -196,8 +196,8 @@ public: a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_80xx); diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h index 6b6cf9eb932..c167308bf7d 100644 --- a/src/devices/bus/a800/sparta.h +++ b/src/devices/bus/a800/sparta.h @@ -15,8 +15,8 @@ public: a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_80xx); virtual DECLARE_WRITE8_MEMBER(write_d5xx); diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h index 3c878bfa95c..0cedef00e45 100644 --- a/src/devices/bus/abcbus/abc890.h +++ b/src/devices/bus/abcbus/abc890.h @@ -31,24 +31,24 @@ public: abc890_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual UINT8 abcbus_inp(); - virtual void abcbus_out(UINT8 data); - virtual UINT8 abcbus_stat(); - virtual void abcbus_c1(UINT8 data); - virtual void abcbus_c2(UINT8 data); - virtual void abcbus_c3(UINT8 data); - virtual void abcbus_c4(UINT8 data); - virtual UINT8 abcbus_xmemfl(offs_t offset); - virtual void abcbus_xmemw(offs_t offset, UINT8 data); + virtual void abcbus_cs(UINT8 data) override; + virtual UINT8 abcbus_inp() override; + virtual void abcbus_out(UINT8 data) override; + virtual UINT8 abcbus_stat() override; + virtual void abcbus_c1(UINT8 data) override; + virtual void abcbus_c2(UINT8 data) override; + virtual void abcbus_c3(UINT8 data) override; + virtual void abcbus_c4(UINT8 data) override; + virtual UINT8 abcbus_xmemfl(offs_t offset) override; + virtual void abcbus_xmemw(offs_t offset, UINT8 data) override; }; @@ -61,7 +61,7 @@ public: abc_expansion_unit_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -74,7 +74,7 @@ public: abc894_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -87,7 +87,7 @@ public: abc850_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -100,7 +100,7 @@ public: abc852_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -113,7 +113,7 @@ public: abc856_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h index cdfd436495d..24ecb23b7ff 100644 --- a/src/devices/bus/abcbus/abcbus.h +++ b/src/devices/bus/abcbus/abcbus.h @@ -275,8 +275,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset() { if (m_card) get_card_device()->reset(); } + virtual void device_start() override; + virtual void device_reset() override { if (m_card) get_card_device()->reset(); } devcb_write_line m_write_irq; devcb_write_line m_write_nmi; diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h index ef183e92843..752c97d818b 100644 --- a/src/devices/bus/abcbus/fd2.h +++ b/src/devices/bus/abcbus/fd2.h @@ -35,8 +35,8 @@ public: abc_fd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE8_MEMBER( status_w ); @@ -49,17 +49,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual UINT8 abcbus_inp(); - virtual void abcbus_out(UINT8 data); - virtual UINT8 abcbus_stat(); - virtual void abcbus_c1(UINT8 data); - virtual void abcbus_c3(UINT8 data); - virtual UINT8 abcbus_xmemfl(offs_t offset); + virtual void abcbus_cs(UINT8 data) override; + virtual UINT8 abcbus_inp() override; + virtual void abcbus_out(UINT8 data) override; + virtual UINT8 abcbus_stat() override; + virtual void abcbus_c1(UINT8 data) override; + virtual void abcbus_c3(UINT8 data) override; + virtual UINT8 abcbus_xmemfl(offs_t offset) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/abcbus/hdc.h b/src/devices/bus/abcbus/hdc.h index cebe7619174..565a3302a88 100644 --- a/src/devices/bus/abcbus/hdc.h +++ b/src/devices/bus/abcbus/hdc.h @@ -33,16 +33,16 @@ public: abc_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index 3ffa18e9122..1d48f042013 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -72,22 +72,22 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual UINT8 abcbus_inp(); - virtual void abcbus_out(UINT8 data); - virtual UINT8 abcbus_stat(); - virtual void abcbus_c1(UINT8 data); - virtual void abcbus_c3(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; + virtual UINT8 abcbus_inp() override; + virtual void abcbus_out(UINT8 data) override; + virtual UINT8 abcbus_stat() override; + virtual void abcbus_c1(UINT8 data) override; + virtual void abcbus_c3(UINT8 data) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index f670b9d5768..da6a5ef5c66 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -57,9 +57,9 @@ public: luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ8_MEMBER( out_r ); @@ -82,18 +82,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual int abcbus_csb(); - virtual UINT8 abcbus_inp(); - virtual void abcbus_out(UINT8 data); - virtual UINT8 abcbus_stat(); - virtual void abcbus_c1(UINT8 data); - virtual void abcbus_c3(UINT8 data); - virtual void abcbus_c4(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; + virtual int abcbus_csb() override; + virtual UINT8 abcbus_inp() override; + virtual void abcbus_out(UINT8 data) override; + virtual UINT8 abcbus_stat() override; + virtual void abcbus_c1(UINT8 data) override; + virtual void abcbus_c3(UINT8 data) override; + virtual void abcbus_c4(UINT8 data) override; private: required_device<cpu_device> m_maincpu; @@ -126,8 +126,8 @@ public: abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; }; @@ -140,8 +140,8 @@ public: abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; }; @@ -154,8 +154,8 @@ public: abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; }; @@ -168,8 +168,8 @@ public: abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; }; @@ -182,8 +182,8 @@ public: abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; }; diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index 56d550155bf..c5fde193476 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -34,9 +34,9 @@ public: luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( sasi_status_r ); DECLARE_WRITE8_MEMBER( stat_w ); @@ -64,16 +64,16 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual UINT8 abcbus_inp(); - virtual void abcbus_out(UINT8 data); - virtual UINT8 abcbus_stat(); - virtual void abcbus_c1(UINT8 data); - virtual void abcbus_c3(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; + virtual UINT8 abcbus_inp() override; + virtual void abcbus_out(UINT8 data) override; + virtual UINT8 abcbus_stat() override; + virtual void abcbus_c1(UINT8 data) override; + virtual void abcbus_c3(UINT8 data) override; private: void set_rdy(int state); diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h index 387cb787466..b1c2731db8d 100644 --- a/src/devices/bus/abcbus/lux4105.h +++ b/src/devices/bus/abcbus/lux4105.h @@ -40,8 +40,8 @@ public: luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); @@ -51,18 +51,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual int abcbus_csb(); - virtual UINT8 abcbus_inp(); - virtual void abcbus_out(UINT8 data); - virtual UINT8 abcbus_stat(); - virtual void abcbus_c1(UINT8 data); - virtual void abcbus_c3(UINT8 data); - virtual void abcbus_c4(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; + virtual int abcbus_csb() override; + virtual UINT8 abcbus_inp() override; + virtual void abcbus_out(UINT8 data) override; + virtual UINT8 abcbus_stat() override; + virtual void abcbus_c1(UINT8 data) override; + virtual void abcbus_c3(UINT8 data) override; + virtual void abcbus_c4(UINT8 data) override; private: inline void update_trrq_int(); diff --git a/src/devices/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h index a3308c47f6f..7fb79f435fe 100644 --- a/src/devices/bus/abcbus/memcard.h +++ b/src/devices/bus/abcbus/memcard.h @@ -30,15 +30,15 @@ public: abc_memory_card_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data) { }; - virtual UINT8 abcbus_xmemfl(offs_t offset); + virtual void abcbus_cs(UINT8 data) override { }; + virtual UINT8 abcbus_xmemfl(offs_t offset) override; private: required_memory_region m_dos_rom; diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h index f7fbd351927..1be225d3008 100644 --- a/src/devices/bus/abcbus/ram.h +++ b/src/devices/bus/abcbus/ram.h @@ -31,12 +31,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data) { }; - virtual UINT8 abcbus_xmemfl(offs_t offset); - virtual void abcbus_xmemw(offs_t offset, UINT8 data); + virtual void abcbus_cs(UINT8 data) override { }; + virtual UINT8 abcbus_xmemfl(offs_t offset) override; + virtual void abcbus_xmemw(offs_t offset, UINT8 data) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h index 6ad8b90df0e..e76b4ad07a4 100644 --- a/src/devices/bus/abcbus/sio.h +++ b/src/devices/bus/abcbus/sio.h @@ -26,17 +26,17 @@ public: abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); - virtual UINT8 abcbus_xmemfl(offs_t offset); + virtual void abcbus_cs(UINT8 data) override; + virtual UINT8 abcbus_xmemfl(offs_t offset) override; private: required_device<z80ctc_device> m_ctc; diff --git a/src/devices/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h index 99d0f8bcc3a..f5b7cf661fb 100644 --- a/src/devices/bus/abcbus/slutprov.h +++ b/src/devices/bus/abcbus/slutprov.h @@ -24,15 +24,15 @@ public: abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; }; diff --git a/src/devices/bus/abcbus/turbo.h b/src/devices/bus/abcbus/turbo.h index c2242eca29e..b4678c4b14c 100644 --- a/src/devices/bus/abcbus/turbo.h +++ b/src/devices/bus/abcbus/turbo.h @@ -32,16 +32,16 @@ public: turbo_kontroller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h index 37ed2e0917b..be1d9086c4e 100644 --- a/src/devices/bus/abcbus/uni800.h +++ b/src/devices/bus/abcbus/uni800.h @@ -24,15 +24,15 @@ public: abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_abcbus_interface overrides - virtual void abcbus_cs(UINT8 data); + virtual void abcbus_cs(UINT8 data) override; }; diff --git a/src/devices/bus/abckb/abc77.h b/src/devices/bus/abckb/abc77.h index 5ead0a32f96..340dd86f8c6 100644 --- a/src/devices/bus/abckb/abc77.h +++ b/src/devices/bus/abckb/abc77.h @@ -34,12 +34,12 @@ public: abc77_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // abc_keyboard_interface overrides - virtual void txd_w(int state); + virtual void txd_w(int state) override; DECLARE_INPUT_CHANGED_MEMBER( keyboard_reset ); @@ -51,9 +51,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; enum { @@ -103,7 +103,7 @@ public: abc55_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; }; diff --git a/src/devices/bus/abckb/abc800kb.h b/src/devices/bus/abckb/abc800kb.h index 52719062314..61e55826d54 100644 --- a/src/devices/bus/abckb/abc800kb.h +++ b/src/devices/bus/abckb/abc800kb.h @@ -33,12 +33,12 @@ public: abc800_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // abc_keyboard_interface overrides - virtual void txd_w(int state); + virtual void txd_w(int state) override; // not really public DECLARE_READ8_MEMBER( kb_p1_r ); @@ -48,9 +48,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: inline void serial_output(int state); diff --git a/src/devices/bus/abckb/abc99.h b/src/devices/bus/abckb/abc99.h index 366d9fa23ce..5ca05436a0b 100644 --- a/src/devices/bus/abckb/abc99.h +++ b/src/devices/bus/abckb/abc99.h @@ -32,12 +32,12 @@ public: abc99_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // abc_keyboard_interface overrides - virtual void txd_w(int state); + virtual void txd_w(int state) override; DECLARE_INPUT_CHANGED_MEMBER( keyboard_reset ); @@ -52,9 +52,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum diff --git a/src/devices/bus/abckb/abckb.h b/src/devices/bus/abckb/abckb.h index 9b396f26983..513350acc53 100644 --- a/src/devices/bus/abckb/abckb.h +++ b/src/devices/bus/abckb/abckb.h @@ -61,8 +61,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; devcb_write_line m_out_rx_handler; devcb_write_line m_out_trxc_handler; diff --git a/src/devices/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h index acf1d2fa31a..25818966ef6 100644 --- a/src/devices/bus/adam/adamlink.h +++ b/src/devices/bus/adam/adamlink.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adam_expansion_slot_card_interface overrides - virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); - virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); + virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; }; diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h index ac5c24b603e..0ede272e340 100644 --- a/src/devices/bus/adam/exp.h +++ b/src/devices/bus/adam/exp.h @@ -67,27 +67,27 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; + virtual void device_reset() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "adam_rom"; } - virtual const char *file_extensions() const { return "bin,rom"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "adam_rom"; } + virtual const char *file_extensions() const override { return "bin,rom"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; devcb_write_line m_write_irq; diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h index 35e26681bcd..f26f42a3c1d 100644 --- a/src/devices/bus/adam/ide.h +++ b/src/devices/bus/adam/ide.h @@ -32,16 +32,16 @@ public: powermate_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adam_expansion_slot_card_interface overrides - virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); - virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); + virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; private: required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/adam/ram.h b/src/devices/bus/adam/ram.h index d6c5e470ee5..5fabdd7e602 100644 --- a/src/devices/bus/adam/ram.h +++ b/src/devices/bus/adam/ram.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adam_expansion_slot_card_interface overrides - virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); - virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); + virtual UINT8 adam_bd_r(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual void adam_bd_w(address_space &space, offs_t offset, UINT8 data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/adamnet/adamnet.h b/src/devices/bus/adamnet/adamnet.h index 7bbf9105556..5ce906d270d 100644 --- a/src/devices/bus/adamnet/adamnet.h +++ b/src/devices/bus/adamnet/adamnet.h @@ -62,8 +62,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_stop() override; private: class daisy_entry @@ -96,7 +96,7 @@ public: adamnet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; protected: // configuration diff --git a/src/devices/bus/adamnet/ddp.h b/src/devices/bus/adamnet/ddp.h index 07c2bf0c0c1..1a2a2402d03 100644 --- a/src/devices/bus/adamnet/ddp.h +++ b/src/devices/bus/adamnet/ddp.h @@ -33,8 +33,8 @@ public: adam_digital_data_pack_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_WRITE8_MEMBER( p1_w ); @@ -44,10 +44,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adamnet_card_interface overrides - virtual void adamnet_reset_w(int state); + virtual void adamnet_reset_w(int state) override; required_device<cpu_device> m_maincpu; required_device<cassette_image_device> m_ddp0; diff --git a/src/devices/bus/adamnet/fdc.h b/src/devices/bus/adamnet/fdc.h index fb519e1a5ba..a8cd3d17648 100644 --- a/src/devices/bus/adamnet/fdc.h +++ b/src/devices/bus/adamnet/fdc.h @@ -33,9 +33,9 @@ public: adam_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ8_MEMBER( data_r ); @@ -48,10 +48,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adamnet_card_interface overrides - virtual void adamnet_reset_w(int state); + virtual void adamnet_reset_w(int state) override; required_device<cpu_device> m_maincpu; required_device<wd2793_t> m_fdc; diff --git a/src/devices/bus/adamnet/kb.h b/src/devices/bus/adamnet/kb.h index 58bf9f07bc5..a9cb98450dd 100644 --- a/src/devices/bus/adamnet/kb.h +++ b/src/devices/bus/adamnet/kb.h @@ -31,9 +31,9 @@ public: adam_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ8_MEMBER( p1_r ); @@ -46,10 +46,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adamnet_card_interface overrides - virtual void adamnet_reset_w(int state); + virtual void adamnet_reset_w(int state) override; required_device<cpu_device> m_maincpu; required_ioport m_y0; diff --git a/src/devices/bus/adamnet/printer.h b/src/devices/bus/adamnet/printer.h index 0a2fae5fac5..13025fe5393 100644 --- a/src/devices/bus/adamnet/printer.h +++ b/src/devices/bus/adamnet/printer.h @@ -31,8 +31,8 @@ public: adam_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_WRITE8_MEMBER( p1_w ); @@ -44,10 +44,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adamnet_card_interface overrides - virtual void adamnet_reset_w(int state); + virtual void adamnet_reset_w(int state) override; required_device<cpu_device> m_maincpu; }; diff --git a/src/devices/bus/adamnet/spi.h b/src/devices/bus/adamnet/spi.h index 19a1d5c9866..81abae409e3 100644 --- a/src/devices/bus/adamnet/spi.h +++ b/src/devices/bus/adamnet/spi.h @@ -34,8 +34,8 @@ public: adam_spi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_READ8_MEMBER( p2_r ); @@ -43,10 +43,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_adamnet_card_interface overrides - virtual void adamnet_reset_w(int state); + virtual void adamnet_reset_w(int state) override; required_device<cpu_device> m_maincpu; }; diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h index 9a189ec58c2..bdb65591425 100644 --- a/src/devices/bus/amiga/zorro/a2052.h +++ b/src/devices/bus/amiga/zorro/a2052.h @@ -31,14 +31,14 @@ public: a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; // device_zorro2_card_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ); // amiga_autoconfig overrides - virtual void autoconfig_base_address(offs_t address); + virtual void autoconfig_base_address(offs_t address) override; private: required_ioport m_config; diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h index c0a6bea2d8f..1b8c1beca95 100644 --- a/src/devices/bus/amiga/zorro/a2232.h +++ b/src/devices/bus/amiga/zorro/a2232.h @@ -101,15 +101,15 @@ public: DECLARE_WRITE_LINE_MEMBER( rs232_7_cts_w ); protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset_after_children(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset_after_children() override; // device_zorro2_card_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ); // amiga_autoconfig overrides - virtual void autoconfig_base_address(offs_t address); + virtual void autoconfig_base_address(offs_t address) override; private: enum diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h index 4c929f28b01..1e0baa7b140 100644 --- a/src/devices/bus/amiga/zorro/a590.h +++ b/src/devices/bus/amiga/zorro/a590.h @@ -33,8 +33,8 @@ public: device_t *owner, UINT32 clock, const char *name, const char *shortname); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER( dmac_scsi_r ); DECLARE_WRITE8_MEMBER( dmac_scsi_w ); @@ -44,8 +44,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // to slot virtual void cfgout_w(int state) = 0; @@ -75,16 +75,16 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; // output to slot - virtual void cfgout_w(int state) { m_slot->cfgout_w(state); } - virtual void int2_w(int state) { m_slot->int2_w(state); } - virtual void int6_w(int state) { m_slot->int6_w(state); } + virtual void cfgout_w(int state) override { m_slot->cfgout_w(state); } + virtual void int2_w(int state) override { m_slot->int2_w(state); } + virtual void int6_w(int state) override { m_slot->int6_w(state); } // input from slot virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ); @@ -105,16 +105,16 @@ public: a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; // output to slot - virtual void cfgout_w(int state) { m_slot->cfgout_w(state); } - virtual void int2_w(int state) { m_slot->int2_w(state); } - virtual void int6_w(int state) { m_slot->int6_w(state); } + virtual void cfgout_w(int state) override { m_slot->cfgout_w(state); } + virtual void int2_w(int state) override { m_slot->int2_w(state); } + virtual void int6_w(int state) override { m_slot->int6_w(state); } // input from slot virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ); diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h index 1e47a9b36f0..7e1eb942796 100644 --- a/src/devices/bus/amiga/zorro/action_replay.h +++ b/src/devices/bus/amiga/zorro/action_replay.h @@ -31,14 +31,14 @@ public: device_t *owner, UINT32 clock, const char *name, const char *shortname); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER( freeze ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_ioport m_button; @@ -51,7 +51,7 @@ public: action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; class action_replay_mk2_device : public action_replay_device @@ -61,7 +61,7 @@ public: action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; class action_replay_mk3_device : public action_replay_device @@ -71,7 +71,7 @@ public: action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h index d1a41dcf635..c1a29158b3f 100644 --- a/src/devices/bus/amiga/zorro/buddha.h +++ b/src/devices/bus/amiga/zorro/buddha.h @@ -55,17 +55,17 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_zorro2_card_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( cfgin_w ); // amiga_autoconfig overrides - virtual void autoconfig_base_address(offs_t address); + virtual void autoconfig_base_address(offs_t address) override; private: required_device<ata_interface_device> m_ata_0; diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h index 4b61b644136..274d7a8b416 100644 --- a/src/devices/bus/amiga/zorro/zorro.h +++ b/src/devices/bus/amiga/zorro/zorro.h @@ -233,7 +233,7 @@ public: const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag); @@ -282,7 +282,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: const char *m_cputag; @@ -306,18 +306,18 @@ public: { return downcast<exp_slot_device &>(device).m_ipl_handler.set_callback(object); } // the expansion slot can only have a single card - virtual void add_card(device_zorro_card_interface *card); + virtual void add_card(device_zorro_card_interface *card) override; // interface (from slot device) void ipl_w(int interrupt); // interface (from host) - virtual void fc_w(int code); + virtual void fc_w(int code) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write8 m_ipl_handler; @@ -349,7 +349,7 @@ public: { return downcast<zorro2_device &>(device).m_eint7_handler.set_callback(object); } // the zorro2 bus supports multiple cards - virtual void add_card(device_zorro_card_interface *card); + virtual void add_card(device_zorro_card_interface *card) override; // interface (from slot device) virtual DECLARE_WRITE_LINE_MEMBER( cfgout_w ); @@ -360,12 +360,12 @@ public: DECLARE_WRITE_LINE_MEMBER( eint7_w ); // interface (from host) - virtual void fc_w(int code); + virtual void fc_w(int code) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write_line m_eint1_handler; @@ -416,7 +416,7 @@ public: device_exp_card_interface(const machine_config &mconfig, device_t &device); virtual ~device_exp_card_interface(); - virtual void set_zorro_device(); + virtual void set_zorro_device() override; protected: exp_slot_device *m_slot; @@ -431,7 +431,7 @@ public: device_zorro2_card_interface(const machine_config &mconfig, device_t &device); virtual ~device_zorro2_card_interface(); - virtual void set_zorro_device(); + virtual void set_zorro_device() override; device_zorro2_card_interface *next() const { return m_next; } device_zorro2_card_interface *m_next; diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h index 7c377a0cc77..0a3ceee8aa3 100644 --- a/src/devices/bus/apf/rom.h +++ b/src/devices/bus/apf/rom.h @@ -17,8 +17,8 @@ public: apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h index 1c2458d5b07..15d2c8500a9 100644 --- a/src/devices/bus/apf/slot.h +++ b/src/devices/bus/apf/slot.h @@ -61,30 +61,30 @@ public: virtual ~apf_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "apfm1000_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "apfm1000_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/apricot/expansion.h b/src/devices/bus/apricot/expansion.h index 38687db4399..fc581f50fb4 100644 --- a/src/devices/bus/apricot/expansion.h +++ b/src/devices/bus/apricot/expansion.h @@ -102,7 +102,7 @@ public: const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; // device type definition @@ -154,8 +154,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: simple_list<device_apricot_expansion_card_interface> m_dev; diff --git a/src/devices/bus/apricot/ram.h b/src/devices/bus/apricot/ram.h index 20ac01f2867..c2b2f771953 100644 --- a/src/devices/bus/apricot/ram.h +++ b/src/devices/bus/apricot/ram.h @@ -29,9 +29,9 @@ public: apricot_256k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_ioport m_sw; @@ -49,9 +49,9 @@ public: apricot_128k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_ioport m_strap; @@ -69,9 +69,9 @@ public: apricot_512k_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_ioport m_strap; diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h index f070ac3aecd..4ce1ebe90fd 100644 --- a/src/devices/bus/arcadia/rom.h +++ b/src/devices/bus/arcadia/rom.h @@ -17,8 +17,8 @@ public: arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h index 039c2944f22..b4777024f2c 100644 --- a/src/devices/bus/arcadia/slot.h +++ b/src/devices/bus/arcadia/slot.h @@ -52,28 +52,28 @@ public: virtual ~arcadia_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "arcadia_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "arcadia_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h index 022178bb242..b2d6e3643ea 100644 --- a/src/devices/bus/astrocde/exp.h +++ b/src/devices/bus/astrocde/exp.h @@ -29,7 +29,7 @@ public: virtual ~astrocade_exp_device(); // device-level overrides - virtual void device_start(); + virtual void device_start() override; bool get_card_mounted() { return m_card_mounted; } diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h index 9df04bdad0e..fe730ae975a 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -17,9 +17,9 @@ public: astrocade_blueram_4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { m_ram.resize(0x1000); save_item(NAME(m_ram)); } - virtual void device_reset() {} - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override { m_ram.resize(0x1000); save_item(NAME(m_ram)); } + virtual void device_reset() override {} + virtual ioport_constructor device_input_ports() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read); @@ -38,7 +38,7 @@ public: // construction/destruction astrocade_blueram_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); } + virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } }; // ======================> astrocade_blueram_32k_device @@ -49,7 +49,7 @@ public: // construction/destruction astrocade_blueram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); } + virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } }; // ======================> astrocade_viper_sys1_device @@ -62,9 +62,9 @@ public: astrocade_viper_sys1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { m_ram.resize(0x4000); save_item(NAME(m_ram)); } - virtual void device_reset() {} - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } + virtual void device_reset() override {} + virtual ioport_constructor device_input_ports() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read); @@ -85,9 +85,9 @@ public: astrocade_whiteram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { m_ram.resize(0x8000); save_item(NAME(m_ram)); } - virtual void device_reset() {} - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } + virtual void device_reset() override {} + virtual ioport_constructor device_input_ports() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read); @@ -108,9 +108,9 @@ public: astrocade_rl64ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { m_ram.resize(0xb000); save_item(NAME(m_ram)); } - virtual void device_reset() {} - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); } + virtual void device_reset() override {} + virtual ioport_constructor device_input_ports() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read); diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h index e0b5647742a..3d608c43153 100644 --- a/src/devices/bus/astrocde/rom.h +++ b/src/devices/bus/astrocde/rom.h @@ -17,8 +17,8 @@ public: astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -32,8 +32,8 @@ public: // construction/destruction astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -50,8 +50,8 @@ public: // construction/destruction astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h index 200f840f0e9..42e8026305e 100644 --- a/src/devices/bus/astrocde/slot.h +++ b/src/devices/bus/astrocde/slot.h @@ -53,28 +53,28 @@ public: virtual ~astrocade_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "astrocde_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "astrocde_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/bml3/bml3bus.h b/src/devices/bus/bml3/bml3bus.h index 63da81fd1fc..36c20f4159e 100644 --- a/src/devices/bus/bml3/bml3bus.h +++ b/src/devices/bus/bml3/bml3bus.h @@ -60,7 +60,7 @@ public: bml3bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_bml3bus_slot(device_t &device, const char *tag, const char *slottag); @@ -101,8 +101,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state cpu_device *m_maincpu; diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h index e05a4fd96d2..8a1c8dd24df 100644 --- a/src/devices/bus/bml3/bml3kanji.h +++ b/src/devices/bus/bml3/bml3kanji.h @@ -27,15 +27,15 @@ public: bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(bml3_kanji_r); DECLARE_WRITE8_MEMBER(bml3_kanji_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT16 m_kanji_addr; diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h index 0c4088c0d4f..de42c95261a 100644 --- a/src/devices/bus/bml3/bml3mp1802.h +++ b/src/devices/bus/bml3/bml3mp1802.h @@ -31,16 +31,16 @@ public: bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(bml3_mp1802_r); DECLARE_WRITE8_MEMBER(bml3_mp1802_w); DECLARE_WRITE_LINE_MEMBER(bml3_wd17xx_intrq_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<mb8866_t> m_fdc; diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h index ca819b4c061..57ffdfefcaa 100644 --- a/src/devices/bus/bml3/bml3mp1805.h +++ b/src/devices/bus/bml3/bml3mp1805.h @@ -30,8 +30,8 @@ public: bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(bml3_mp1805_r); DECLARE_WRITE8_MEMBER(bml3_mp1805_w); @@ -39,8 +39,8 @@ public: DECLARE_WRITE_LINE_MEMBER( bml3_mc6843_intrq_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; required_device<mc6843_device> m_mc6843; diff --git a/src/devices/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h index 4d87f1d3ea1..b9d4fbcc0d8 100644 --- a/src/devices/bus/bw2/exp.h +++ b/src/devices/bus/bw2/exp.h @@ -89,8 +89,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_bw2_expansion_slot_interface *m_cart; }; diff --git a/src/devices/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h index 1d346370567..da66c4d670d 100644 --- a/src/devices/bus/bw2/ramcard.h +++ b/src/devices/bus/bw2/ramcard.h @@ -30,17 +30,17 @@ public: bw2_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_bw2_expansion_slot_interface overrides - virtual UINT8 bw2_cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6); - virtual void bw2_cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6); - virtual void bw2_slot_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 bw2_cd_r(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6) override; + virtual void bw2_cd_w(address_space &space, offs_t offset, UINT8 data, int ram2, int ram3, int ram4, int ram5, int ram6) override; + virtual void bw2_slot_w(address_space &space, offs_t offset, UINT8 data) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h index 6ebec5dca7e..fd4b7a50fcb 100644 --- a/src/devices/bus/c64/16kb.h +++ b/src/devices/bus/c64/16kb.h @@ -33,16 +33,16 @@ public: c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_ioport m_sw1; diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h index 3e99406ab89..a8a0a684fe5 100644 --- a/src/devices/bus/c64/4dxh.h +++ b/src/devices/bus/c64/4dxh.h @@ -31,15 +31,15 @@ public: c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - virtual WRITE_LINE_MEMBER( input_4 ) { output_6(state); } - virtual WRITE_LINE_MEMBER( input_6 ) { output_4(state); } + virtual WRITE_LINE_MEMBER( input_4 ) override { output_6(state); } + virtual WRITE_LINE_MEMBER( input_6 ) override { output_4(state); } protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h index 8177922fb1e..bbb61e0bf73 100644 --- a/src/devices/bus/c64/4ksa.h +++ b/src/devices/bus/c64/4ksa.h @@ -31,15 +31,15 @@ public: c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - virtual WRITE_LINE_MEMBER( input_4 ) { output_6(state); } - virtual WRITE_LINE_MEMBER( input_6 ) { output_4(state); } + virtual WRITE_LINE_MEMBER( input_4 ) override { output_6(state); } + virtual WRITE_LINE_MEMBER( input_6 ) override { output_4(state); } protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h index 5b4329b5463..c7505d0d49a 100644 --- a/src/devices/bus/c64/4tba.h +++ b/src/devices/bus/c64/4tba.h @@ -31,15 +31,15 @@ public: c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides - virtual WRITE_LINE_MEMBER( input_4 ) { output_6(state); } - virtual WRITE_LINE_MEMBER( input_6 ) { output_4(state); } + virtual WRITE_LINE_MEMBER( input_4 ) override { output_6(state); } + virtual WRITE_LINE_MEMBER( input_6 ) override { output_4(state); } protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h index 3ad7aee1c87..a3f0a1834b6 100644 --- a/src/devices/bus/c64/bn1541.h +++ b/src/devices/bus/c64/bn1541.h @@ -52,22 +52,22 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_floppy_parallel_interface overrides - virtual void parallel_data_w(UINT8 data); - virtual void parallel_strobe_w(int state); + virtual void parallel_data_w(UINT8 data) override; + virtual void parallel_strobe_w(int state) override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_8); - virtual WRITE_LINE_MEMBER(input_c) { if (state) m_parallel_output |= 1; else m_parallel_output &= ~1; update_output(); } - virtual WRITE_LINE_MEMBER(input_d) { if (state) m_parallel_output |= 2; else m_parallel_output &= ~2; update_output(); } - virtual WRITE_LINE_MEMBER(input_e) { if (state) m_parallel_output |= 4; else m_parallel_output &= ~4; update_output(); } - virtual WRITE_LINE_MEMBER(input_f) { if (state) m_parallel_output |= 8; else m_parallel_output &= ~8; update_output(); } - virtual WRITE_LINE_MEMBER(input_h) { if (state) m_parallel_output |= 16; else m_parallel_output &= ~16; update_output(); } - virtual WRITE_LINE_MEMBER(input_j) { if (state) m_parallel_output |= 32; else m_parallel_output &= ~32; update_output(); } - virtual WRITE_LINE_MEMBER(input_k) { if (state) m_parallel_output |= 64; else m_parallel_output &= ~64; update_output(); } - virtual WRITE_LINE_MEMBER(input_l) { if (state) m_parallel_output |= 128; else m_parallel_output &= ~128; update_output(); } + virtual DECLARE_WRITE_LINE_MEMBER(input_8) override; + virtual WRITE_LINE_MEMBER(input_c) override { if (state) m_parallel_output |= 1; else m_parallel_output &= ~1; update_output(); } + virtual WRITE_LINE_MEMBER(input_d) override { if (state) m_parallel_output |= 2; else m_parallel_output &= ~2; update_output(); } + virtual WRITE_LINE_MEMBER(input_e) override { if (state) m_parallel_output |= 4; else m_parallel_output &= ~4; update_output(); } + virtual WRITE_LINE_MEMBER(input_f) override { if (state) m_parallel_output |= 8; else m_parallel_output &= ~8; update_output(); } + virtual WRITE_LINE_MEMBER(input_h) override { if (state) m_parallel_output |= 16; else m_parallel_output &= ~16; update_output(); } + virtual WRITE_LINE_MEMBER(input_j) override { if (state) m_parallel_output |= 32; else m_parallel_output &= ~32; update_output(); } + virtual WRITE_LINE_MEMBER(input_k) override { if (state) m_parallel_output |= 64; else m_parallel_output &= ~64; update_output(); } + virtual WRITE_LINE_MEMBER(input_l) override { if (state) m_parallel_output |= 128; else m_parallel_output &= ~128; update_output(); } private: void update_output(); diff --git a/src/devices/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h index de7cfc862de..e403cd8b10f 100644 --- a/src/devices/bus/c64/c128_comal80.h +++ b/src/devices/bus/c64/c128_comal80.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h index 2210cdc7388..1ba872ca121 100644 --- a/src/devices/bus/c64/c128_partner.h +++ b/src/devices/bus/c64/c128_partner.h @@ -32,19 +32,19 @@ public: partner128_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( nmi_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; // device_vcs_control_port_interface overrides virtual void vcs_joy_w(UINT8 data); diff --git a/src/devices/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h index 766b6ed10d7..b77adf1a8bd 100644 --- a/src/devices/bus/c64/comal80.h +++ b/src/devices/bus/c64/comal80.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h index 67e7495d027..1e10bc810ce 100644 --- a/src/devices/bus/c64/cpm.h +++ b/src/devices/bus/c64/cpm.h @@ -31,7 +31,7 @@ public: c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_READ8_MEMBER( dma_r ); @@ -39,12 +39,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: inline void update_signals(); diff --git a/src/devices/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h index db687704252..1ca31571bbd 100644 --- a/src/devices/bus/c64/currah_speech.h +++ b/src/devices/bus/c64/currah_speech.h @@ -32,17 +32,17 @@ public: c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: inline void set_osc1(int voice, int intonation); diff --git a/src/devices/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h index 8cae8b25b25..df5ce8580e5 100644 --- a/src/devices/bus/c64/dela_ep256.h +++ b/src/devices/bus/c64/dela_ep256.h @@ -33,16 +33,16 @@ public: c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: generic_slot_device *m_eproms[8]; diff --git a/src/devices/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h index 9ee3455aeba..db1da8feca0 100644 --- a/src/devices/bus/c64/dela_ep64.h +++ b/src/devices/bus/c64/dela_ep64.h @@ -33,16 +33,16 @@ public: c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<generic_slot_device> m_eprom1; diff --git a/src/devices/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h index cf236fadc07..904eda891e2 100644 --- a/src/devices/bus/c64/dela_ep7x8.h +++ b/src/devices/bus/c64/dela_ep7x8.h @@ -33,16 +33,16 @@ public: c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<generic_slot_device> m_eprom1; diff --git a/src/devices/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h index 2f3ecc07302..234f14c43eb 100644 --- a/src/devices/bus/c64/dinamic.h +++ b/src/devices/bus/c64/dinamic.h @@ -32,11 +32,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h index 1d9acd82aa2..f826cf5e165 100644 --- a/src/devices/bus/c64/dqbb.h +++ b/src/devices/bus/c64/dqbb.h @@ -34,17 +34,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default() { } - virtual void nvram_read(emu_file &file) { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } - virtual void nvram_write(emu_file &file) { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } } + virtual void nvram_default() override { } + virtual void nvram_read(emu_file &file) override { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } + virtual void nvram_write(emu_file &file) override { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } } // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: int m_cs; diff --git a/src/devices/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h index e0fe1e34ac8..791692c04c7 100644 --- a/src/devices/bus/c64/easy_calc_result.h +++ b/src/devices/bus/c64/easy_calc_result.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: int m_bank; diff --git a/src/devices/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h index 4dba6c1e5be..265abf19771 100644 --- a/src/devices/bus/c64/easyflash.h +++ b/src/devices/bus/c64/easyflash.h @@ -32,19 +32,19 @@ public: c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<amd_29f040_device> m_flash_roml; diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h index f0f30c5ccc6..c65f3842d12 100644 --- a/src/devices/bus/c64/epyx_fast_load.h +++ b/src/devices/bus/c64/epyx_fast_load.h @@ -32,13 +32,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: emu_timer *m_exrom_timer; diff --git a/src/devices/bus/c64/exos.h b/src/devices/bus/c64/exos.h index 1fffb003c86..7f4785098f4 100644 --- a/src/devices/bus/c64/exos.h +++ b/src/devices/bus/c64/exos.h @@ -32,11 +32,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; }; diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h index d66f0575313..1e3c4ad049c 100644 --- a/src/devices/bus/c64/exp.h +++ b/src/devices/bus/c64/exp.h @@ -129,27 +129,27 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; + virtual void device_reset() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "c64_cart,vic10_cart"; } - virtual const char *file_extensions() const { return "80,a0,e0,crt"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "c64_cart,vic10_cart"; } + virtual const char *file_extensions() const override { return "80,a0,e0,crt"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; devcb_read8 m_read_dma_cd; devcb_write8 m_write_dma_cd; diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h index 7ca145246c8..a2952e34c0f 100644 --- a/src/devices/bus/c64/fcc.h +++ b/src/devices/bus/c64/fcc.h @@ -32,26 +32,26 @@ public: c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( nvram_r ); DECLARE_WRITE8_MEMBER( nvram_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default() { } - virtual void nvram_read(emu_file &file) { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } - virtual void nvram_write(emu_file &file) { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } } + virtual void nvram_default() override { } + virtual void nvram_read(emu_file &file) override { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } + virtual void nvram_write(emu_file &file) override { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } } // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<m65sc02_device> m_maincpu; diff --git a/src/devices/bus/c64/final.h b/src/devices/bus/c64/final.h index 44ce29e3fee..cbf7fab0b73 100644 --- a/src/devices/bus/c64/final.h +++ b/src/devices/bus/c64/final.h @@ -31,18 +31,18 @@ public: c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER( freeze ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h index 766e40a942b..42c1e1aa9f8 100644 --- a/src/devices/bus/c64/final3.h +++ b/src/devices/bus/c64/final3.h @@ -31,18 +31,18 @@ public: c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER( freeze ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h index 6ea38b0ac7f..8e4e7528eb7 100644 --- a/src/devices/bus/c64/fun_play.h +++ b/src/devices/bus/c64/fun_play.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h index 16d7b831d7a..373fcd25a73 100644 --- a/src/devices/bus/c64/geocable.h +++ b/src/devices/bus/c64/geocable.h @@ -32,22 +32,22 @@ public: c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_c) { m_centronics->write_data0(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_d) { m_centronics->write_data1(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_e) { m_centronics->write_data2(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_f) { m_centronics->write_data3(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_h) { m_centronics->write_data4(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_j) { m_centronics->write_data5(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_k) { m_centronics->write_data6(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_l) { m_centronics->write_data7(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_m) { m_centronics->write_strobe(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_c) override { m_centronics->write_data0(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_d) override { m_centronics->write_data1(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_e) override { m_centronics->write_data2(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_f) override { m_centronics->write_data3(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_h) override { m_centronics->write_data4(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_j) override { m_centronics->write_data5(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_k) override { m_centronics->write_data6(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_l) override { m_centronics->write_data7(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_m) override { m_centronics->write_strobe(state); } private: required_device<centronics_device> m_centronics; diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h index 7415b911dc2..bf1a431244d 100644 --- a/src/devices/bus/c64/georam.h +++ b/src/devices/bus/c64/georam.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h index c87cbf41479..cfe6e1cd27f 100644 --- a/src/devices/bus/c64/ide64.h +++ b/src/devices/bus/c64/ide64.h @@ -35,19 +35,19 @@ public: c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<atmel_29c010_device> m_flash_rom; diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h index 9e8b2ee8e4d..ca11ff7f5dc 100644 --- a/src/devices/bus/c64/ieee488.h +++ b/src/devices/bus/c64/ieee488.h @@ -32,7 +32,7 @@ public: c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_READ8_MEMBER( tpi_pa_r ); @@ -42,13 +42,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<tpi6525_device> m_tpi; diff --git a/src/devices/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h index d6ca889b5fa..ab9dea5d935 100644 --- a/src/devices/bus/c64/kingsoft.h +++ b/src/devices/bus/c64/kingsoft.h @@ -32,13 +32,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; }; diff --git a/src/devices/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h index b3e448e77b4..a41114ccffe 100644 --- a/src/devices/bus/c64/mach5.h +++ b/src/devices/bus/c64/mach5.h @@ -30,16 +30,16 @@ public: c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_ioport m_s1; diff --git a/src/devices/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h index a1db772cb2c..601805fabaa 100644 --- a/src/devices/bus/c64/magic_desk.h +++ b/src/devices/bus/c64/magic_desk.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h index 251fbbb0c90..ecf439e5606 100644 --- a/src/devices/bus/c64/magic_formel.h +++ b/src/devices/bus/c64/magic_formel.h @@ -31,8 +31,8 @@ public: c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER( freeze ); @@ -43,13 +43,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<pia6821_device> m_pia; diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h index ef385a5a502..cfcd2aaded8 100644 --- a/src/devices/bus/c64/magic_voice.h +++ b/src/devices/bus/c64/magic_voice.h @@ -33,7 +33,7 @@ public: c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( tpi_irq_w ); DECLARE_READ8_MEMBER( tpi_pa_r ); @@ -51,13 +51,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: offs_t get_offset(offs_t offset); diff --git a/src/devices/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h index 95f447f122e..ac088c2f631 100644 --- a/src/devices/bus/c64/midi_maplin.h +++ b/src/devices/bus/c64/midi_maplin.h @@ -30,19 +30,19 @@ public: c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<acia6850_device> m_acia; diff --git a/src/devices/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h index bc91dbd8f86..048ea6b123f 100644 --- a/src/devices/bus/c64/midi_namesoft.h +++ b/src/devices/bus/c64/midi_namesoft.h @@ -30,19 +30,19 @@ public: c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<acia6850_device> m_acia; diff --git a/src/devices/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h index e60331cd727..ff7be2185a1 100644 --- a/src/devices/bus/c64/midi_passport.h +++ b/src/devices/bus/c64/midi_passport.h @@ -31,7 +31,7 @@ public: c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( ptm_irq_w ); DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); @@ -39,12 +39,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<acia6850_device> m_acia; diff --git a/src/devices/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h index 0401f3a82a1..6ab277b3ef1 100644 --- a/src/devices/bus/c64/midi_sci.h +++ b/src/devices/bus/c64/midi_sci.h @@ -30,19 +30,19 @@ public: c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<acia6850_device> m_acia; diff --git a/src/devices/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h index f566489259e..12787d4999c 100644 --- a/src/devices/bus/c64/midi_siel.h +++ b/src/devices/bus/c64/midi_siel.h @@ -30,19 +30,19 @@ public: c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); DECLARE_WRITE_LINE_MEMBER( write_acia_clock ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<acia6850_device> m_acia; diff --git a/src/devices/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h index 15c4e06279d..6b742fbb0f3 100644 --- a/src/devices/bus/c64/mikro_assembler.h +++ b/src/devices/bus/c64/mikro_assembler.h @@ -32,10 +32,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h index 08d570f8308..1b56cdda70f 100644 --- a/src/devices/bus/c64/multiscreen.h +++ b/src/devices/bus/c64/multiscreen.h @@ -33,17 +33,17 @@ public: c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/music64.h b/src/devices/bus/c64/music64.h index bd1cfe2774b..8af27d6601e 100644 --- a/src/devices/bus/c64/music64.h +++ b/src/devices/bus/c64/music64.h @@ -30,19 +30,19 @@ public: c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<c64_expansion_slot_device> m_exp; diff --git a/src/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h index 824124bbe1e..f9e28d23c0a 100644 --- a/src/devices/bus/c64/neoram.h +++ b/src/devices/bus/c64/neoram.h @@ -33,17 +33,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default() { } - virtual void nvram_read(emu_file &file) { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } - virtual void nvram_write(emu_file &file) { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } } + virtual void nvram_default() override { } + virtual void nvram_read(emu_file &file) override { if (m_nvram != nullptr) { file.read(m_nvram, m_nvram.bytes()); } } + virtual void nvram_write(emu_file &file) override { if (m_nvram != nullptr) { file.write(m_nvram, m_nvram.bytes()); } } // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT16 m_bank; diff --git a/src/devices/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h index 6a44f6a4ace..49697d758e7 100644 --- a/src/devices/bus/c64/ocean.h +++ b/src/devices/bus/c64/ocean.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h index d9c71206e10..7b68ce54c07 100644 --- a/src/devices/bus/c64/pagefox.h +++ b/src/devices/bus/c64/pagefox.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h index bfa2abb314b..640cb7daab5 100644 --- a/src/devices/bus/c64/partner.h +++ b/src/devices/bus/c64/partner.h @@ -30,19 +30,19 @@ public: c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( nmi_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h index d9ee926de3c..e8e810da9e6 100644 --- a/src/devices/bus/c64/prophet64.h +++ b/src/devices/bus/c64/prophet64.h @@ -31,12 +31,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h index 6c7a183c487..5f2e87d7bcb 100644 --- a/src/devices/bus/c64/ps64.h +++ b/src/devices/bus/c64/ps64.h @@ -32,16 +32,16 @@ public: c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h index d3df7f4d1d9..c0fb6252ac3 100644 --- a/src/devices/bus/c64/reu.h +++ b/src/devices/bus/c64/reu.h @@ -34,7 +34,7 @@ public: c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, int jp1, size_t ram_size, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: enum @@ -45,12 +45,12 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; required_device<mos8726_device> m_dmac; required_device<generic_slot_device> m_eprom; diff --git a/src/devices/bus/c64/rex.h b/src/devices/bus/c64/rex.h index d94b720f22d..d5f17dfdd5b 100644 --- a/src/devices/bus/c64/rex.h +++ b/src/devices/bus/c64/rex.h @@ -32,11 +32,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h index 140e8402ce3..abd5f53618b 100644 --- a/src/devices/bus/c64/rex_ep256.h +++ b/src/devices/bus/c64/rex_ep256.h @@ -33,16 +33,16 @@ public: c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: generic_slot_device *m_eproms[8]; diff --git a/src/devices/bus/c64/ross.h b/src/devices/bus/c64/ross.h index 0cb4d1f36b5..6f88948927b 100644 --- a/src/devices/bus/c64/ross.h +++ b/src/devices/bus/c64/ross.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h index d7a0d229b45..b51fd23e751 100644 --- a/src/devices/bus/c64/sfx_sound_expander.h +++ b/src/devices/bus/c64/sfx_sound_expander.h @@ -31,21 +31,21 @@ public: c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( opl_irq_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<ym3526_device> m_opl; diff --git a/src/devices/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h index 65e20f1ccf6..6450e555fa7 100644 --- a/src/devices/bus/c64/silverrock.h +++ b/src/devices/bus/c64/silverrock.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h index 3ebff2b672a..7193fee1aa3 100644 --- a/src/devices/bus/c64/simons_basic.h +++ b/src/devices/bus/c64/simons_basic.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h index a1cbe520afb..63b37867da7 100644 --- a/src/devices/bus/c64/stardos.h +++ b/src/devices/bus/c64/stardos.h @@ -32,17 +32,17 @@ public: c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: inline void charge_io1_capacitor(); diff --git a/src/devices/bus/c64/std.h b/src/devices/bus/c64/std.h index c726e901025..16bbdb9f4ff 100644 --- a/src/devices/bus/c64/std.h +++ b/src/devices/bus/c64/std.h @@ -32,10 +32,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h index 18465113d94..b061da08921 100644 --- a/src/devices/bus/c64/structured_basic.h +++ b/src/devices/bus/c64/structured_basic.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h index d33b4047725..d460791bef3 100644 --- a/src/devices/bus/c64/super_explode.h +++ b/src/devices/bus/c64/super_explode.h @@ -32,13 +32,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h index 689fe7c79b9..321a5c8ef92 100644 --- a/src/devices/bus/c64/super_games.h +++ b/src/devices/bus/c64/super_games.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h index 857f6feb47f..df799261faf 100644 --- a/src/devices/bus/c64/supercpu.h +++ b/src/devices/bus/c64/supercpu.h @@ -31,20 +31,20 @@ public: c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h index 0838baf68a7..d6a753e1f1b 100644 --- a/src/devices/bus/c64/sw8k.h +++ b/src/devices/bus/c64/sw8k.h @@ -31,15 +31,15 @@ public: c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_ioport m_sw; diff --git a/src/devices/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h index 713bafbb289..9a364845094 100644 --- a/src/devices/bus/c64/swiftlink.h +++ b/src/devices/bus/c64/swiftlink.h @@ -32,19 +32,19 @@ public: c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<mos6551_device> m_acia; diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h index c6adc33c880..fef5c100217 100644 --- a/src/devices/bus/c64/system3.h +++ b/src/devices/bus/c64/system3.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: UINT8 m_bank; diff --git a/src/devices/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h index 93e3823d180..42c08cbd1c8 100644 --- a/src/devices/bus/c64/tdos.h +++ b/src/devices/bus/c64/tdos.h @@ -31,19 +31,19 @@ public: c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override; private: required_device<mc6852_device> m_ssda; diff --git a/src/devices/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h index b8ff5a17c8c..4f80cec374f 100644 --- a/src/devices/bus/c64/turbo232.h +++ b/src/devices/bus/c64/turbo232.h @@ -32,19 +32,19 @@ public: c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( acia_irq_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: required_device<mos6551_device> m_acia; diff --git a/src/devices/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h index 0b01f4424a7..4c24f9705be 100644 --- a/src/devices/bus/c64/vizastar.h +++ b/src/devices/bus/c64/vizastar.h @@ -32,10 +32,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h index fac67142a1a..906ca3b0b27 100644 --- a/src/devices/bus/c64/vw64.h +++ b/src/devices/bus/c64/vw64.h @@ -32,13 +32,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return 0; } + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override { return 0; } private: emu_timer *m_game_timer; diff --git a/src/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h index 8c3b7a445ec..b3eeca48809 100644 --- a/src/devices/bus/c64/warp_speed.h +++ b/src/devices/bus/c64/warp_speed.h @@ -31,16 +31,16 @@ public: c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h index 9ea1d0d605c..220b5390925 100644 --- a/src/devices/bus/c64/westermann.h +++ b/src/devices/bus/c64/westermann.h @@ -32,11 +32,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; }; diff --git a/src/devices/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h index 38a90baf6b1..b167b549265 100644 --- a/src/devices/bus/c64/xl80.h +++ b/src/devices/bus/c64/xl80.h @@ -32,22 +32,22 @@ public: c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public MC6845_UPDATE_ROW( crtc_update_row ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); - virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) { return 1; } - virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return 0; } + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual void c64_cd_w(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; + virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) override { return 1; } + virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) override { return 0; } private: required_device<h46505_device> m_crtc; diff --git a/src/devices/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h index b5740605ef0..28b8eecc911 100644 --- a/src/devices/bus/c64/zaxxon.h +++ b/src/devices/bus/c64/zaxxon.h @@ -32,10 +32,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_c64_expansion_card_interface overrides - virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2); + virtual UINT8 c64_cd_r(address_space &space, offs_t offset, UINT8 data, int sphi2, int ba, int roml, int romh, int io1, int io2) override; private: int m_bank; diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h index 80dbc52046b..6d39d0dd5d5 100644 --- a/src/devices/bus/cbm2/24k.h +++ b/src/devices/bus/cbm2/24k.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_cbm2_expansion_card_interface overrides - virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3); - virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3); + virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override; + virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override; optional_shared_ptr<UINT8> m_ram; }; diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h index 5d76899db22..771a66604cc 100644 --- a/src/devices/bus/cbm2/exp.h +++ b/src/devices/bus/cbm2/exp.h @@ -76,27 +76,27 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; + virtual void device_reset() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "cbm2_cart"; } - virtual const char *file_extensions() const { return "20,40,60"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "cbm2_cart"; } + virtual const char *file_extensions() const override { return "20,40,60"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; device_cbm2_expansion_card_interface *m_card; }; diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h index 91892274fc1..604229e9da4 100644 --- a/src/devices/bus/cbm2/hrg.h +++ b/src/devices/bus/cbm2/hrg.h @@ -31,16 +31,16 @@ public: cbm2_graphic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm2_expansion_card_interface overrides - virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3); - virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3); + virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override; + virtual void cbm2_bd_w(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override; private: //required_device<ef9365_device> m_gdc; @@ -57,7 +57,7 @@ public: cbm2_graphic_cartridge_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -70,7 +70,7 @@ public: cbm2_graphic_cartridge_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h index 8dee67b9c11..1645958e40b 100644 --- a/src/devices/bus/cbm2/std.h +++ b/src/devices/bus/cbm2/std.h @@ -31,10 +31,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_cbm2_expansion_card_interface overrides - virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3); + virtual UINT8 cbm2_bd_r(address_space &space, offs_t offset, UINT8 data, int csbank1, int csbank2, int csbank3) override; }; diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h index 4aefd41bfc5..58810f02f3f 100644 --- a/src/devices/bus/cbm2/user.h +++ b/src/devices/bus/cbm2/user.h @@ -134,7 +134,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; devcb_write_line m_write_irq; devcb_write_line m_write_sp; diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h index c6389bf4662..deba3be2ce7 100644 --- a/src/devices/bus/cbmiec/c1526.h +++ b/src/devices/bus/cbmiec/c1526.h @@ -32,8 +32,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -47,15 +47,15 @@ public: c1526_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device_cbm_iec_interface overrides - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; }; @@ -69,14 +69,14 @@ public: c4023_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device_ieee488_interface overrides - virtual void ieee488_atn(int state); - virtual void ieee488_ifc(int state); + virtual void ieee488_atn(int state) override; + virtual void ieee488_ifc(int state) override; }; diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h index 7195b93293e..9c1b8ab5c91 100644 --- a/src/devices/bus/cbmiec/c1541.h +++ b/src/devices/bus/cbmiec/c1541.h @@ -45,8 +45,8 @@ public: c1541_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); virtual DECLARE_READ8_MEMBER( via0_pa_r ); @@ -64,16 +64,16 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - virtual void cbm_iec_atn(int state); - virtual void cbm_iec_reset(int state); + virtual void cbm_iec_atn(int state) override; + virtual void cbm_iec_reset(int state) override; // device_c64_floppy_parallel_interface overrides - virtual void parallel_data_w(UINT8 data); - virtual void parallel_strobe_w(int state); + virtual void parallel_data_w(UINT8 data) override; + virtual void parallel_strobe_w(int state) override; enum { @@ -108,7 +108,7 @@ public: c1540_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -121,7 +121,7 @@ public: c1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -134,8 +134,8 @@ public: c1541c_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public virtual DECLARE_READ8_MEMBER( via0_pa_r ); @@ -151,7 +151,7 @@ public: c1541ii_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -164,7 +164,7 @@ public: sx1541_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -177,7 +177,7 @@ public: fsd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -190,10 +190,10 @@ public: fsd2_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; @@ -206,7 +206,7 @@ public: csd1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -219,8 +219,8 @@ public: c1541_dolphin_dos_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -233,8 +233,8 @@ public: c1541_professional_dos_v1_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -247,8 +247,8 @@ public: c1541_prologic_dos_classic_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_READ8_MEMBER( read ); @@ -277,7 +277,7 @@ public: indus_gt_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h index 6a938b73291..fde13dd0b66 100644 --- a/src/devices/bus/cbmiec/c1571.h +++ b/src/devices/bus/cbmiec/c1571.h @@ -48,9 +48,9 @@ public: c1571_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE_LINE_MEMBER( via0_irq_w ); DECLARE_READ8_MEMBER( via0_pa_r ); @@ -81,18 +81,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - virtual void cbm_iec_srq(int state); - virtual void cbm_iec_atn(int state); - virtual void cbm_iec_data(int state); - virtual void cbm_iec_reset(int state); + virtual void cbm_iec_srq(int state) override; + virtual void cbm_iec_atn(int state) override; + virtual void cbm_iec_data(int state) override; + virtual void cbm_iec_reset(int state) override; // device_c64_floppy_parallel_interface overrides - virtual void parallel_data_w(UINT8 data); - virtual void parallel_strobe_w(int state); + virtual void parallel_data_w(UINT8 data) override; + virtual void parallel_strobe_w(int state) override; enum { @@ -136,8 +136,8 @@ public: c1570_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -150,8 +150,8 @@ public: c1571cr_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE8_MEMBER( via0_pa_w ); DECLARE_WRITE8_MEMBER( via0_pb_w ); @@ -167,8 +167,8 @@ public: mini_chief_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( cia_pa_r ); DECLARE_WRITE8_MEMBER( cia_pa_w ); diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h index 4a2ac6a28a5..adcbaf63468 100644 --- a/src/devices/bus/cbmiec/c1581.h +++ b/src/devices/bus/cbmiec/c1581.h @@ -43,9 +43,9 @@ public: c1581_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_WRITE_LINE_MEMBER( cnt_w ); @@ -59,14 +59,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - virtual void cbm_iec_srq(int state); - virtual void cbm_iec_atn(int state); - virtual void cbm_iec_data(int state); - virtual void cbm_iec_reset(int state); + virtual void cbm_iec_srq(int state) override; + virtual void cbm_iec_atn(int state) override; + virtual void cbm_iec_data(int state) override; + virtual void cbm_iec_reset(int state) override; enum { @@ -99,7 +99,7 @@ public: c1563_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h index f0ceafd3f2d..143758c98e4 100644 --- a/src/devices/bus/cbmiec/c64_nl10.h +++ b/src/devices/bus/cbmiec/c64_nl10.h @@ -30,17 +30,17 @@ public: c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; }; diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h index 627e3dc203f..d950a8c19e1 100644 --- a/src/devices/bus/cbmiec/cbmiec.h +++ b/src/devices/bus/cbmiec/cbmiec.h @@ -119,9 +119,9 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; class daisy_entry { @@ -165,7 +165,7 @@ public: int get_address() { return m_address; } // device-level overrides - virtual void device_start(); + virtual void device_start() override; protected: int m_address; diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h index f71c0ad2741..2a1a244affe 100644 --- a/src/devices/bus/cbmiec/cmdhd.h +++ b/src/devices/bus/cbmiec/cmdhd.h @@ -43,21 +43,21 @@ public: cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE8_MEMBER( led_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - void cbm_iec_srq(int state); - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_srq(int state) override; + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; required_device<cpu_device> m_maincpu; required_device<SCSI_PORT_DEVICE> m_scsibus; diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h index ac963ec231e..b76c1fc696e 100644 --- a/src/devices/bus/cbmiec/diag264_lb_iec.h +++ b/src/devices/bus/cbmiec/diag264_lb_iec.h @@ -31,10 +31,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_cbm_iec_interface overrides - virtual void cbm_iec_atn(int state); + virtual void cbm_iec_atn(int state) override; }; diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h index 00ff81a038d..90f6db128ca 100644 --- a/src/devices/bus/cbmiec/fd2000.h +++ b/src/devices/bus/cbmiec/fd2000.h @@ -49,8 +49,8 @@ public: }; // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( via_pa_r ); DECLARE_WRITE8_MEMBER( via_pa_w ); @@ -61,14 +61,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - void cbm_iec_srq(int state); - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_srq(int state) override; + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; required_device<m65c02_device> m_maincpu; required_device<upd765_family_device> m_fdc; diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h index fbbe194cca6..0de21651381 100644 --- a/src/devices/bus/cbmiec/interpod.h +++ b/src/devices/bus/cbmiec/interpod.h @@ -52,13 +52,13 @@ public: interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; required_device<cpu_device> m_maincpu; required_device<via6522_device> m_via; diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h index f045fd05dfb..93c558b9512 100644 --- a/src/devices/bus/cbmiec/serialbox.h +++ b/src/devices/bus/cbmiec/serialbox.h @@ -39,18 +39,18 @@ public: serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; private: required_device<m65c02_device> m_maincpu; diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h index cd3d4554994..d726bdb4087 100644 --- a/src/devices/bus/cbmiec/vic1515.h +++ b/src/devices/bus/cbmiec/vic1515.h @@ -31,19 +31,19 @@ public: vic1515_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; }; diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h index 4169164d0ae..61bd5e314ef 100644 --- a/src/devices/bus/cbmiec/vic1520.h +++ b/src/devices/bus/cbmiec/vic1520.h @@ -31,19 +31,19 @@ public: vic1520_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_cbm_iec_interface overrides - void cbm_iec_atn(int state); - void cbm_iec_data(int state); - void cbm_iec_reset(int state); + void cbm_iec_atn(int state) override; + void cbm_iec_data(int state) override; + void cbm_iec_reset(int state) override; }; diff --git a/src/devices/bus/centronics/comxpl80.h b/src/devices/bus/centronics/comxpl80.h index 4a943459c09..96821d1f5eb 100644 --- a/src/devices/bus/centronics/comxpl80.h +++ b/src/devices/bus/centronics/comxpl80.h @@ -31,9 +31,9 @@ public: comx_pl80_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_WRITE8_MEMBER( pa_w ); @@ -43,17 +43,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_data |= 0x01; else m_data &= ~0x01; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_data |= 0x02; else m_data &= ~0x02; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_data |= 0x04; else m_data &= ~0x04; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_data |= 0x08; else m_data &= ~0x08; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_data |= 0x10; else m_data &= ~0x10; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_data |= 0x20; else m_data &= ~0x20; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (state) m_data |= 0x40; else m_data &= ~0x40; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { if (state) m_data |= 0x80; else m_data &= ~0x80; } + virtual void device_start() override; + virtual void device_reset() override; + + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; } private: required_memory_region m_plotter; diff --git a/src/devices/bus/centronics/covox.h b/src/devices/bus/centronics/covox.h index c4d3d3ea94a..68eeff2212f 100644 --- a/src/devices/bus/centronics/covox.h +++ b/src/devices/bus/centronics/covox.h @@ -24,20 +24,20 @@ public: centronics_covox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); } private: required_device<dac_device> m_dac; @@ -60,22 +60,22 @@ public: centronics_covox_stereo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) { m_strobe = state; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); if (started()) output_busy(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_autofd ) { m_autofd = state; update_dac(); } + virtual void device_start() override; + + virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { m_strobe = state; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; update_dac(); if (started()) output_busy(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_autofd ) override { m_autofd = state; update_dac(); } private: required_device<dac_device> m_dac_left; diff --git a/src/devices/bus/centronics/ctronics.h b/src/devices/bus/centronics/ctronics.h index 1235179fdf6..51f13348051 100644 --- a/src/devices/bus/centronics/ctronics.h +++ b/src/devices/bus/centronics/ctronics.h @@ -142,8 +142,8 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; devcb_write_line m_strobe_handler; devcb_write_line m_data0_handler; diff --git a/src/devices/bus/centronics/digiblst.h b/src/devices/bus/centronics/digiblst.h index 340e5cd0f4c..cec32eef1e9 100644 --- a/src/devices/bus/centronics/digiblst.h +++ b/src/devices/bus/centronics/digiblst.h @@ -30,20 +30,20 @@ public: centronics_digiblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) { if (state) m_data &= ~0x80; else m_data |= 0x80; update_dac(); } + virtual void device_start() override; + + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; update_dac(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { if (state) m_data &= ~0x80; else m_data |= 0x80; update_dac(); } private: required_device<dac_device> m_dac; diff --git a/src/devices/bus/centronics/dsjoy.h b/src/devices/bus/centronics/dsjoy.h index a6eec3668ad..c23ddf87e11 100644 --- a/src/devices/bus/centronics/dsjoy.h +++ b/src/devices/bus/centronics/dsjoy.h @@ -22,15 +22,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual ioport_constructor device_input_ports() const; - - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_data |= 0x01; else m_data &= ~0x01; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_data |= 0x02; else m_data &= ~0x02; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_data |= 0x04; else m_data &= ~0x04; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_data |= 0x08; else m_data &= ~0x08; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_data |= 0x10; else m_data &= ~0x10; update_perror(); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_data |= 0x20; else m_data &= ~0x20; update_perror(); } + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; update_perror(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; update_perror(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; update_perror(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; update_perror(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; update_perror(); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; update_perror(); } private: required_ioport m_lptjoy; diff --git a/src/devices/bus/centronics/epson_ex800.h b/src/devices/bus/centronics/epson_ex800.h index 274eac50bf0..23d960a055a 100644 --- a/src/devices/bus/centronics/epson_ex800.h +++ b/src/devices/bus/centronics/epson_ex800.h @@ -33,9 +33,9 @@ public: epson_ex800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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(porta_r); DECLARE_READ8_MEMBER(portb_r); @@ -56,8 +56,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/centronics/epson_lx800.h b/src/devices/bus/centronics/epson_lx800.h index 591d75cbcf3..89e88ceb6d9 100644 --- a/src/devices/bus/centronics/epson_lx800.h +++ b/src/devices/bus/centronics/epson_lx800.h @@ -34,9 +34,9 @@ public: epson_lx800_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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(porta_r); DECLARE_WRITE8_MEMBER(porta_w); @@ -55,8 +55,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/centronics/epson_lx810l.h b/src/devices/bus/centronics/epson_lx810l.h index 4d1b54f0c63..072f30500bd 100644 --- a/src/devices/bus/centronics/epson_lx810l.h +++ b/src/devices/bus/centronics/epson_lx810l.h @@ -47,9 +47,9 @@ public: UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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(porta_r); DECLARE_WRITE8_MEMBER(porta_w); @@ -83,15 +83,15 @@ public: DECLARE_WRITE_LINE_MEMBER(e05a30_ready); /* Centronics stuff */ - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) { if (m_e05a30) m_e05a30->centronics_input_strobe(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (m_e05a30) m_e05a30->centronics_input_data0(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (m_e05a30) m_e05a30->centronics_input_data1(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (m_e05a30) m_e05a30->centronics_input_data2(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (m_e05a30) m_e05a30->centronics_input_data3(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (m_e05a30) m_e05a30->centronics_input_data4(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (m_e05a30) m_e05a30->centronics_input_data5(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (m_e05a30) m_e05a30->centronics_input_data6(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { if (m_e05a30) m_e05a30->centronics_input_data7(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override { if (m_e05a30) m_e05a30->centronics_input_strobe(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (m_e05a30) m_e05a30->centronics_input_data0(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (m_e05a30) m_e05a30->centronics_input_data1(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (m_e05a30) m_e05a30->centronics_input_data2(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (m_e05a30) m_e05a30->centronics_input_data3(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (m_e05a30) m_e05a30->centronics_input_data4(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (m_e05a30) m_e05a30->centronics_input_data5(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (m_e05a30) m_e05a30->centronics_input_data6(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (m_e05a30) m_e05a30->centronics_input_data7(state); } DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_ack) { output_ack(state); } DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_busy) { output_busy(state); } DECLARE_WRITE_LINE_MEMBER(e05a30_centronics_perror) { output_perror(state); } @@ -108,9 +108,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: required_device<cpu_device> m_maincpu; @@ -147,7 +147,7 @@ public: device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/centronics/nec_p72.h b/src/devices/bus/centronics/nec_p72.h index 07335577ed4..ef7c67f85f1 100644 --- a/src/devices/bus/centronics/nec_p72.h +++ b/src/devices/bus/centronics/nec_p72.h @@ -28,12 +28,12 @@ public: UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/centronics/printer.h b/src/devices/bus/centronics/printer.h index 7f10fd7e4c2..7e0ce223e7f 100644 --- a/src/devices/bus/centronics/printer.h +++ b/src/devices/bus/centronics/printer.h @@ -17,25 +17,25 @@ public: // construction/destruction centronics_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ); - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_data |= 0x01; else m_data &= ~0x01; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_data |= 0x02; else m_data &= ~0x02; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_data |= 0x04; else m_data &= ~0x04; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_data |= 0x08; else m_data &= ~0x08; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_data |= 0x10; else m_data &= ~0x10; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_data |= 0x20; else m_data &= ~0x20; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (state) m_data |= 0x40; else m_data &= ~0x40; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { if (state) m_data |= 0x80; else m_data &= ~0x80; } - virtual DECLARE_WRITE_LINE_MEMBER( input_init ); + virtual DECLARE_WRITE_LINE_MEMBER( input_strobe ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_data |= 0x01; else m_data &= ~0x01; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_data |= 0x02; else m_data &= ~0x02; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_data |= 0x04; else m_data &= ~0x04; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_data |= 0x08; else m_data &= ~0x08; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_data |= 0x10; else m_data &= ~0x10; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_data |= 0x20; else m_data &= ~0x20; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_data |= 0x40; else m_data &= ~0x40; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_data |= 0x80; else m_data &= ~0x80; } + virtual DECLARE_WRITE_LINE_MEMBER( input_init ) override; DECLARE_WRITE_LINE_MEMBER( printer_online ); protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: diff --git a/src/devices/bus/cgenie/expansion/expansion.h b/src/devices/bus/cgenie/expansion/expansion.h index 311da3afa6d..c465561d300 100644 --- a/src/devices/bus/cgenie/expansion/expansion.h +++ b/src/devices/bus/cgenie/expansion/expansion.h @@ -96,8 +96,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_expansion_interface *m_cart; diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h index 67926ba9954..a85f26a68fe 100644 --- a/src/devices/bus/cgenie/expansion/floppy.h +++ b/src/devices/bus/cgenie/expansion/floppy.h @@ -44,10 +44,10 @@ public: protected: - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; private: void update_irq(); diff --git a/src/devices/bus/cgenie/parallel/joystick.h b/src/devices/bus/cgenie/parallel/joystick.h index 28be43b00e6..bbdb32e5444 100644 --- a/src/devices/bus/cgenie/parallel/joystick.h +++ b/src/devices/bus/cgenie/parallel/joystick.h @@ -28,12 +28,12 @@ public: cgenie_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; - virtual void pa_w(UINT8 data); - virtual UINT8 pb_r(); + virtual void pa_w(UINT8 data) override; + virtual UINT8 pb_r() override; private: required_ioport_array<4> m_joy; diff --git a/src/devices/bus/cgenie/parallel/parallel.h b/src/devices/bus/cgenie/parallel/parallel.h index b8b3cb9c90f..3c8bd6bf8c0 100644 --- a/src/devices/bus/cgenie/parallel/parallel.h +++ b/src/devices/bus/cgenie/parallel/parallel.h @@ -59,8 +59,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_parallel_interface *m_cart; }; diff --git a/src/devices/bus/cgenie/parallel/printer.h b/src/devices/bus/cgenie/parallel/printer.h index 52479c73d5c..6faec62f308 100644 --- a/src/devices/bus/cgenie/parallel/printer.h +++ b/src/devices/bus/cgenie/parallel/printer.h @@ -34,13 +34,13 @@ public: DECLARE_WRITE_LINE_MEMBER(fault_w); protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; - virtual void pa_w(UINT8 data); - virtual UINT8 pb_r(); - virtual void pb_w(UINT8 data); + virtual void pa_w(UINT8 data) override; + virtual UINT8 pb_r() override; + virtual void pb_w(UINT8 data) override; private: required_device<centronics_device> m_centronics; diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h index 5a13e38b2df..f63f66ea561 100644 --- a/src/devices/bus/chanf/rom.h +++ b/src/devices/bus/chanf/rom.h @@ -17,8 +17,8 @@ public: chanf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} UINT8 common_read_2102(UINT32 offset); UINT8 common_read_3853(UINT32 offset); @@ -45,12 +45,12 @@ public: chanf_maze_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) { return common_read_2102(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) { common_write_2102(offset, data); } + virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_2102(offset); } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_2102(offset, data); } }; @@ -63,12 +63,12 @@ public: chanf_hangman_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) { return common_read_2102(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) { common_write_2102(offset, data); } + virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_2102(offset); } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_2102(offset, data); } }; @@ -81,8 +81,8 @@ public: chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) { return common_read_3853(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) { common_write_3853(offset, data); } + virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); } }; @@ -95,13 +95,13 @@ public: chanf_multi_old_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram) { return common_read_3853(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) { common_write_3853(offset, data); } + virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); } virtual DECLARE_WRITE8_MEMBER(write_bank); private: @@ -118,13 +118,13 @@ public: chanf_multi_final_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram) { return common_read_3853(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) { common_write_3853(offset, data); } + virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); } virtual DECLARE_WRITE8_MEMBER(write_bank); private: diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h index d243b5dbbe3..cd20ce557c4 100644 --- a/src/devices/bus/chanf/slot.h +++ b/src/devices/bus/chanf/slot.h @@ -64,30 +64,30 @@ public: virtual ~channelf_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "channelf_cart"; } - virtual const char *file_extensions() const { return "bin,chf"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "channelf_cart"; } + virtual const char *file_extensions() const override { return "bin,chf"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/coco/coco_232.h b/src/devices/bus/coco/coco_232.h index 362e4928de6..7d2d1cc02b9 100644 --- a/src/devices/bus/coco/coco_232.h +++ b/src/devices/bus/coco/coco_232.h @@ -24,10 +24,10 @@ public: coco_232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); private: diff --git a/src/devices/bus/coco/coco_dwsock.h b/src/devices/bus/coco/coco_dwsock.h index 21b0ceb2170..1d1fe71c3d3 100644 --- a/src/devices/bus/coco/coco_dwsock.h +++ b/src/devices/bus/coco/coco_dwsock.h @@ -29,11 +29,11 @@ public: virtual ~beckerport_device(); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; - virtual void device_start(void); - virtual void device_stop(void); - virtual void device_config_complete(void); + virtual void device_start(void) override; + virtual void device_stop(void) override; + virtual void device_config_complete(void) override; void update_port(void); diff --git a/src/devices/bus/coco/coco_fdc.h b/src/devices/bus/coco/coco_fdc.h index c5b9eac2f9e..2408350f16e 100644 --- a/src/devices/bus/coco/coco_fdc.h +++ b/src/devices/bus/coco/coco_fdc.h @@ -40,10 +40,10 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; - virtual UINT8* get_cart_base(); + virtual UINT8* get_cart_base() override; virtual void update_lines(); virtual void dskreg_w(UINT8 data); @@ -55,7 +55,7 @@ public: DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); @@ -92,7 +92,7 @@ public: coco_fdc_v11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -109,7 +109,7 @@ public: coco3_hdb1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -126,7 +126,7 @@ public: cp400_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -144,13 +144,13 @@ public: dragon_fdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual void update_lines(); - virtual void dskreg_w(UINT8 data); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual void update_lines() override; + virtual void dskreg_w(UINT8 data) override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); }; @@ -169,7 +169,7 @@ public: sdtandy_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/coco/coco_multi.h b/src/devices/bus/coco/coco_multi.h index 6c894b6377d..0cc7b4baae4 100644 --- a/src/devices/bus/coco/coco_multi.h +++ b/src/devices/bus/coco/coco_multi.h @@ -33,17 +33,17 @@ public: coco_multipak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual UINT8* get_cart_base(); + virtual UINT8* get_cart_base() override; DECLARE_WRITE_LINE_MEMBER(multi_cart_w); DECLARE_WRITE_LINE_MEMBER(multi_nmi_w); DECLARE_WRITE_LINE_MEMBER(multi_halt_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/coco/coco_orch90.h b/src/devices/bus/coco/coco_orch90.h index d96c99a911a..7677216be63 100644 --- a/src/devices/bus/coco/coco_orch90.h +++ b/src/devices/bus/coco/coco_orch90.h @@ -24,10 +24,10 @@ public: coco_orch90_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write); private: // internal state diff --git a/src/devices/bus/coco/coco_pak.h b/src/devices/bus/coco/coco_pak.h index 50df99ea4d5..39ac4d4e947 100644 --- a/src/devices/bus/coco/coco_pak.h +++ b/src/devices/bus/coco/coco_pak.h @@ -24,14 +24,14 @@ public: coco_pak_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; - virtual UINT8* get_cart_base(); + virtual UINT8* get_cart_base() override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state device_image_interface *m_cart; @@ -53,7 +53,7 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; virtual DECLARE_WRITE8_MEMBER(write); private: void banked_pak_set_bank(UINT32 bank); diff --git a/src/devices/bus/coco/cococart.h b/src/devices/bus/coco/cococart.h index 414a5184451..ac53c52a0da 100644 --- a/src/devices/bus/coco/cococart.h +++ b/src/devices/bus/coco/cococart.h @@ -82,27 +82,27 @@ public: template<class _Object> static devcb_base &static_set_halt_callback(device_t &device, _Object object) { return downcast<cococart_slot_device &>(device).m_halt_callback.set_callback(object); } // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_config_complete() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "coco_cart"; } - virtual const char *file_extensions() const { return "ccc,rom"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "coco_cart"; } + virtual const char *file_extensions() const override { return "ccc,rom"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing to $FF40-$FF7F DECLARE_READ8_MEMBER(read); diff --git a/src/devices/bus/coleco/ctrl.h b/src/devices/bus/coleco/ctrl.h index c4d6e7f12cb..a8c82ee23c4 100644 --- a/src/devices/bus/coleco/ctrl.h +++ b/src/devices/bus/coleco/ctrl.h @@ -86,7 +86,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_colecovision_control_port_interface *m_device; diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h index 1264c7bec89..c70b06959a0 100644 --- a/src/devices/bus/coleco/exp.h +++ b/src/devices/bus/coleco/exp.h @@ -74,26 +74,26 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "coleco_cart"; } - virtual const char *file_extensions() const { return "rom,col,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "coleco_cart"; } + virtual const char *file_extensions() const override { return "rom,col,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; device_colecovision_cartridge_interface *m_card; }; diff --git a/src/devices/bus/coleco/hand.h b/src/devices/bus/coleco/hand.h index d57ea3ea212..a43632e66db 100644 --- a/src/devices/bus/coleco/hand.h +++ b/src/devices/bus/coleco/hand.h @@ -30,16 +30,16 @@ public: coleco_hand_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_CUSTOM_INPUT_MEMBER( keypad_r ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 joy_r(); + virtual UINT8 joy_r() override; private: required_ioport m_io_common0; diff --git a/src/devices/bus/coleco/sac.h b/src/devices/bus/coleco/sac.h index b4bf3b09111..51dcfae357f 100644 --- a/src/devices/bus/coleco/sac.h +++ b/src/devices/bus/coleco/sac.h @@ -30,17 +30,17 @@ public: coleco_super_action_controller_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_CUSTOM_INPUT_MEMBER( keypad_r ); DECLARE_INPUT_CHANGED_MEMBER( slider_w ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 joy_r(); + virtual UINT8 joy_r() override; private: required_ioport m_io_common0; diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/std.h index ee0a6e24e9a..4afde3809c9 100644 --- a/src/devices/bus/coleco/std.h +++ b/src/devices/bus/coleco/std.h @@ -30,10 +30,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_colecovision_expansion_card_interface overrides - virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000); + virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) override; }; diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h index 79a940c646f..defe4d8d4fa 100644 --- a/src/devices/bus/coleco/xin1.h +++ b/src/devices/bus/coleco/xin1.h @@ -30,11 +30,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_colecovision_expansion_card_interface overrides - virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000); + virtual UINT8 bd_r(address_space &space, offs_t offset, UINT8 data, int _8000, int _a000, int _c000, int _e000) override; private: UINT32 m_current_offset; diff --git a/src/devices/bus/compucolor/floppy.h b/src/devices/bus/compucolor/floppy.h index f229e96c3a9..f17772c88fe 100644 --- a/src/devices/bus/compucolor/floppy.h +++ b/src/devices/bus/compucolor/floppy.h @@ -59,8 +59,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; private: device_compucolor_floppy_port_interface *m_dev; @@ -79,20 +79,20 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_port_interface overrides virtual void tx(UINT8 state); // device_compucolor_floppy_port_interface overrides - virtual void rw_w(int state); - virtual void stepper_w(UINT8 data); - virtual void select_w(int state); + virtual void rw_w(int state) override; + virtual void stepper_w(UINT8 data) override; + virtual void select_w(int state) override; private: required_device<floppy_image_device> m_floppy; diff --git a/src/devices/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h index c64e57956bd..131a57b2cd9 100644 --- a/src/devices/bus/comx35/clm.h +++ b/src/devices/bus/comx35/clm.h @@ -31,21 +31,21 @@ public: comx_clm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public MC6845_UPDATE_ROW( crtc_update_row ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual int comx_ef4_r(); - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data); + virtual int comx_ef4_r() override; + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) override; private: required_device<mc6845_device> m_crtc; diff --git a/src/devices/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h index f3b03f42367..3d30b7e312a 100644 --- a/src/devices/bus/comx35/eprom.h +++ b/src/devices/bus/comx35/eprom.h @@ -30,16 +30,16 @@ public: comx_epr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h index df4f7fffb68..02325753396 100644 --- a/src/devices/bus/comx35/exp.h +++ b/src/devices/bus/comx35/exp.h @@ -95,7 +95,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; devcb_write_line m_write_irq; diff --git a/src/devices/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h index 6863f2c1339..0b479c79326 100644 --- a/src/devices/bus/comx35/expbox.h +++ b/src/devices/bus/comx35/expbox.h @@ -43,20 +43,20 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_comx_expansion_card_interface overrides - virtual int comx_ef4_r(); - virtual void comx_q_w(int state); - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT8 comx_io_r(address_space &space, offs_t offset); - virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data); + virtual int comx_ef4_r() override; + virtual void comx_q_w(int state) override; + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT8 comx_io_r(address_space &space, offs_t offset) override; + virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override; void set_irq() { m_slot->irq_w(m_irq[0] || m_irq[1] || m_irq[2] || m_irq[3]); } diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h index ce1a71c46a2..cdcb23a363e 100644 --- a/src/devices/bus/comx35/fdc.h +++ b/src/devices/bus/comx35/fdc.h @@ -32,22 +32,22 @@ public: comx_fd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual int comx_ef4_r(); - virtual void comx_q_w(int state); - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual UINT8 comx_io_r(address_space &space, offs_t offset); - virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data); + virtual int comx_ef4_r() override; + virtual void comx_q_w(int state) override; + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual UINT8 comx_io_r(address_space &space, offs_t offset) override; + virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override; private: // internal state diff --git a/src/devices/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h index be7bd63e528..318c5265069 100644 --- a/src/devices/bus/comx35/joycard.h +++ b/src/devices/bus/comx35/joycard.h @@ -30,15 +30,15 @@ public: comx_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual UINT8 comx_io_r(address_space &space, offs_t offset); + virtual UINT8 comx_io_r(address_space &space, offs_t offset) override; private: required_ioport m_joy1; diff --git a/src/devices/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h index f67997b19ea..8f0a2d2fcaf 100644 --- a/src/devices/bus/comx35/printer.h +++ b/src/devices/bus/comx35/printer.h @@ -32,18 +32,18 @@ public: comx_prn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual UINT8 comx_io_r(address_space &space, offs_t offset); - virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual UINT8 comx_io_r(address_space &space, offs_t offset) override; + virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override; private: required_device<centronics_device> m_centronics; diff --git a/src/devices/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h index 3618d6e2b4b..c74a54066f4 100644 --- a/src/devices/bus/comx35/ram.h +++ b/src/devices/bus/comx35/ram.h @@ -31,13 +31,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data); - virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual void comx_mwr_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h index 8314039301c..7d16f2a3d06 100644 --- a/src/devices/bus/comx35/thermal.h +++ b/src/devices/bus/comx35/thermal.h @@ -30,17 +30,17 @@ public: comx_thm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom); - virtual UINT8 comx_io_r(address_space &space, offs_t offset); - virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; + virtual UINT8 comx_io_r(address_space &space, offs_t offset) override; + virtual void comx_io_w(address_space &space, offs_t offset, UINT8 data) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/cpc/amdrum.h b/src/devices/bus/cpc/amdrum.h index 5040e7d4457..5a3df11d273 100644 --- a/src/devices/bus/cpc/amdrum.h +++ b/src/devices/bus/cpc/amdrum.h @@ -27,13 +27,13 @@ public: cpc_amdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE8_MEMBER(dac_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/brunword4.h b/src/devices/bus/cpc/brunword4.h index 8c18b599e38..4a65bf3402d 100644 --- a/src/devices/bus/cpc/brunword4.h +++ b/src/devices/bus/cpc/brunword4.h @@ -17,15 +17,15 @@ public: cpc_brunword4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; DECLARE_WRITE8_MEMBER(rombank_w); - virtual void set_mapping(UINT8 type); + virtual void set_mapping(UINT8 type) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/cpc_pds.h b/src/devices/bus/cpc/cpc_pds.h index 12100e8acbe..54d68e431fd 100644 --- a/src/devices/bus/cpc/cpc_pds.h +++ b/src/devices/bus/cpc/cpc_pds.h @@ -36,15 +36,15 @@ public: cpc_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(pio_r); DECLARE_WRITE8_MEMBER(pio_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/cpc_rom.h b/src/devices/bus/cpc/cpc_rom.h index e5df38039fd..b53a94d49d3 100644 --- a/src/devices/bus/cpc/cpc_rom.h +++ b/src/devices/bus/cpc/cpc_rom.h @@ -25,26 +25,26 @@ public: virtual ~rom_image_device(); // image-level overrides - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; - virtual iodevice_t image_type() const { return IO_ROM; } + virtual iodevice_t image_type() const override { return IO_ROM; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "cpc_rom"; } - virtual const char *file_extensions() const { return "rom,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "cpc_rom"; } + virtual const char *file_extensions() const override { return "rom,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } UINT8* base() { return m_base; } protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; private: UINT8* m_base; @@ -68,14 +68,14 @@ public: cpc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; UINT8* base(UINT8 slot) { if(slot >=1 && slot <= 8) return m_rom[slot]->base(); else return nullptr; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: //cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/cpc_rs232.h b/src/devices/bus/cpc/cpc_rs232.h index b11960c01f9..0124a685ea8 100644 --- a/src/devices/bus/cpc/cpc_rs232.h +++ b/src/devices/bus/cpc/cpc_rs232.h @@ -24,7 +24,7 @@ public: cpc_rs232_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER(pit_out0_w); DECLARE_WRITE_LINE_MEMBER(pit_out1_w); @@ -40,9 +40,9 @@ public: required_device<rs232_port_device> m_rs232; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual const rom_entry *device_rom_region() const override; private: cpc_expansion_slot_device *m_slot; @@ -55,7 +55,7 @@ public: cpc_ams_rs232_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/cpc/cpc_ssa1.h b/src/devices/bus/cpc/cpc_ssa1.h index 32c311f5b65..e47112511f5 100644 --- a/src/devices/bus/cpc/cpc_ssa1.h +++ b/src/devices/bus/cpc/cpc_ssa1.h @@ -56,8 +56,8 @@ public: cpc_ssa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; void set_lrq(UINT8 state) { m_lrq = state; } UINT8 get_lrq() { return m_lrq; } @@ -71,8 +71,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; @@ -92,8 +92,8 @@ public: cpc_dkspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; void set_lrq(UINT8 state) { m_lrq = state; } UINT8 get_lrq() { return m_lrq; } @@ -107,8 +107,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/cpcexp.h b/src/devices/bus/cpc/cpcexp.h index a49c2a033a9..ffde80ef655 100644 --- a/src/devices/bus/cpc/cpcexp.h +++ b/src/devices/bus/cpc/cpcexp.h @@ -139,8 +139,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; devcb_write_line m_out_irq_cb; devcb_write_line m_out_nmi_cb; diff --git a/src/devices/bus/cpc/ddi1.h b/src/devices/bus/cpc/ddi1.h index 9d36783d9b4..600098a3e53 100644 --- a/src/devices/bus/cpc/ddi1.h +++ b/src/devices/bus/cpc/ddi1.h @@ -23,10 +23,10 @@ public: cpc_ddi1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual void set_mapping(UINT8 type); - virtual WRITE_LINE_MEMBER( romen_w ) { m_romen = state; } + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void set_mapping(UINT8 type) override; + virtual WRITE_LINE_MEMBER( romen_w ) override { m_romen = state; } DECLARE_WRITE8_MEMBER(motor_w); DECLARE_WRITE8_MEMBER(fdc_w); @@ -34,8 +34,8 @@ public: DECLARE_WRITE8_MEMBER(rombank_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/doubler.h b/src/devices/bus/cpc/doubler.h index 6b650179b0f..6c429618789 100644 --- a/src/devices/bus/cpc/doubler.h +++ b/src/devices/bus/cpc/doubler.h @@ -24,14 +24,14 @@ public: cpc_doubler_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(ext_tape_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/hd20.h b/src/devices/bus/cpc/hd20.h index 0926e6bd5be..3d4f48837fd 100644 --- a/src/devices/bus/cpc/hd20.h +++ b/src/devices/bus/cpc/hd20.h @@ -26,8 +26,8 @@ public: cpc_hd20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(hdc_r); DECLARE_WRITE8_MEMBER(hdc_w); @@ -35,8 +35,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/magicsound.h b/src/devices/bus/cpc/magicsound.h index 588ead99b40..519e820bac4 100644 --- a/src/devices/bus/cpc/magicsound.h +++ b/src/devices/bus/cpc/magicsound.h @@ -41,7 +41,7 @@ public: al_magicsound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(dmac_r); DECLARE_WRITE8_MEMBER(dmac_w); @@ -62,8 +62,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/mface2.h b/src/devices/bus/cpc/mface2.h index 56eb017b208..c54e38ec889 100644 --- a/src/devices/bus/cpc/mface2.h +++ b/src/devices/bus/cpc/mface2.h @@ -39,9 +39,9 @@ public: cpc_multiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; int multiface_hardware_enabled(); void multiface_rethink_memory(); @@ -50,8 +50,8 @@ public: void check_button_state(); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/playcity.h b/src/devices/bus/cpc/playcity.h index d7abaa08c33..757ffb23c45 100644 --- a/src/devices/bus/cpc/playcity.h +++ b/src/devices/bus/cpc/playcity.h @@ -31,7 +31,7 @@ public: cpc_playcity_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(ctc_r); DECLARE_WRITE8_MEMBER(ctc_w); @@ -44,12 +44,12 @@ public: DECLARE_WRITE_LINE_MEMBER(ctc_zc1_cb) { if(state) { m_slot->nmi_w(1); m_slot->nmi_w(0); } } DECLARE_WRITE_LINE_MEMBER(ctc_intr_cb) { m_slot->irq_w(state); } - virtual WRITE_LINE_MEMBER(cursor_w) { m_ctc->trg1(state); } + virtual WRITE_LINE_MEMBER(cursor_w) override { m_ctc->trg1(state); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/smartwatch.h b/src/devices/bus/cpc/smartwatch.h index 3a4655f4304..b4741bed193 100644 --- a/src/devices/bus/cpc/smartwatch.h +++ b/src/devices/bus/cpc/smartwatch.h @@ -24,15 +24,15 @@ public: cpc_smartwatch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(rtc_w); DECLARE_READ8_MEMBER(rtc_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/symbfac2.h b/src/devices/bus/cpc/symbfac2.h index 2392dbf7bd0..04bc55bae4d 100644 --- a/src/devices/bus/cpc/symbfac2.h +++ b/src/devices/bus/cpc/symbfac2.h @@ -23,8 +23,8 @@ public: cpc_symbiface2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_READ8_MEMBER(ide_cs0_r); DECLARE_WRITE8_MEMBER(ide_cs0_w); @@ -49,8 +49,8 @@ public: }; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/cpc/transtape.h b/src/devices/bus/cpc/transtape.h index a354a1e2037..ec177f8ed7e 100644 --- a/src/devices/bus/cpc/transtape.h +++ b/src/devices/bus/cpc/transtape.h @@ -21,11 +21,11 @@ public: cpc_transtape_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; - virtual void set_mapping(UINT8 type); - virtual WRITE_LINE_MEMBER( romen_w ) { m_romen = state; } + virtual void set_mapping(UINT8 type) override; + virtual WRITE_LINE_MEMBER( romen_w ) override { m_romen = state; } DECLARE_READ8_MEMBER(input_r); DECLARE_WRITE8_MEMBER(output_w); @@ -34,8 +34,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cpc_expansion_slot_device *m_slot; diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h index 2d8330f0d1e..47d3ec9d472 100644 --- a/src/devices/bus/crvision/rom.h +++ b/src/devices/bus/crvision/rom.h @@ -17,8 +17,8 @@ public: crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_rom80); diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h index 50e1f952b1e..b6da6c165df 100644 --- a/src/devices/bus/crvision/slot.h +++ b/src/devices/bus/crvision/slot.h @@ -57,28 +57,28 @@ public: virtual ~crvision_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "crvision_cart"; } - virtual const char *file_extensions() const { return "bin,rom"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "crvision_cart"; } + virtual const char *file_extensions() const override { return "bin,rom"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom40); diff --git a/src/devices/bus/dmv/dmvbus.h b/src/devices/bus/dmv/dmvbus.h index 7043423dc1a..da7f8f68d35 100644 --- a/src/devices/bus/dmv/dmvbus.h +++ b/src/devices/bus/dmv/dmvbus.h @@ -65,7 +65,7 @@ public: template<class _Object> static devcb_base &set_out_thold_callback(device_t &device, _Object object) { return downcast<dmvcart_slot_device &>(device).m_out_thold_cb.set_callback(object); } // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual bool read(offs_t offset, UINT8 &data); diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h index 705e1afe978..1939c5c051e 100644 --- a/src/devices/bus/dmv/k210.h +++ b/src/devices/bus/dmv/k210.h @@ -25,7 +25,7 @@ public: dmv_k210_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(porta_r); DECLARE_READ8_MEMBER(portb_r); @@ -44,13 +44,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) override; // dmvcart_interface overrides - virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data); - virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data); + virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override; + virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override; private: required_device<i8255_device> m_ppi; diff --git a/src/devices/bus/dmv/k220.h b/src/devices/bus/dmv/k220.h index 0465d3de706..0f405946ec6 100644 --- a/src/devices/bus/dmv/k220.h +++ b/src/devices/bus/dmv/k220.h @@ -25,9 +25,9 @@ public: dmv_k220_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE8_MEMBER(porta_w); DECLARE_WRITE8_MEMBER(portc_w); @@ -37,12 +37,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // dmvcart_interface overrides - virtual bool read(offs_t offset, UINT8 &data); - virtual bool write(offs_t offset, UINT8 data); + virtual bool read(offs_t offset, UINT8 &data) override; + virtual bool write(offs_t offset, UINT8 data) override; private: required_device<pit8253_device> m_pit; diff --git a/src/devices/bus/dmv/k230.h b/src/devices/bus/dmv/k230.h index 6c658f2d2c3..d05d6ef8317 100644 --- a/src/devices/bus/dmv/k230.h +++ b/src/devices/bus/dmv/k230.h @@ -33,8 +33,8 @@ public: dmv_k230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(io_r); DECLARE_READ8_MEMBER(program_r); @@ -44,13 +44,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // dmvcart_interface overrides - virtual void hold_w(int state); - virtual void switch16_w(int state); - virtual bool av16bit(); + virtual void hold_w(int state) override; + virtual void switch16_w(int state) override; + virtual bool av16bit() override; protected: required_device<cpu_device> m_maincpu; @@ -72,7 +72,7 @@ public: dmv_k231_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -90,16 +90,16 @@ public: protected: // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // dmvcart_interface overrides - virtual void hold_w(int state); - virtual void switch16_w(int state); + virtual void hold_w(int state) override; + virtual void switch16_w(int state) override; private: int m_snr; @@ -117,20 +117,20 @@ public: protected: // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - - void timint_w(int state) { m_pic->ir0_w(state); } - void keyint_w(int state) { m_pic->ir1_w(state); } - void busint_w(int state) { m_pic->ir2_w(state); } - void flexint_w(int state) { m_pic->ir6_w(state); } - void irq2a_w(int state) { if (!(m_dsw->read() & 0x02)) m_pic->ir5_w(state); } - void irq2_w(int state) { if ( (m_dsw->read() & 0x02)) m_pic->ir5_w(state); } - void irq3_w(int state) { m_pic->ir3_w(state); } - void irq4_w(int state) { m_pic->ir4_w(state); } - void irq5_w(int state) { if (!(m_dsw->read() & 0x01)) m_pic->ir7_w(state); } - void irq6_w(int state) { if ( (m_dsw->read() & 0x01)) m_pic->ir7_w(state); } + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + + void timint_w(int state) override { m_pic->ir0_w(state); } + void keyint_w(int state) override { m_pic->ir1_w(state); } + void busint_w(int state) override { m_pic->ir2_w(state); } + void flexint_w(int state) override { m_pic->ir6_w(state); } + void irq2a_w(int state) override { if (!(m_dsw->read() & 0x02)) m_pic->ir5_w(state); } + void irq2_w(int state) override { if ( (m_dsw->read() & 0x02)) m_pic->ir5_w(state); } + void irq3_w(int state) override { m_pic->ir3_w(state); } + void irq4_w(int state) override { m_pic->ir4_w(state); } + void irq5_w(int state) override { if (!(m_dsw->read() & 0x01)) m_pic->ir7_w(state); } + void irq6_w(int state) override { if ( (m_dsw->read() & 0x01)) m_pic->ir7_w(state); } private: required_device<pic8259_device> m_pic; diff --git a/src/devices/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h index 5aeb5b6c782..f736dee2d4a 100644 --- a/src/devices/bus/dmv/k233.h +++ b/src/devices/bus/dmv/k233.h @@ -24,13 +24,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // dmvcart_interface overrides - virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data); - virtual bool read(offs_t offset, UINT8 &data); - virtual bool write(offs_t offset, UINT8 data); + virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override; + virtual bool read(offs_t offset, UINT8 &data) override; + virtual bool write(offs_t offset, UINT8 data) override; private: bool m_enabled; diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h index 9ad8489a4c2..0b67b6c5d71 100644 --- a/src/devices/bus/dmv/k801.h +++ b/src/devices/bus/dmv/k801.h @@ -27,19 +27,19 @@ public: dmv_k801_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER(epci_irq_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // dmvcart_interface overrides - virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data); - virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data); + virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override; + virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override; protected: required_device<mc2661_device> m_epci; @@ -59,13 +59,13 @@ public: dmv_k211_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // dmvcart_interface overrides - virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data); - virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data); + virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override; + virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override; }; // ======================> dmv_k212_device @@ -78,8 +78,8 @@ public: dmv_k212_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; }; // ======================> dmv_k213_device @@ -92,8 +92,8 @@ public: dmv_k213_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h index 51fd9eaaa9c..c6a7d70af4d 100644 --- a/src/devices/bus/dmv/k803.h +++ b/src/devices/bus/dmv/k803.h @@ -24,18 +24,18 @@ public: dmv_k803_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER(rtc_irq_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data); - virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data); + virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override; + virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override; void update_int(); diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h index a1cf7c7b145..1c25f9b6102 100644 --- a/src/devices/bus/dmv/k806.h +++ b/src/devices/bus/dmv/k806.h @@ -25,9 +25,9 @@ public: dmv_k806_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(portt1_r); DECLARE_READ8_MEMBER(port1_r); @@ -37,11 +37,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data); - virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data); + virtual void io_read(address_space &space, int ifsel, offs_t offset, UINT8 &data) override; + virtual void io_write(address_space &space, int ifsel, offs_t offset, UINT8 data) override; private: required_device<upi41_cpu_device> m_mcu; diff --git a/src/devices/bus/dmv/ram.h b/src/devices/bus/dmv/ram.h index ac841932532..3aceebe9165 100644 --- a/src/devices/bus/dmv/ram.h +++ b/src/devices/bus/dmv/ram.h @@ -24,11 +24,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // dmvcart_interface overrides - virtual void ram_read(UINT8 cas, offs_t offset, UINT8 &data); - virtual void ram_write(UINT8 cas, offs_t offset, UINT8 data); + virtual void ram_read(UINT8 cas, offs_t offset, UINT8 &data) override; + virtual void ram_write(UINT8 cas, offs_t offset, UINT8 data) override; private: UINT8 * m_ram; diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h index c04a0245596..90bb67bced9 100644 --- a/src/devices/bus/ecbbus/ecbbus.h +++ b/src/devices/bus/ecbbus/ecbbus.h @@ -97,7 +97,7 @@ public: ecbbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_ecbbus_slot(device_t &device, const char *tag, int num); @@ -143,7 +143,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: devcb_write_line m_write_irq; diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index 9c4f098d2b9..7f7abe6d0a1 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -38,9 +38,9 @@ public: grip_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_WRITE8_MEMBER( vol0_w ); @@ -67,12 +67,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ecbbus_card_interface overrides - virtual UINT8 ecbbus_io_r(offs_t offset); - virtual void ecbbus_io_w(offs_t offset, UINT8 data); + virtual UINT8 ecbbus_io_r(offs_t offset) override; + virtual void ecbbus_io_w(offs_t offset, UINT8 data) override; private: required_device<i8255_device> m_ppi; diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index dc8708ef78d..07c84969239 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -66,18 +66,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // device_econet_interface overrides - virtual void econet_data(int state); - virtual void econet_clk(int state); + virtual void econet_data(int state) override; + virtual void econet_clk(int state) override; required_device<m65c02_device> m_maincpu; required_device<wd2793_t> m_fdc; diff --git a/src/devices/bus/econet/econet.h b/src/devices/bus/econet/econet.h index e072c7bb43b..e37cf989696 100644 --- a/src/devices/bus/econet/econet.h +++ b/src/devices/bus/econet/econet.h @@ -80,8 +80,8 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_stop() override; class daisy_entry { @@ -119,7 +119,7 @@ public: econet_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_slot(device_t &device, int address); diff --git a/src/devices/bus/ep64/exdos.h b/src/devices/bus/ep64/exdos.h index 2ac9f5bca85..dac02daa1b4 100644 --- a/src/devices/bus/ep64/exdos.h +++ b/src/devices/bus/ep64/exdos.h @@ -32,8 +32,8 @@ public: ep64_exdos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -42,8 +42,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<wd1770_t> m_fdc; diff --git a/src/devices/bus/ep64/exp.h b/src/devices/bus/ep64/exp.h index cbd7b4394a1..a80f05b76f9 100644 --- a/src/devices/bus/ep64/exp.h +++ b/src/devices/bus/ep64/exp.h @@ -113,8 +113,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write_line m_write_irq; diff --git a/src/devices/bus/epson_sio/epson_sio.h b/src/devices/bus/epson_sio/epson_sio.h index 828d64a3eae..c59b3d6ddc1 100644 --- a/src/devices/bus/epson_sio/epson_sio.h +++ b/src/devices/bus/epson_sio/epson_sio.h @@ -58,8 +58,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_epson_sio_interface *m_cart; diff --git a/src/devices/bus/epson_sio/pf10.h b/src/devices/bus/epson_sio/pf10.h index dd937ff0526..4a648bbd997 100644 --- a/src/devices/bus/epson_sio/pf10.h +++ b/src/devices/bus/epson_sio/pf10.h @@ -31,8 +31,8 @@ public: epson_pf10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // floppy disk controller DECLARE_READ8_MEMBER( fdc_r ); @@ -54,13 +54,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_epson_sio_interface overrides - virtual void tx_w(int level); - virtual void pout_w(int level); + virtual void tx_w(int level) override; + virtual void pout_w(int level) override; private: required_device<hd6303y_cpu_device> m_cpu; diff --git a/src/devices/bus/epson_sio/tf20.h b/src/devices/bus/epson_sio/tf20.h index a51848ffc38..3e76b3dab27 100644 --- a/src/devices/bus/epson_sio/tf20.h +++ b/src/devices/bus/epson_sio/tf20.h @@ -33,9 +33,9 @@ public: epson_tf20_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ8_MEMBER( rom_disable_r ); @@ -51,13 +51,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_epson_sio_interface overrides - virtual void tx_w(int level); - virtual void pout_w(int level); + virtual void tx_w(int level) override; + virtual void pout_w(int level) override; private: required_device<cpu_device> m_cpu; diff --git a/src/devices/bus/gameboy/gb_slot.h b/src/devices/bus/gameboy/gb_slot.h index e810ab99e1c..3d37b7b11ec 100644 --- a/src/devices/bus/gameboy/gb_slot.h +++ b/src/devices/bus/gameboy/gb_slot.h @@ -112,13 +112,13 @@ public: virtual ~base_gb_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_cart_type(UINT8 *ROM, UINT32 len); @@ -130,18 +130,18 @@ public: void internal_header_logging(UINT8 *ROM, UINT32 len); void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "gameboy_cart"; } - virtual const char *file_extensions() const { return "bin,gb,gbc"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "gameboy_cart"; } + virtual const char *file_extensions() const override { return "bin,gb,gbc"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -177,12 +177,12 @@ public: megaduck_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual bool call_load(); - virtual const char *image_interface() const { return "megaduck_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual bool call_load() override; + virtual const char *image_interface() const override { return "megaduck_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; }; diff --git a/src/devices/bus/gameboy/mbc.h b/src/devices/bus/gameboy/mbc.h index 3ad27d2cdee..f1041e4541f 100644 --- a/src/devices/bus/gameboy/mbc.h +++ b/src/devices/bus/gameboy/mbc.h @@ -16,16 +16,16 @@ public: gb_rom_mbc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; void shared_start(); void shared_reset(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT8 m_ram_enable; }; @@ -46,14 +46,14 @@ public: gb_rom_mbc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); save_item(NAME(m_mode)); }; - virtual void device_reset() { shared_reset(); m_mode = MODE_16M_64k; }; - virtual void set_additional_wirings(UINT8 mask, int shift) { m_mask = mask; m_shift = shift; } // these get set at cart loading + virtual void device_start() override { shared_start(); save_item(NAME(m_mode)); }; + virtual void device_reset() override { shared_reset(); m_mode = MODE_16M_64k; }; + virtual void set_additional_wirings(UINT8 mask, int shift) override { m_mask = mask; m_shift = shift; } // these get set at cart loading - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT8 m_mode, m_mask; int m_shift; @@ -68,13 +68,13 @@ public: gb_rom_mbc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; // ======================> gb_rom_mbc3_device @@ -86,13 +86,13 @@ public: gb_rom_mbc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT8 m_rtc_map[5]; }; @@ -106,13 +106,13 @@ public: gb_rom_mbc5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; // ======================> gb_rom_mbc6_device @@ -124,13 +124,13 @@ public: gb_rom_mbc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT16 m_latch1, m_latch2; UINT8 m_bank_4000, m_bank_6000; }; @@ -144,13 +144,13 @@ public: gb_rom_mbc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; // ======================> gb_rom_m161_device @@ -163,13 +163,13 @@ public: gb_rom_m161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) { } + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override { return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { } UINT8 m_base_bank; }; @@ -182,12 +182,12 @@ public: gb_rom_mmm01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; UINT8 m_bank_mask, m_bank, m_reg; }; @@ -207,13 +207,13 @@ public: gb_rom_sachen_mmc1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) { } + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override { return 0xff; } + virtual DECLARE_WRITE8_MEMBER(write_ram) override { } UINT8 m_base_bank, m_mask, m_mode, m_unlock_cnt; }; @@ -234,12 +234,12 @@ public: gb_rom_sachen_mmc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; @@ -251,12 +251,12 @@ public: gb_rom_188in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); save_item(NAME(m_game_base)); }; - virtual void device_reset() { shared_reset(); m_game_base = 0; }; + virtual void device_start() override { shared_start(); save_item(NAME(m_game_base)); }; + virtual void device_reset() override { shared_reset(); m_game_base = 0; }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; private: UINT32 m_game_base; @@ -270,15 +270,15 @@ public: gb_rom_sintax_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void set_xor_for_bank(UINT8 bank); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT8 m_bank_mask, m_bank, m_reg; UINT8 m_currentxor, m_xor2, m_xor3, m_xor4, m_xor5, m_sintax_mode; @@ -293,10 +293,10 @@ public: gb_rom_chongwu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_rom); + virtual DECLARE_READ8_MEMBER(read_rom) override; UINT8 m_protection_checked; }; @@ -308,7 +308,7 @@ public: // construction/destruction gb_rom_licheng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_WRITE8_MEMBER(write_bank) override; }; // ======================> gb_rom_digimon_device @@ -320,13 +320,13 @@ public: gb_rom_digimon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; // ======================> gb_rom_rockman8_device @@ -337,14 +337,14 @@ public: gb_rom_rockman8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT8 m_bank_mask, m_bank, m_reg; }; @@ -356,14 +356,14 @@ public: gb_rom_sm3sp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; UINT8 m_bank_mask, m_bank, m_reg, m_mode; }; diff --git a/src/devices/bus/gameboy/rom.h b/src/devices/bus/gameboy/rom.h index 3bd27a362c8..80fedd7a838 100644 --- a/src/devices/bus/gameboy/rom.h +++ b/src/devices/bus/gameboy/rom.h @@ -17,16 +17,16 @@ public: gb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; void shared_start(); void shared_reset(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; // ======================> gb_rom_tama5_device @@ -37,13 +37,14 @@ public: gb_rom_tama5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; + UINT16 m_tama5_data, m_tama5_addr, m_tama5_cmd; UINT8 m_regs[32]; UINT8 m_rtc_reg; @@ -57,12 +58,12 @@ public: gb_rom_wisdom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; }; // ======================> gb_rom_yong_device @@ -73,12 +74,12 @@ public: gb_rom_yong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; }; // ======================> gb_rom_atvrac_device @@ -89,12 +90,12 @@ public: gb_rom_atvrac_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; }; // ======================> gb_rom_lasama_device @@ -105,12 +106,12 @@ public: gb_rom_lasama_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { shared_start(); }; - virtual void device_reset() { shared_reset(); }; + virtual void device_start() override { shared_start(); }; + virtual void device_reset() override { shared_reset(); }; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; }; @@ -124,13 +125,13 @@ public: megaduck_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_bank); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; // device type definition diff --git a/src/devices/bus/gamegear/ggext.h b/src/devices/bus/gamegear/ggext.h index a3110dea711..0388838daaa 100644 --- a/src/devices/bus/gamegear/ggext.h +++ b/src/devices/bus/gamegear/ggext.h @@ -84,7 +84,7 @@ public: //protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_gg_ext_port_interface *m_device; diff --git a/src/devices/bus/gamegear/smsctrladp.h b/src/devices/bus/gamegear/smsctrladp.h index 76c629f4dd8..e06dc76163f 100644 --- a/src/devices/bus/gamegear/smsctrladp.h +++ b/src/devices/bus/gamegear/smsctrladp.h @@ -37,12 +37,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_gg_ext_port_interface overrides - virtual UINT8 peripheral_r(); - virtual void peripheral_w(UINT8 data); + virtual UINT8 peripheral_r() override; + virtual void peripheral_w(UINT8 data) override; private: required_device<sms_control_port_device> m_subctrl_port; diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h index 3c6919db041..107334004ac 100644 --- a/src/devices/bus/gba/gba_slot.h +++ b/src/devices/bus/gba/gba_slot.h @@ -65,13 +65,13 @@ public: virtual ~gba_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_cart_type(UINT8 *ROM, UINT32 len); @@ -81,18 +81,18 @@ public: void save_nvram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "gba_cart"; } - virtual const char *file_extensions() const { return "gba,bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "gba_cart"; } + virtual const char *file_extensions() const override { return "gba,bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ32_MEMBER(read_rom); diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h index 296f561ba32..5f258d7650f 100644 --- a/src/devices/bus/gba/rom.h +++ b/src/devices/bus/gba/rom.h @@ -18,11 +18,11 @@ public: gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ32_MEMBER(read_rom) { return m_rom[offset]; } + virtual DECLARE_READ32_MEMBER(read_rom) override { return m_rom[offset]; } }; // ======================> gba_rom_sram_device @@ -47,8 +47,8 @@ public: gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ32_MEMBER(read_ram); @@ -69,8 +69,8 @@ public: gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ32_MEMBER(read_ram); @@ -130,7 +130,7 @@ public: gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual DECLARE_READ32_MEMBER(read_ram); @@ -150,7 +150,7 @@ public: gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual DECLARE_READ32_MEMBER(read_ram); diff --git a/src/devices/bus/generic/ram.h b/src/devices/bus/generic/ram.h index ac3cfdbb113..487aa5aae1b 100644 --- a/src/devices/bus/generic/ram.h +++ b/src/devices/bus/generic/ram.h @@ -16,11 +16,11 @@ public: generic_ram_plain_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; private: UINT32 m_size; @@ -37,11 +37,11 @@ public: generic_ram_linear_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 size, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; private: UINT32 m_size; diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h index f6c9da14341..73489ab0932 100644 --- a/src/devices/bus/generic/rom.h +++ b/src/devices/bus/generic/rom.h @@ -16,7 +16,7 @@ public: generic_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start() {} + virtual void device_start() override {} }; @@ -30,9 +30,9 @@ public: generic_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ16_MEMBER(read16_rom); - virtual DECLARE_READ32_MEMBER(read32_rom); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ16_MEMBER(read16_rom) override; + virtual DECLARE_READ32_MEMBER(read32_rom) override; }; @@ -45,8 +45,8 @@ public: generic_romram_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual DECLARE_READ8_MEMBER(read_ram) override; + virtual DECLARE_WRITE8_MEMBER(write_ram) override; }; @@ -59,9 +59,9 @@ public: generic_rom_linear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ16_MEMBER(read16_rom); - virtual DECLARE_READ32_MEMBER(read32_rom); + virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual DECLARE_READ16_MEMBER(read16_rom) override; + virtual DECLARE_READ32_MEMBER(read32_rom) override; }; diff --git a/src/devices/bus/generic/slot.h b/src/devices/bus/generic/slot.h index f31f114e4c5..bf3833558da 100644 --- a/src/devices/bus/generic/slot.h +++ b/src/devices/bus/generic/slot.h @@ -102,29 +102,29 @@ public: void set_endian(endianness_t end) { m_endianness = end; } // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; UINT32 common_get_size(const char *region); void common_load_rom(UINT8 *ROM, UINT32 len, const char *region); - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return m_must_be_loaded; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_extensions; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return m_must_be_loaded; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_extensions; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/ieee488/c2031.h b/src/devices/bus/ieee488/c2031.h index 8423a8c1c95..ccc2c31621a 100644 --- a/src/devices/bus/ieee488/c2031.h +++ b/src/devices/bus/ieee488/c2031.h @@ -33,9 +33,9 @@ public: c2031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE_LINE_MEMBER( via0_irq_w ); DECLARE_READ8_MEMBER( via0_pa_r ); @@ -51,12 +51,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ieee488_interface overrides - virtual void ieee488_atn(int state); - virtual void ieee488_ifc(int state); + virtual void ieee488_atn(int state) override; + virtual void ieee488_ifc(int state) override; inline int get_device_number(); diff --git a/src/devices/bus/ieee488/c2040.h b/src/devices/bus/ieee488/c2040.h index 1618a46599f..ef62555f1b9 100644 --- a/src/devices/bus/ieee488/c2040.h +++ b/src/devices/bus/ieee488/c2040.h @@ -36,9 +36,9 @@ public: c2040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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 ); @@ -54,12 +54,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ieee488_interface overrides - virtual void ieee488_atn(int state); - virtual void ieee488_ifc(int state); + virtual void ieee488_atn(int state) override; + virtual void ieee488_ifc(int state) override; enum { @@ -100,8 +100,8 @@ public: c3040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); }; @@ -116,8 +116,8 @@ public: c4040_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); }; diff --git a/src/devices/bus/ieee488/c2040fdc.h b/src/devices/bus/ieee488/c2040fdc.h index 178e81240a2..a056a8f0b60 100644 --- a/src/devices/bus/ieee488/c2040fdc.h +++ b/src/devices/bus/ieee488/c2040fdc.h @@ -73,12 +73,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; void stp_w(floppy_image_device *floppy, int mtr, int &old_stp, int stp); diff --git a/src/devices/bus/ieee488/c8050.h b/src/devices/bus/ieee488/c8050.h index 3d5904dd6cb..3dd65dfc742 100644 --- a/src/devices/bus/ieee488/c8050.h +++ b/src/devices/bus/ieee488/c8050.h @@ -36,9 +36,9 @@ public: c8050_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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 ); @@ -54,12 +54,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ieee488_interface overrides - virtual void ieee488_atn(int state); - virtual void ieee488_ifc(int state); + virtual void ieee488_atn(int state) override; + virtual void ieee488_ifc(int state) override; inline void update_ieee_signals(); @@ -91,7 +91,7 @@ public: c8250_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); }; @@ -106,8 +106,8 @@ public: c8250lp_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); }; @@ -122,8 +122,8 @@ public: sfd1001_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); }; diff --git a/src/devices/bus/ieee488/c8050fdc.h b/src/devices/bus/ieee488/c8050fdc.h index 8228c9660d0..4f82962f524 100644 --- a/src/devices/bus/ieee488/c8050fdc.h +++ b/src/devices/bus/ieee488/c8050fdc.h @@ -77,12 +77,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; void stp_w(floppy_image_device *floppy, int mtr, int &old_stp, int stp); diff --git a/src/devices/bus/ieee488/c8280.h b/src/devices/bus/ieee488/c8280.h index 076edcd736c..a7f17aaf55c 100644 --- a/src/devices/bus/ieee488/c8280.h +++ b/src/devices/bus/ieee488/c8280.h @@ -34,9 +34,9 @@ public: c8280_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ8_MEMBER( dio_r ); @@ -52,12 +52,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ieee488_interface overrides - void ieee488_atn(int state); - void ieee488_ifc(int state); + void ieee488_atn(int state) override; + void ieee488_ifc(int state) override; private: inline void update_ieee_signals(); diff --git a/src/devices/bus/ieee488/d9060.h b/src/devices/bus/ieee488/d9060.h index 7efc20006cf..e5681dae310 100644 --- a/src/devices/bus/ieee488/d9060.h +++ b/src/devices/bus/ieee488/d9060.h @@ -41,9 +41,9 @@ public: d9060_base_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, UINT32 variant, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ8_MEMBER( dio_r ); @@ -60,12 +60,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ieee488_interface overrides - void ieee488_atn(int state); - void ieee488_ifc(int state); + void ieee488_atn(int state) override; + void ieee488_ifc(int state) override; private: inline void update_ieee_signals(); diff --git a/src/devices/bus/ieee488/hardbox.h b/src/devices/bus/ieee488/hardbox.h index 77cbd23fb07..cbaa26d335c 100644 --- a/src/devices/bus/ieee488/hardbox.h +++ b/src/devices/bus/ieee488/hardbox.h @@ -34,9 +34,9 @@ public: hardbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( ppi0_pa_r ); DECLARE_WRITE8_MEMBER( ppi0_pb_w ); @@ -49,11 +49,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset_after_children(); + virtual void device_start() override; + virtual void device_reset_after_children() override; // device_ieee488_interface overrides - virtual void ieee488_ifc(int state); + virtual void ieee488_ifc(int state) override; private: enum diff --git a/src/devices/bus/ieee488/ieee488.h b/src/devices/bus/ieee488/ieee488.h index 3a6c53966f1..f14189e83d9 100644 --- a/src/devices/bus/ieee488/ieee488.h +++ b/src/devices/bus/ieee488/ieee488.h @@ -153,8 +153,8 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_stop() override; class daisy_entry { @@ -205,7 +205,7 @@ public: int get_address() { return m_address; } // device-level overrides - virtual void device_start(); + virtual void device_start() override; protected: int m_address; diff --git a/src/devices/bus/ieee488/shark.h b/src/devices/bus/ieee488/shark.h index d5e2f1fe1f8..50a9c967244 100644 --- a/src/devices/bus/ieee488/shark.h +++ b/src/devices/bus/ieee488/shark.h @@ -31,13 +31,13 @@ public: mshark_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/ieee488/softbox.h b/src/devices/bus/ieee488/softbox.h index 97e729fcc8d..d8de28d031c 100644 --- a/src/devices/bus/ieee488/softbox.h +++ b/src/devices/bus/ieee488/softbox.h @@ -36,9 +36,9 @@ public: softbox_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE8_MEMBER( dbrg_w ); @@ -52,11 +52,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset_after_children(); + virtual void device_start() override; + virtual void device_reset_after_children() override; // device_ieee488_interface overrides - virtual void ieee488_ifc(int state); + virtual void ieee488_ifc(int state) override; private: enum diff --git a/src/devices/bus/imi7000/imi5000h.h b/src/devices/bus/imi7000/imi5000h.h index 2577293ae20..cb37319f6c1 100644 --- a/src/devices/bus/imi7000/imi5000h.h +++ b/src/devices/bus/imi7000/imi5000h.h @@ -36,9 +36,9 @@ public: imi5000h_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE_LINE_MEMBER( ctc_z0_w ); DECLARE_WRITE_LINE_MEMBER( ctc_z1_w ); @@ -61,8 +61,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: enum diff --git a/src/devices/bus/imi7000/imi7000.h b/src/devices/bus/imi7000/imi7000.h index 257ad0c562c..391899a63f9 100644 --- a/src/devices/bus/imi7000/imi7000.h +++ b/src/devices/bus/imi7000/imi7000.h @@ -80,7 +80,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; imi7000_slot_device *m_unit[4]; }; @@ -97,7 +97,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_imi7000_interface *m_card; }; diff --git a/src/devices/bus/intv/ecs.h b/src/devices/bus/intv/ecs.h index 8148459fc22..3f82aff15e5 100644 --- a/src/devices/bus/intv/ecs.h +++ b/src/devices/bus/intv/ecs.h @@ -18,11 +18,11 @@ public: intv_ecs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; // reading and writing @@ -33,8 +33,8 @@ public: virtual DECLARE_READ16_MEMBER(read_rome0); virtual DECLARE_READ16_MEMBER(read_romf0); // RAM - virtual DECLARE_READ16_MEMBER(read_ram) { return (int)m_ram[offset & (m_ram.size() - 1)]; } - virtual DECLARE_WRITE16_MEMBER(write_ram) { m_ram[offset & (m_ram.size() - 1)] = data & 0xff; } + virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; } + virtual DECLARE_WRITE16_MEMBER(write_ram) override { m_ram[offset & (m_ram.size() - 1)] = data & 0xff; } // AY8914 virtual DECLARE_READ16_MEMBER(read_ay); virtual DECLARE_WRITE16_MEMBER(write_ay); @@ -43,23 +43,23 @@ public: DECLARE_WRITE8_MEMBER(ay_porta_w); // passthru accesses - virtual DECLARE_READ16_MEMBER(read_rom04) { return m_subslot->read_rom04(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom40) { return m_subslot->read_rom40(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom48) { return m_subslot->read_rom48(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom50) { return m_subslot->read_rom50(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom60) { return m_subslot->read_rom60(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom80) + virtual DECLARE_READ16_MEMBER(read_rom04) override { return m_subslot->read_rom04(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom40) override { return m_subslot->read_rom40(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom48) override { return m_subslot->read_rom48(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom50) override { return m_subslot->read_rom50(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom60) override { return m_subslot->read_rom60(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom80) override { if (m_ram88_enabled && offset >= 0x800) return m_subslot->read_ram(space, offset & 0x7ff, mem_mask); else return m_subslot->read_rom80(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom90) { return m_subslot->read_rom90(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_roma0) { return m_subslot->read_roma0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romb0) { return m_subslot->read_romb0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romc0) { return m_subslot->read_romc0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romd0) + virtual DECLARE_READ16_MEMBER(read_rom90) override { return m_subslot->read_rom90(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_roma0) override { return m_subslot->read_roma0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romb0) override { return m_subslot->read_romb0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romc0) override { return m_subslot->read_romc0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romd0) override { if (m_ramd0_enabled && offset < 0x800) return m_subslot->read_ram(space, offset, mem_mask); @@ -68,7 +68,7 @@ public: } // paged ROM banking - virtual DECLARE_WRITE16_MEMBER(write_rom20) + virtual DECLARE_WRITE16_MEMBER(write_rom20) override { if (offset == 0xfff) { @@ -78,7 +78,7 @@ public: m_bank_base[2] = 1; } } - virtual DECLARE_WRITE16_MEMBER(write_rom70) + virtual DECLARE_WRITE16_MEMBER(write_rom70) override { if (offset == 0xfff) { @@ -88,7 +88,7 @@ public: m_bank_base[7] = 1; } } - virtual DECLARE_WRITE16_MEMBER(write_rome0) + virtual DECLARE_WRITE16_MEMBER(write_rome0) override { if (offset == 0xfff) { @@ -98,7 +98,7 @@ public: m_bank_base[14] = 1; } } - virtual DECLARE_WRITE16_MEMBER(write_romf0) + virtual DECLARE_WRITE16_MEMBER(write_romf0) override { if (offset == 0xfff) { @@ -109,13 +109,13 @@ public: } } // RAM passthru write - virtual DECLARE_WRITE16_MEMBER(write_88) { if (m_ram88_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } - virtual DECLARE_WRITE16_MEMBER(write_d0) { if (m_ramd0_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } + virtual DECLARE_WRITE16_MEMBER(write_88) override { if (m_ram88_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } + virtual DECLARE_WRITE16_MEMBER(write_d0) override { if (m_ramd0_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } // IntelliVoice passthru - virtual DECLARE_READ16_MEMBER(read_speech) { if (m_voice_enabled) return m_subslot->read_speech(space, offset, mem_mask); else return 0xffff; } - virtual DECLARE_WRITE16_MEMBER(write_speech) { if (m_voice_enabled) m_subslot->write_speech(space, offset, data, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_speech) override { if (m_voice_enabled) return m_subslot->read_speech(space, offset, mem_mask); else return 0xffff; } + virtual DECLARE_WRITE16_MEMBER(write_speech) override { if (m_voice_enabled) m_subslot->write_speech(space, offset, data, mem_mask); } - virtual void late_subslot_setup(); + virtual void late_subslot_setup() override; UINT8 intv_control_r(int hand); diff --git a/src/devices/bus/intv/rom.h b/src/devices/bus/intv/rom.h index 15a66e10817..ec1b153071d 100644 --- a/src/devices/bus/intv/rom.h +++ b/src/devices/bus/intv/rom.h @@ -17,25 +17,25 @@ public: intv_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ16_MEMBER(read_rom04) { return INTV_ROM16_READ(offset + 0x0400); } - virtual DECLARE_READ16_MEMBER(read_rom20) { return INTV_ROM16_READ(offset + 0x2000); } - virtual DECLARE_READ16_MEMBER(read_rom40) { return INTV_ROM16_READ(offset + 0x4000); } - virtual DECLARE_READ16_MEMBER(read_rom48) { return INTV_ROM16_READ(offset + 0x4800); } - virtual DECLARE_READ16_MEMBER(read_rom50) { return INTV_ROM16_READ(offset + 0x5000); } - virtual DECLARE_READ16_MEMBER(read_rom60) { return INTV_ROM16_READ(offset + 0x6000); } - virtual DECLARE_READ16_MEMBER(read_rom70) { return INTV_ROM16_READ(offset + 0x7000); } - virtual DECLARE_READ16_MEMBER(read_rom80) { return INTV_ROM16_READ(offset + 0x8000); } - virtual DECLARE_READ16_MEMBER(read_rom90) { return INTV_ROM16_READ(offset + 0x9000); } - virtual DECLARE_READ16_MEMBER(read_roma0) { return INTV_ROM16_READ(offset + 0xa000); } - virtual DECLARE_READ16_MEMBER(read_romb0) { return INTV_ROM16_READ(offset + 0xb000); } - virtual DECLARE_READ16_MEMBER(read_romc0) { return INTV_ROM16_READ(offset + 0xc000); } - virtual DECLARE_READ16_MEMBER(read_romd0) { return INTV_ROM16_READ(offset + 0xd000); } - virtual DECLARE_READ16_MEMBER(read_rome0) { return INTV_ROM16_READ(offset + 0xe000); } - virtual DECLARE_READ16_MEMBER(read_romf0) { return INTV_ROM16_READ(offset + 0xf000); } + virtual DECLARE_READ16_MEMBER(read_rom04) override { return INTV_ROM16_READ(offset + 0x0400); } + virtual DECLARE_READ16_MEMBER(read_rom20) override { return INTV_ROM16_READ(offset + 0x2000); } + virtual DECLARE_READ16_MEMBER(read_rom40) override { return INTV_ROM16_READ(offset + 0x4000); } + virtual DECLARE_READ16_MEMBER(read_rom48) override { return INTV_ROM16_READ(offset + 0x4800); } + virtual DECLARE_READ16_MEMBER(read_rom50) override { return INTV_ROM16_READ(offset + 0x5000); } + virtual DECLARE_READ16_MEMBER(read_rom60) override { return INTV_ROM16_READ(offset + 0x6000); } + virtual DECLARE_READ16_MEMBER(read_rom70) override { return INTV_ROM16_READ(offset + 0x7000); } + virtual DECLARE_READ16_MEMBER(read_rom80) override { return INTV_ROM16_READ(offset + 0x8000); } + virtual DECLARE_READ16_MEMBER(read_rom90) override { return INTV_ROM16_READ(offset + 0x9000); } + virtual DECLARE_READ16_MEMBER(read_roma0) override { return INTV_ROM16_READ(offset + 0xa000); } + virtual DECLARE_READ16_MEMBER(read_romb0) override { return INTV_ROM16_READ(offset + 0xb000); } + virtual DECLARE_READ16_MEMBER(read_romc0) override { return INTV_ROM16_READ(offset + 0xc000); } + virtual DECLARE_READ16_MEMBER(read_romd0) override { return INTV_ROM16_READ(offset + 0xd000); } + virtual DECLARE_READ16_MEMBER(read_rome0) override { return INTV_ROM16_READ(offset + 0xe000); } + virtual DECLARE_READ16_MEMBER(read_romf0) override { return INTV_ROM16_READ(offset + 0xf000); } // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} }; // ======================> intv_ram_device @@ -47,8 +47,8 @@ public: intv_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ16_MEMBER(read_ram) { return (int)m_ram[offset & (m_ram.size() - 1)]; } - virtual DECLARE_WRITE16_MEMBER(write_ram) { m_ram[offset & (m_ram.size() - 1)] = data & 0xff; } + virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; } + virtual DECLARE_WRITE16_MEMBER(write_ram) override { m_ram[offset & (m_ram.size() - 1)] = data & 0xff; } }; // ======================> intv_gfact_device @@ -60,8 +60,8 @@ public: intv_gfact_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_READ16_MEMBER(read_ram) { return (int)m_ram[offset & (m_ram.size() - 1)]; } - virtual DECLARE_WRITE16_MEMBER(write_ram) { m_ram[offset & (m_ram.size() - 1)] = data & 0xff; } + virtual DECLARE_READ16_MEMBER(read_ram) override { return (int)m_ram[offset & (m_ram.size() - 1)]; } + virtual DECLARE_WRITE16_MEMBER(write_ram) override { m_ram[offset & (m_ram.size() - 1)] = data & 0xff; } }; // ======================> intv_wsmlb_device diff --git a/src/devices/bus/intv/slot.h b/src/devices/bus/intv/slot.h index 2f99612fe27..865866ca2e0 100644 --- a/src/devices/bus/intv/slot.h +++ b/src/devices/bus/intv/slot.h @@ -96,31 +96,31 @@ public: virtual ~intv_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int load_fullpath(); void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "intv_cart"; } - virtual const char *file_extensions() const { return "bin,int,rom,itv"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "intv_cart"; } + virtual const char *file_extensions() const override { return "bin,int,rom,itv"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom04) { if (m_cart) return m_cart->read_rom04(space, offset, mem_mask); else return 0xffff; } diff --git a/src/devices/bus/intv/voice.h b/src/devices/bus/intv/voice.h index 412d3de7760..84d8727c2b9 100644 --- a/src/devices/bus/intv/voice.h +++ b/src/devices/bus/intv/voice.h @@ -17,9 +17,9 @@ public: intv_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; // reading and writing // actual IntelliVoice access @@ -27,41 +27,41 @@ public: virtual DECLARE_WRITE16_MEMBER(write_speech); // passthru access - virtual DECLARE_READ16_MEMBER(read_rom04) { return m_subslot->read_rom04(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom20) { return m_subslot->read_rom20(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom40) { return m_subslot->read_rom40(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom48) { return m_subslot->read_rom48(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom50) { return m_subslot->read_rom50(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom60) { return m_subslot->read_rom60(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom70) { return m_subslot->read_rom70(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom80) + virtual DECLARE_READ16_MEMBER(read_rom04) override { return m_subslot->read_rom04(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom20) override { return m_subslot->read_rom20(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom40) override { return m_subslot->read_rom40(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom48) override { return m_subslot->read_rom48(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom50) override { return m_subslot->read_rom50(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom60) override { return m_subslot->read_rom60(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom70) override { return m_subslot->read_rom70(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rom80) override { if (m_ram88_enabled && offset >= 0x800) return m_subslot->read_ram(space, offset & 0x7ff, mem_mask); else return m_subslot->read_rom80(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rom90) { return m_subslot->read_rom90(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_roma0) { return m_subslot->read_roma0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romb0) { return m_subslot->read_romb0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romc0) { return m_subslot->read_romc0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romd0) + virtual DECLARE_READ16_MEMBER(read_rom90) override { return m_subslot->read_rom90(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_roma0) override { return m_subslot->read_roma0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romb0) override { return m_subslot->read_romb0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romc0) override { return m_subslot->read_romc0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romd0) override { if (m_ramd0_enabled && offset < 0x800) return m_subslot->read_ram(space, offset, mem_mask); else return m_subslot->read_romd0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_rome0) { return m_subslot->read_rome0(space, offset, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_romf0) { return m_subslot->read_romf0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_rome0) override { return m_subslot->read_rome0(space, offset, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_romf0) override { return m_subslot->read_romf0(space, offset, mem_mask); } // RAM passthru write - virtual DECLARE_WRITE16_MEMBER(write_88) { if (m_ram88_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } - virtual DECLARE_WRITE16_MEMBER(write_d0) { if (m_ramd0_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } - virtual DECLARE_READ16_MEMBER(read_ram) { return m_subslot->read_ram(space, offset, mem_mask); } - virtual DECLARE_WRITE16_MEMBER(write_ram) { m_subslot->write_ram(space, offset, data, mem_mask); } + virtual DECLARE_WRITE16_MEMBER(write_88) override { if (m_ram88_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } + virtual DECLARE_WRITE16_MEMBER(write_d0) override { if (m_ramd0_enabled) m_subslot->write_ram(space, offset, data, mem_mask); } + virtual DECLARE_READ16_MEMBER(read_ram) override { return m_subslot->read_ram(space, offset, mem_mask); } + virtual DECLARE_WRITE16_MEMBER(write_ram) override { m_subslot->write_ram(space, offset, data, mem_mask); } - virtual void late_subslot_setup(); + virtual void late_subslot_setup() override; private: required_device<sp0256_device> m_speech; diff --git a/src/devices/bus/iq151/disc2.h b/src/devices/bus/iq151/disc2.h index 1f35778429a..37bb1c7c26d 100644 --- a/src/devices/bus/iq151/disc2.h +++ b/src/devices/bus/iq151/disc2.h @@ -24,20 +24,20 @@ public: iq151_disc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void io_read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; private: diff --git a/src/devices/bus/iq151/grafik.h b/src/devices/bus/iq151/grafik.h index c93c534e72d..47a6287ec91 100644 --- a/src/devices/bus/iq151/grafik.h +++ b/src/devices/bus/iq151/grafik.h @@ -24,7 +24,7 @@ public: iq151_grafik_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // ppi8255 callback DECLARE_WRITE8_MEMBER(x_write); @@ -33,13 +33,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // iq151cart_interface overrides - virtual void io_read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); - virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect); + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; + virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override; private: diff --git a/src/devices/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h index f561a27ca3f..c88948c925c 100644 --- a/src/devices/bus/iq151/iq151.h +++ b/src/devices/bus/iq151/iq151.h @@ -88,25 +88,25 @@ public: template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_drq_cb.set_callback(object); } // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "iq151_cart"; } - virtual const char *file_extensions() const { return "bin,rom"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "iq151_cart"; } + virtual const char *file_extensions() const override { return "bin,rom"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual void read(offs_t offset, UINT8 &data); diff --git a/src/devices/bus/iq151/minigraf.h b/src/devices/bus/iq151/minigraf.h index 6226d0ffa2d..311d79e97f1 100644 --- a/src/devices/bus/iq151/minigraf.h +++ b/src/devices/bus/iq151/minigraf.h @@ -23,16 +23,16 @@ public: iq151_minigraf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_stop() override; // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; // Aritma MINIGRAF 0507 void plotter_update(UINT8 control); diff --git a/src/devices/bus/iq151/ms151a.h b/src/devices/bus/iq151/ms151a.h index cbba64981c5..528ce9a9554 100644 --- a/src/devices/bus/iq151/ms151a.h +++ b/src/devices/bus/iq151/ms151a.h @@ -23,17 +23,17 @@ public: iq151_ms151a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_stop() override; // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void io_read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; // XY 4130/4131 UINT8 plotter_status(); diff --git a/src/devices/bus/iq151/rom.h b/src/devices/bus/iq151/rom.h index da1f72bcec4..b1c5a42cc22 100644 --- a/src/devices/bus/iq151/rom.h +++ b/src/devices/bus/iq151/rom.h @@ -24,14 +24,14 @@ public: iq151_rom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // iq151cart_interface overrides - virtual UINT8* get_cart_base(); + virtual UINT8* get_cart_base() override; UINT8 * m_rom; }; @@ -48,7 +48,7 @@ public: protected: // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); + virtual void read(offs_t offset, UINT8 &data) override; }; // ======================> iq151_basicg_device @@ -62,7 +62,7 @@ public: protected: // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); + virtual void read(offs_t offset, UINT8 &data) override; }; @@ -77,8 +77,8 @@ public: protected: // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; bool m_active; }; @@ -95,8 +95,8 @@ public: protected: // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; bool m_active; }; @@ -113,8 +113,8 @@ public: protected: // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; bool m_active; }; diff --git a/src/devices/bus/iq151/staper.h b/src/devices/bus/iq151/staper.h index e8aa6639d4e..426f87116f0 100644 --- a/src/devices/bus/iq151/staper.h +++ b/src/devices/bus/iq151/staper.h @@ -25,7 +25,7 @@ public: iq151_staper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // i8255 callbacks DECLARE_READ8_MEMBER( ppi_porta_r ); @@ -34,12 +34,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // iq151cart_interface overrides - virtual void io_read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; private: diff --git a/src/devices/bus/iq151/video32.h b/src/devices/bus/iq151/video32.h index f813ca6edb2..d8b3a1e93eb 100644 --- a/src/devices/bus/iq151/video32.h +++ b/src/devices/bus/iq151/video32.h @@ -23,18 +23,18 @@ public: iq151_video32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); - virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; + virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override; private: UINT8 * m_videoram; diff --git a/src/devices/bus/iq151/video64.h b/src/devices/bus/iq151/video64.h index 36487711acf..0162e107e31 100644 --- a/src/devices/bus/iq151/video64.h +++ b/src/devices/bus/iq151/video64.h @@ -23,19 +23,19 @@ public: iq151_video64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // iq151cart_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); - virtual void io_read(offs_t offset, UINT8 &data); - virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) override; private: UINT8 * m_videoram; diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h index ad5da16dac8..5a31c2948fe 100644 --- a/src/devices/bus/isa/3c503.h +++ b/src/devices/bus/isa/3c503.h @@ -14,7 +14,7 @@ class el2_3c503_device: public device_t, { public: el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; void el2_3c503_irq_w(int state); DECLARE_READ8_MEMBER(el2_3c503_mem_read); @@ -23,12 +23,12 @@ public: DECLARE_WRITE8_MEMBER(el2_3c503_loport_w); DECLARE_READ8_MEMBER(el2_3c503_hiport_r); DECLARE_WRITE8_MEMBER(el2_3c503_hiport_w); - void eop_w(int state); - UINT8 dack_r(int line); - void dack_w(int line, UINT8 data); + void eop_w(int state) override; + UINT8 dack_r(int line) override; + void dack_w(int line, UINT8 data) override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<dp8390d_device> m_dp8390; UINT8 m_board_ram[8*1024]; diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h index 929089628ef..36b90369540 100644 --- a/src/devices/bus/isa/3c505.h +++ b/src/devices/bus/isa/3c505.h @@ -136,7 +136,7 @@ public: required_ioport m_irqdrq; required_ioport m_romopts; - virtual void recv_cb(UINT8 *data, int length); + virtual void recv_cb(UINT8 *data, int length) override; protected: virtual int tx_data(device_t *, const UINT8 *, int); @@ -145,14 +145,14 @@ protected: const char *cpu_context(); // device-level overrides - virtual void device_start(); - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual const rom_entry *device_rom_region() const override; private: // device-level overrides - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual ioport_constructor device_input_ports() const; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual ioport_constructor device_input_ports() const override; class data_buffer_fifo; diff --git a/src/devices/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h index 873b60a7ad1..da22516fd72 100644 --- a/src/devices/bus/isa/adlib.h +++ b/src/devices/bus/isa/adlib.h @@ -24,14 +24,14 @@ public: isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(ym3812_16_r); DECLARE_WRITE8_MEMBER(ym3812_16_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state required_device<ym3812_device> m_ym3812; diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index 1526fade3a6..5ed2e560287 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -40,11 +40,11 @@ public: isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); isa8_aga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER( hsync_changed ); DECLARE_WRITE_LINE_MEMBER( vsync_changed ); @@ -108,9 +108,9 @@ public: // construction/destruction isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; UINT8 m_port8; UINT8 m_portd; diff --git a/src/devices/bus/isa/aha1542.h b/src/devices/bus/isa/aha1542.h index d8e8320dca6..ecbe2f158d2 100644 --- a/src/devices/bus/isa/aha1542.h +++ b/src/devices/bus/isa/aha1542.h @@ -33,16 +33,16 @@ public: aha1542_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( aha1542_r ); DECLARE_WRITE8_MEMBER( aha1542_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 5342718652a..09212df65fc 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -42,16 +42,16 @@ public: MC6845_UPDATE_ROW( cga_gfx_1bpp_update_row ); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; protected: required_ioport m_cga_config; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: void mode_control_w(UINT8 data); void set_palette_luts(); @@ -114,7 +114,7 @@ public: // construction/destruction isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition @@ -130,16 +130,16 @@ public: // construction/destruction isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; - virtual MC6845_UPDATE_ROW( crtc_update_row ); + virtual MC6845_UPDATE_ROW( crtc_update_row ) override; MC6845_UPDATE_ROW( pc1512_gfx_4bpp_update_row ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: UINT8 m_write; @@ -154,8 +154,8 @@ public: static const offs_t vram_offset[4]; static const UINT8 mc6845_writeonce_register[31]; - virtual DECLARE_READ8_MEMBER( io_read ); - virtual DECLARE_WRITE8_MEMBER( io_write ); + virtual DECLARE_READ8_MEMBER( io_read ) override; + virtual DECLARE_WRITE8_MEMBER( io_write ) override; DECLARE_WRITE8_MEMBER( vram_w ); }; @@ -172,17 +172,17 @@ public: // construction/destruction isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: - virtual DECLARE_READ8_MEMBER( io_read ); - virtual DECLARE_WRITE8_MEMBER( io_write ); - virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual DECLARE_READ8_MEMBER( io_read ) override; + virtual DECLARE_WRITE8_MEMBER( io_write ) override; + virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; void change_resolution(UINT8 mode); UINT8 m_bank_offset; @@ -204,12 +204,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: - virtual DECLARE_READ8_MEMBER( io_read ); - virtual DECLARE_WRITE8_MEMBER( io_write ); + virtual DECLARE_READ8_MEMBER( io_read ) override; + virtual DECLARE_WRITE8_MEMBER( io_write ) override; UINT8 m_p3df; DECLARE_READ8_MEMBER( char_ram_read ); @@ -227,7 +227,7 @@ class isa8_cga_iskr1030m_device : public: // construction/destruction isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition @@ -241,7 +241,7 @@ class isa8_cga_iskr1031_device : public: // construction/destruction isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition @@ -256,7 +256,7 @@ public: // construction/destruction isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition @@ -269,16 +269,16 @@ class isa8_cga_m24_device : public: // construction/destruction isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // optional information overrides //virtual const rom_entry *device_rom_region() const; - virtual DECLARE_READ8_MEMBER( io_read ); - virtual DECLARE_WRITE8_MEMBER( io_write ); - virtual MC6845_UPDATE_ROW( crtc_update_row ); + virtual DECLARE_READ8_MEMBER( io_read ) override; + virtual DECLARE_WRITE8_MEMBER( io_write ) override; + virtual MC6845_UPDATE_ROW( crtc_update_row ) override; MC6845_UPDATE_ROW( m24_gfx_1bpp_m24_update_row ); MC6845_RECONFIGURE(reconfigure); protected: - virtual void device_reset(); + virtual void device_reset() override; private: UINT8 m_mode2, m_index; }; diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h index ff48980dc12..807d390ef83 100644 --- a/src/devices/bus/isa/com.h +++ b/src/devices/bus/isa/com.h @@ -25,13 +25,13 @@ public: isa8_com_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER(pc_com_interrupt_1) { m_isa->irq4_w(state); } DECLARE_WRITE_LINE_MEMBER(pc_com_interrupt_2) { m_isa->irq3_w(state); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -48,7 +48,7 @@ public: isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h index 029d41e8263..5d9d11f44ca 100644 --- a/src/devices/bus/isa/dectalk.h +++ b/src/devices/bus/isa/dectalk.h @@ -16,8 +16,8 @@ public: dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE8_MEMBER(write); DECLARE_READ8_MEMBER(read); @@ -39,8 +39,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT16 m_cmd, m_stat, m_data, m_dsp_dma, m_ctl; diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h index dc449e81ee7..99dac11e1aa 100644 --- a/src/devices/bus/isa/ega.h +++ b/src/devices/bus/isa/ega.h @@ -25,9 +25,9 @@ public: isa8_ega_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -48,8 +48,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 alu_op( UINT8 data, UINT8 latch_data ); diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 2c929259c9c..1848df8cd0a 100644 --- a/src/devices/bus/isa/fdc.h +++ b/src/devices/bus/isa/fdc.h @@ -36,42 +36,42 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 dack_r(int line); - virtual void dack_w(int line, UINT8 data); - virtual void eop_w(int state); + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line, UINT8 data) override; + virtual void eop_w(int state) override; }; class isa8_fdc_xt_device : public isa8_fdc_device { public: isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_at_device : public isa8_fdc_device { public: isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_smc_device : public isa8_fdc_device { public: isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_ps2_device : public isa8_fdc_device { public: isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; class isa8_fdc_superio_device : public isa8_fdc_device { public: isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h index ec1d05e1f43..b964310b6ba 100644 --- a/src/devices/bus/isa/finalchs.h +++ b/src/devices/bus/isa/finalchs.h @@ -31,12 +31,12 @@ public: DECLARE_WRITE8_MEMBER( io6000_write ); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h index b2625e98975..7dad823033a 100644 --- a/src/devices/bus/isa/gblaster.h +++ b/src/devices/bus/isa/gblaster.h @@ -24,7 +24,7 @@ public: isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(saa1099_16_r); DECLARE_WRITE8_MEMBER(saa1099_1_16_w); @@ -33,8 +33,8 @@ public: DECLARE_WRITE8_MEMBER(detect_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state required_device<saa1099_device> m_saa1099_1; diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h index 60d03cf0262..eb4413d3bd8 100644 --- a/src/devices/bus/isa/gus.h +++ b/src/devices/bus/isa/gus.h @@ -165,8 +165,8 @@ public: void eop_w(int state); // optional information overrides - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; // voice-specific registers gus_voice m_voice[32]; @@ -195,11 +195,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; - virtual void update_irq(); + virtual void update_irq() override; private: // internal state @@ -295,19 +295,19 @@ public: DECLARE_WRITE_LINE_MEMBER(write_acia_clock); // DMA overrides - virtual UINT8 dack_r(int line); - virtual void dack_w(int line,UINT8 data); - virtual void eop_w(int state); + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line,UINT8 data) override; + virtual void eop_w(int state) override; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; private: required_device<gf1_device> m_gf1; diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index 21a47707e69..994af2ea3ba 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -53,9 +53,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; hard_disk_file *pc_hdc_file(int id); void pc_hdc_result(int set_error_info); int no_dma(void); @@ -152,16 +152,16 @@ public: required_device<xt_hdc_device> m_hdc; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: - virtual UINT8 dack_r(int line); - virtual void dack_w(int line,UINT8 data); + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line,UINT8 data) override; UINT8 pc_hdc_dipswitch_r(); int dip; /* dip switches */ @@ -174,7 +174,7 @@ public: isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<ec1841_device> m_hdc; }; diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h index 51bcace8bd8..4a86972d838 100644 --- a/src/devices/bus/isa/ibm_mfc.h +++ b/src/devices/bus/isa/ibm_mfc.h @@ -54,13 +54,13 @@ public: protected: // Device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; - virtual const rom_entry* device_rom_region() const; + virtual const rom_entry* device_rom_region() const override; private: void set_z80_interrupt(int src, int state); diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h index 290eee2a153..7a59e15da20 100644 --- a/src/devices/bus/isa/ide.h +++ b/src/devices/bus/isa/ide.h @@ -23,8 +23,8 @@ public: isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; bool is_primary() { return m_is_primary; } DECLARE_WRITE_LINE_MEMBER(ide_interrupt); @@ -34,8 +34,8 @@ public: WRITE8_MEMBER(ide16_alt_w); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index e851cebe8af..a93fddd6acb 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -166,7 +166,7 @@ public: isa8_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_isa8_slot(device_t &device, device_t *owner, const char *isa_tag); @@ -203,7 +203,7 @@ public: template<class _Object> static devcb_base &set_out_drq3_callback(device_t &device, _Object object) { return downcast<isa8_device &>(device).m_out_drq3_cb.set_callback(object); } // for ISA8, put the 8-bit configs in the primary slots and the 16-bit configs in the secondary - virtual const address_space_config *memory_space_config(address_spacenum spacenum) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override { switch (spacenum) { @@ -260,9 +260,9 @@ protected: void install_space(address_spacenum spacenum, offs_t start, offs_t end, offs_t mask, offs_t mirror, read8_delegate rhandler, write8_delegate whandler); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; // internal state cpu_device *m_maincpu; @@ -330,7 +330,7 @@ public: // construction/destruction isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_isa16_slot(device_t &device, device_t *owner, const char *isa_tag); @@ -360,7 +360,7 @@ public: void install16_device(offs_t start, offs_t end, offs_t mask, offs_t mirror, read16_delegate rhandler, write16_delegate whandler); // for ISA16, put the 16-bit configs in the primary slots and the 8-bit configs in the secondary - virtual const address_space_config *memory_space_config(address_spacenum spacenum) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override { switch (spacenum) { @@ -399,8 +399,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; private: // internal state diff --git a/src/devices/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h index 4f73b68c5d5..6626198b430 100644 --- a/src/devices/bus/isa/lpt.h +++ b/src/devices/bus/isa/lpt.h @@ -26,8 +26,8 @@ public: isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; bool is_primary() { return m_is_primary; } @@ -35,8 +35,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h index 7842f1b5a97..4f57f55faf9 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -27,9 +27,9 @@ public: DECLARE_WRITE16_MEMBER(mach32_mem_boundary_w) { m_membounds = data; if(data & 0x10) logerror("ATI: Unimplemented memory boundary activated."); } protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; UINT16 m_chip_ID; UINT16 m_membounds; @@ -123,9 +123,9 @@ public: DECLARE_READ16_MEMBER(mach32_status_r) { return vga_vblank() << 1; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; }; /* @@ -141,9 +141,9 @@ public: mach64_8514a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; }; // main SVGA device @@ -161,9 +161,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition extern const device_type ATIMACH32; diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h index 344b4df9ff0..c254aa3b791 100644 --- a/src/devices/bus/isa/mc1502_fdc.h +++ b/src/devices/bus/isa/mc1502_fdc.h @@ -29,8 +29,8 @@ public: mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); TIMER_CALLBACK_MEMBER( motor_callback ); @@ -42,7 +42,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: required_device<fd1793_t> m_fdc; diff --git a/src/devices/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h index 9e426d93ab3..d4423247991 100644 --- a/src/devices/bus/isa/mc1502_rom.h +++ b/src/devices/bus/isa/mc1502_rom.h @@ -26,12 +26,12 @@ public: mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index d8e39f4bb8f..cba94767b40 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -26,8 +26,8 @@ public: isa8_mda_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_WRITE_LINE_MEMBER(hsync_changed); DECLARE_WRITE_LINE_MEMBER(vsync_changed); @@ -44,8 +44,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: int m_framecnt; @@ -73,21 +73,21 @@ public: // construction/destruction isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; - virtual DECLARE_READ8_MEMBER(io_read); - virtual DECLARE_WRITE8_MEMBER(io_write); - virtual DECLARE_READ8_MEMBER(status_r); - virtual DECLARE_WRITE8_MEMBER(mode_control_w); + virtual DECLARE_READ8_MEMBER(io_read) override; + virtual DECLARE_WRITE8_MEMBER(io_write) override; + virtual DECLARE_READ8_MEMBER(status_r) override; + virtual DECLARE_WRITE8_MEMBER(mode_control_w) override; - virtual MC6845_UPDATE_ROW( crtc_update_row ); + virtual MC6845_UPDATE_ROW( crtc_update_row ) override; MC6845_UPDATE_ROW( hercules_gfx_update_row ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: UINT8 m_configuration_switch; //hercules @@ -106,18 +106,18 @@ public: // construction/destruction isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual DECLARE_WRITE8_MEMBER(mode_control_w); + virtual DECLARE_WRITE8_MEMBER(mode_control_w) override; - virtual MC6845_UPDATE_ROW( crtc_update_row ); + virtual MC6845_UPDATE_ROW( crtc_update_row ) override; MC6845_UPDATE_ROW( mda_lowres_text_inten_update_row ); MC6845_UPDATE_ROW( mda_lowres_text_blink_update_row ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: UINT8 *m_soft_chr_gen; diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h index a7ba010757a..cdf70fe2acf 100644 --- a/src/devices/bus/isa/mpu401.h +++ b/src/devices/bus/isa/mpu401.h @@ -31,9 +31,9 @@ public: // optional information overrides protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h index bf33d8f4a6d..976558e90cd 100644 --- a/src/devices/bus/isa/mufdc.h +++ b/src/devices/bus/isa/mufdc.h @@ -39,8 +39,8 @@ public: mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, UINT32 clock, const char *name, const char *shortname); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); @@ -50,13 +50,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_isa8_card_interface - virtual UINT8 dack_r(int line); - virtual void dack_w(int line, UINT8 data); - virtual void eop_w(int state); + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line, UINT8 data) override; + virtual void eop_w(int state) override; private: required_device<pc_fdc_interface> m_fdc; @@ -69,10 +69,10 @@ public: // construction/destruction fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_config_complete() { m_shortname = "fdc344"; } + virtual void device_config_complete() override { m_shortname = "fdc344"; } }; class fdcmag_device : public mufdc_device @@ -81,10 +81,10 @@ public: // construction/destruction fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: - virtual void device_config_complete() { m_shortname = "fdcmag"; } + virtual void device_config_complete() override { m_shortname = "fdcmag"; } }; // device type definition diff --git a/src/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h index c246c70d02f..96f98673477 100644 --- a/src/devices/bus/isa/ne1000.h +++ b/src/devices/bus/isa/ne1000.h @@ -14,8 +14,8 @@ class ne1000_device: public device_t, { public: ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; void ne1000_irq_w(int state); DECLARE_READ8_MEMBER(ne1000_mem_read); @@ -23,8 +23,8 @@ public: DECLARE_READ8_MEMBER(ne1000_port_r); DECLARE_WRITE8_MEMBER(ne1000_port_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<dp8390d_device> m_dp8390; UINT8 m_irq; diff --git a/src/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h index 76a271dadc0..ac7d56772a7 100644 --- a/src/devices/bus/isa/ne2000.h +++ b/src/devices/bus/isa/ne2000.h @@ -12,8 +12,8 @@ class ne2000_device: public device_t, { public: ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; void ne2000_irq_w(int state); DECLARE_READ8_MEMBER(ne2000_mem_read); @@ -21,8 +21,8 @@ public: DECLARE_READ16_MEMBER(ne2000_port_r); DECLARE_WRITE16_MEMBER(ne2000_port_w); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<dp8390d_device> m_dp8390; UINT8 m_irq; diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h index 44011ddb9af..bf185d5eb62 100644 --- a/src/devices/bus/isa/num9rev.h +++ b/src/devices/bus/isa/num9rev.h @@ -25,7 +25,7 @@ public: isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; UPD7220_DISPLAY_PIXELS_MEMBER(hgdc_display_pixels); DECLARE_READ8_MEMBER(pal8_r); @@ -44,8 +44,8 @@ public: UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<upd7220_device> m_upd7220; required_device<palette_device> m_palette; diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index e024f1b601c..3df6cb77b66 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -54,23 +54,23 @@ public: omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual iodevice_t image_type() const { return IO_HARDDISK; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return nullptr; } - virtual const char *file_extensions() const { return "awd"; } - virtual const option_guide *create_option_guide() const { return nullptr; } - - virtual bool call_create(int format_type, option_resolution *format_options); + virtual iodevice_t image_type() const override { return IO_HARDDISK; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return nullptr; } + virtual const char *file_extensions() const override { return "awd"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + + virtual bool call_create(int format_type, option_resolution *format_options) override; protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; void omti_disk_config(UINT16 disk_type); public: diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index d08ad8fdb41..4bc92a3a5de 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -54,17 +54,17 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); - virtual const rom_entry *device_rom_region() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - - virtual UINT8 dack_r(int line); - virtual void dack_w(int line, UINT8 data); - virtual void eop_w(int state); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; + virtual const rom_entry *device_rom_region() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line, UINT8 data) override; + virtual void eop_w(int state) override; void set_interrupt(enum line_state line_state); diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h index 810f7e4cba0..f40748085d8 100644 --- a/src/devices/bus/isa/p1_fdc.h +++ b/src/devices/bus/isa/p1_fdc.h @@ -29,8 +29,8 @@ public: p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); DECLARE_READ8_MEMBER(p1_fdc_r); @@ -38,8 +38,8 @@ public: DECLARE_WRITE_LINE_MEMBER( p1_fdc_irq_drq ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<fd1793_t> m_fdc; diff --git a/src/devices/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h index f1a844b5edc..7d4e0af3486 100644 --- a/src/devices/bus/isa/p1_hdc.h +++ b/src/devices/bus/isa/p1_hdc.h @@ -29,13 +29,13 @@ public: p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<wd2010_device> m_hdc; diff --git a/src/devices/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h index 7b5ddd79150..4d0cffcbaea 100644 --- a/src/devices/bus/isa/p1_rom.h +++ b/src/devices/bus/isa/p1_rom.h @@ -26,12 +26,12 @@ public: p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h index 3bb632528d4..c0e055b7424 100644 --- a/src/devices/bus/isa/pc1640_iga.h +++ b/src/devices/bus/isa/pc1640_iga.h @@ -30,11 +30,11 @@ public: isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/isa/pds.h b/src/devices/bus/isa/pds.h index d9d255cb19c..eb98c3abb83 100644 --- a/src/devices/bus/isa/pds.h +++ b/src/devices/bus/isa/pds.h @@ -24,14 +24,14 @@ public: DECLARE_WRITE8_MEMBER(ppi_w); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<i8255_device> m_ppi; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; }; diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index 9e5361bf105..45eb4bfb25a 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -27,9 +27,9 @@ public: isa8_pgc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; UINT32 screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -46,8 +46,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<i8088_cpu_device> m_cpu; diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index b04354fa997..1b7f6796e95 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -22,20 +22,20 @@ public: s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); s3virge_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual READ8_MEMBER(port_03b0_r); - virtual WRITE8_MEMBER(port_03b0_w); - virtual READ8_MEMBER(port_03c0_r); - virtual WRITE8_MEMBER(port_03c0_w); - virtual READ8_MEMBER(port_03d0_r); - virtual WRITE8_MEMBER(port_03d0_w); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); + virtual READ8_MEMBER(port_03b0_r) override; + virtual WRITE8_MEMBER(port_03b0_w) override; + virtual READ8_MEMBER(port_03c0_r) override; + virtual WRITE8_MEMBER(port_03c0_w) override; + virtual READ8_MEMBER(port_03d0_r) override; + virtual WRITE8_MEMBER(port_03d0_w) override; + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; ibm8514a_device* get_8514() { fatalerror("s3virge requested non-existant 8514/A device\n"); return nullptr; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: virtual UINT8 s3_crtc_reg_read(UINT8 index); @@ -56,8 +56,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; // ======================> s3virgedx_vga_device @@ -70,8 +70,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; // device type definition diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h index 0236f97ea3f..ff4c8a4a8f0 100644 --- a/src/devices/bus/isa/sb16.h +++ b/src/devices/bus/isa/sb16.h @@ -25,8 +25,8 @@ public: sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<dac_device> m_dacl; required_device<dac_device> m_dacr; @@ -81,14 +81,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - UINT8 dack_r(int line); - void dack_w(int line, UINT8 data); - UINT16 dack16_r(int line); - void dack16_w(int line, UINT16 data); + virtual void device_start() override; + virtual void device_reset() override; + + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + UINT8 dack_r(int line) override; + void dack_w(int line, UINT8 data) override; + UINT16 dack16_r(int line) override; + void dack16_w(int line, UINT16 data) override; private: void control_timer(bool start); diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index d1b3be92bbc..25bdc0f4b56 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -122,10 +122,10 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; UINT8 dack_r(int line); void dack_w(int line, UINT8 data); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void drq16_w(int state) { } virtual void drq_w(int state) { } virtual void irq_w(int state, int source) { } @@ -133,9 +133,9 @@ protected: void adpcm_decode(UINT8 sample, int size); // serial overrides - virtual void rcv_complete(); // Rx completed receiving byte - virtual void tra_complete(); // Tx completed sending byte - virtual void tra_callback(); // Tx send bit + virtual void rcv_complete() override; // Rx completed receiving byte + virtual void tra_complete() override; // Tx completed sending byte + virtual void tra_callback() override; // Tx send bit static const int MIDI_RING_SIZE = 2048; @@ -163,11 +163,11 @@ public: DECLARE_READ8_MEMBER(ym3812_16_r); DECLARE_WRITE8_MEMBER(ym3812_16_w); protected: - virtual void device_start(); - virtual void drq_w(int state) { m_isa->drq1_w(state); } - virtual void irq_w(int state, int source) { m_isa->irq5_w(state); } - virtual UINT8 dack_r(int line) { return sb_device::dack_r(line); } - virtual void dack_w(int line, UINT8 data) { sb_device::dack_w(line, data); } + virtual void device_start() override; + virtual void drq_w(int state) override { m_isa->drq1_w(state); } + virtual void irq_w(int state, int source) override { m_isa->irq5_w(state); } + virtual UINT8 dack_r(int line) override { return sb_device::dack_r(line); } + virtual void dack_w(int line, UINT8 data) override { sb_device::dack_w(line, data); } private: required_device<ym3812_device> m_ym3812; }; @@ -179,14 +179,14 @@ public: isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER(saa1099_16_r); DECLARE_WRITE8_MEMBER(saa1099_1_16_w); DECLARE_WRITE8_MEMBER(saa1099_2_16_w); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: // internal state required_device<saa1099_device> m_saa1099_1; @@ -201,10 +201,10 @@ public: isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class sb16_device : public sb_device, @@ -218,17 +218,17 @@ public: DECLARE_READ8_MEMBER(mixer_r); DECLARE_WRITE8_MEMBER(mixer_w); protected: - virtual void device_start(); - virtual UINT16 dack16_r(int line); - virtual UINT8 dack_r(int line) { return sb_device::dack_r(line); } - virtual void dack_w(int line, UINT8 data) { sb_device::dack_w(line, data); } - virtual void dack16_w(int line, UINT16 data); - virtual void drq16_w(int state) { m_isa->drq5_w(state); } - virtual void drq_w(int state) { m_isa->drq1_w(state); } - virtual void irq_w(int state, int source) { (state?m_dsp.irq_active|=source:m_dsp.irq_active&=~source); m_isa->irq5_w(m_dsp.irq_active != 0); } - virtual void mixer_reset(); + virtual void device_start() override; + virtual UINT16 dack16_r(int line) override; + virtual UINT8 dack_r(int line) override { return sb_device::dack_r(line); } + virtual void dack_w(int line, UINT8 data) override { sb_device::dack_w(line, data); } + virtual void dack16_w(int line, UINT16 data) override; + virtual void drq16_w(int state) override { m_isa->drq5_w(state); } + virtual void drq_w(int state) override { m_isa->drq1_w(state); } + virtual void irq_w(int state, int source) override { (state?m_dsp.irq_active|=source:m_dsp.irq_active&=~source); m_isa->irq5_w(m_dsp.irq_active != 0); } + virtual void mixer_reset() override; void mixer_set(); - virtual void rcv_complete(); // Rx completed receiving byte + virtual void rcv_complete() override; // Rx completed receiving byte private: struct sb16_mixer m_mixer; }; @@ -240,10 +240,10 @@ public: isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; // device type definition diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h index a6522423752..d8c347e2859 100644 --- a/src/devices/bus/isa/sc499.h +++ b/src/devices/bus/isa/sc499.h @@ -29,19 +29,19 @@ public: sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual void call_unload(); - virtual iodevice_t image_type() const { return IO_MAGTAPE; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return "sc499_cass"; } - virtual const char *file_extensions() const { return "act,ct"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } + virtual void call_unload() override; + virtual iodevice_t image_type() const override { return IO_MAGTAPE; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return "sc499_cass"; } + virtual const char *file_extensions() const override { return "act,ct"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } UINT8 *read_block(int block_num); void write_block(int block_num, UINT8 *ptr); @@ -49,8 +49,8 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start() { }; + virtual void device_config_complete() override; + virtual void device_start() override { }; dynamic_buffer m_ctape_data; }; @@ -70,16 +70,16 @@ public: private: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // ISA overrides - virtual UINT8 dack_r(int line); - virtual void dack_w(int line,UINT8 data); - virtual void eop_w(int state); + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line,UINT8 data) override; + virtual void eop_w(int state) override; const char *cpu_context(); diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h index 43c7a003810..1c9592de531 100644 --- a/src/devices/bus/isa/side116.h +++ b/src/devices/bus/isa/side116.h @@ -32,9 +32,9 @@ public: side116_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); @@ -42,9 +42,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete() { m_shortname = "side116"; } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override { m_shortname = "side116"; } private: required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h index 589adac9f0b..8a58cbb8bf8 100644 --- a/src/devices/bus/isa/ssi2001.h +++ b/src/devices/bus/isa/ssi2001.h @@ -22,15 +22,15 @@ public: ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<pc_joy_device> m_joy; required_device<mos6581_device> m_sid; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; // device type definition diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h index d82367cfff9..9ec059a2640 100644 --- a/src/devices/bus/isa/stereo_fx.h +++ b/src/devices/bus/isa/stereo_fx.h @@ -24,8 +24,8 @@ public: stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<dac_device> m_dacl; required_device<dac_device> m_dacr; @@ -54,12 +54,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - UINT8 dack_r(int line); - void dack_w(int line, UINT8 data); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + UINT8 dack_r(int line) override; + void dack_w(int line, UINT8 data) override; private: // internal state bool m_data_in; diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h index 5259590bf7e..a26e9503e1b 100644 --- a/src/devices/bus/isa/svga_cirrus.h +++ b/src/devices/bus/isa/svga_cirrus.h @@ -22,14 +22,14 @@ public: isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cirrus_gd5430_device *m_vga; }; @@ -43,14 +43,14 @@ public: isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: cirrus_gd5428_device *m_vga; }; diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h index 5e62d941fa3..fba9bfd6769 100644 --- a/src/devices/bus/isa/svga_s3.h +++ b/src/devices/bus/isa/svga_s3.h @@ -25,14 +25,14 @@ public: isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: s3_vga_device *m_vga; ibm8514a_device *m_8514; @@ -47,14 +47,14 @@ public: isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: s3virge_vga_device *m_vga; }; @@ -68,14 +68,14 @@ public: isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: s3virgedx_vga_device *m_vga; }; @@ -89,14 +89,14 @@ public: isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: s3virgedx_vga_device *m_vga; }; diff --git a/src/devices/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h index d5dde48d531..7ce5479735b 100644 --- a/src/devices/bus/isa/svga_trident.h +++ b/src/devices/bus/isa/svga_trident.h @@ -29,14 +29,14 @@ public: isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: trident_vga_device *m_vga; }; diff --git a/src/devices/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h index 23700089f0e..4762fed3ec0 100644 --- a/src/devices/bus/isa/svga_tseng.h +++ b/src/devices/bus/isa/svga_tseng.h @@ -24,14 +24,14 @@ public: isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: tseng_vga_device *m_vga; }; diff --git a/src/devices/bus/isa/trident.h b/src/devices/bus/isa/trident.h index e8c03a5254b..db470ec2838 100644 --- a/src/devices/bus/isa/trident.h +++ b/src/devices/bus/isa/trident.h @@ -18,28 +18,28 @@ public: // construction/destruction trident_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual READ8_MEMBER(port_03c0_r); - virtual WRITE8_MEMBER(port_03c0_w); - virtual READ8_MEMBER(port_03d0_r); - virtual WRITE8_MEMBER(port_03d0_w); + virtual READ8_MEMBER(port_03c0_r) override; + virtual WRITE8_MEMBER(port_03c0_w) override; + virtual READ8_MEMBER(port_03d0_r) override; + virtual WRITE8_MEMBER(port_03d0_w) override; DECLARE_READ8_MEMBER(port_83c6_r); DECLARE_WRITE8_MEMBER(port_83c6_w); DECLARE_READ8_MEMBER(port_43c6_r); DECLARE_WRITE8_MEMBER(port_43c6_w); DECLARE_READ8_MEMBER(vram_r); DECLARE_WRITE8_MEMBER(vram_w); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); - virtual UINT16 offset(); + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; + virtual UINT16 offset() override; DECLARE_READ8_MEMBER(accel_r); DECLARE_WRITE8_MEMBER(accel_w); - virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; struct { diff --git a/src/devices/bus/isa/vga.h b/src/devices/bus/isa/vga.h index 4317592b33b..4707b3c0d61 100644 --- a/src/devices/bus/isa/vga.h +++ b/src/devices/bus/isa/vga.h @@ -24,14 +24,14 @@ public: isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: vga_device *m_vga; }; diff --git a/src/devices/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h index 94c5167f1d5..616667ef17b 100644 --- a/src/devices/bus/isa/vga_ati.h +++ b/src/devices/bus/isa/vga_ati.h @@ -32,14 +32,14 @@ public: isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: ati_vga_device *m_vga; mach8_device *m_8514; @@ -54,14 +54,14 @@ public: isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: mach32_device *m_vga; }; @@ -75,14 +75,14 @@ public: isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(input_port_0_r); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: mach64_device *m_vga; }; diff --git a/src/devices/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h index d328fb0f16b..86715ed367e 100644 --- a/src/devices/bus/isa/wd1002a_wx1.h +++ b/src/devices/bus/isa/wd1002a_wx1.h @@ -30,12 +30,12 @@ public: isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h index dae157cba89..5185b2d8def 100644 --- a/src/devices/bus/isa/wdxt_gen.h +++ b/src/devices/bus/isa/wdxt_gen.h @@ -42,8 +42,8 @@ public: wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; // not really public DECLARE_WRITE_LINE_MEMBER( irq5_w ); @@ -61,12 +61,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_isa8_card_interface - virtual UINT8 dack_r(int line); - virtual void dack_w(int line, UINT8 data); + virtual UINT8 dack_r(int line) override; + virtual void dack_w(int line, UINT8 data) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h index 762be607ea3..a8113ebe9db 100644 --- a/src/devices/bus/isa/xtide.h +++ b/src/devices/bus/isa/xtide.h @@ -22,9 +22,9 @@ public: xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -32,9 +32,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete() { m_shortname = "xtide"; } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override { m_shortname = "xtide"; } private: required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/isbx/compis_fdc.h b/src/devices/bus/isbx/compis_fdc.h index 3ccd294a9f8..d97bc4eb468 100644 --- a/src/devices/bus/isbx/compis_fdc.h +++ b/src/devices/bus/isbx/compis_fdc.h @@ -32,7 +32,7 @@ public: compis_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( fdc_irq ); DECLARE_WRITE_LINE_MEMBER( fdc_drq ); @@ -40,16 +40,16 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_isbx_card_interface overrides - virtual UINT8 mcs0_r(address_space &space, offs_t offset); - virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT8 mdack_r(address_space &space, offs_t offset); - virtual void mdack_w(address_space &space, offs_t offset, UINT8 data); - virtual void opt0_w(int state); - virtual void opt1_w(int state); + virtual UINT8 mcs0_r(address_space &space, offs_t offset) override; + virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT8 mdack_r(address_space &space, offs_t offset) override; + virtual void mdack_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void opt0_w(int state) override; + virtual void opt1_w(int state) override; private: required_device<i8272a_device> m_fdc; diff --git a/src/devices/bus/isbx/isbc_218a.h b/src/devices/bus/isbx/isbc_218a.h index 8718c012696..5fc354a725f 100644 --- a/src/devices/bus/isbx/isbc_218a.h +++ b/src/devices/bus/isbx/isbc_218a.h @@ -32,7 +32,7 @@ public: isbc_218a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( fdc_irq ); DECLARE_WRITE_LINE_MEMBER( fdc_drq ); @@ -40,17 +40,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_isbx_card_interface overrides - virtual UINT8 mcs0_r(address_space &space, offs_t offset); - virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT8 mcs1_r(address_space &space, offs_t offset); - virtual void mcs1_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT8 mdack_r(address_space &space, offs_t offset); - virtual void mdack_w(address_space &space, offs_t offset, UINT8 data); - virtual void opt0_w(int state); + virtual UINT8 mcs0_r(address_space &space, offs_t offset) override; + virtual void mcs0_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT8 mcs1_r(address_space &space, offs_t offset) override; + virtual void mcs1_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT8 mdack_r(address_space &space, offs_t offset) override; + virtual void mdack_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void opt0_w(int state) override; private: required_device<i8272a_device> m_fdc; diff --git a/src/devices/bus/isbx/isbx.h b/src/devices/bus/isbx/isbx.h index 6591a35320a..cb90fbd27b1 100644 --- a/src/devices/bus/isbx/isbx.h +++ b/src/devices/bus/isbx/isbx.h @@ -132,8 +132,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset() { if (m_card) get_card_device()->reset(); } + virtual void device_start() override; + virtual void device_reset() override { if (m_card) get_card_device()->reset(); } devcb_write_line m_write_mintr0; devcb_write_line m_write_mintr1; diff --git a/src/devices/bus/kc/d002.h b/src/devices/bus/kc/d002.h index 0f9ebe5f07e..ea28698e884 100644 --- a/src/devices/bus/kc/d002.h +++ b/src/devices/bus/kc/d002.h @@ -26,8 +26,8 @@ public: kc_d002_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // interface callbacks DECLARE_WRITE_LINE_MEMBER( out_irq_w ); @@ -36,14 +36,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // kcexp_interface overrides - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); - virtual void io_read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; virtual DECLARE_WRITE_LINE_MEMBER( mei_w ); private: diff --git a/src/devices/bus/kc/d004.h b/src/devices/bus/kc/d004.h index 79f45cba03a..ceb0a848876 100644 --- a/src/devices/bus/kc/d004.h +++ b/src/devices/bus/kc/d004.h @@ -30,23 +30,23 @@ public: kc_d004_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0xa7; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual void io_read(offs_t offset, UINT8 &data); - virtual void io_write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0xa7; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual void io_read(offs_t offset, UINT8 &data) override; + virtual void io_write(offs_t offset, UINT8 data) override; public: DECLARE_READ8_MEMBER(hw_input_gate_r); @@ -89,12 +89,12 @@ public: kc_d004_gide_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; public: DECLARE_READ8_MEMBER(gide_r); diff --git a/src/devices/bus/kc/kc.h b/src/devices/bus/kc/kc.h index 57209a0802a..85146d4cfe8 100644 --- a/src/devices/bus/kc/kc.h +++ b/src/devices/bus/kc/kc.h @@ -51,7 +51,7 @@ public: template<class _Object> static devcb_base &set_out_halt_callback(device_t &device, _Object object) { return downcast<kcexp_slot_device &>(device).m_out_halt_cb.set_callback(object); } // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_next_slot(device_t &device, const char *next_module_tag); @@ -87,24 +87,24 @@ public: virtual ~kccart_slot_device(); // device-level overrides - virtual void device_config_complete(); + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "kc_cart"; } - virtual const char *file_extensions() const { return "bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "kc_cart"; } + virtual const char *file_extensions() const override { return "bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; }; // device type definition diff --git a/src/devices/bus/kc/ram.h b/src/devices/bus/kc/ram.h index 02eca67c909..927b6b9341e 100644 --- a/src/devices/bus/kc/ram.h +++ b/src/devices/bus/kc/ram.h @@ -25,14 +25,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0xf6; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0xf6; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; virtual DECLARE_WRITE_LINE_MEMBER( mei_w ); protected: @@ -63,13 +63,13 @@ public: protected: // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0xf4; } - virtual void read(offs_t offset, UINT8 &ata); - virtual void write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0xf4; } + virtual void read(offs_t offset, UINT8 &ata) override; + virtual void write(offs_t offset, UINT8 data) override; private: // internal helpers - virtual UINT32 get_ram_size() const { return 0x4000; } + virtual UINT32 get_ram_size() const override { return 0x4000; } }; @@ -84,17 +84,17 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0x79; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0x79; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; private: // internal helpers - virtual UINT32 get_ram_size() const { return 0x40000; } + virtual UINT32 get_ram_size() const override { return 0x40000; } }; @@ -109,17 +109,17 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0x7a; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0x7a; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; private: // internal helpers - virtual UINT32 get_ram_size() const { return 0x80000; } + virtual UINT32 get_ram_size() const override { return 0x80000; } }; @@ -134,14 +134,14 @@ public: protected: // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0x7b; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0x7b; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; private: // internal helpers - virtual UINT32 get_ram_size() const { return 0x100000; } + virtual UINT32 get_ram_size() const override { return 0x100000; } }; @@ -156,17 +156,17 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0x78; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual void write(offs_t offset, UINT8 data); + virtual UINT8 module_id_r() override { return 0x78; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual void write(offs_t offset, UINT8 data) override; private: // internal helpers - virtual UINT32 get_ram_size() const { return 0x20000; } + virtual UINT32 get_ram_size() const override { return 0x20000; } }; // device type definition diff --git a/src/devices/bus/kc/rom.h b/src/devices/bus/kc/rom.h index 9cfa06eefab..9256ed181fc 100644 --- a/src/devices/bus/kc/rom.h +++ b/src/devices/bus/kc/rom.h @@ -27,15 +27,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual const rom_entry *device_rom_region() const override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0xfb; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); - virtual UINT8* get_cart_base(); + virtual UINT8 module_id_r() override { return 0xfb; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; + virtual UINT8* get_cart_base() override; virtual DECLARE_WRITE_LINE_MEMBER( mei_w ); protected: @@ -60,9 +60,9 @@ public: protected: // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0xfc; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); + virtual UINT8 module_id_r() override { return 0xfc; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; }; @@ -77,12 +77,12 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // kcexp_interface overrides - virtual UINT8 module_id_r() { return 0x01; } - virtual void control_w(UINT8 data); - virtual void read(offs_t offset, UINT8 &data); + virtual UINT8 module_id_r() override { return 0x01; } + virtual void control_w(UINT8 data) override; + virtual void read(offs_t offset, UINT8 &data) override; private: // internal state diff --git a/src/devices/bus/lpci/cirrus.h b/src/devices/bus/lpci/cirrus.h index 8e7bc0c41a9..9b06a0c7878 100644 --- a/src/devices/bus/lpci/cirrus.h +++ b/src/devices/bus/lpci/cirrus.h @@ -22,15 +22,15 @@ public: // construction/destruction cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask); - virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask); + virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; + virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; DECLARE_WRITE8_MEMBER( cirrus_42E8_w ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/bus/lpci/i82371ab.h b/src/devices/bus/lpci/i82371ab.h index a905404e14c..ec5ec8b3be2 100644 --- a/src/devices/bus/lpci/i82371ab.h +++ b/src/devices/bus/lpci/i82371ab.h @@ -23,13 +23,13 @@ public: // construction/destruction i82371ab_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask); - virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask); + virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; + virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT32 pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask); void pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask); diff --git a/src/devices/bus/lpci/i82371sb.h b/src/devices/bus/lpci/i82371sb.h index b8cac08edb9..9e5b3c14b2a 100644 --- a/src/devices/bus/lpci/i82371sb.h +++ b/src/devices/bus/lpci/i82371sb.h @@ -23,13 +23,13 @@ public: // construction/destruction i82371sb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask); - virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask); + virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; + virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT32 pci_isa_r(device_t *busdevice, int offset, UINT32 mem_mask); void pci_isa_w(device_t *busdevice, int offset, UINT32 data, UINT32 mem_mask); diff --git a/src/devices/bus/lpci/i82439tx.h b/src/devices/bus/lpci/i82439tx.h index d6ac36a372e..a0179af8265 100644 --- a/src/devices/bus/lpci/i82439tx.h +++ b/src/devices/bus/lpci/i82439tx.h @@ -32,13 +32,13 @@ public: static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_cpu_tag = tag; } static void static_set_region(device_t &device, const char *tag) { dynamic_cast<i82439tx_device &>(device).m_region_tag = tag; } - virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask); - virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask); + virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; + virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void i82439tx_configure_memory(UINT8 val, offs_t begin, offs_t end); diff --git a/src/devices/bus/lpci/mpc105.h b/src/devices/bus/lpci/mpc105.h index 404a891d446..f890432dca4 100644 --- a/src/devices/bus/lpci/mpc105.h +++ b/src/devices/bus/lpci/mpc105.h @@ -33,13 +33,13 @@ public: static void static_set_cpu(device_t &device, const char *tag) { dynamic_cast<mpc105_device &>(device).m_cpu_tag = tag; } static void static_set_bank_base_default(device_t &device, int bank_base_default) { dynamic_cast<mpc105_device &>(device).m_bank_base_default = bank_base_default; } - virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask); - virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask); + virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; + virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void update_memory(); diff --git a/src/devices/bus/lpci/northbridge.h b/src/devices/bus/lpci/northbridge.h index f52f690ada2..73c21086b8f 100644 --- a/src/devices/bus/lpci/northbridge.h +++ b/src/devices/bus/lpci/northbridge.h @@ -23,8 +23,8 @@ public: northbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: required_device<cpu_device> m_maincpu; required_device<ram_device> m_ram; diff --git a/src/devices/bus/lpci/pci.h b/src/devices/bus/lpci/pci.h index a85ea34b52c..fbf37faa83a 100644 --- a/src/devices/bus/lpci/pci.h +++ b/src/devices/bus/lpci/pci.h @@ -39,7 +39,7 @@ public: pci_device_interface *get_device(); protected: - virtual void device_start(); + virtual void device_start() override; }; extern const device_type PCI_CONNECTOR; @@ -68,9 +68,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; private: UINT8 m_busnum; diff --git a/src/devices/bus/lpci/southbridge.h b/src/devices/bus/lpci/southbridge.h index aaf8bc973e3..5e280192dd4 100644 --- a/src/devices/bus/lpci/southbridge.h +++ b/src/devices/bus/lpci/southbridge.h @@ -44,12 +44,12 @@ public: southbridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; public: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/lpci/vt82c505.h b/src/devices/bus/lpci/vt82c505.h index 8021077081f..68bb3358b00 100644 --- a/src/devices/bus/lpci/vt82c505.h +++ b/src/devices/bus/lpci/vt82c505.h @@ -18,13 +18,13 @@ public: // construction/destruction vt82c505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask); - virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask); + virtual UINT32 pci_read(pci_bus_device *pcibus, int function, int offset, UINT32 mem_mask) override; + virtual void pci_write(pci_bus_device *pcibus, int function, int offset, UINT32 data, UINT32 mem_mask) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT16 m_window_addr[3]; diff --git a/src/devices/bus/macpds/macpds.h b/src/devices/bus/macpds/macpds.h index 90c136e73bb..f1a67dfc1be 100644 --- a/src/devices/bus/macpds/macpds.h +++ b/src/devices/bus/macpds/macpds.h @@ -55,7 +55,7 @@ public: macpds_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_macpds_slot(device_t &device, const char *tag, const char *slottag); @@ -88,8 +88,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state cpu_device *m_maincpu; diff --git a/src/devices/bus/macpds/pds_tpdfpd.h b/src/devices/bus/macpds/pds_tpdfpd.h index 126af9887a1..0adf48c2765 100644 --- a/src/devices/bus/macpds/pds_tpdfpd.h +++ b/src/devices/bus/macpds/pds_tpdfpd.h @@ -25,15 +25,15 @@ public: macpds_sedisplay_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ16_MEMBER(sedisplay_r); DECLARE_WRITE16_MEMBER(sedisplay_w); diff --git a/src/devices/bus/megadrive/eeprom.h b/src/devices/bus/megadrive/eeprom.h index a7916e628bf..a47ea4357ed 100644 --- a/src/devices/bus/megadrive/eeprom.h +++ b/src/devices/bus/megadrive/eeprom.h @@ -22,9 +22,9 @@ public: md_std_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -43,7 +43,7 @@ public: md_eeprom_nbajam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -59,7 +59,7 @@ public: md_eeprom_nbajamte_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -75,7 +75,7 @@ public: md_eeprom_cslam_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -91,7 +91,7 @@ public: md_eeprom_nflqb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -107,7 +107,7 @@ public: md_eeprom_nhlpa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -123,7 +123,7 @@ public: md_eeprom_blara_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); diff --git a/src/devices/bus/megadrive/ggenie.h b/src/devices/bus/megadrive/ggenie.h index 010ace73441..91960a54dc4 100644 --- a/src/devices/bus/megadrive/ggenie.h +++ b/src/devices/bus/megadrive/ggenie.h @@ -16,9 +16,9 @@ public: md_rom_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); diff --git a/src/devices/bus/megadrive/jcart.h b/src/devices/bus/megadrive/jcart.h index c59f3af7572..f6014b6556f 100644 --- a/src/devices/bus/megadrive/jcart.h +++ b/src/devices/bus/megadrive/jcart.h @@ -22,9 +22,9 @@ public: md_jcart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -47,9 +47,9 @@ public: md_seprom_codemast_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -71,7 +71,7 @@ public: md_seprom_mm96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 456eb6fabea..2adac9e01d0 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -144,24 +144,24 @@ public: virtual ~base_md_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return m_must_be_loaded; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return m_must_be_loaded; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; int get_type() { return m_type; } @@ -202,8 +202,8 @@ class md_cart_slot_device : public base_md_cart_slot_device public: // construction/destruction md_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const char *image_interface() const { return "megadriv_cart"; } - virtual const char *file_extensions() const { return "smd,bin,md,gen"; } + virtual const char *image_interface() const override { return "megadriv_cart"; } + virtual const char *file_extensions() const override { return "smd,bin,md,gen"; } }; // ======================> pico_cart_slot_device @@ -213,8 +213,8 @@ class pico_cart_slot_device : public base_md_cart_slot_device public: // construction/destruction pico_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const char *image_interface() const { return "pico_cart"; } - virtual const char *file_extensions() const { return "bin,md"; } + virtual const char *image_interface() const override { return "pico_cart"; } + virtual const char *file_extensions() const override { return "bin,md"; } }; // ======================> copera_cart_slot_device @@ -224,8 +224,8 @@ class copera_cart_slot_device : public base_md_cart_slot_device public: // construction/destruction copera_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const char *image_interface() const { return "copera_cart"; } - virtual const char *file_extensions() const { return "bin,md"; } + virtual const char *image_interface() const override { return "copera_cart"; } + virtual const char *file_extensions() const override { return "bin,md"; } }; diff --git a/src/devices/bus/megadrive/rom.h b/src/devices/bus/megadrive/rom.h index 1ecc693606e..4607055bb6c 100644 --- a/src/devices/bus/megadrive/rom.h +++ b/src/devices/bus/megadrive/rom.h @@ -20,11 +20,11 @@ public: md_std_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {}; + virtual void device_start() override {}; // reading and writing - virtual DECLARE_READ16_MEMBER(read) { if (offset < 0x400000/2) return m_rom[MD_ADDR(offset)]; else return 0xffff; }; - virtual DECLARE_WRITE16_MEMBER(write) { }; + virtual DECLARE_READ16_MEMBER(read) override { if (offset < 0x400000/2) return m_rom[MD_ADDR(offset)]; else return 0xffff; }; + virtual DECLARE_WRITE16_MEMBER(write) override { }; }; // ======================> md_rom_sram_device @@ -65,8 +65,8 @@ public: md_rom_ssf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -86,8 +86,8 @@ public: md_rom_cm2in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -106,8 +106,8 @@ public: md_rom_mcpirate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -139,8 +139,8 @@ public: md_rom_chinf3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -219,8 +219,8 @@ public: md_rom_lion2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -239,8 +239,8 @@ public: md_rom_lion3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -284,8 +284,8 @@ public: md_rom_pokestad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -304,8 +304,8 @@ public: md_rom_realtec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -384,8 +384,8 @@ public: md_rom_smw64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -431,8 +431,8 @@ public: md_rom_squir_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -451,8 +451,8 @@ public: md_rom_tekkensp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -471,8 +471,8 @@ public: md_rom_topf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -492,8 +492,8 @@ public: md_rom_radica_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -512,8 +512,8 @@ public: md_rom_beggarp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); @@ -533,8 +533,8 @@ public: md_rom_wukong_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); diff --git a/src/devices/bus/megadrive/sk.h b/src/devices/bus/megadrive/sk.h index 4ad52056066..d15ef1fb3b9 100644 --- a/src/devices/bus/megadrive/sk.h +++ b/src/devices/bus/megadrive/sk.h @@ -17,8 +17,8 @@ public: md_rom_sk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read); diff --git a/src/devices/bus/megadrive/stm95.h b/src/devices/bus/megadrive/stm95.h index a64eeccd65b..98490d51b4d 100644 --- a/src/devices/bus/megadrive/stm95.h +++ b/src/devices/bus/megadrive/stm95.h @@ -64,8 +64,8 @@ public: md_eeprom_stm95_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ16_MEMBER(read); diff --git a/src/devices/bus/megadrive/svp.h b/src/devices/bus/megadrive/svp.h index 0f128240a86..aad90b8f53f 100644 --- a/src/devices/bus/megadrive/svp.h +++ b/src/devices/bus/megadrive/svp.h @@ -22,10 +22,10 @@ public: //protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual void set_bank_to_rom(const char *banktag, UINT32 offset); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual void set_bank_to_rom(const char *banktag, UINT32 offset) override; required_device<device_t> m_svp; required_ioport m_test_ipt; @@ -36,7 +36,7 @@ public: virtual DECLARE_READ16_MEMBER(read_a15); virtual DECLARE_WRITE16_MEMBER(write_a15); - virtual int read_test(); + virtual int read_test() override; virtual DECLARE_READ16_MEMBER(rom_read1); virtual DECLARE_READ16_MEMBER(rom_read2); diff --git a/src/devices/bus/midi/midi.h b/src/devices/bus/midi/midi.h index 2013e625f91..fcd16932637 100644 --- a/src/devices/bus/midi/midi.h +++ b/src/devices/bus/midi/midi.h @@ -31,8 +31,8 @@ public: DECLARE_READ_LINE_MEMBER( rx_r ) { return m_rxd; } protected: - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; int m_rxd; diff --git a/src/devices/bus/midi/midiinport.h b/src/devices/bus/midi/midiinport.h index 5c95257f0e5..1f938855d70 100644 --- a/src/devices/bus/midi/midiinport.h +++ b/src/devices/bus/midi/midiinport.h @@ -23,9 +23,9 @@ public: DECLARE_WRITE_LINE_MEMBER( read ) { output_rxd(state); } protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start() { m_owner = dynamic_cast<midi_port_device *>(owner()); } - virtual void device_reset() { } + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override { m_owner = dynamic_cast<midi_port_device *>(owner()); } + virtual void device_reset() override { } private: required_device<midiin_device> m_midiin; diff --git a/src/devices/bus/midi/midioutport.h b/src/devices/bus/midi/midioutport.h index 3c0de35cb08..4cfabf9eeea 100644 --- a/src/devices/bus/midi/midioutport.h +++ b/src/devices/bus/midi/midioutport.h @@ -19,13 +19,13 @@ class midiout_port_device : public device_t, { public: midiout_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { if (started()) m_midiout->tx(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { if (started()) m_midiout->tx(state); } protected: - virtual void device_start() { } - virtual void device_reset() { } + virtual void device_start() override { } + virtual void device_reset() override { } private: required_device<midiout_device> m_midiout; diff --git a/src/devices/bus/msx_cart/arc.h b/src/devices/bus/msx_cart/arc.h index 57e96c5a925..07858b58dbe 100644 --- a/src/devices/bus/msx_cart/arc.h +++ b/src/devices/bus/msx_cart/arc.h @@ -16,10 +16,10 @@ public: msx_cart_arc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/msx_cart/ascii.h b/src/devices/bus/msx_cart/ascii.h index e23ce939e31..448e776149c 100644 --- a/src/devices/bus/msx_cart/ascii.h +++ b/src/devices/bus/msx_cart/ascii.h @@ -20,10 +20,10 @@ public: msx_cart_ascii8(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -44,10 +44,10 @@ public: msx_cart_ascii16(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -68,10 +68,10 @@ public: msx_cart_ascii8_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -95,10 +95,10 @@ public: msx_cart_ascii16_sram(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -122,10 +122,10 @@ public: msx_cart_msxwrite(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/bm_012.h b/src/devices/bus/msx_cart/bm_012.h index ce0ad337777..20c6c1970be 100644 --- a/src/devices/bus/msx_cart/bm_012.h +++ b/src/devices/bus/msx_cart/bm_012.h @@ -18,9 +18,9 @@ public: msx_cart_bm_012(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual void device_start(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual void device_start() override; DECLARE_WRITE_LINE_MEMBER(midi_in); diff --git a/src/devices/bus/msx_cart/crossblaim.h b/src/devices/bus/msx_cart/crossblaim.h index b94a3cc6e59..651da22d362 100644 --- a/src/devices/bus/msx_cart/crossblaim.h +++ b/src/devices/bus/msx_cart/crossblaim.h @@ -16,10 +16,10 @@ public: msx_cart_crossblaim(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/disk.h b/src/devices/bus/msx_cart/disk.h index 5b5d6675131..d8297b46cd7 100644 --- a/src/devices/bus/msx_cart/disk.h +++ b/src/devices/bus/msx_cart/disk.h @@ -22,7 +22,7 @@ class msx_cart_disk : public device_t public: msx_cart_disk(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; DECLARE_FLOPPY_FORMATS(floppy_formats); @@ -49,8 +49,8 @@ public: msx_cart_disk_type1(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -72,8 +72,8 @@ public: msx_cart_disk_type2(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -92,7 +92,7 @@ class msx_cart_vy0010 : public msx_cart_disk_type1 public: msx_cart_vy0010(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -101,7 +101,7 @@ class msx_cart_fsfd1 : public msx_cart_disk_type1 public: msx_cart_fsfd1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -110,7 +110,7 @@ class msx_cart_fscf351 : public msx_cart_disk_type2 public: msx_cart_fscf351(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -130,9 +130,9 @@ public: msx_cart_fsfd1a(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/dooly.h b/src/devices/bus/msx_cart/dooly.h index 45ba9343fd4..7b5e2d6666f 100644 --- a/src/devices/bus/msx_cart/dooly.h +++ b/src/devices/bus/msx_cart/dooly.h @@ -16,10 +16,10 @@ public: msx_cart_dooly(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/fmpac.h b/src/devices/bus/msx_cart/fmpac.h index 610f3b99038..bb2825bc818 100644 --- a/src/devices/bus/msx_cart/fmpac.h +++ b/src/devices/bus/msx_cart/fmpac.h @@ -17,11 +17,11 @@ public: msx_cart_fmpac(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/fs_sr022.h b/src/devices/bus/msx_cart/fs_sr022.h index edae6296beb..699c7785e94 100644 --- a/src/devices/bus/msx_cart/fs_sr022.h +++ b/src/devices/bus/msx_cart/fs_sr022.h @@ -16,10 +16,10 @@ public: msx_cart_fs_sr022(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/halnote.h b/src/devices/bus/msx_cart/halnote.h index 8020219a77d..f0dc811aaa2 100644 --- a/src/devices/bus/msx_cart/halnote.h +++ b/src/devices/bus/msx_cart/halnote.h @@ -16,10 +16,10 @@ public: msx_cart_halnote(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/hfox.h b/src/devices/bus/msx_cart/hfox.h index c3a17d365c5..b4c0582eab6 100644 --- a/src/devices/bus/msx_cart/hfox.h +++ b/src/devices/bus/msx_cart/hfox.h @@ -16,10 +16,10 @@ public: msx_cart_hfox(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/holy_quran.h b/src/devices/bus/msx_cart/holy_quran.h index e6c949f1eac..ebcef6d3d97 100644 --- a/src/devices/bus/msx_cart/holy_quran.h +++ b/src/devices/bus/msx_cart/holy_quran.h @@ -16,10 +16,10 @@ public: msx_cart_holy_quran(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/konami.h b/src/devices/bus/msx_cart/konami.h index 1fd982610e8..9b902ab6f4c 100644 --- a/src/devices/bus/msx_cart/konami.h +++ b/src/devices/bus/msx_cart/konami.h @@ -25,10 +25,10 @@ public: msx_cart_konami(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -49,11 +49,11 @@ public: msx_cart_konami_scc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -77,10 +77,10 @@ public: msx_cart_gamemaster2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -102,10 +102,10 @@ public: msx_cart_synthesizer(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -123,11 +123,11 @@ public: msx_cart_konami_sound(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -157,7 +157,7 @@ class msx_cart_konami_sound_snatcher : public msx_cart_konami_sound public: msx_cart_konami_sound_snatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; }; @@ -166,7 +166,7 @@ class msx_cart_konami_sound_sdsnatcher : public msx_cart_konami_sound public: msx_cart_konami_sound_sdsnatcher(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; }; @@ -178,10 +178,10 @@ public: msx_cart_keyboard_master(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/msx_cart/korean.h b/src/devices/bus/msx_cart/korean.h index 83dc84680f1..923b7cde795 100644 --- a/src/devices/bus/msx_cart/korean.h +++ b/src/devices/bus/msx_cart/korean.h @@ -18,10 +18,10 @@ public: msx_cart_korean_80in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -44,10 +44,10 @@ public: msx_cart_korean_90in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); @@ -69,10 +69,10 @@ public: msx_cart_korean_126in1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/majutsushi.h b/src/devices/bus/msx_cart/majutsushi.h index aadbc8a8b5d..cd6d80226e0 100644 --- a/src/devices/bus/msx_cart/majutsushi.h +++ b/src/devices/bus/msx_cart/majutsushi.h @@ -17,11 +17,11 @@ public: msx_cart_majutsushi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/moonsound.h b/src/devices/bus/msx_cart/moonsound.h index e09aa0e58d2..d826d446ec1 100644 --- a/src/devices/bus/msx_cart/moonsound.h +++ b/src/devices/bus/msx_cart/moonsound.h @@ -17,10 +17,10 @@ public: msx_cart_moonsound(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_WRITE8_MEMBER(write_ymf278b_fm); DECLARE_READ8_MEMBER(read_ymf278b_fm); diff --git a/src/devices/bus/msx_cart/msx_audio.h b/src/devices/bus/msx_cart/msx_audio.h index f62462e29a5..2a5e34f0f4b 100644 --- a/src/devices/bus/msx_cart/msx_audio.h +++ b/src/devices/bus/msx_cart/msx_audio.h @@ -21,10 +21,10 @@ public: msx_cart_msx_audio_hxmu900(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); @@ -40,11 +40,11 @@ public: msx_cart_msx_audio_nms1205(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); @@ -66,12 +66,12 @@ public: msx_cart_msx_audio_fsca1(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/msx_audio_kb.cpp b/src/devices/bus/msx_cart/msx_audio_kb.cpp index 0dfcebde30a..d9304613ca7 100644 --- a/src/devices/bus/msx_cart/msx_audio_kb.cpp +++ b/src/devices/bus/msx_cart/msx_audio_kb.cpp @@ -55,9 +55,9 @@ public: , m_keyboard(*this, "KEY") { }; - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_READ8_MEMBER(read) + virtual DECLARE_READ8_MEMBER(read) override { UINT8 result = 0xff; @@ -71,13 +71,13 @@ public: return result; } - virtual DECLARE_WRITE8_MEMBER(write) + virtual DECLARE_WRITE8_MEMBER(write) override { m_row = data; } protected: - virtual void device_start() { } + virtual void device_start() override { } private: UINT8 m_row; @@ -185,9 +185,9 @@ public: , m_keyboard(*this, "KEY") { }; - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; - virtual DECLARE_READ8_MEMBER(read) + virtual DECLARE_READ8_MEMBER(read) override { UINT8 result = 0xff; @@ -201,14 +201,14 @@ public: return result; } - virtual DECLARE_WRITE8_MEMBER(write) + virtual DECLARE_WRITE8_MEMBER(write) override { logerror("msx_nms1160::write %02x\n", data); m_row = data; } protected: - virtual void device_start() { } + virtual void device_start() override { } private: UINT8 m_row; diff --git a/src/devices/bus/msx_cart/msx_audio_kb.h b/src/devices/bus/msx_cart/msx_audio_kb.h index db09bf64dd9..6bdc1fe86fe 100644 --- a/src/devices/bus/msx_cart/msx_audio_kb.h +++ b/src/devices/bus/msx_cart/msx_audio_kb.h @@ -33,7 +33,7 @@ public: msx_audio_kbdc_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // Physical connection simply consists of 8 input and 8 output lines split across 2 connectors DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_cart/msxdos2.h b/src/devices/bus/msx_cart/msxdos2.h index 1209b102372..8cc4564c2d9 100644 --- a/src/devices/bus/msx_cart/msxdos2.h +++ b/src/devices/bus/msx_cart/msxdos2.h @@ -16,10 +16,10 @@ public: msx_cart_msxdos2(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/nomapper.h b/src/devices/bus/msx_cart/nomapper.h index b0c197d2545..bc0dbbc56d6 100644 --- a/src/devices/bus/msx_cart/nomapper.h +++ b/src/devices/bus/msx_cart/nomapper.h @@ -16,9 +16,9 @@ public: msx_cart_nomapper(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/msx_cart/rtype.h b/src/devices/bus/msx_cart/rtype.h index e6bfec30de8..373409bd023 100644 --- a/src/devices/bus/msx_cart/rtype.h +++ b/src/devices/bus/msx_cart/rtype.h @@ -16,10 +16,10 @@ public: msx_cart_rtype(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/super_swangi.h b/src/devices/bus/msx_cart/super_swangi.h index a71bf7fe250..fdca9541266 100644 --- a/src/devices/bus/msx_cart/super_swangi.h +++ b/src/devices/bus/msx_cart/super_swangi.h @@ -16,10 +16,10 @@ public: msx_cart_super_swangi(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); diff --git a/src/devices/bus/msx_cart/superloderunner.h b/src/devices/bus/msx_cart/superloderunner.h index f3737081b98..221ab5128cc 100644 --- a/src/devices/bus/msx_cart/superloderunner.h +++ b/src/devices/bus/msx_cart/superloderunner.h @@ -16,9 +16,9 @@ public: msx_cart_superloderunner(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; - virtual void initialize_cartridge(); + virtual void initialize_cartridge() override; virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/msx_cart/yamaha.h b/src/devices/bus/msx_cart/yamaha.h index c186ad52e16..1888614236d 100644 --- a/src/devices/bus/msx_cart/yamaha.h +++ b/src/devices/bus/msx_cart/yamaha.h @@ -20,8 +20,8 @@ public: msx_cart_sfg(const machine_config &mconfig, const device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); @@ -49,7 +49,7 @@ class msx_cart_sfg01 : public msx_cart_sfg public: msx_cart_sfg01(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; @@ -58,7 +58,7 @@ class msx_cart_sfg05 : public msx_cart_sfg public: msx_cart_sfg05(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; #endif diff --git a/src/devices/bus/msx_slot/bunsetsu.h b/src/devices/bus/msx_slot/bunsetsu.h index 4da57dc565b..47036b9d4c5 100644 --- a/src/devices/bus/msx_slot/bunsetsu.h +++ b/src/devices/bus/msx_slot/bunsetsu.h @@ -22,8 +22,8 @@ public: // static configuration helpers static void set_bunsetsu_region_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_bunsetsu_device &>(device).m_bunsetsu_region_tag = tag; } - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_slot/cartridge.h b/src/devices/bus/msx_slot/cartridge.h index edff7a16606..9db927cbe17 100644 --- a/src/devices/bus/msx_slot/cartridge.h +++ b/src/devices/bus/msx_slot/cartridge.h @@ -37,25 +37,25 @@ public: template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object) { return downcast<msx_slot_cartridge_device &>(device).m_irq_handler.set_callback(object); } // device-level overrides - virtual void device_start(); - virtual void device_config_complete() { update_names(MSX_SLOT_CARTRIDGE, "cartridge", "cart"); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(MSX_SLOT_CARTRIDGE, "cartridge", "cart"); } // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return true; } - virtual bool is_writeable() const { return false; } - virtual bool is_creatable() const { return false; } - virtual bool must_be_loaded() const { return false; } - virtual bool is_reset_on_load() const { return true; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "msx_cart"; } - virtual const char *file_extensions() const { return "mx1,bin,rom"; } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return true; } + virtual bool is_writeable() const override { return false; } + virtual bool is_creatable() const override { return false; } + virtual bool must_be_loaded() const override { return false; } + virtual bool is_reset_on_load() const override { return true; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "msx_cart"; } + virtual const char *file_extensions() const override { return "mx1,bin,rom"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // msx_internal_slot-level overrides virtual DECLARE_READ8_MEMBER(read); @@ -77,10 +77,10 @@ public: // construction/destruction msx_slot_yamaha_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_config_complete() { update_names(MSX_SLOT_YAMAHA_EXPANSION, "cartridge60pin", "cart60p"); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(MSX_SLOT_YAMAHA_EXPANSION, "cartridge60pin", "cart60p"); } - virtual const char *image_interface() const { return "msx_yamaha_60pin"; } + virtual const char *image_interface() const override { return "msx_yamaha_60pin"; } }; diff --git a/src/devices/bus/msx_slot/disk.h b/src/devices/bus/msx_slot/disk.h index 34de73f69e9..26ab1785599 100644 --- a/src/devices/bus/msx_slot/disk.h +++ b/src/devices/bus/msx_slot/disk.h @@ -75,7 +75,7 @@ class msx_slot_disk_device : public msx_slot_rom_device public: msx_slot_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void device_start(); + virtual void device_start() override; // static configuration helpers static void set_fdc_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_disk_device &>(device).m_fdc_tag = tag; } @@ -104,7 +104,7 @@ class msx_slot_wd_disk_device : public msx_slot_disk_device public: msx_slot_wd_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void device_start(); + virtual void device_start() override; protected: wd_fdc_analog_t *m_fdc; @@ -116,7 +116,7 @@ class msx_slot_tc8566_disk_device : public msx_slot_disk_device public: msx_slot_tc8566_disk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void device_start(); + virtual void device_start() override; protected: tc8566af_device *m_fdc; @@ -128,8 +128,8 @@ class msx_slot_disk1_device : public msx_slot_wd_disk_device public: msx_slot_disk1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); @@ -150,8 +150,8 @@ class msx_slot_disk2_device : public msx_slot_wd_disk_device public: msx_slot_disk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); @@ -190,8 +190,8 @@ class msx_slot_disk5_device : public msx_slot_wd_disk_device public: msx_slot_disk5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ8_MEMBER(io_read); DECLARE_WRITE8_MEMBER(io_write); @@ -210,8 +210,8 @@ class msx_slot_disk6_device : public msx_slot_wd_disk_device public: msx_slot_disk6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_slot/fs4600.h b/src/devices/bus/msx_slot/fs4600.h index c383ba49e30..d7e18f7480b 100644 --- a/src/devices/bus/msx_slot/fs4600.h +++ b/src/devices/bus/msx_slot/fs4600.h @@ -23,8 +23,8 @@ public: // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_slot/music.h b/src/devices/bus/msx_slot/music.h index 8cbefb4bc0c..e11c73b9a49 100644 --- a/src/devices/bus/msx_slot/music.h +++ b/src/devices/bus/msx_slot/music.h @@ -24,7 +24,7 @@ public: // static configuration helpers static void set_ym2413_tag(device_t &device, const char *tag) { dynamic_cast<msx_slot_music_device &>(device).m_ym2413_tag = tag; } - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); diff --git a/src/devices/bus/msx_slot/panasonic08.h b/src/devices/bus/msx_slot/panasonic08.h index c9be040678f..bb02e69f622 100644 --- a/src/devices/bus/msx_slot/panasonic08.h +++ b/src/devices/bus/msx_slot/panasonic08.h @@ -23,8 +23,8 @@ public: // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_slot/ram.h b/src/devices/bus/msx_slot/ram.h index 1b85ee8ac5d..0753fcb6a93 100644 --- a/src/devices/bus/msx_slot/ram.h +++ b/src/devices/bus/msx_slot/ram.h @@ -20,7 +20,7 @@ public: static void force_start_address(device_t &device, UINT16 start) { downcast<msx_slot_ram_device &>(device).m_start_address = start; } - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_slot/ram_mm.h b/src/devices/bus/msx_slot/ram_mm.h index 59eb7f18e89..d2dfee8c294 100644 --- a/src/devices/bus/msx_slot/ram_mm.h +++ b/src/devices/bus/msx_slot/ram_mm.h @@ -21,7 +21,7 @@ public: static void set_total_size(device_t &device, UINT32 total_size) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_total_size = total_size; } static void set_ramio_set_bits(device_t &device, UINT8 ramio_set_bits) { dynamic_cast<msx_slot_ram_mm_device &>(device).m_ramio_set_bits = ramio_set_bits; } - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/msx_slot/rom.h b/src/devices/bus/msx_slot/rom.h index 6317d28f3c0..5ed56a151f6 100644 --- a/src/devices/bus/msx_slot/rom.h +++ b/src/devices/bus/msx_slot/rom.h @@ -19,7 +19,7 @@ public: // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read); diff --git a/src/devices/bus/msx_slot/sony08.h b/src/devices/bus/msx_slot/sony08.h index 28798f9bc06..f303c0fc83d 100644 --- a/src/devices/bus/msx_slot/sony08.h +++ b/src/devices/bus/msx_slot/sony08.h @@ -23,8 +23,8 @@ public: // static configuration helpers static void set_rom_start(device_t &device, const char *region, UINT32 offset); - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h index 754781fc70e..08b43b82d8d 100644 --- a/src/devices/bus/nasbus/avc.h +++ b/src/devices/bus/nasbus/avc.h @@ -35,9 +35,9 @@ public: WRITE8_MEMBER(vram_w); protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_device<mc6845_device> m_crtc; diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h index 9315bb92df1..ea27b266667 100644 --- a/src/devices/bus/nasbus/floppy.h +++ b/src/devices/bus/nasbus/floppy.h @@ -35,10 +35,10 @@ public: DECLARE_FLOPPY_FORMATS(floppy_formats); protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_reset_after_children(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_reset_after_children() override; private: TIMER_CALLBACK_MEMBER(motor_off); diff --git a/src/devices/bus/nasbus/nasbus.h b/src/devices/bus/nasbus/nasbus.h index f7766bc0426..34e35de4886 100644 --- a/src/devices/bus/nasbus/nasbus.h +++ b/src/devices/bus/nasbus/nasbus.h @@ -136,7 +136,7 @@ public: const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void set_nasbus_slot(device_t &device, device_t *owner, const char *nasbus_tag); @@ -174,8 +174,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: simple_list<device_nasbus_card_interface> m_dev; diff --git a/src/devices/bus/neogeo/banked_cart.h b/src/devices/bus/neogeo/banked_cart.h index 337e37a37ef..5f9c4d9503d 100644 --- a/src/devices/bus/neogeo/banked_cart.h +++ b/src/devices/bus/neogeo/banked_cart.h @@ -32,8 +32,8 @@ public: void init_banks(void); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void postload(); }; diff --git a/src/devices/bus/neogeo/bootleg_cart.h b/src/devices/bus/neogeo/bootleg_cart.h index a3932c25df8..94571d5b108 100644 --- a/src/devices/bus/neogeo/bootleg_cart.h +++ b/src/devices/bus/neogeo/bootleg_cart.h @@ -20,16 +20,16 @@ public: neogeo_bootleg_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) {} - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override {} + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<ngbootleg_prot_device> m_bootleg_prot; @@ -49,9 +49,9 @@ class neogeo_bootleg_garoubl_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_garoubl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_GAROUBL_CART; @@ -64,9 +64,9 @@ class neogeo_bootleg_cthd2003_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_cthd2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_CTHD2003_CART; @@ -74,9 +74,9 @@ class neogeo_bootleg_ct2k3sp_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_ct2k3sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_CT2K3SP_CART; @@ -84,9 +84,9 @@ class neogeo_bootleg_ct2k3sa_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_ct2k3sa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_CT2K3SA_CART; @@ -99,9 +99,9 @@ class neogeo_bootleg_kf10thep_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_kf10thep_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_KF10THEP_CART; @@ -114,9 +114,9 @@ class neogeo_bootleg_kf2k5uni_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_kf2k5uni_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_KF2K5UNI_CART; @@ -128,9 +128,9 @@ class neogeo_bootleg_kf2k4se_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_kf2k4se_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_KF2K4SE_CART; @@ -143,9 +143,9 @@ class neogeo_bootleg_svcplus_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_svcplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_SVCPLUS_CART; @@ -157,9 +157,9 @@ class neogeo_bootleg_svcplusa_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_svcplusa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_SVCPLUSA_CART; @@ -171,9 +171,9 @@ class neogeo_bootleg_samsho5b_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_samsho5b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_SAMSHO5B_CART; @@ -186,9 +186,9 @@ class neogeo_bootleg_kof97oro_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_kof97oro_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_KOF97ORO_CART; @@ -201,9 +201,9 @@ class neogeo_bootleg_lans2004_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_lans2004_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_LANS2004_CART; @@ -215,9 +215,9 @@ class neogeo_bootleg_kof10th_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_kof10th_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_KOF10TH_CART; @@ -231,11 +231,11 @@ class neogeo_bootleg_kog_cart : public neogeo_bootleg_cart { public: neogeo_bootleg_kog_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<kog_prot_device> m_kog_prot; }; diff --git a/src/devices/bus/neogeo/bootleg_hybrid_cart.h b/src/devices/bus/neogeo/bootleg_hybrid_cart.h index ace1886e840..c6b6a7858d9 100644 --- a/src/devices/bus/neogeo/bootleg_hybrid_cart.h +++ b/src/devices/bus/neogeo/bootleg_hybrid_cart.h @@ -22,16 +22,16 @@ public: neogeo_bootleg_hybrid_hybrid_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) {} - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override {} + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<ngbootleg_prot_device> m_bootleg_prot; @@ -56,9 +56,9 @@ class neogeo_bootleg_hybrid_mslug3b6_cart : public neogeo_bootleg_hybrid_hybrid_ { public: neogeo_bootleg_hybrid_mslug3b6_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_MSLUG3B6_CART; @@ -71,9 +71,9 @@ class neogeo_bootleg_hybrid_kof2002b_cart : public neogeo_bootleg_hybrid_hybrid_ { public: neogeo_bootleg_hybrid_kof2002b_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_KOF2002B_CART; @@ -81,9 +81,9 @@ class neogeo_bootleg_hybrid_kf2k2mp_cart : public neogeo_bootleg_hybrid_hybrid_c { public: neogeo_bootleg_hybrid_kf2k2mp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP_CART; @@ -91,9 +91,9 @@ class neogeo_bootleg_hybrid_kf2k2mp2_cart : public neogeo_bootleg_hybrid_hybrid_ { public: neogeo_bootleg_hybrid_kf2k2mp2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K2MP2_CART; @@ -106,9 +106,9 @@ class neogeo_bootleg_hybrid_matrimbl_cart : public neogeo_bootleg_hybrid_hybrid_ { public: neogeo_bootleg_hybrid_matrimbl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_MATRIMBL_CART; @@ -120,9 +120,9 @@ class neogeo_bootleg_hybrid_ms5plus_cart : public neogeo_bootleg_hybrid_hybrid_c { public: neogeo_bootleg_hybrid_ms5plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_MS5PLUS_CART; @@ -134,9 +134,9 @@ class neogeo_bootleg_hybrid_svcboot_cart : public neogeo_bootleg_hybrid_hybrid_c { public: neogeo_bootleg_hybrid_svcboot_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_SVCBOOT_CART; @@ -144,9 +144,9 @@ class neogeo_bootleg_hybrid_svcsplus_cart : public neogeo_bootleg_hybrid_hybrid_ { public: neogeo_bootleg_hybrid_svcsplus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_SVCSPLUS_CART; @@ -160,9 +160,9 @@ class neogeo_bootleg_hybrid_kf2k3bl_cart : public neogeo_bootleg_hybrid_hybrid_c { public: neogeo_bootleg_hybrid_kf2k3bl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3BL_CART; @@ -170,9 +170,9 @@ class neogeo_bootleg_hybrid_kf2k3pl_cart : public neogeo_bootleg_hybrid_hybrid_c { public: neogeo_bootleg_hybrid_kf2k3pl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3PL_CART; @@ -181,9 +181,9 @@ class neogeo_bootleg_hybrid_kf2k3upl_cart : public neogeo_bootleg_hybrid_hybrid_ { public: neogeo_bootleg_hybrid_kf2k3upl_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_BOOTLEG_HYBRID_KF2K3UPL_CART; diff --git a/src/devices/bus/neogeo/bootleg_prot.h b/src/devices/bus/neogeo/bootleg_prot.h index d6e23accbd0..8aa1c9bdd7e 100644 --- a/src/devices/bus/neogeo/bootleg_prot.h +++ b/src/devices/bus/neogeo/bootleg_prot.h @@ -85,8 +85,8 @@ public: UINT16 m_cartridge_ram2[0x10000]; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/cmc_cart.h b/src/devices/bus/neogeo/cmc_cart.h index 2e07e29c93f..fdbaab73207 100644 --- a/src/devices/bus/neogeo/cmc_cart.h +++ b/src/devices/bus/neogeo/cmc_cart.h @@ -19,16 +19,16 @@ public: neogeo_cmc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); } - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<cmc_prot_device> m_cmc_prot; @@ -48,8 +48,8 @@ class neogeo_cmc_zupapa_cart : public neogeo_cmc_cart { public: neogeo_cmc_zupapa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_ZUPAPA_CART; @@ -61,8 +61,8 @@ class neogeo_cmc_mslug3h_cart : public neogeo_cmc_cart { public: neogeo_cmc_mslug3h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_MSLUG3H_CART; @@ -75,8 +75,8 @@ class neogeo_cmc_ganryu_cart : public neogeo_cmc_cart { public: neogeo_cmc_ganryu_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_GANRYU_CART; @@ -88,8 +88,8 @@ class neogeo_cmc_s1945p_cart : public neogeo_cmc_cart { public: neogeo_cmc_s1945p_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_S1945P_CART; @@ -102,8 +102,8 @@ class neogeo_cmc_preisle2_cart : public neogeo_cmc_cart { public: neogeo_cmc_preisle2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_PREISLE2_CART; @@ -115,8 +115,8 @@ class neogeo_cmc_bangbead_cart : public neogeo_cmc_cart { public: neogeo_cmc_bangbead_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_BANGBEAD_CART; @@ -129,8 +129,8 @@ class neogeo_cmc_nitd_cart : public neogeo_cmc_cart { public: neogeo_cmc_nitd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_NITD_CART; @@ -142,8 +142,8 @@ class neogeo_cmc_sengoku3_cart : public neogeo_cmc_cart { public: neogeo_cmc_sengoku3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_SENGOKU3_CART; @@ -155,8 +155,8 @@ class neogeo_cmc_kof99k_cart : public neogeo_cmc_cart { public: neogeo_cmc_kof99k_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_KOF99K_CART; @@ -168,8 +168,8 @@ class neogeo_cmc_kof2001_cart : public neogeo_cmc_cart { public: neogeo_cmc_kof2001_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_CMC_KOF2001_CART; @@ -181,8 +181,8 @@ class neogeo_cmc_kof2000n_cart : public neogeo_cmc_cart { public: neogeo_cmc_kof2000n_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_CMC_KOF2000N_CART; diff --git a/src/devices/bus/neogeo/cmc_prot.h b/src/devices/bus/neogeo/cmc_prot.h index 676b7ab5cd4..cbf53a865dd 100644 --- a/src/devices/bus/neogeo/cmc_prot.h +++ b/src/devices/bus/neogeo/cmc_prot.h @@ -66,8 +66,8 @@ public: void neogeo_cmc50_m1_decrypt(UINT8* romcrypt, UINT32 romcrypt_size, UINT8* romaudio, UINT32 romaudio_size); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; const UINT8 *type0_t03; const UINT8 *type0_t12; diff --git a/src/devices/bus/neogeo/fatfury2_cart.h b/src/devices/bus/neogeo/fatfury2_cart.h index 1356d130bf9..05041421643 100644 --- a/src/devices/bus/neogeo/fatfury2_cart.h +++ b/src/devices/bus/neogeo/fatfury2_cart.h @@ -18,14 +18,14 @@ public: neogeo_fatfury2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS); + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; required_device<neogeo_banked_cart_device> m_banked_cart; required_device<fatfury2_prot_device> m_fatfury2_prot; diff --git a/src/devices/bus/neogeo/fatfury2_prot.h b/src/devices/bus/neogeo/fatfury2_prot.h index 400fee2d160..17a31586ed4 100644 --- a/src/devices/bus/neogeo/fatfury2_prot.h +++ b/src/devices/bus/neogeo/fatfury2_prot.h @@ -29,8 +29,8 @@ public: UINT32 m_fatfury2_prot_data; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/kof2002_cart.h b/src/devices/bus/neogeo/kof2002_cart.h index 7d995c88adc..1d2184f5b2e 100644 --- a/src/devices/bus/neogeo/kof2002_cart.h +++ b/src/devices/bus/neogeo/kof2002_cart.h @@ -20,16 +20,16 @@ public: neogeo_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); } - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<cmc_prot_device> m_cmc_prot; @@ -52,8 +52,8 @@ class neogeo_kof2002_kof2002_cart : public neogeo_kof2002_cart { public: neogeo_kof2002_kof2002_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_KOF2002_KOF2002_CART; @@ -61,8 +61,8 @@ class neogeo_kof2002_kf2k2pls_cart : public neogeo_kof2002_cart { public: neogeo_kof2002_kf2k2pls_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_KOF2002_KF2K2PLS_CART; @@ -76,8 +76,8 @@ class neogeo_kof2002_matrim_cart : public neogeo_kof2002_cart { public: neogeo_kof2002_matrim_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_KOF2002_MATRIM_CART; @@ -89,8 +89,8 @@ class neogeo_kof2002_samsho5_cart : public neogeo_kof2002_cart { public: neogeo_kof2002_samsho5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_KOF2002_SAMSHO5_CART; @@ -102,8 +102,8 @@ class neogeo_kof2002_samsho5sp_cart : public neogeo_kof2002_cart { public: neogeo_kof2002_samsho5sp_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_KOF2002_SAMSHO5SP_CART; diff --git a/src/devices/bus/neogeo/kof2002_prot.h b/src/devices/bus/neogeo/kof2002_prot.h index c3479ec9a21..8ed4873b1be 100644 --- a/src/devices/bus/neogeo/kof2002_prot.h +++ b/src/devices/bus/neogeo/kof2002_prot.h @@ -25,8 +25,8 @@ public: void samsh5sp_decrypt_68k(UINT8* cpurom, UINT32 cpurom_size); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/kof98_cart.h b/src/devices/bus/neogeo/kof98_cart.h index f0054d8c4bd..15c680ea7c9 100644 --- a/src/devices/bus/neogeo/kof98_cart.h +++ b/src/devices/bus/neogeo/kof98_cart.h @@ -18,14 +18,14 @@ public: neogeo_kof98_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual void activate_cart(ACTIVATE_CART_PARAMS); + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; required_device<neogeo_banked_cart_device> m_banked_cart; required_device<kof98_prot_device> m_kof98_prot; diff --git a/src/devices/bus/neogeo/kof98_prot.h b/src/devices/bus/neogeo/kof98_prot.h index 83c9dd5f23a..f824a8a1206 100644 --- a/src/devices/bus/neogeo/kof98_prot.h +++ b/src/devices/bus/neogeo/kof98_prot.h @@ -27,8 +27,8 @@ public: UINT16 m_default_rom[2]; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/kog_prot.h b/src/devices/bus/neogeo/kog_prot.h index b1ff5f6ee6d..5e19053c3d4 100644 --- a/src/devices/bus/neogeo/kog_prot.h +++ b/src/devices/bus/neogeo/kog_prot.h @@ -26,9 +26,9 @@ public: required_ioport m_jumper; protected: - virtual void device_start(); - virtual void device_reset(); - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; }; #endif diff --git a/src/devices/bus/neogeo/mslugx_cart.h b/src/devices/bus/neogeo/mslugx_cart.h index 70d25d2338a..65acd584a54 100644 --- a/src/devices/bus/neogeo/mslugx_cart.h +++ b/src/devices/bus/neogeo/mslugx_cart.h @@ -18,14 +18,14 @@ public: neogeo_mslugx_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS); + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; required_device<neogeo_banked_cart_device> m_banked_cart; required_device<mslugx_prot_device> m_mslugx_prot; diff --git a/src/devices/bus/neogeo/mslugx_prot.h b/src/devices/bus/neogeo/mslugx_prot.h index 42d75263432..fb1f2261957 100644 --- a/src/devices/bus/neogeo/mslugx_prot.h +++ b/src/devices/bus/neogeo/mslugx_prot.h @@ -28,8 +28,8 @@ public: UINT16 m_mslugx_command; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/neogeo_slot.h b/src/devices/bus/neogeo/neogeo_slot.h index 215d41567e7..ae46e619f0e 100644 --- a/src/devices/bus/neogeo/neogeo_slot.h +++ b/src/devices/bus/neogeo/neogeo_slot.h @@ -22,26 +22,26 @@ public: virtual ~neogeo_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "neo_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "neo_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); diff --git a/src/devices/bus/neogeo/pcm2_cart.h b/src/devices/bus/neogeo/pcm2_cart.h index 5cbb31656fc..dc967365f3b 100644 --- a/src/devices/bus/neogeo/pcm2_cart.h +++ b/src/devices/bus/neogeo/pcm2_cart.h @@ -19,16 +19,16 @@ public: neogeo_pcm2_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); } - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<cmc_prot_device> m_cmc_prot; @@ -49,8 +49,8 @@ class neogeo_pcm2_mslug4_cart : public neogeo_pcm2_cart { public: neogeo_pcm2_mslug4_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_PCM2_MSLUG4_CART; @@ -58,8 +58,8 @@ class neogeo_pcm2_ms4plus_cart : public neogeo_pcm2_cart { public: neogeo_pcm2_ms4plus_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 0; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 0; } }; extern const device_type NEOGEO_PCM2_MS4PLUS_CART; @@ -73,8 +73,8 @@ class neogeo_pcm2_rotd_cart : public neogeo_pcm2_cart { public: neogeo_pcm2_rotd_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_PCM2_ROTD_CART; @@ -87,8 +87,8 @@ class neogeo_pcm2_pnyaa_cart : public neogeo_pcm2_cart { public: neogeo_pcm2_pnyaa_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_PCM2_PNYAA_CART; diff --git a/src/devices/bus/neogeo/pcm2_prot.h b/src/devices/bus/neogeo/pcm2_prot.h index 62193ee5901..72f59dac1b3 100644 --- a/src/devices/bus/neogeo/pcm2_prot.h +++ b/src/devices/bus/neogeo/pcm2_prot.h @@ -23,8 +23,8 @@ public: void neo_pcm2_swap(UINT8* ymrom, UINT32 ymsize, int value); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/pvc_cart.h b/src/devices/bus/neogeo/pvc_cart.h index e3e409081c4..040ff94ad91 100644 --- a/src/devices/bus/neogeo/pvc_cart.h +++ b/src/devices/bus/neogeo/pvc_cart.h @@ -20,21 +20,21 @@ public: neogeo_pvc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) + virtual void activate_cart(ACTIVATE_CART_PARAMS) override { m_banked_cart->install_banks(machine, maincpu, cpuregion, cpuregion_size); m_pvc_prot->install_pvc_protection(maincpu,m_banked_cart); } - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<cmc_prot_device> m_cmc_prot; @@ -57,8 +57,8 @@ class neogeo_pvc_mslug5_cart : public neogeo_pvc_cart { public: neogeo_pvc_mslug5_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_PVC_MSLUG5_CART; @@ -70,8 +70,8 @@ class neogeo_pvc_svc_cart : public neogeo_pvc_cart { public: neogeo_pvc_svc_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_PVC_SVC_CART; @@ -84,8 +84,8 @@ class neogeo_pvc_kof2003_cart : public neogeo_pvc_cart { public: neogeo_pvc_kof2003_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_PVC_KOF2003_CART; @@ -98,8 +98,8 @@ class neogeo_pvc_kof2003h_cart : public neogeo_pvc_cart { public: neogeo_pvc_kof2003h_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_PVC_KOF2003H_CART; diff --git a/src/devices/bus/neogeo/pvc_prot.h b/src/devices/bus/neogeo/pvc_prot.h index 87f6b24ecc5..db853285a28 100644 --- a/src/devices/bus/neogeo/pvc_prot.h +++ b/src/devices/bus/neogeo/pvc_prot.h @@ -37,8 +37,8 @@ public: void kof2003h_decrypt_68k(UINT8* rom, UINT32 size); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/rom.h b/src/devices/bus/neogeo/rom.h index 9394a7ec5bd..1031d443089 100644 --- a/src/devices/bus/neogeo/rom.h +++ b/src/devices/bus/neogeo/rom.h @@ -17,14 +17,14 @@ public: neogeo_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS); + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; required_device<neogeo_banked_cart_device> m_banked_cart; }; diff --git a/src/devices/bus/neogeo/sbp_prot.h b/src/devices/bus/neogeo/sbp_prot.h index d9c0884d36b..702bb9c42e0 100644 --- a/src/devices/bus/neogeo/sbp_prot.h +++ b/src/devices/bus/neogeo/sbp_prot.h @@ -27,8 +27,8 @@ public: DECLARE_READ16_MEMBER(sbp_lowerrom_r); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/neogeo/sma_cart.h b/src/devices/bus/neogeo/sma_cart.h index d0b0fb64432..f3d890db167 100644 --- a/src/devices/bus/neogeo/sma_cart.h +++ b/src/devices/bus/neogeo/sma_cart.h @@ -19,16 +19,16 @@ public: neogeo_sma_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT16 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ16_MEMBER(read_rom); - virtual void activate_cart(ACTIVATE_CART_PARAMS) {} - virtual void decrypt_all(DECRYPT_ALL_PARAMS) {} - virtual int get_fixed_bank_type(void) { return 0; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override {} + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override {} + virtual int get_fixed_bank_type(void) override { return 0; } required_device<neogeo_banked_cart_device> m_banked_cart; required_device<sma_prot_device> m_sma_prot; @@ -49,9 +49,9 @@ class neogeo_sma_kof99_cart : public neogeo_sma_cart { public: neogeo_sma_kof99_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_SMA_KOF99_CART; @@ -63,9 +63,9 @@ class neogeo_sma_garou_cart : public neogeo_sma_cart { public: neogeo_sma_garou_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_SMA_GAROU_CART; @@ -73,9 +73,9 @@ class neogeo_sma_garouh_cart : public neogeo_sma_cart { public: neogeo_sma_garouh_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_SMA_GAROUH_CART; @@ -87,9 +87,9 @@ class neogeo_sma_mslug3_cart : public neogeo_sma_cart { public: neogeo_sma_mslug3_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 1; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 1; } }; extern const device_type NEOGEO_SMA_MSLUG3_CART; @@ -102,9 +102,9 @@ class neogeo_sma_kof2000_cart : public neogeo_sma_cart { public: neogeo_sma_kof2000_cart(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void activate_cart(ACTIVATE_CART_PARAMS); - virtual void decrypt_all(DECRYPT_ALL_PARAMS); - virtual int get_fixed_bank_type(void) { return 2; } + virtual void activate_cart(ACTIVATE_CART_PARAMS) override; + virtual void decrypt_all(DECRYPT_ALL_PARAMS) override; + virtual int get_fixed_bank_type(void) override { return 2; } }; extern const device_type NEOGEO_SMA_KOF2000_CART; diff --git a/src/devices/bus/neogeo/sma_prot.h b/src/devices/bus/neogeo/sma_prot.h index 8fbe4770076..37f7e82fbc1 100644 --- a/src/devices/bus/neogeo/sma_prot.h +++ b/src/devices/bus/neogeo/sma_prot.h @@ -45,8 +45,8 @@ public: UINT16 m_sma_rng; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; #endif diff --git a/src/devices/bus/nes/2a03pur.h b/src/devices/bus/nes/2a03pur.h index c0d80f67bd1..20c410b9d44 100644 --- a/src/devices/bus/nes/2a03pur.h +++ b/src/devices/bus/nes/2a03pur.h @@ -15,11 +15,11 @@ public: nes_2a03pur_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[8]; diff --git a/src/devices/bus/nes/act53.h b/src/devices/bus/nes/act53.h index c870d600102..acf49fadbe2 100644 --- a/src/devices/bus/nes/act53.h +++ b/src/devices/bus/nes/act53.h @@ -15,11 +15,11 @@ public: nes_action53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_prg(); diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h index d6334276d27..3c3e77dda2e 100644 --- a/src/devices/bus/nes/aladdin.h +++ b/src/devices/bus/nes/aladdin.h @@ -47,25 +47,25 @@ public: virtual ~nes_aladdin_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete() { update_names(); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(); } // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "ade_cart"; } - virtual const char *file_extensions() const { return "nes,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "ade_cart"; } + virtual const char *file_extensions() const override { return "nes,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; virtual DECLARE_READ8_MEMBER(read); void write_prg(UINT32 offset, UINT8 data) { if (m_cart) m_cart->write_prg(offset, data); } @@ -99,14 +99,14 @@ public: nes_algn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; virtual UINT8* get_cart_base(); - virtual void write_prg(UINT32 offset, UINT8 data); + virtual void write_prg(UINT32 offset, UINT8 data) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -119,12 +119,12 @@ public: nes_algq_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual void write_prg(UINT32 offset, UINT8 data); + virtual void write_prg(UINT32 offset, UINT8 data) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 m_bank_base; }; @@ -149,12 +149,12 @@ public: nes_aladdin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: required_device<nes_aladdin_slot_device> m_subslot; diff --git a/src/devices/bus/nes/ave.h b/src/devices/bus/nes/ave.h index 9d35c3eb623..4b2cdc04e67 100644 --- a/src/devices/bus/nes/ave.h +++ b/src/devices/bus/nes/ave.h @@ -15,10 +15,10 @@ public: nes_nina001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,10 +31,10 @@ public: nes_nina006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -47,10 +47,10 @@ public: nes_maxi15_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_banks(); diff --git a/src/devices/bus/nes/bandai.h b/src/devices/bus/nes/bandai.h index ae19589be37..b1c1a796686 100644 --- a/src/devices/bus/nes/bandai.h +++ b/src/devices/bus/nes/bandai.h @@ -16,14 +16,14 @@ public: nes_oekakids_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); virtual DECLARE_READ8_MEMBER(nt_r); virtual DECLARE_WRITE8_MEMBER(nt_w); - virtual void pcb_reset(); + virtual void pcb_reset() override; - virtual void ppu_latch(offs_t offset); + virtual void ppu_latch(offs_t offset) override; // TODO: add oeka kids controller emulation protected: @@ -42,12 +42,12 @@ public: nes_fcg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(fcg_write); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT16 m_irq_count; @@ -68,7 +68,7 @@ public: nes_lz93d50_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual DECLARE_WRITE8_MEMBER(write_h) { fcg_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { fcg_write(space, offset, data, mem_mask); } }; @@ -82,12 +82,12 @@ public: nes_lz93d50_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; // TODO: fix EEPROM I/O emulation required_device<i2cmem_device> m_i2cmem; @@ -104,7 +104,7 @@ public: nes_lz93d50_24c02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -117,12 +117,12 @@ public: nes_fjump2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void set_prg(); diff --git a/src/devices/bus/nes/benshieng.h b/src/devices/bus/nes/benshieng.h index 2a042a432e4..1e6741e8433 100644 --- a/src/devices/bus/nes/benshieng.h +++ b/src/devices/bus/nes/benshieng.h @@ -15,10 +15,10 @@ public: nes_benshieng_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_banks(); diff --git a/src/devices/bus/nes/bootleg.h b/src/devices/bus/nes/bootleg.h index d261ba23c31..809eb82a277 100644 --- a/src/devices/bus/nes/bootleg.h +++ b/src/devices/bus/nes/bootleg.h @@ -15,10 +15,10 @@ public: nes_ax5705_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void set_prg(); @@ -36,11 +36,11 @@ public: nes_sc127_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -57,12 +57,12 @@ public: nes_mbaby_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -83,11 +83,11 @@ public: nes_asn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -103,11 +103,11 @@ public: nes_smb3p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -127,11 +127,11 @@ public: nes_btl_dn_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -147,11 +147,11 @@ public: nes_whirl2706_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -167,15 +167,15 @@ public: nes_smb2j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_ex); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -195,12 +195,12 @@ public: nes_smb2ja_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -220,13 +220,13 @@ public: nes_smb2jb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_ex); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -246,11 +246,11 @@ public: nes_09034a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_ex); virtual DECLARE_READ8_MEMBER(read_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -266,11 +266,11 @@ public: nes_tobidase_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -286,13 +286,13 @@ public: nes_lh32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -308,12 +308,12 @@ public: nes_lh10_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_prg(); @@ -331,14 +331,14 @@ public: nes_lh53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); - virtual DECLARE_WRITE8_MEMBER(write_m) {} + virtual DECLARE_WRITE8_MEMBER(write_m) override {} virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -360,13 +360,13 @@ public: nes_2708_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[2]; @@ -381,12 +381,12 @@ public: nes_ac08_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_ex); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -401,11 +401,11 @@ public: nes_unl_bb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[2]; @@ -420,11 +420,11 @@ public: nes_mmalee_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; // ======================> nes_shuiguan_device @@ -436,12 +436,12 @@ public: nes_shuiguan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; diff --git a/src/devices/bus/nes/camerica.h b/src/devices/bus/nes/camerica.h index 7c91bda1f91..103eb7f033e 100644 --- a/src/devices/bus/nes/camerica.h +++ b/src/devices/bus/nes/camerica.h @@ -15,10 +15,10 @@ public: nes_bf9093_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,11 +31,11 @@ public: nes_bf9096_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual DECLARE_WRITE8_MEMBER(write_m) { write_h(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_m) override { write_h(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_bank_base, m_latch; @@ -51,10 +51,10 @@ public: nes_golden5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_bank_base, m_latch; diff --git a/src/devices/bus/nes/cne.h b/src/devices/bus/nes/cne.h index d00ef06f5cc..1defc8aef51 100644 --- a/src/devices/bus/nes/cne.h +++ b/src/devices/bus/nes/cne.h @@ -15,10 +15,10 @@ public: nes_cne_decathl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,11 +31,11 @@ public: nes_cne_fsb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -48,10 +48,10 @@ public: nes_cne_shlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/cony.h b/src/devices/bus/nes/cony.h index e97cfdee81d..5bd254a8690 100644 --- a/src/devices/bus/nes/cony.h +++ b/src/devices/bus/nes/cony.h @@ -16,13 +16,13 @@ public: nes_cony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: virtual void set_prg(); @@ -50,16 +50,16 @@ public: nes_yoko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: - virtual void set_prg(); - virtual void set_chr(); + virtual void set_prg() override; + virtual void set_chr() override; UINT8 m_extra2; }; diff --git a/src/devices/bus/nes/datach.h b/src/devices/bus/nes/datach.h index cde1ac3ffb5..b8294d87f17 100644 --- a/src/devices/bus/nes/datach.h +++ b/src/devices/bus/nes/datach.h @@ -49,25 +49,25 @@ public: virtual ~nes_datach_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete() { update_names(); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(); } // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "datach_cart"; } - virtual const char *file_extensions() const { return "nes,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "datach_cart"; } + virtual const char *file_extensions() const override { return "nes,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; virtual DECLARE_READ8_MEMBER(read); void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); } @@ -101,13 +101,13 @@ public: nes_datach_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; virtual UINT8* get_cart_base(); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; // ======================> nes_datach_24c01_device @@ -119,7 +119,7 @@ public: nes_datach_24c01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; // device type definition @@ -142,14 +142,14 @@ public: nes_datach_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_datach_latch; diff --git a/src/devices/bus/nes/discrete.h b/src/devices/bus/nes/discrete.h index 1fb615c38f2..3b666fee6f8 100644 --- a/src/devices/bus/nes/discrete.h +++ b/src/devices/bus/nes/discrete.h @@ -15,10 +15,10 @@ public: nes_74x161x161x32_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,10 +31,10 @@ public: nes_74x139x74_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -47,10 +47,10 @@ public: nes_74x377_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -63,10 +63,10 @@ public: nes_74x161x138_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/disksys.h b/src/devices/bus/nes/disksys.h index dcb2bd75c0c..a52dc24c803 100644 --- a/src/devices/bus/nes/disksys.h +++ b/src/devices/bus/nes/disksys.h @@ -16,10 +16,10 @@ public: nes_disksys_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual const rom_entry *device_rom_region() const override; virtual DECLARE_READ8_MEMBER(read_ex); virtual DECLARE_READ8_MEMBER(read_m); @@ -28,10 +28,10 @@ public: virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void disk_flip_side(); + virtual void disk_flip_side() override; - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; static void load_proc(device_image_interface &image); static void unload_proc(device_image_interface &image); diff --git a/src/devices/bus/nes/event.h b/src/devices/bus/nes/event.h index 31076cec074..7da34bc58c2 100644 --- a/src/devices/bus/nes/event.h +++ b/src/devices/bus/nes/event.h @@ -15,18 +15,18 @@ public: nes_event_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual ioport_constructor device_input_ports() const; - virtual void update_regs(int reg); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual ioport_constructor device_input_ports() const override; + virtual void update_regs(int reg) override; required_ioport m_dsw; - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: - virtual void set_prg(); - virtual void set_chr(); + virtual void set_prg() override; + virtual void set_chr() override; int m_nwc_init; static const device_timer_id TIMER_EVENT = 0; diff --git a/src/devices/bus/nes/ggenie.h b/src/devices/bus/nes/ggenie.h index e4620e59e09..863f917ad1a 100644 --- a/src/devices/bus/nes/ggenie.h +++ b/src/devices/bus/nes/ggenie.h @@ -15,7 +15,7 @@ public: nes_ggenie_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); @@ -28,14 +28,14 @@ public: virtual DECLARE_READ8_MEMBER(nt_r); virtual DECLARE_WRITE8_MEMBER(nt_w); - void hblank_irq(int scanline, int vblank, int blanked) { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->hblank_irq(scanline, vblank, blanked); } - void scanline_irq(int scanline, int vblank, int blanked) { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->scanline_irq(scanline, vblank, blanked); } - void ppu_latch(offs_t offset) { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->ppu_latch(offset); } + void hblank_irq(int scanline, int vblank, int blanked) override { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->hblank_irq(scanline, vblank, blanked); } + void scanline_irq(int scanline, int vblank, int blanked) override { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->scanline_irq(scanline, vblank, blanked); } + void ppu_latch(offs_t offset) override { if (m_gg_bypass && m_ggslot->m_cart) m_ggslot->m_cart->ppu_latch(offset); } - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void pcb_reset(); - virtual void pcb_start(running_machine &machine, UINT8 *ciram_ptr, bool cart_mounted); + virtual void pcb_reset() override; + virtual void pcb_start(running_machine &machine, UINT8 *ciram_ptr, bool cart_mounted) override; private: // emulate the Game Genie! diff --git a/src/devices/bus/nes/henggedianzi.h b/src/devices/bus/nes/henggedianzi.h index a229ddbda4a..55abac8c479 100644 --- a/src/devices/bus/nes/henggedianzi.h +++ b/src/devices/bus/nes/henggedianzi.h @@ -15,10 +15,10 @@ public: nes_hengg_srich_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,11 +31,11 @@ public: nes_hengg_xhzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -48,11 +48,11 @@ public: nes_hengg_shjy3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: void update_banks(); diff --git a/src/devices/bus/nes/hes.h b/src/devices/bus/nes/hes.h index 6a895a8ec1e..1af0679bd1d 100644 --- a/src/devices/bus/nes/hes.h +++ b/src/devices/bus/nes/hes.h @@ -15,10 +15,10 @@ public: nes_hes_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/hosenkan.h b/src/devices/bus/nes/hosenkan.h index f775a513adb..6b18f0c8866 100644 --- a/src/devices/bus/nes/hosenkan.h +++ b/src/devices/bus/nes/hosenkan.h @@ -15,12 +15,12 @@ public: nes_hosenkan_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count, m_irq_count_latch; diff --git a/src/devices/bus/nes/irem.h b/src/devices/bus/nes/irem.h index 5c7924b4e7d..12d581fdd25 100644 --- a/src/devices/bus/nes/irem.h +++ b/src/devices/bus/nes/irem.h @@ -15,10 +15,10 @@ public: nes_lrog017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,10 +31,10 @@ public: nes_holydivr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -47,10 +47,10 @@ public: nes_tam_s1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -63,10 +63,10 @@ public: nes_g101_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_latch; @@ -82,11 +82,11 @@ public: nes_h3001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT16 m_irq_count, m_irq_count_latch; diff --git a/src/devices/bus/nes/jaleco.h b/src/devices/bus/nes/jaleco.h index facea12b75f..9600ebb3725 100644 --- a/src/devices/bus/nes/jaleco.h +++ b/src/devices/bus/nes/jaleco.h @@ -16,10 +16,10 @@ public: nes_jf11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -32,11 +32,11 @@ public: nes_jf13_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: required_device<samples_device> m_samples; @@ -52,10 +52,10 @@ public: nes_jf16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -69,10 +69,10 @@ public: nes_jf17_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_latch; @@ -87,7 +87,7 @@ public: // construction/destruction nes_jf17_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h); private: @@ -105,10 +105,10 @@ public: nes_jf19_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -120,7 +120,7 @@ public: // construction/destruction nes_jf19_adpcm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h); private: @@ -138,12 +138,12 @@ public: nes_ss88006_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(ss88006_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { ss88006_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { ss88006_write(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT16 m_irq_count, m_irq_count_latch; @@ -181,11 +181,11 @@ public: // construction/destruction nes_jf23_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; private: required_device<samples_device> m_samples; - virtual DECLARE_WRITE8_MEMBER(write_h) { ss88006_adpcm_write(space, offset, data, m_samples); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { ss88006_adpcm_write(space, offset, data, m_samples); } }; @@ -197,11 +197,11 @@ public: // construction/destruction nes_jf24_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; private: required_device<samples_device> m_samples; - virtual DECLARE_WRITE8_MEMBER(write_h) { ss88006_adpcm_write(space, offset, data, m_samples); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { ss88006_adpcm_write(space, offset, data, m_samples); } }; @@ -213,11 +213,11 @@ public: // construction/destruction nes_jf29_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; private: required_device<samples_device> m_samples; - virtual DECLARE_WRITE8_MEMBER(write_h) { ss88006_adpcm_write(space, offset, data, m_samples); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { ss88006_adpcm_write(space, offset, data, m_samples); } }; @@ -229,11 +229,11 @@ public: // construction/destruction nes_jf33_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; private: required_device<samples_device> m_samples; - virtual DECLARE_WRITE8_MEMBER(write_h) { ss88006_adpcm_write(space, offset, data, m_samples); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { ss88006_adpcm_write(space, offset, data, m_samples); } }; diff --git a/src/devices/bus/nes/jy.h b/src/devices/bus/nes/jy.h index f2441654d57..ce9f6dd2426 100644 --- a/src/devices/bus/nes/jy.h +++ b/src/devices/bus/nes/jy.h @@ -16,8 +16,8 @@ public: nes_jy_typea_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_l); @@ -26,8 +26,8 @@ public: virtual DECLARE_READ8_MEMBER(chr_r); virtual DECLARE_READ8_MEMBER(nt_r); - virtual void scanline_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void scanline_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; protected: void irq_clock(int blanked, int mode); @@ -74,7 +74,7 @@ public: protected: void update_mirror_typeb(); - virtual void update_mirror() { update_mirror_typeb(); } + virtual void update_mirror() override { update_mirror_typeb(); } }; // ======================> nes_jy_typec_device @@ -89,7 +89,7 @@ public: protected: void update_mirror_typec(); - virtual void update_mirror() { update_mirror_typec(); } + virtual void update_mirror() override { update_mirror_typec(); } }; diff --git a/src/devices/bus/nes/kaiser.h b/src/devices/bus/nes/kaiser.h index b00f410ba05..556f22edef7 100644 --- a/src/devices/bus/nes/kaiser.h +++ b/src/devices/bus/nes/kaiser.h @@ -15,10 +15,10 @@ public: nes_ks7058_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,11 +31,11 @@ public: nes_ks7022_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -52,13 +52,13 @@ public: nes_ks7032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(ks7032_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { ks7032_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { ks7032_write(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void prg_update(); @@ -97,13 +97,13 @@ public: nes_ks7017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_ex); virtual DECLARE_WRITE8_MEMBER(write_ex); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -126,10 +126,10 @@ public: nes_ks7012_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; // ======================> nes_ks7013b_device @@ -141,11 +141,11 @@ public: nes_ks7013b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -158,12 +158,12 @@ public: nes_ks7031_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[4]; diff --git a/src/devices/bus/nes/karastudio.h b/src/devices/bus/nes/karastudio.h index 00ad8aa4f86..e49edfbed17 100644 --- a/src/devices/bus/nes/karastudio.h +++ b/src/devices/bus/nes/karastudio.h @@ -46,25 +46,25 @@ public: virtual ~nes_kstudio_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete() { update_names(); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(); } // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "ks_cart"; } - virtual const char *file_extensions() const { return "bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "ks_cart"; } + virtual const char *file_extensions() const override { return "bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; virtual DECLARE_READ8_MEMBER(read); void write_prg_bank(UINT8 bank) { if (m_cart) m_cart->write_prg_bank(bank); } @@ -97,13 +97,13 @@ public: nes_kstudio_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; virtual UINT8* get_cart_base(); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; // device type definition @@ -125,14 +125,14 @@ public: nes_karaokestudio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: int m_exp_active; diff --git a/src/devices/bus/nes/konami.h b/src/devices/bus/nes/konami.h index 0ecece270fd..34626a327a5 100644 --- a/src/devices/bus/nes/konami.h +++ b/src/devices/bus/nes/konami.h @@ -17,10 +17,10 @@ public: nes_konami_vrc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_mmc_vrom_bank[2]; @@ -36,12 +36,12 @@ public: nes_konami_vrc2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_mmc_vrom_bank[8]; @@ -58,11 +58,11 @@ public: nes_konami_vrc3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count, m_irq_count_latch; @@ -84,11 +84,11 @@ public: nes_konami_vrc4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void set_prg(); @@ -115,8 +115,8 @@ public: nes_konami_vrc6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h); required_device<vrc6snd_device> m_vrc6snd; @@ -132,11 +132,11 @@ public: nes_konami_vrc7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: required_device<ym2413_device> m_ym2413; diff --git a/src/devices/bus/nes/legacy.h b/src/devices/bus/nes/legacy.h index 4b4667ab61b..9c9f0f34f23 100644 --- a/src/devices/bus/nes/legacy.h +++ b/src/devices/bus/nes/legacy.h @@ -15,10 +15,10 @@ public: nes_ffe3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -32,14 +32,14 @@ public: nes_ffe4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); virtual DECLARE_READ8_MEMBER(chr_r); virtual DECLARE_WRITE8_MEMBER(chr_w); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT16 m_irq_count; @@ -65,9 +65,9 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_l); - virtual DECLARE_WRITE8_MEMBER(write_h) {} + virtual DECLARE_WRITE8_MEMBER(write_h) override {} - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/mmc1.h b/src/devices/bus/nes/mmc1.h index 05e25c46818..eb3cde7d063 100644 --- a/src/devices/bus/nes/mmc1.h +++ b/src/devices/bus/nes/mmc1.h @@ -16,13 +16,13 @@ public: nes_sxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); virtual void update_regs(int reg); // this is needed to simplify NES-EVENT pcb implementation, which handle differently some regs! - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: TIMER_CALLBACK_MEMBER(resync_callback); @@ -44,7 +44,7 @@ public: virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; class nes_sxrom_a_device : public nes_sxrom_device @@ -66,7 +66,7 @@ public: virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/mmc2.h b/src/devices/bus/nes/mmc2.h index 205fcf7a1d4..3008d9b3425 100644 --- a/src/devices/bus/nes/mmc2.h +++ b/src/devices/bus/nes/mmc2.h @@ -16,12 +16,12 @@ public: nes_pxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(pxrom_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { pxrom_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { pxrom_write(space, offset, data, mem_mask); } - virtual void ppu_latch(offs_t offset); - virtual void pcb_reset(); + virtual void ppu_latch(offs_t offset) override; + virtual void pcb_reset() override; protected: UINT8 m_reg[4]; @@ -40,7 +40,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/mmc3.h b/src/devices/bus/nes/mmc3.h index ace03588bb4..6366459f2b8 100644 --- a/src/devices/bus/nes/mmc3.h +++ b/src/devices/bus/nes/mmc3.h @@ -16,16 +16,16 @@ public: nes_txrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { mmc3_start(); } + virtual void device_start() override { mmc3_start(); } virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(txrom_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { txrom_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { txrom_write(space, offset, data, mem_mask); } virtual void prg_cb(int start, int bank); virtual void chr_cb(int start, int bank, int source); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; protected: virtual void set_prg(int prg_base, int prg_mask); @@ -59,12 +59,12 @@ public: nes_hkrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: int m_wram_enable; @@ -85,7 +85,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; protected: void set_mirror(); @@ -101,7 +101,7 @@ public: nes_tqrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void set_chr( UINT8 chr, int chr_base, int chr_mask ); + virtual void set_chr( UINT8 chr, int chr_base, int chr_mask ) override; }; @@ -115,7 +115,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -129,7 +129,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/mmc3_clones.h b/src/devices/bus/nes/mmc3_clones.h index 9445395889d..5cfcee6c35a 100644 --- a/src/devices/bus/nes/mmc3_clones.h +++ b/src/devices/bus/nes/mmc3_clones.h @@ -55,8 +55,8 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; }; @@ -71,7 +71,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -84,12 +84,12 @@ public: nes_pikay2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[2]; @@ -105,13 +105,13 @@ public: nes_8237_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[3]; @@ -128,11 +128,11 @@ public: nes_sglionk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -149,17 +149,17 @@ public: nes_sgboog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: - virtual void set_prg(int prg_base, int prg_mask); + virtual void set_prg(int prg_base, int prg_mask) override; UINT8 m_reg[3]; UINT8 m_mode; }; @@ -174,11 +174,11 @@ public: nes_kasing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void prg_cb(int start, int bank); + virtual void prg_cb(int start, int bank) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -194,14 +194,14 @@ public: nes_kay_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_regs(); @@ -219,13 +219,13 @@ public: nes_h2288_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); + virtual void prg_cb(int start, int bank) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[2]; // reg 1 is unused? @@ -241,15 +241,15 @@ public: nes_6035052_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_ex); virtual DECLARE_WRITE8_MEMBER(write_ex); - virtual DECLARE_READ8_MEMBER(read_l) { return read_ex(space, offset, mem_mask); } - virtual DECLARE_READ8_MEMBER(read_m) { return read_ex(space, offset, mem_mask); } - virtual DECLARE_WRITE8_MEMBER(write_l) { write_ex(space, offset, data, mem_mask); } - virtual DECLARE_WRITE8_MEMBER(write_m) { write_ex(space, offset, data, mem_mask); } + virtual DECLARE_READ8_MEMBER(read_l) override { return read_ex(space, offset, mem_mask); } + virtual DECLARE_READ8_MEMBER(read_m) override { return read_ex(space, offset, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_l) override { write_ex(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_m) override { write_ex(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_prot; @@ -266,8 +266,8 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_l); - virtual DECLARE_WRITE8_MEMBER(write_m) { write_l(space, offset & 0xff, data, mem_mask); } // offset does not really count for this mapper } - virtual void prg_cb(int start, int bank); + virtual DECLARE_WRITE8_MEMBER(write_m) override { write_l(space, offset & 0xff, data, mem_mask); } // offset does not really count for this mapper } + virtual void prg_cb(int start, int bank) override; }; @@ -293,14 +293,14 @@ public: nes_kof96_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); // offset does not really count for this mapper - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[4]; @@ -319,7 +319,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_h); protected: - virtual void set_chr(UINT8 chr, int chr_base, int chr_mask); + virtual void set_chr(UINT8 chr, int chr_base, int chr_mask) override; }; @@ -332,12 +332,12 @@ public: nes_gouder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void prg_cb(int start, int bank); + virtual void prg_cb(int start, int bank) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[5]; @@ -353,11 +353,11 @@ public: nes_sa9602b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); + virtual void prg_cb(int start, int bank) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -374,12 +374,12 @@ public: nes_sachen_shero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -417,13 +417,13 @@ public: nes_fk23c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void fk23c_set_prg(); @@ -441,7 +441,7 @@ public: // construction/destruction nes_fk23ca_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -454,12 +454,12 @@ public: nes_s24in1sc03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[3]; @@ -477,7 +477,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -492,7 +492,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -505,10 +505,10 @@ public: nes_bmc_hik8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[4]; @@ -527,7 +527,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -540,10 +540,10 @@ public: nes_bmc_mario7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg_written; @@ -559,10 +559,10 @@ public: nes_bmc_gold7in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg_written; @@ -578,13 +578,13 @@ public: nes_bmc_gc6in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[4]; @@ -600,12 +600,12 @@ public: nes_bmc_411120c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -621,12 +621,12 @@ public: nes_bmc_830118c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -642,12 +642,12 @@ public: nes_pjoy84_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: inline void set_base_mask(); diff --git a/src/devices/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h index 46fe19af7a8..c693b33e8bb 100644 --- a/src/devices/bus/nes/mmc5.h +++ b/src/devices/bus/nes/mmc5.h @@ -15,7 +15,7 @@ public: nes_exrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); @@ -27,8 +27,8 @@ public: virtual DECLARE_READ8_MEMBER(nt_r); virtual DECLARE_WRITE8_MEMBER(nt_w); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; protected: void set_mirror(int page, int src); diff --git a/src/devices/bus/nes/multigame.h b/src/devices/bus/nes/multigame.h index dbc824dfd54..6ee92e0de59 100644 --- a/src/devices/bus/nes/multigame.h +++ b/src/devices/bus/nes/multigame.h @@ -15,10 +15,10 @@ public: nes_action52_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,11 +31,11 @@ public: nes_caltron_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -51,11 +51,11 @@ public: nes_rumblestat_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_prg, m_chr; @@ -71,12 +71,12 @@ public: nes_svision16_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_prg(); @@ -93,10 +93,10 @@ public: nes_n625092_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void set_prg(UINT8 reg1, UINT8 reg2); @@ -113,10 +113,10 @@ public: nes_a65as_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -129,10 +129,10 @@ public: nes_t262_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch1, m_latch2; @@ -148,10 +148,10 @@ public: nes_novel1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -164,10 +164,10 @@ public: nes_novel2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -180,10 +180,10 @@ public: nes_studyngame_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -196,10 +196,10 @@ public: nes_sgun20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -212,11 +212,11 @@ public: nes_vt5201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch, m_dipsetting; @@ -232,10 +232,10 @@ public: nes_810544c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -248,10 +248,10 @@ public: nes_ntd03_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -264,12 +264,12 @@ public: nes_bmc_gb63_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); virtual DECLARE_WRITE8_MEMBER(chr_w); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_banks(); @@ -287,10 +287,10 @@ public: nes_bmc_gka_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch1, m_latch2; @@ -306,10 +306,10 @@ public: nes_bmc_gkb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -322,10 +322,10 @@ public: nes_bmc_ws_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -341,10 +341,10 @@ public: nes_bmc_11160_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -357,10 +357,10 @@ public: nes_bmc_g146_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -373,11 +373,11 @@ public: nes_bmc_8157_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -390,10 +390,10 @@ public: nes_bmc_hik300_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -406,10 +406,10 @@ public: nes_bmc_s700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -422,11 +422,11 @@ public: nes_bmc_ball11_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void set_banks(); @@ -443,10 +443,10 @@ public: nes_bmc_22games_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -459,11 +459,11 @@ public: nes_bmc_64y2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void set_prg(); @@ -480,10 +480,10 @@ public: nes_bmc_12in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_banks(); @@ -500,10 +500,10 @@ public: nes_bmc_20in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -516,10 +516,10 @@ public: nes_bmc_21in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -532,10 +532,10 @@ public: nes_bmc_31in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -548,10 +548,10 @@ public: nes_bmc_35in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -564,10 +564,10 @@ public: nes_bmc_36in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -580,10 +580,10 @@ public: nes_bmc_64in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -596,11 +596,11 @@ public: nes_bmc_70in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_mode; @@ -617,10 +617,10 @@ public: nes_bmc_72in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -633,10 +633,10 @@ public: nes_bmc_76in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch1, m_latch2; @@ -652,10 +652,10 @@ public: nes_bmc_110in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -668,10 +668,10 @@ public: nes_bmc_150in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -684,10 +684,10 @@ public: nes_bmc_190in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -700,11 +700,11 @@ public: nes_bmc_800in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_mode; @@ -721,11 +721,11 @@ public: nes_bmc_1200in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); virtual DECLARE_WRITE8_MEMBER(chr_w); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_vram_protect; @@ -741,11 +741,11 @@ public: nes_bmc_gold150_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -761,10 +761,10 @@ public: nes_bmc_gold260_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -777,11 +777,11 @@ public: nes_bmc_ch001_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -797,10 +797,10 @@ public: nes_bmc_super22_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -813,8 +813,8 @@ public: nes_bmc_4in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void pcb_reset(); + virtual void device_start() override; + virtual void pcb_reset() override; private: int m_latch; @@ -829,10 +829,10 @@ public: nes_bmc_42in1reset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: int m_latch; diff --git a/src/devices/bus/nes/namcot.h b/src/devices/bus/nes/namcot.h index 268347068b9..5e9a51cc2a0 100644 --- a/src/devices/bus/nes/namcot.h +++ b/src/devices/bus/nes/namcot.h @@ -16,11 +16,11 @@ public: nes_namcot3433_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(dxrom_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { dxrom_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { dxrom_write(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -36,10 +36,10 @@ public: nes_namcot3446_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -55,10 +55,10 @@ public: nes_namcot3425_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -76,16 +76,16 @@ public: nes_namcot340_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(n340_loread); virtual DECLARE_WRITE8_MEMBER(n340_lowrite); virtual DECLARE_WRITE8_MEMBER(n340_hiwrite); - virtual DECLARE_READ8_MEMBER(read_l) { return n340_loread(space, offset, mem_mask); } - virtual DECLARE_WRITE8_MEMBER(write_l) { n340_lowrite(space, offset, data, mem_mask); } - virtual DECLARE_WRITE8_MEMBER(write_h) { n340_hiwrite(space, offset, data, mem_mask); } + virtual DECLARE_READ8_MEMBER(read_l) override { return n340_loread(space, offset, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_l) override { n340_lowrite(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { n340_hiwrite(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT16 m_irq_count; @@ -109,12 +109,12 @@ public: nes_namcot175_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_wram_protect; @@ -130,7 +130,7 @@ public: nes_namcot163_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_l); @@ -141,7 +141,7 @@ public: virtual DECLARE_READ8_MEMBER(chr_r); virtual DECLARE_WRITE8_MEMBER(chr_w); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void set_mirror(UINT8 page, UINT8 data); diff --git a/src/devices/bus/nes/nanjing.h b/src/devices/bus/nes/nanjing.h index 40fb8c2e714..9ce95cf136c 100644 --- a/src/devices/bus/nes/nanjing.h +++ b/src/devices/bus/nes/nanjing.h @@ -15,12 +15,12 @@ public: nes_nanjing_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT8 m_count; diff --git a/src/devices/bus/nes/nes_slot.h b/src/devices/bus/nes/nes_slot.h index 070d9e23110..975357c81aa 100644 --- a/src/devices/bus/nes/nes_slot.h +++ b/src/devices/bus/nes/nes_slot.h @@ -339,31 +339,31 @@ public: virtual ~nes_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; void call_load_ines(); void call_load_unif(); void call_load_pcb(); - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return m_must_be_loaded; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "nes_cart"; } - virtual const char *file_extensions() const { return "nes,unf,unif"; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual device_image_partialhash_func get_partial_hash() const { return &nes_partialhash; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return m_must_be_loaded; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "nes_cart"; } + virtual const char *file_extensions() const override { return "nes,unf,unif"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual device_image_partialhash_func get_partial_hash() const override { return &nes_partialhash; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; const char * get_default_card_ines(UINT8 *ROM, UINT32 len); const char * get_default_card_unif(UINT8 *ROM, UINT32 len); const char * nes_get_slot(int pcb_id); diff --git a/src/devices/bus/nes/ntdec.h b/src/devices/bus/nes/ntdec.h index 00712eecf1c..1b0414550ee 100644 --- a/src/devices/bus/nes/ntdec.h +++ b/src/devices/bus/nes/ntdec.h @@ -15,10 +15,10 @@ public: nes_ntdec_asder_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -34,10 +34,10 @@ public: nes_ntdec_fh_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/nxrom.h b/src/devices/bus/nes/nxrom.h index fe105be0189..f641965a282 100644 --- a/src/devices/bus/nes/nxrom.h +++ b/src/devices/bus/nes/nxrom.h @@ -17,9 +17,9 @@ public: nes_nrom_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); nes_nrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_start() { common_start(); } + virtual void device_start() override { common_start(); } - virtual void pcb_reset(); + virtual void pcb_reset() override; void common_start(); }; @@ -60,10 +60,10 @@ public: nes_axrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -76,10 +76,10 @@ public: nes_bxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -93,11 +93,11 @@ public: nes_cnrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(chr_r); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_chr_open_bus; @@ -113,10 +113,10 @@ public: nes_cprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -129,10 +129,10 @@ public: nes_gxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -145,10 +145,10 @@ public: nes_uxrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -161,10 +161,10 @@ public: nes_uxrom_cc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -177,10 +177,10 @@ public: nes_un1rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/pirate.h b/src/devices/bus/nes/pirate.h index f11c53ced0d..f3af96fe4fa 100644 --- a/src/devices/bus/nes/pirate.h +++ b/src/devices/bus/nes/pirate.h @@ -15,10 +15,10 @@ public: nes_agci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,10 +31,10 @@ public: nes_dreamtech_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -47,13 +47,13 @@ public: nes_fukutake_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -70,11 +70,11 @@ public: nes_futuremedia_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count, m_irq_count_latch; @@ -92,10 +92,10 @@ public: nes_magseries_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -108,10 +108,10 @@ public: nes_daou306_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[16]; @@ -127,10 +127,10 @@ public: nes_subor0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[4]; @@ -146,10 +146,10 @@ public: nes_subor1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_reg[4]; @@ -165,10 +165,10 @@ public: nes_cc21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -181,10 +181,10 @@ public: nes_xiaozy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -197,12 +197,12 @@ public: nes_edu2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -218,11 +218,11 @@ public: nes_t230_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count, m_irq_count_latch; @@ -242,11 +242,11 @@ public: nes_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count, m_irq_count_latch; @@ -264,11 +264,11 @@ public: nes_whero_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT8 m_reg; @@ -289,11 +289,11 @@ public: nes_43272_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_latch; @@ -309,11 +309,11 @@ public: nes_tf1201_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: void update_prg(); @@ -334,11 +334,11 @@ public: nes_cityfight_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_prg(); diff --git a/src/devices/bus/nes/pt554.h b/src/devices/bus/nes/pt554.h index 0d0bd7b60f4..917a7d65c42 100644 --- a/src/devices/bus/nes/pt554.h +++ b/src/devices/bus/nes/pt554.h @@ -15,7 +15,7 @@ public: nes_bandai_pt554_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_m); private: diff --git a/src/devices/bus/nes/racermate.h b/src/devices/bus/nes/racermate.h index 209c2f56601..22aac1913b5 100644 --- a/src/devices/bus/nes/racermate.h +++ b/src/devices/bus/nes/racermate.h @@ -15,10 +15,10 @@ public: nes_racermate_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_banks(); diff --git a/src/devices/bus/nes/rcm.h b/src/devices/bus/nes/rcm.h index 4a5c05b6aa9..3a7afce5844 100644 --- a/src/devices/bus/nes/rcm.h +++ b/src/devices/bus/nes/rcm.h @@ -15,12 +15,12 @@ public: nes_gs2015_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual DECLARE_READ8_MEMBER(read_l) { return read_m(space, offset, mem_mask); } + virtual void device_start() override; + virtual DECLARE_READ8_MEMBER(read_l) override { return read_m(space, offset, mem_mask); } virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -33,10 +33,10 @@ public: nes_gs2004_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -49,10 +49,10 @@ public: nes_gs2013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -65,10 +65,10 @@ public: nes_tf9_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -81,11 +81,11 @@ public: nes_3dblock_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT8 m_reg[4]; diff --git a/src/devices/bus/nes/rexsoft.h b/src/devices/bus/nes/rexsoft.h index 81527759574..778deb94af3 100644 --- a/src/devices/bus/nes/rexsoft.h +++ b/src/devices/bus/nes/rexsoft.h @@ -15,13 +15,13 @@ public: nes_rex_dbz5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); - virtual DECLARE_READ8_MEMBER(read_m) { return read_l(space, offset, mem_mask); } + virtual DECLARE_READ8_MEMBER(read_m) override { return read_l(space, offset, mem_mask); } virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void chr_cb( int start, int bank, int source ); + virtual void chr_cb( int start, int bank, int source ) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_extra; @@ -37,14 +37,14 @@ public: nes_rex_sl1632_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: - virtual void set_prg(int prg_base, int prg_mask); - virtual void set_chr(UINT8 chr, int chr_base, int chr_mask); + virtual void set_prg(int prg_base, int prg_mask) override; + virtual void set_chr(UINT8 chr, int chr_base, int chr_mask) override; UINT8 m_mode, m_mirror; UINT8 m_extra_bank[12]; diff --git a/src/devices/bus/nes/sachen.h b/src/devices/bus/nes/sachen.h index d6604578d3a..31c77263b78 100644 --- a/src/devices/bus/nes/sachen.h +++ b/src/devices/bus/nes/sachen.h @@ -15,10 +15,10 @@ public: nes_sachen_sa009_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -31,10 +31,10 @@ public: nes_sachen_sa0036_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -47,10 +47,10 @@ public: nes_sachen_sa0037_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -63,10 +63,10 @@ public: nes_sachen_sa72007_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -79,10 +79,10 @@ public: nes_sachen_sa72008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -95,10 +95,10 @@ public: nes_sachen_tca01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -111,12 +111,12 @@ public: nes_sachen_tcu01_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual DECLARE_WRITE8_MEMBER(write_m) { write_l(space, (offset + 0x100) & 0xfff, data, mem_mask); } - virtual DECLARE_WRITE8_MEMBER(write_h) { write_l(space, (offset + 0x100) & 0xfff, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_m) override { write_l(space, (offset + 0x100) & 0xfff, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { write_l(space, (offset + 0x100) & 0xfff, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -129,11 +129,11 @@ public: nes_sachen_tcu02_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -150,11 +150,11 @@ public: nes_sachen_74x374_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void set_mirror(UINT8 nt); @@ -171,7 +171,7 @@ public: nes_sachen_74x374_alt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual DECLARE_READ8_MEMBER(read_l) { return 0xff; } // no read_l here + virtual DECLARE_READ8_MEMBER(read_l) override { return 0xff; } // no read_l here virtual DECLARE_WRITE8_MEMBER(write_l); }; @@ -186,11 +186,11 @@ public: nes_sachen_8259a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual DECLARE_WRITE8_MEMBER(write_m) { write_l(space, (offset + 0x100) & 0xfff, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_m) override { write_l(space, (offset + 0x100) & 0xfff, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: virtual void chr_update(); @@ -207,7 +207,7 @@ public: nes_sachen_8259b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void chr_update(); + virtual void chr_update() override; }; @@ -220,7 +220,7 @@ public: nes_sachen_8259c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void chr_update(); + virtual void chr_update() override; }; @@ -232,10 +232,10 @@ public: // construction/destruction nes_sachen_8259d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: - virtual void chr_update(); + virtual void chr_update() override; }; diff --git a/src/devices/bus/nes/somari.h b/src/devices/bus/nes/somari.h index 726df0a4926..596ecd0a33f 100644 --- a/src/devices/bus/nes/somari.h +++ b/src/devices/bus/nes/somari.h @@ -15,15 +15,15 @@ public: nes_somari_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual DECLARE_WRITE8_MEMBER(write_l) { write_m(space, offset + 0x100, data, mem_mask); } + virtual void device_start() override; + virtual DECLARE_WRITE8_MEMBER(write_l) override { write_m(space, offset + 0x100, data, mem_mask); } virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(mmc1_w); virtual DECLARE_WRITE8_MEMBER(mmc3_w); virtual DECLARE_WRITE8_MEMBER(vrc2_w); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void update_prg(); void update_chr(); diff --git a/src/devices/bus/nes/sunsoft.h b/src/devices/bus/nes/sunsoft.h index 53ea24adeae..4e7be6d9d91 100644 --- a/src/devices/bus/nes/sunsoft.h +++ b/src/devices/bus/nes/sunsoft.h @@ -16,10 +16,10 @@ public: nes_sunsoft_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -32,10 +32,10 @@ public: nes_sunsoft_2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -48,11 +48,11 @@ public: nes_sunsoft_3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -73,13 +73,13 @@ public: nes_sunsoft_4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(sun4_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { sun4_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { sun4_write(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void sun4_mirror(int mirror, int mirr0, int mirr1); @@ -96,14 +96,14 @@ public: nes_sunsoft_fme7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(fme7_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { fme7_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { fme7_write(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT16 m_irq_count; @@ -125,7 +125,7 @@ public: // construction/destruction nes_sunsoft_5_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE8_MEMBER(write_h); diff --git a/src/devices/bus/nes/sunsoft_dcs.h b/src/devices/bus/nes/sunsoft_dcs.h index bd3ecf88bf2..20266b52540 100644 --- a/src/devices/bus/nes/sunsoft_dcs.h +++ b/src/devices/bus/nes/sunsoft_dcs.h @@ -43,25 +43,25 @@ public: virtual ~nes_ntb_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete() { update_names(); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(); } // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "ntb_cart"; } - virtual const char *file_extensions() const { return "bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "ntb_cart"; } + virtual const char *file_extensions() const override { return "bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; virtual DECLARE_READ8_MEMBER(read); @@ -93,12 +93,12 @@ public: nes_ntb_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; virtual UINT8* get_cart_base(); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; // device type definition @@ -123,15 +123,15 @@ public: nes_sunsoft_dcs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_READ8_MEMBER(read_h); virtual DECLARE_WRITE8_MEMBER(write_m); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: int m_timer_on, m_exrom_enable; diff --git a/src/devices/bus/nes/taito.h b/src/devices/bus/nes/taito.h index 9f2b57ca512..cf79dbd18b6 100644 --- a/src/devices/bus/nes/taito.h +++ b/src/devices/bus/nes/taito.h @@ -16,11 +16,11 @@ public: nes_tc0190fmc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(tc0190fmc_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { tc0190fmc_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { tc0190fmc_write(space, offset, data, mem_mask); } - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -33,11 +33,11 @@ public: nes_tc0190fmc_pal16r4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; private: UINT16 m_irq_count, m_irq_count_latch; @@ -54,11 +54,11 @@ public: nes_x1_005_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: UINT8 m_latch; @@ -76,11 +76,11 @@ public: nes_x1_017_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_m); virtual DECLARE_WRITE8_MEMBER(write_m); - virtual void pcb_reset(); + virtual void pcb_reset() override; private: void set_chr(); diff --git a/src/devices/bus/nes/tengen.h b/src/devices/bus/nes/tengen.h index 8732e6e1321..ba421179c96 100644 --- a/src/devices/bus/nes/tengen.h +++ b/src/devices/bus/nes/tengen.h @@ -15,10 +15,10 @@ public: nes_tengen008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -32,14 +32,14 @@ public: nes_tengen032_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual DECLARE_WRITE8_MEMBER(tengen032_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { tengen032_write(space, offset, data, mem_mask); } + virtual DECLARE_WRITE8_MEMBER(write_h) override { tengen032_write(space, offset, data, mem_mask); } virtual void chr_cb(int start, int bank, int source); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; protected: void set_prg(); @@ -70,7 +70,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; protected: void set_mirror(); diff --git a/src/devices/bus/nes/txc.h b/src/devices/bus/nes/txc.h index e71e6fde249..663359ddb45 100644 --- a/src/devices/bus/nes/txc.h +++ b/src/devices/bus/nes/txc.h @@ -16,12 +16,12 @@ public: nes_txc_22211_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_reg[4]; @@ -63,10 +63,10 @@ public: nes_txc_strikew_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -79,11 +79,11 @@ public: nes_txc_commandos_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; diff --git a/src/devices/bus/nes/waixing.h b/src/devices/bus/nes/waixing.h index 42220c5523d..ded4b59d149 100644 --- a/src/devices/bus/nes/waixing.h +++ b/src/devices/bus/nes/waixing.h @@ -16,14 +16,14 @@ public: nes_waixing_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(read_l); virtual DECLARE_WRITE8_MEMBER(write_l); virtual DECLARE_WRITE8_MEMBER(waixing_write); - virtual DECLARE_WRITE8_MEMBER(write_h) { waixing_write(space, offset, data, mem_mask); } - virtual void chr_cb(int start, int bank, int source); + virtual DECLARE_WRITE8_MEMBER(write_h) override { waixing_write(space, offset, data, mem_mask); } + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: void set_mirror(UINT8 nt); @@ -39,7 +39,7 @@ public: // construction/destruction nes_waixing_a1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; }; @@ -52,7 +52,7 @@ public: nes_waixing_b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; }; @@ -65,7 +65,7 @@ public: nes_waixing_c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; }; @@ -78,7 +78,7 @@ public: nes_waixing_d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; }; @@ -91,7 +91,7 @@ public: nes_waixing_e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; }; @@ -105,12 +105,12 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; private: - virtual void set_prg(int prg_base, int prg_mask); + virtual void set_prg(int prg_base, int prg_mask) override; }; @@ -124,12 +124,12 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: - virtual void set_chr(UINT8 chr, int chr_base, int chr_mask); + virtual void set_chr(UINT8 chr, int chr_base, int chr_mask) override; }; @@ -144,7 +144,7 @@ public: // device-level overrides virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; // This PCB does not have 1K of internal RAM, so it's not derived from nes_waixing_a_device!! }; @@ -186,13 +186,13 @@ public: nes_waixing_j_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: - virtual void set_prg(int prg_base, int prg_mask); + virtual void set_prg(int prg_base, int prg_mask) override; UINT8 m_reg[4]; }; @@ -206,11 +206,11 @@ public: nes_waixing_sh2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_READ8_MEMBER(chr_r); - virtual void chr_cb(int start, int bank, int source); + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_reg[2]; @@ -226,12 +226,12 @@ public: nes_waixing_sec_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void prg_cb(int start, int bank); - virtual void chr_cb(int start, int bank, int source); + virtual void prg_cb(int start, int bank) override; + virtual void chr_cb(int start, int bank, int source) override; - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_reg; @@ -247,11 +247,11 @@ public: nes_waixing_sgz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void hblank_irq(int scanline, int vblank, int blanked); - virtual void pcb_reset(); + virtual void hblank_irq(int scanline, int vblank, int blanked) override; + virtual void pcb_reset() override; protected: UINT16 m_irq_count, m_irq_count_latch; @@ -270,10 +270,10 @@ public: nes_waixing_sgzlz_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_latch; @@ -289,10 +289,10 @@ public: nes_waixing_ffv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_reg[2]; @@ -308,10 +308,10 @@ public: nes_waixing_wxzs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -324,10 +324,10 @@ public: nes_waixing_dq8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -340,10 +340,10 @@ public: nes_waixing_wxzs2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_h); - virtual void pcb_reset(); + virtual void pcb_reset() override; }; @@ -356,10 +356,10 @@ public: nes_waixing_fs304_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual DECLARE_WRITE8_MEMBER(write_l); - virtual void pcb_reset(); + virtual void pcb_reset() override; protected: UINT8 m_reg[4]; diff --git a/src/devices/bus/nes_ctrl/4score.h b/src/devices/bus/nes_ctrl/4score.h index f4f17174957..c05cb403b39 100644 --- a/src/devices/bus/nes_ctrl/4score.h +++ b/src/devices/bus/nes_ctrl/4score.h @@ -30,10 +30,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_bit0(); + virtual UINT8 read_bit0() override; protected: UINT32 m_latch; @@ -47,10 +47,10 @@ public: // construction/destruction nes_4score_p1p3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: - virtual void write(UINT8 data); + virtual void write(UINT8 data) override; private: required_ioport m_joypad1; @@ -65,10 +65,10 @@ public: // construction/destruction nes_4score_p2p4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: - virtual void write(UINT8 data); + virtual void write(UINT8 data) override; private: required_ioport m_joypad2; diff --git a/src/devices/bus/nes_ctrl/arkpaddle.h b/src/devices/bus/nes_ctrl/arkpaddle.h index 84fe327b7d4..d693bb7c0b7 100644 --- a/src/devices/bus/nes_ctrl/arkpaddle.h +++ b/src/devices/bus/nes_ctrl/arkpaddle.h @@ -31,15 +31,15 @@ public: nes_vaus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_bit34(); - virtual void write(UINT8 data); + virtual UINT8 read_bit34() override; + virtual void write(UINT8 data) override; required_ioport m_paddle; required_ioport m_button; @@ -57,8 +57,8 @@ public: nes_vausfc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual UINT8 read_bit34() { return 0; } - virtual UINT8 read_exp(offs_t offset); + virtual UINT8 read_bit34() override { return 0; } + virtual UINT8 read_exp(offs_t offset) override; }; diff --git a/src/devices/bus/nes_ctrl/bcbattle.h b/src/devices/bus/nes_ctrl/bcbattle.h index c68d0bc669b..cbc7125c041 100644 --- a/src/devices/bus/nes_ctrl/bcbattle.h +++ b/src/devices/bus/nes_ctrl/bcbattle.h @@ -29,15 +29,15 @@ public: // construction/destruction nes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); + virtual UINT8 read_exp(offs_t offset) override; int read_current_bit(); static const device_timer_id TIMER_BATTLER = 1; diff --git a/src/devices/bus/nes_ctrl/ctrl.h b/src/devices/bus/nes_ctrl/ctrl.h index 1c682c0491b..e899258547c 100644 --- a/src/devices/bus/nes_ctrl/ctrl.h +++ b/src/devices/bus/nes_ctrl/ctrl.h @@ -67,7 +67,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_nes_control_port_interface *m_device; }; diff --git a/src/devices/bus/nes_ctrl/fckeybrd.h b/src/devices/bus/nes_ctrl/fckeybrd.h index 594c3bcae8e..f4cdc02ba39 100644 --- a/src/devices/bus/nes_ctrl/fckeybrd.h +++ b/src/devices/bus/nes_ctrl/fckeybrd.h @@ -29,16 +29,16 @@ public: // construction/destruction nes_fckeybrd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; private: required_device<cassette_image_device> m_cassette; diff --git a/src/devices/bus/nes_ctrl/ftrainer.h b/src/devices/bus/nes_ctrl/ftrainer.h index bc546295c8f..f426f4e6a2c 100644 --- a/src/devices/bus/nes_ctrl/ftrainer.h +++ b/src/devices/bus/nes_ctrl/ftrainer.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_ftrainer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; private: required_ioport_array<4> m_trainer; diff --git a/src/devices/bus/nes_ctrl/hori.h b/src/devices/bus/nes_ctrl/hori.h index 8df4fd892ee..613a8bdac7c 100644 --- a/src/devices/bus/nes_ctrl/hori.h +++ b/src/devices/bus/nes_ctrl/hori.h @@ -28,14 +28,14 @@ public: // construction/destruction nes_horitwin_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start() {} + virtual void device_start() override {} - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; private: required_device<nes_control_port_device> m_port1; @@ -51,15 +51,15 @@ public: // construction/destruction nes_hori4p_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start() {} + virtual void device_start() override {} - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; private: required_device<nes_control_port_device> m_port1; diff --git a/src/devices/bus/nes_ctrl/joypad.h b/src/devices/bus/nes_ctrl/joypad.h index 87966386e8d..8430db4dff9 100644 --- a/src/devices/bus/nes_ctrl/joypad.h +++ b/src/devices/bus/nes_ctrl/joypad.h @@ -29,15 +29,15 @@ public: nes_joypad_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); nes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_bit0(); - virtual void write(UINT8 data); + virtual UINT8 read_bit0() override; + virtual void write(UINT8 data) override; required_ioport m_joypad; UINT32 m_latch; @@ -51,11 +51,11 @@ public: // construction/destruction nes_fcpad2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; }; // ======================> nes_ccpadl_device @@ -66,7 +66,7 @@ public: // construction/destruction nes_ccpadl_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; }; // ======================> nes_ccpadr_device @@ -77,7 +77,7 @@ public: // construction/destruction nes_ccpadr_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; }; // ======================> nes_arcstick_device @@ -88,13 +88,13 @@ public: // construction/destruction nes_arcstick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual UINT8 read_bit0() { return 0; } - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_bit0() override { return 0; } + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; required_device<nes_control_port_device> m_daisychain; required_ioport m_cfg; diff --git a/src/devices/bus/nes_ctrl/konamihs.h b/src/devices/bus/nes_ctrl/konamihs.h index d2ec5b92b2a..da3aca612be 100644 --- a/src/devices/bus/nes_ctrl/konamihs.h +++ b/src/devices/bus/nes_ctrl/konamihs.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_konamihs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; required_ioport m_ipt_p1; required_ioport m_ipt_p2; diff --git a/src/devices/bus/nes_ctrl/miracle.h b/src/devices/bus/nes_ctrl/miracle.h index ee68cf7f357..6d0730423aa 100644 --- a/src/devices/bus/nes_ctrl/miracle.h +++ b/src/devices/bus/nes_ctrl/miracle.h @@ -33,13 +33,13 @@ public: // construction/destruction nes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; // serial overrides - virtual void rcv_complete(); // Rx completed receiving byte - virtual void tra_complete(); // Tx completed sending byte - virtual void tra_callback(); // Tx send bit + virtual void rcv_complete() override; // Rx completed receiving byte + virtual void tra_complete() override; // Tx completed sending byte + virtual void tra_callback() override; // Tx send bit void xmit_char(UINT8 data); @@ -47,11 +47,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_bit0(); - virtual void write(UINT8 data); + virtual UINT8 read_bit0() override; + virtual void write(UINT8 data) override; static const device_timer_id TIMER_STROBE_ON = 0; emu_timer *strobe_timer; diff --git a/src/devices/bus/nes_ctrl/mjpanel.h b/src/devices/bus/nes_ctrl/mjpanel.h index e48ee792a80..ad470cb91e7 100644 --- a/src/devices/bus/nes_ctrl/mjpanel.h +++ b/src/devices/bus/nes_ctrl/mjpanel.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_mjpanel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; private: required_ioport_array<4> m_panel; diff --git a/src/devices/bus/nes_ctrl/pachinko.h b/src/devices/bus/nes_ctrl/pachinko.h index 8d01ce6983d..04fad189160 100644 --- a/src/devices/bus/nes_ctrl/pachinko.h +++ b/src/devices/bus/nes_ctrl/pachinko.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; required_ioport m_joypad; required_ioport m_trigger; diff --git a/src/devices/bus/nes_ctrl/partytap.h b/src/devices/bus/nes_ctrl/partytap.h index 3fc29c19445..f66b7af7eec 100644 --- a/src/devices/bus/nes_ctrl/partytap.h +++ b/src/devices/bus/nes_ctrl/partytap.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_partytap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; required_ioport m_inputs; UINT8 m_mode; diff --git a/src/devices/bus/nes_ctrl/powerpad.h b/src/devices/bus/nes_ctrl/powerpad.h index 47463a9055c..a69486e7e23 100644 --- a/src/devices/bus/nes_ctrl/powerpad.h +++ b/src/devices/bus/nes_ctrl/powerpad.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_powerpad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_bit34(); - virtual void write(UINT8 data); + virtual UINT8 read_bit34() override; + virtual void write(UINT8 data) override; private: required_ioport m_ipt1; diff --git a/src/devices/bus/nes_ctrl/suborkey.h b/src/devices/bus/nes_ctrl/suborkey.h index 21f804da6f0..b50b0e3bb94 100644 --- a/src/devices/bus/nes_ctrl/suborkey.h +++ b/src/devices/bus/nes_ctrl/suborkey.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_suborkey_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_exp(offs_t offset); - virtual void write(UINT8 data); + virtual UINT8 read_exp(offs_t offset) override; + virtual void write(UINT8 data) override; private: required_ioport_array<13> m_kbd; diff --git a/src/devices/bus/nes_ctrl/zapper.h b/src/devices/bus/nes_ctrl/zapper.h index ca4b1eb40fd..8aedda7fc7a 100644 --- a/src/devices/bus/nes_ctrl/zapper.h +++ b/src/devices/bus/nes_ctrl/zapper.h @@ -28,15 +28,15 @@ public: // construction/destruction nes_zapper_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_bit34(); - virtual UINT8 read_exp(offs_t offset); + virtual UINT8 read_bit34() override; + virtual UINT8 read_exp(offs_t offset) override; private: required_ioport m_lightx; diff --git a/src/devices/bus/nubus/nubus.h b/src/devices/bus/nubus/nubus.h index 72bee5f7b84..4bb736f1eb7 100644 --- a/src/devices/bus/nubus/nubus.h +++ b/src/devices/bus/nubus/nubus.h @@ -68,7 +68,7 @@ public: nubus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_nubus_slot(device_t &device, const char *tag, const char *slottag); @@ -118,8 +118,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // internal state cpu_device *m_maincpu; diff --git a/src/devices/bus/nubus/nubus_48gc.h b/src/devices/bus/nubus/nubus_48gc.h index 85384ace70f..b32b057cfda 100644 --- a/src/devices/bus/nubus/nubus_48gc.h +++ b/src/devices/bus/nubus/nubus_48gc.h @@ -24,9 +24,9 @@ public: jmfb_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -34,8 +34,8 @@ public: emu_timer *m_timer; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(mac_48gc_r); DECLARE_WRITE32_MEMBER(mac_48gc_w); @@ -60,7 +60,7 @@ class nubus_824gc_device : public jmfb_device { public: nubus_824gc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h index fd5851a61df..7933cc11623 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.h +++ b/src/devices/bus/nubus/nubus_asntmc3b.h @@ -24,8 +24,8 @@ public: nubus_mac8390_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; void dp_irq_w(int state); DECLARE_READ8_MEMBER(dp_mem_read); @@ -33,8 +33,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ8_MEMBER(asntm3b_ram_r); DECLARE_WRITE8_MEMBER(asntm3b_ram_w); @@ -58,7 +58,7 @@ class nubus_appleenet_device : public nubus_mac8390_device { public: nubus_appleenet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; }; // device type definition diff --git a/src/devices/bus/nubus/nubus_cb264.h b/src/devices/bus/nubus/nubus_cb264.h index 633bf0f4962..fe0a934d7c8 100644 --- a/src/devices/bus/nubus/nubus_cb264.h +++ b/src/devices/bus/nubus/nubus_cb264.h @@ -24,14 +24,14 @@ public: nubus_cb264_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(cb264_r); DECLARE_WRITE32_MEMBER(cb264_w); diff --git a/src/devices/bus/nubus/nubus_image.cpp b/src/devices/bus/nubus/nubus_image.cpp index 5fbcb292948..e9c94e9c891 100644 --- a/src/devices/bus/nubus/nubus_image.cpp +++ b/src/devices/bus/nubus/nubus_image.cpp @@ -37,25 +37,25 @@ public: messimg_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual iodevice_t image_type() const { return IO_QUICKLOAD; } + virtual iodevice_t image_type() const override { return IO_QUICKLOAD; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return nullptr; } - virtual const char *file_extensions() const { return "img"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return nullptr; } + virtual const char *file_extensions() const override { return "img"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; public: UINT32 m_size; UINT8 *m_data; diff --git a/src/devices/bus/nubus/nubus_image.h b/src/devices/bus/nubus/nubus_image.h index cbd68d1ae51..d850b3f7735 100644 --- a/src/devices/bus/nubus/nubus_image.h +++ b/src/devices/bus/nubus/nubus_image.h @@ -36,13 +36,13 @@ public: nubus_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(image_status_r); DECLARE_WRITE32_MEMBER(image_status_w); diff --git a/src/devices/bus/nubus/nubus_m2hires.h b/src/devices/bus/nubus/nubus_m2hires.h index b47db82b0a6..e11e6e1a3ff 100644 --- a/src/devices/bus/nubus/nubus_m2hires.h +++ b/src/devices/bus/nubus/nubus_m2hires.h @@ -25,15 +25,15 @@ public: nubus_m2hires_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(m2hires_r); DECLARE_WRITE32_MEMBER(m2hires_w); diff --git a/src/devices/bus/nubus/nubus_m2video.h b/src/devices/bus/nubus/nubus_m2video.h index 211482c4c97..9dd7bc4a80b 100644 --- a/src/devices/bus/nubus/nubus_m2video.h +++ b/src/devices/bus/nubus/nubus_m2video.h @@ -25,15 +25,15 @@ public: nubus_m2video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(m2video_r); DECLARE_WRITE32_MEMBER(m2video_w); diff --git a/src/devices/bus/nubus/nubus_radiustpd.h b/src/devices/bus/nubus/nubus_radiustpd.h index eb12fdaf0ae..c8968ca30eb 100644 --- a/src/devices/bus/nubus/nubus_radiustpd.h +++ b/src/devices/bus/nubus/nubus_radiustpd.h @@ -25,15 +25,15 @@ public: nubus_radiustpd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(radiustpd_r); DECLARE_WRITE32_MEMBER(radiustpd_w); diff --git a/src/devices/bus/nubus/nubus_spec8.h b/src/devices/bus/nubus/nubus_spec8.h index ed04f1598e8..57c721afde5 100644 --- a/src/devices/bus/nubus/nubus_spec8.h +++ b/src/devices/bus/nubus/nubus_spec8.h @@ -25,15 +25,15 @@ public: nubus_spec8s3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(spec8s3_r); DECLARE_WRITE32_MEMBER(spec8s3_w); diff --git a/src/devices/bus/nubus/nubus_specpdq.h b/src/devices/bus/nubus/nubus_specpdq.h index fb956743197..ef260f7512a 100644 --- a/src/devices/bus/nubus/nubus_specpdq.h +++ b/src/devices/bus/nubus/nubus_specpdq.h @@ -25,15 +25,15 @@ public: nubus_specpdq_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(specpdq_r); DECLARE_WRITE32_MEMBER(specpdq_w); diff --git a/src/devices/bus/nubus/nubus_vikbw.h b/src/devices/bus/nubus/nubus_vikbw.h index 8ddc5aaf50f..e7a7b090eb1 100644 --- a/src/devices/bus/nubus/nubus_vikbw.h +++ b/src/devices/bus/nubus/nubus_vikbw.h @@ -24,14 +24,14 @@ public: nubus_vikbw_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; DECLARE_READ32_MEMBER(viking_ack_r); DECLARE_WRITE32_MEMBER(viking_ack_w); diff --git a/src/devices/bus/nubus/nubus_wsportrait.h b/src/devices/bus/nubus/nubus_wsportrait.h index a677daea6cc..9afdf36d8c7 100644 --- a/src/devices/bus/nubus/nubus_wsportrait.h +++ b/src/devices/bus/nubus/nubus_wsportrait.h @@ -25,15 +25,15 @@ public: nubus_wsportrait_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(wsportrait_r); DECLARE_WRITE32_MEMBER(wsportrait_w); diff --git a/src/devices/bus/nubus/pds30_30hr.h b/src/devices/bus/nubus/pds30_30hr.h index 9366a555285..7cb832d4af3 100644 --- a/src/devices/bus/nubus/pds30_30hr.h +++ b/src/devices/bus/nubus/pds30_30hr.h @@ -25,15 +25,15 @@ public: nubus_xceed30hr_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(xceed30hr_r); DECLARE_WRITE32_MEMBER(xceed30hr_w); diff --git a/src/devices/bus/nubus/pds30_cb264.h b/src/devices/bus/nubus/pds30_cb264.h index d1f7839ab45..4932468e573 100644 --- a/src/devices/bus/nubus/pds30_cb264.h +++ b/src/devices/bus/nubus/pds30_cb264.h @@ -25,15 +25,15 @@ public: nubus_cb264se30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(cb264se30_r); DECLARE_WRITE32_MEMBER(cb264se30_w); diff --git a/src/devices/bus/nubus/pds30_mc30.h b/src/devices/bus/nubus/pds30_mc30.h index b7b7276df9f..b9bcc01a42a 100644 --- a/src/devices/bus/nubus/pds30_mc30.h +++ b/src/devices/bus/nubus/pds30_mc30.h @@ -25,15 +25,15 @@ public: nubus_xceedmc30_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(xceedmc30_r); DECLARE_WRITE32_MEMBER(xceedmc30_w); diff --git a/src/devices/bus/nubus/pds30_procolor816.h b/src/devices/bus/nubus/pds30_procolor816.h index 65bf9d9e76f..5dfabef5be4 100644 --- a/src/devices/bus/nubus/pds30_procolor816.h +++ b/src/devices/bus/nubus/pds30_procolor816.h @@ -25,15 +25,15 @@ public: nubus_procolor816_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(procolor816_r); DECLARE_WRITE32_MEMBER(procolor816_w); diff --git a/src/devices/bus/nubus/pds30_sigmalview.h b/src/devices/bus/nubus/pds30_sigmalview.h index 62530e412b1..3fe9d94f952 100644 --- a/src/devices/bus/nubus/pds30_sigmalview.h +++ b/src/devices/bus/nubus/pds30_sigmalview.h @@ -25,15 +25,15 @@ public: nubus_lview_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; DECLARE_READ32_MEMBER(lview_r); DECLARE_WRITE32_MEMBER(lview_w); diff --git a/src/devices/bus/odyssey2/chess.h b/src/devices/bus/odyssey2/chess.h index 8604c317924..4cfefa10347 100644 --- a/src/devices/bus/odyssey2/chess.h +++ b/src/devices/bus/odyssey2/chess.h @@ -12,7 +12,7 @@ class o2_chess_device : public o2_rom_device { - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // virtual const rom_entry *device_rom_region() const; public: diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h index 18bfa63c4b4..1aabe776b18 100644 --- a/src/devices/bus/odyssey2/rom.h +++ b/src/devices/bus/odyssey2/rom.h @@ -17,14 +17,14 @@ public: o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04); virtual DECLARE_READ8_MEMBER(read_rom0c); - virtual void write_bank(int bank); + virtual void write_bank(int bank) override; protected: int m_bank_base; diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index c1b29ab7d7b..59b576af30f 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -63,28 +63,28 @@ public: virtual ~o2_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "odyssey_cart"; } - virtual const char *file_extensions() const { return "bin,rom"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "odyssey_cart"; } + virtual const char *file_extensions() const override { return "bin,rom"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom04); diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h index 71fb77b067c..7ae4ff732cd 100644 --- a/src/devices/bus/odyssey2/voice.h +++ b/src/devices/bus/odyssey2/voice.h @@ -17,17 +17,17 @@ public: o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset() {} + virtual void device_start() override; + virtual void device_reset() override {} - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom04) { if (m_subslot->exists()) return m_subslot->read_rom04(space, offset); else return 0xff; } - virtual DECLARE_READ8_MEMBER(read_rom0c) { if (m_subslot->exists()) return m_subslot->read_rom0c(space, offset); else return 0xff; } + virtual DECLARE_READ8_MEMBER(read_rom04) override { if (m_subslot->exists()) return m_subslot->read_rom04(space, offset); else return 0xff; } + virtual DECLARE_READ8_MEMBER(read_rom0c) override { if (m_subslot->exists()) return m_subslot->read_rom0c(space, offset); else return 0xff; } - virtual void write_bank(int bank) { if (m_subslot->exists()) m_subslot->write_bank(bank); } + virtual void write_bank(int bank) override { if (m_subslot->exists()) m_subslot->write_bank(bank); } DECLARE_WRITE_LINE_MEMBER(lrq_callback); DECLARE_WRITE8_MEMBER(io_write); diff --git a/src/devices/bus/oricext/jasmin.h b/src/devices/bus/oricext/jasmin.h index 8dae60eedbf..5d27895ccfa 100644 --- a/src/devices/bus/oricext/jasmin.h +++ b/src/devices/bus/oricext/jasmin.h @@ -31,11 +31,11 @@ protected: UINT8 *jasmin_rom; floppy_image_device *cur_floppy, *floppies[4]; - virtual void device_start(); - virtual void device_reset(); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + const rom_entry *device_rom_region() const override; + machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; void remap(); }; diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h index bf790c4af52..9ffc2f23f14 100644 --- a/src/devices/bus/oricext/microdisc.h +++ b/src/devices/bus/oricext/microdisc.h @@ -43,10 +43,10 @@ protected: UINT8 port_314; bool intrq_state, drq_state, hld_state; - virtual void device_start(); - virtual void device_reset(); - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + const rom_entry *device_rom_region() const override; + machine_config_constructor device_mconfig_additions() const override; void remap(); }; diff --git a/src/devices/bus/oricext/oricext.h b/src/devices/bus/oricext/oricext.h index 4eeb7766aea..738850a40b5 100644 --- a/src/devices/bus/oricext/oricext.h +++ b/src/devices/bus/oricext/oricext.h @@ -35,8 +35,8 @@ public: protected: devcb_write_line irq_handler; const char *cputag; - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; }; class oricext_device : public device_t, @@ -56,7 +56,7 @@ protected: UINT8 *rom, *ram; UINT8 junk_read[8192], junk_write[8192]; - virtual void device_start(); + virtual void device_start() override; }; extern const device_type ORICEXT_CONNECTOR; diff --git a/src/devices/bus/pc_joy/pc_joy.h b/src/devices/bus/pc_joy/pc_joy.h index f67e74ff003..c5e1d890c8e 100644 --- a/src/devices/bus/pc_joy/pc_joy.h +++ b/src/devices/bus/pc_joy/pc_joy.h @@ -42,8 +42,8 @@ public: DECLARE_READ8_MEMBER(joy_port_r); DECLARE_WRITE8_MEMBER(joy_port_w); protected: - virtual void device_start() { m_stime = machine().time(); } - virtual void device_config_complete(); + virtual void device_start() override { m_stime = machine().time(); } + virtual void device_config_complete() override; private: attotime m_stime; device_pc_joy_interface *m_dev; @@ -56,16 +56,16 @@ class pc_basic_joy_device : public device_t, { public: pc_basic_joy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; - virtual UINT8 x1(int delta) { return (m_x1->read() > delta); } - virtual UINT8 x2(int delta) { return (m_x2->read() > delta); } - virtual UINT8 y1(int delta) { return (m_y1->read() > delta); } - virtual UINT8 y2(int delta) { return (m_y2->read() > delta); } - virtual UINT8 btn() { return m_btn->read(); } + virtual UINT8 x1(int delta) override { return (m_x1->read() > delta); } + virtual UINT8 x2(int delta) override { return (m_x2->read() > delta); } + virtual UINT8 y1(int delta) override { return (m_y1->read() > delta); } + virtual UINT8 y2(int delta) override { return (m_y2->read() > delta); } + virtual UINT8 btn() override { return m_btn->read(); } protected: - virtual void device_start() {} + virtual void device_start() override {} private: required_ioport m_btn; diff --git a/src/devices/bus/pc_joy/pc_joy_sw.h b/src/devices/bus/pc_joy/pc_joy_sw.h index 12506ef1f1b..29500ed35ea 100644 --- a/src/devices/bus/pc_joy/pc_joy_sw.h +++ b/src/devices/bus/pc_joy/pc_joy_sw.h @@ -10,16 +10,16 @@ class pc_mssw_pad_device : public device_t, { public: pc_mssw_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; - virtual UINT8 btn() { return m_state; } + virtual UINT8 btn() override { return m_state; } // timing is guessed, calibrated for at486 - virtual void port_write() { if(!m_active) { m_timer->adjust(attotime::from_usec(50), 0, attotime::from_usec(5)); m_active = true; } } + virtual void port_write() override { if(!m_active) { m_timer->adjust(attotime::from_usec(50), 0, attotime::from_usec(5)); m_active = true; } } protected: - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id tid, int param, void *ptr) override; + virtual void device_reset() override; private: required_ioport m_btn1; diff --git a/src/devices/bus/pc_kbd/ec1841.h b/src/devices/bus/pc_kbd/ec1841.h index 20c8e74a5d6..1a7c46fdb52 100644 --- a/src/devices/bus/pc_kbd/ec1841.h +++ b/src/devices/bus/pc_kbd/ec1841.h @@ -31,9 +31,9 @@ public: ec_1841_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE8_MEMBER( bus_w ); DECLARE_READ8_MEMBER( p1_r ); @@ -43,8 +43,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ); diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 40957295b52..d213596c31c 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -32,9 +32,9 @@ public: iskr_1030_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( ram_r ); DECLARE_WRITE8_MEMBER( ram_w ); @@ -45,8 +45,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ); diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index 4a41b9bb4f5..4931c259ddb 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -27,9 +27,9 @@ public: required_device<cpu_device> m_cpu; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; virtual DECLARE_WRITE_LINE_MEMBER(clock_write); virtual DECLARE_WRITE_LINE_MEMBER(data_write); @@ -45,8 +45,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 m_p1; UINT8 m_p1_data; @@ -65,7 +65,7 @@ public: { } - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; }; diff --git a/src/devices/bus/pc_kbd/msnat.h b/src/devices/bus/pc_kbd/msnat.h index 6ed13a35b8e..5dd7f18c1ba 100644 --- a/src/devices/bus/pc_kbd/msnat.h +++ b/src/devices/bus/pc_kbd/msnat.h @@ -25,9 +25,9 @@ public: required_device<cpu_device> m_cpu; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; virtual DECLARE_WRITE_LINE_MEMBER(clock_write); virtual DECLARE_WRITE_LINE_MEMBER(data_write); @@ -58,8 +58,8 @@ protected: required_ioport m_p1_7; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 m_p0; UINT8 m_p1; diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h index 5ee259253ff..b445c5b1f45 100644 --- a/src/devices/bus/pc_kbd/pc83.h +++ b/src/devices/bus/pc_kbd/pc83.h @@ -32,9 +32,9 @@ public: ibm_pc_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE8_MEMBER( bus_w ); DECLARE_READ8_MEMBER( p1_r ); @@ -43,12 +43,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) { }; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) { }; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { }; + virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { }; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/pc_kbd/pc_kbdc.h b/src/devices/bus/pc_kbd/pc_kbdc.h index 76b82de023f..3f1788ac021 100644 --- a/src/devices/bus/pc_kbd/pc_kbdc.h +++ b/src/devices/bus/pc_kbd/pc_kbdc.h @@ -45,7 +45,7 @@ public: pc_kbdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_pc_kbdc_slot(device_t &device, device_t *kbdc_device); @@ -82,8 +82,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void update_clock_state(); void update_data_state(); diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h index 06f58c84738..e099dd31760 100644 --- a/src/devices/bus/pc_kbd/pcat84.h +++ b/src/devices/bus/pc_kbd/pcat84.h @@ -33,9 +33,9 @@ public: ibm_pc_at_84_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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_WRITE8_MEMBER( bus_w ); DECLARE_READ8_MEMBER( p1_r ); @@ -47,12 +47,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); }; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) { }; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); }; + virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { }; private: enum @@ -100,8 +100,8 @@ public: ibm_3270pc_122_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; }; diff --git a/src/devices/bus/pc_kbd/pcxt83.h b/src/devices/bus/pc_kbd/pcxt83.h index cec03f8bc92..d053c65f25f 100644 --- a/src/devices/bus/pc_kbd/pcxt83.h +++ b/src/devices/bus/pc_kbd/pcxt83.h @@ -32,9 +32,9 @@ public: ibm_pc_xt_83_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( bus_r ); DECLARE_WRITE8_MEMBER( bus_w ); @@ -45,8 +45,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pc_kbd_interface overrides virtual DECLARE_WRITE_LINE_MEMBER( clock_write ); diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h index 3f6b9efcd47..eef765a6c27 100644 --- a/src/devices/bus/pce/pce_rom.h +++ b/src/devices/bus/pce/pce_rom.h @@ -17,8 +17,8 @@ public: pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -61,8 +61,8 @@ public: pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h index 8fc691f6183..cb9036b02c7 100644 --- a/src/devices/bus/pce/pce_slot.h +++ b/src/devices/bus/pce/pce_slot.h @@ -62,13 +62,13 @@ public: virtual ~pce_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_cart_type(UINT8 *ROM, UINT32 len); @@ -78,18 +78,18 @@ public: void set_intf(const char * interface) { m_interface = interface; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return "pce,bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return "pce,bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h index 6a7511357ad..ed698f539d1 100644 --- a/src/devices/bus/pet/64k.h +++ b/src/devices/bus/pet/64k.h @@ -31,13 +31,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pet_expansion_card_interface overrides - virtual int pet_norom_r(address_space &space, offs_t offset, int sel); - virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel); - virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel); + virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override; + virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) override; + virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) override; private: inline UINT8 read_ram(offs_t offset); diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h index a8e09d57c00..5aeac83ce0b 100644 --- a/src/devices/bus/pet/c2n.h +++ b/src/devices/bus/pet/c2n.h @@ -33,18 +33,18 @@ public: c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_pet_datassette_port_interface overrides - virtual int datassette_read(); - virtual void datassette_write(int state); - virtual int datassette_sense(); - virtual void datassette_motor(int state); + virtual int datassette_read() override; + virtual void datassette_write(int state) override; + virtual int datassette_sense() override; + virtual void datassette_motor(int state) override; private: required_device<cassette_image_device> m_cassette; diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h index b4c2da0738b..a3dbda7797d 100644 --- a/src/devices/bus/pet/cass.h +++ b/src/devices/bus/pet/cass.h @@ -74,7 +74,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; devcb_write_line m_read_handler; diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h index 77d5f93979a..238c6cc8ac0 100644 --- a/src/devices/bus/pet/cb2snd.h +++ b/src/devices/bus/pet/cb2snd.h @@ -26,7 +26,7 @@ public: // construction/destruction pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; virtual DECLARE_WRITE_LINE_MEMBER( input_m ); @@ -34,7 +34,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h index 2f8d094ef01..58ce46f82ba 100644 --- a/src/devices/bus/pet/diag.h +++ b/src/devices/bus/pet/diag.h @@ -30,23 +30,23 @@ public: pet_userport_diagnostic_connector_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) { output_b(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_3 ) { output_c(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_4 ) { output_d(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_6 ) { output_7(state); output_8(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_7 ) { output_6(state); output_8(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_8 ) { output_6(state); output_7(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_9 ) { output_k(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_10 ) { output_l(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_b ) { output_2(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_c ) { output_3(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_d ) { output_4(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_k ) { output_9(state); } - virtual DECLARE_WRITE_LINE_MEMBER( input_l ) { output_10(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) override { output_b(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_3 ) override { output_c(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_4 ) override { output_d(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_6 ) override { output_7(state); output_8(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_7 ) override { output_6(state); output_8(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_8 ) override { output_6(state); output_7(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_9 ) override { output_k(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_10 ) override { output_l(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_b ) override { output_2(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_c ) override { output_3(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_d ) override { output_4(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_k ) override { output_9(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_l ) override { output_10(state); } protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h index 4d37e32ec94..c4bc2ad4e02 100644 --- a/src/devices/bus/pet/diag264_lb_tape.h +++ b/src/devices/bus/pet/diag264_lb_tape.h @@ -31,13 +31,13 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_pet_datassette_port_interface overrides - virtual int datassette_read(); - virtual void datassette_write(int state); - virtual int datassette_sense(); - virtual void datassette_motor(int state); + virtual int datassette_read() override; + virtual void datassette_write(int state) override; + virtual int datassette_sense() override; + virtual void datassette_motor(int state) override; private: int m_read; diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h index ed583333c60..d2f189cf0cd 100644 --- a/src/devices/bus/pet/exp.h +++ b/src/devices/bus/pet/exp.h @@ -95,8 +95,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_pet_expansion_card_interface *m_card; diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h index 40345894063..3b5dcaeb9ee 100644 --- a/src/devices/bus/pet/hsg.h +++ b/src/devices/bus/pet/hsg.h @@ -31,19 +31,19 @@ public: cbm8000_hsg_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; // device_pet_expansion_card_interface overrides - virtual int pet_norom_r(address_space &space, offs_t offset, int sel); - virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel); - virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel); + virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override; + virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) override; + virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: //required_device<ef9365_device> m_gdc; @@ -61,7 +61,7 @@ public: cbm8000_hsg_a_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -74,7 +74,7 @@ public: cbm8000_hsg_b_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h index f923b3dccda..720594e9561 100644 --- a/src/devices/bus/pet/petuja.h +++ b/src/devices/bus/pet/petuja.h @@ -31,7 +31,7 @@ public: pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; // device_pet_user_port_interface overrides WRITE_LINE_MEMBER( write_up1 ) { m_up1 = state; update_port1(); } @@ -43,7 +43,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; void update_port1(); void update_port2(); diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h index 2cf1c011c6e..d26fbf059dd 100644 --- a/src/devices/bus/pet/superpet.h +++ b/src/devices/bus/pet/superpet.h @@ -31,9 +31,9 @@ public: superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( read ); DECLARE_WRITE8_MEMBER( write ); @@ -41,15 +41,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_pet_expansion_card_interface overrides - virtual int pet_norom_r(address_space &space, offs_t offset, int sel); - virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel); - virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel); - virtual int pet_diag_r(); - virtual void pet_irq_w(int state); + virtual int pet_norom_r(address_space &space, offs_t offset, int sel) override; + virtual UINT8 pet_bd_r(address_space &space, offs_t offset, UINT8 data, int &sel) override; + virtual void pet_bd_w(address_space &space, offs_t offset, UINT8 data, int &sel) override; + virtual int pet_diag_r() override; + virtual void pet_irq_w(int state) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h index 9c6e6d8bd3e..6b402691b17 100644 --- a/src/devices/bus/pet/user.h +++ b/src/devices/bus/pet/user.h @@ -145,8 +145,8 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; devcb_write_line m_2_handler; devcb_write_line m_3_handler; diff --git a/src/devices/bus/plus4/c1551.h b/src/devices/bus/plus4/c1551.h index e31ec0afdd5..04a8a1a7a47 100644 --- a/src/devices/bus/plus4/c1551.h +++ b/src/devices/bus/plus4/c1551.h @@ -34,9 +34,9 @@ public: c1551_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const 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( port_r ); DECLARE_WRITE8_MEMBER( port_w ); @@ -60,13 +60,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_plus4_expansion_card_interface overrides - virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); - virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); + virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; + virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; private: enum diff --git a/src/devices/bus/plus4/diag264_lb_user.h b/src/devices/bus/plus4/diag264_lb_user.h index 25e0766d064..6c4ecae22ad 100644 --- a/src/devices/bus/plus4/diag264_lb_user.h +++ b/src/devices/bus/plus4/diag264_lb_user.h @@ -31,26 +31,26 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER(input_b) { output_6(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_k) { output_7(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_4) { output_j(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_5) { output_f(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(input_6) { output_b(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_7) { output_k(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_j) { output_4(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_f) { output_5(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(input_c) { output_m(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_d) { output_l(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_e) { output_h(state); } - - virtual DECLARE_WRITE_LINE_MEMBER(input_m) { output_c(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_l) { output_d(state); } - virtual DECLARE_WRITE_LINE_MEMBER(input_h) { output_e(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_b) override { output_6(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_k) override { output_7(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_4) override { output_j(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_5) override { output_f(state); } + + virtual DECLARE_WRITE_LINE_MEMBER(input_6) override { output_b(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_7) override { output_k(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_j) override { output_4(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_f) override { output_5(state); } + + virtual DECLARE_WRITE_LINE_MEMBER(input_c) override { output_m(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_d) override { output_l(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_e) override { output_h(state); } + + virtual DECLARE_WRITE_LINE_MEMBER(input_m) override { output_c(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_l) override { output_d(state); } + virtual DECLARE_WRITE_LINE_MEMBER(input_h) override { output_e(state); } }; // device type definition diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h index d637b1b5ee2..616857711c8 100644 --- a/src/devices/bus/plus4/exp.h +++ b/src/devices/bus/plus4/exp.h @@ -115,27 +115,27 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; + virtual void device_reset() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "plus4_cart"; } - virtual const char *file_extensions() const { return "rom,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "plus4_cart"; } + virtual const char *file_extensions() const override { return "rom,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; devcb_write_line m_write_irq; devcb_read8 m_read_dma_cd; diff --git a/src/devices/bus/plus4/sid.h b/src/devices/bus/plus4/sid.h index 63a7040416f..0351381f478 100644 --- a/src/devices/bus/plus4/sid.h +++ b/src/devices/bus/plus4/sid.h @@ -33,17 +33,17 @@ public: plus4_sid_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_plus4_expansion_card_interface overrides - virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); - virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); + virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; + virtual void plus4_cd_w(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; virtual void plus4_breset_w(int state); private: diff --git a/src/devices/bus/plus4/std.h b/src/devices/bus/plus4/std.h index 3949240b037..29fe1d16b13 100644 --- a/src/devices/bus/plus4/std.h +++ b/src/devices/bus/plus4/std.h @@ -31,10 +31,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_plus4_expansion_card_interface overrides - virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h); + virtual UINT8 plus4_cd_r(address_space &space, offs_t offset, UINT8 data, int ba, int cs0, int c1l, int c2l, int cs1, int c1h, int c2h) override; }; diff --git a/src/devices/bus/psx/analogue.h b/src/devices/bus/psx/analogue.h index dad5490f944..9fab90f3625 100644 --- a/src/devices/bus/psx/analogue.h +++ b/src/devices/bus/psx/analogue.h @@ -14,17 +14,17 @@ class psx_analog_controller_device : public device_t, public: psx_analog_controller_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER(change_mode); protected: - virtual void device_reset(); - virtual void device_start() {} + virtual void device_reset() override; + virtual void device_start() override {} enum { JOYSTICK, DUALSHOCK } m_type; private: - virtual bool get_pad(int count, UINT8 *odata, UINT8 idata); + virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) override; UINT8 pad_data(int count, bool analog); bool m_confmode; diff --git a/src/devices/bus/psx/ctlrport.h b/src/devices/bus/psx/ctlrport.h index 2e7a35d2d9d..09f1b947eab 100644 --- a/src/devices/bus/psx/ctlrport.h +++ b/src/devices/bus/psx/ctlrport.h @@ -33,8 +33,8 @@ public: bool ack_r() { return m_ack; } protected: - virtual void interface_pre_reset(); - virtual void interface_pre_start(); + virtual void interface_pre_reset() override; + virtual void interface_pre_start() override; enum { @@ -68,12 +68,12 @@ class psx_standard_controller_device : public device_t, public: psx_standard_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: - virtual void device_start() { } + virtual void device_start() override { } private: - virtual bool get_pad(int count, UINT8 *odata, UINT8 idata); + virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) override; required_ioport m_pad0; required_ioport m_pad1; @@ -99,7 +99,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_txd); protected: - virtual void device_start(); + virtual void device_start() override; private: psx_controller_port_device *m_port0; @@ -114,7 +114,7 @@ class psx_controller_port_device : public device_t, { public: psx_controller_port_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; typedef delegate<void ()> void_cb; void ack() { if(!ack_cb.isnull()) ack_cb(); } @@ -131,9 +131,9 @@ public: void disable_card(bool status); protected: - virtual void device_start() {} - virtual void device_reset() { m_tx = true; } - virtual void device_config_complete(); + virtual void device_start() override {} + virtual void device_reset() override { m_tx = true; } + virtual void device_config_complete() override; private: void_cb ack_cb; diff --git a/src/devices/bus/psx/memcard.h b/src/devices/bus/psx/memcard.h index 88289c4ba4f..762545d60db 100644 --- a/src/devices/bus/psx/memcard.h +++ b/src/devices/bus/psx/memcard.h @@ -18,18 +18,18 @@ class psxcard_device : public device_t, public: psxcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual iodevice_t image_type() const { return IO_MEMCARD; } + virtual iodevice_t image_type() const override { return IO_MEMCARD; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "mc"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "mc"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } - virtual bool call_load(); - virtual bool call_create(int format_type, option_resolution *format_options); + virtual bool call_load() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; void disable(bool state) { m_disabled = state; if(state) unload(); } @@ -61,9 +61,9 @@ private: void ack_timer(void *ptr, int param); public: - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; void clock_w(bool state) { if(!m_clock && !m_sel && state && !m_pad) do_card(); m_clock = state; } void sel_w(bool state); diff --git a/src/devices/bus/psx/multitap.h b/src/devices/bus/psx/multitap.h index f968d4e4dc6..160b0de6b5d 100644 --- a/src/devices/bus/psx/multitap.h +++ b/src/devices/bus/psx/multitap.h @@ -12,18 +12,18 @@ class psx_multitap_device : public device_t, { public: psx_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); - virtual void device_stop() { device_psx_controller_interface::m_owner->disable_card(false); } - virtual void device_reset() { device_psx_controller_interface::m_owner->disable_card(true); } - virtual void device_config_complete() { m_shortname = "psx_multitap"; } - virtual void interface_pre_reset(); + virtual void device_start() override; + virtual void device_stop() override { device_psx_controller_interface::m_owner->disable_card(false); } + virtual void device_reset() override { device_psx_controller_interface::m_owner->disable_card(true); } + virtual void device_config_complete() override { m_shortname = "psx_multitap"; } + virtual void interface_pre_reset() override; private: - virtual bool get_pad(int count, UINT8 *odata, UINT8 idata); - virtual void do_pad(); + virtual bool get_pad(int count, UINT8 *odata, UINT8 idata) override; + virtual void do_pad() override; void ack(); void set_tx_line(bool tx, int port); bool get_rx_line(int port); diff --git a/src/devices/bus/ql/cst_q_plus4.h b/src/devices/bus/ql/cst_q_plus4.h index 3fa37a71bcc..29437632b1a 100644 --- a/src/devices/bus/ql/cst_q_plus4.h +++ b/src/devices/bus/ql/cst_q_plus4.h @@ -31,8 +31,8 @@ public: cst_q_plus4_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_WRITE_LINE_MEMBER( exp1_extintl_w ) { m_exp1_extinl = state; update_extintl(); } DECLARE_WRITE_LINE_MEMBER( exp2_extintl_w ) { m_exp2_extinl = state; update_extintl(); } @@ -41,11 +41,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; private: void update_extintl() { m_slot->extintl_w(m_exp1_extinl || m_exp2_extinl || m_exp3_extinl || m_exp4_extinl); } diff --git a/src/devices/bus/ql/cst_qdisc.h b/src/devices/bus/ql/cst_qdisc.h index a946767a87b..ec9f5a253e9 100644 --- a/src/devices/bus/ql/cst_qdisc.h +++ b/src/devices/bus/ql/cst_qdisc.h @@ -30,15 +30,15 @@ public: cst_ql_disc_interface_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/cumana_fdi.h b/src/devices/bus/ql/cumana_fdi.h index 7b7a9b2fa8f..fa3d0d0a7ae 100644 --- a/src/devices/bus/ql/cumana_fdi.h +++ b/src/devices/bus/ql/cumana_fdi.h @@ -30,15 +30,15 @@ public: cumana_floppy_disk_interface_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/exp.h b/src/devices/bus/ql/exp.h index c9f84c793e9..e4b259b475c 100644 --- a/src/devices/bus/ql/exp.h +++ b/src/devices/bus/ql/exp.h @@ -128,8 +128,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset() { if (get_card_device()) get_card_device()->reset(); } + virtual void device_start() override; + virtual void device_reset() override { if (get_card_device()) get_card_device()->reset(); } devcb_write_line m_write_ipl0l; devcb_write_line m_write_ipl1l; diff --git a/src/devices/bus/ql/kempston_di.h b/src/devices/bus/ql/kempston_di.h index 613df61c357..f0fe15a0f34 100644 --- a/src/devices/bus/ql/kempston_di.h +++ b/src/devices/bus/ql/kempston_di.h @@ -30,15 +30,15 @@ public: kempston_disk_interface_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/miracle_gold_card.h b/src/devices/bus/ql/miracle_gold_card.h index 574dee19182..694ce2af578 100644 --- a/src/devices/bus/ql/miracle_gold_card.h +++ b/src/devices/bus/ql/miracle_gold_card.h @@ -30,15 +30,15 @@ public: miracle_gold_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/miracle_hd.h b/src/devices/bus/ql/miracle_hd.h index e72b7c483d4..df4dc99a47b 100644 --- a/src/devices/bus/ql/miracle_hd.h +++ b/src/devices/bus/ql/miracle_hd.h @@ -30,15 +30,15 @@ public: miracle_hard_disk_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_rom_cartridge_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/mp_fdi.h b/src/devices/bus/ql/mp_fdi.h index f8df3088269..d5e485ba3af 100644 --- a/src/devices/bus/ql/mp_fdi.h +++ b/src/devices/bus/ql/mp_fdi.h @@ -30,15 +30,15 @@ public: micro_peripherals_floppy_disk_interface_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/opd_basic_master.h b/src/devices/bus/ql/opd_basic_master.h index 90ca72f612a..3edf027fe92 100644 --- a/src/devices/bus/ql/opd_basic_master.h +++ b/src/devices/bus/ql/opd_basic_master.h @@ -30,15 +30,15 @@ public: opd_basic_master_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/pcml_qdisk.h b/src/devices/bus/ql/pcml_qdisk.h index 1996683cbbb..a4062c8ab9f 100644 --- a/src/devices/bus/ql/pcml_qdisk.h +++ b/src/devices/bus/ql/pcml_qdisk.h @@ -30,15 +30,15 @@ public: pcml_q_disk_interface_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/qubide.h b/src/devices/bus/ql/qubide.h index 8c93c68cae6..29e1fde3fa8 100644 --- a/src/devices/bus/ql/qubide.h +++ b/src/devices/bus/ql/qubide.h @@ -31,18 +31,18 @@ public: qubide_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; private: required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/ql/rom.h b/src/devices/bus/ql/rom.h index b51e64e0b3a..e2c9a89818e 100644 --- a/src/devices/bus/ql/rom.h +++ b/src/devices/bus/ql/rom.h @@ -91,26 +91,26 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "ql_cart"; } - virtual const char *file_extensions() const { return "rom,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "ql_cart"; } + virtual const char *file_extensions() const override { return "rom,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; device_ql_rom_cartridge_card_interface *m_card; }; diff --git a/src/devices/bus/ql/sandy_superdisk.h b/src/devices/bus/ql/sandy_superdisk.h index 350ba709c72..408c3430695 100644 --- a/src/devices/bus/ql/sandy_superdisk.h +++ b/src/devices/bus/ql/sandy_superdisk.h @@ -32,8 +32,8 @@ public: sandy_super_disk_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; WRITE_LINE_MEMBER( busy_w ); @@ -41,12 +41,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; private: void check_interrupt(); diff --git a/src/devices/bus/ql/sandy_superqboard.h b/src/devices/bus/ql/sandy_superqboard.h index 07bcd60a137..286e224f962 100644 --- a/src/devices/bus/ql/sandy_superqboard.h +++ b/src/devices/bus/ql/sandy_superqboard.h @@ -33,8 +33,8 @@ public: sandy_superqboard_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; WRITE_LINE_MEMBER( busy_w ); @@ -45,12 +45,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; private: enum @@ -103,7 +103,7 @@ public: sandy_superqmouse_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; }; @@ -116,7 +116,7 @@ public: sandy_superqmouse_512k_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; }; diff --git a/src/devices/bus/ql/std.h b/src/devices/bus/ql/std.h index 70b1328d79c..cbf7731c59a 100644 --- a/src/devices/bus/ql/std.h +++ b/src/devices/bus/ql/std.h @@ -30,10 +30,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_ql_rom_cartridge_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; }; diff --git a/src/devices/bus/ql/trumpcard.h b/src/devices/bus/ql/trumpcard.h index 4c303aafd3e..d8675a8459c 100644 --- a/src/devices/bus/ql/trumpcard.h +++ b/src/devices/bus/ql/trumpcard.h @@ -32,19 +32,19 @@ public: ql_trump_card_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int ram_size); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_ql_expansion_card_interface overrides - virtual UINT8 read(address_space &space, offs_t offset, UINT8 data); - virtual void write(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 read(address_space &space, offs_t offset, UINT8 data) override; + virtual void write(address_space &space, offs_t offset, UINT8 data) override; private: required_device<wd1772_t> m_fdc; diff --git a/src/devices/bus/rs232/keyboard.h b/src/devices/bus/rs232/keyboard.h index d2f12663d90..38d9dfbc56e 100644 --- a/src/devices/bus/rs232/keyboard.h +++ b/src/devices/bus/rs232/keyboard.h @@ -17,20 +17,20 @@ public: serial_keyboard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); serial_keyboard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { device_serial_interface::rx_w(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } DECLARE_READ_LINE_MEMBER(tx_r); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER(update_serial); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void tra_callback(); - virtual void tra_complete(); - virtual void send_key(UINT8 code); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void send_key(UINT8 code) override; private: UINT8 m_curr_key; diff --git a/src/devices/bus/rs232/loopback.h b/src/devices/bus/rs232/loopback.h index 3027fe167f3..c3e42fafbd0 100644 --- a/src/devices/bus/rs232/loopback.h +++ b/src/devices/bus/rs232/loopback.h @@ -17,7 +17,7 @@ public: virtual WRITE_LINE_MEMBER( input_dtr ); protected: - virtual void device_start(); + virtual void device_start() override; }; extern const device_type RS232_LOOPBACK; diff --git a/src/devices/bus/rs232/null_modem.h b/src/devices/bus/rs232/null_modem.h index e985cafdda3..aed62fb3aad 100644 --- a/src/devices/bus/rs232/null_modem.h +++ b/src/devices/bus/rs232/null_modem.h @@ -12,21 +12,21 @@ class null_modem_device : public device_t, { public: null_modem_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual WRITE_LINE_MEMBER( input_txd ) { device_serial_interface::rx_w(state); } + virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } DECLARE_WRITE_LINE_MEMBER(update_serial); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; private: void queue(); diff --git a/src/devices/bus/rs232/printer.h b/src/devices/bus/rs232/printer.h index ba36eef04eb..4ce526fac4b 100644 --- a/src/devices/bus/rs232/printer.h +++ b/src/devices/bus/rs232/printer.h @@ -15,19 +15,19 @@ class serial_printer_device : public device_t, public: serial_printer_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { device_serial_interface::rx_w(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } DECLARE_WRITE_LINE_MEMBER(update_serial); DECLARE_WRITE_LINE_MEMBER(printer_online); protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void rcv_complete(); + virtual void rcv_complete() override; private: required_device<printer_image_device> m_printer; diff --git a/src/devices/bus/rs232/pty.h b/src/devices/bus/rs232/pty.h index 222ee446b53..19f0a30ef9f 100644 --- a/src/devices/bus/rs232/pty.h +++ b/src/devices/bus/rs232/pty.h @@ -14,22 +14,22 @@ class pseudo_terminal_device : public device_t, public: pseudo_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { + virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } DECLARE_WRITE_LINE_MEMBER(update_serial); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; private: required_ioport m_rs232_txbaud; diff --git a/src/devices/bus/rs232/rs232.h b/src/devices/bus/rs232/rs232.h index 6be21fcb639..75e1e963eca 100644 --- a/src/devices/bus/rs232/rs232.h +++ b/src/devices/bus/rs232/rs232.h @@ -140,8 +140,8 @@ public: DECLARE_READ_LINE_MEMBER( cts_r ) { return m_cts; } protected: - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; int m_rxd; int m_dcd; diff --git a/src/devices/bus/rs232/ser_mouse.h b/src/devices/bus/rs232/ser_mouse.h index ccc4cdbbdae..6a8986aa081 100644 --- a/src/devices/bus/rs232/ser_mouse.h +++ b/src/devices/bus/rs232/ser_mouse.h @@ -19,22 +19,22 @@ class serial_mouse_device : public: serial_mouse_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void mouse_trans(int dx, int dy, int nb, int mbc) = 0; virtual void set_frame() = 0; void set_mouse_enable(bool state); void queue_data(UINT8 data) {m_queue[m_head] = data; ++m_head %= 256;} UINT8 unqueue_data() {UINT8 ret = m_queue[m_tail]; ++m_tail %= 256; return ret;} - virtual void tra_complete(); - virtual void tra_callback(); + virtual void tra_complete() override; + virtual void tra_callback() override; void reset_mouse(); - virtual WRITE_LINE_MEMBER(input_dtr); - virtual WRITE_LINE_MEMBER(input_rts); + virtual WRITE_LINE_MEMBER(input_dtr) override; + virtual WRITE_LINE_MEMBER(input_rts) override; int m_dtr; int m_rts; @@ -58,10 +58,10 @@ public: microsoft_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual WRITE_LINE_MEMBER(input_rts); + virtual WRITE_LINE_MEMBER(input_rts) override; - virtual void set_frame() { set_data_frame(1, 7, PARITY_NONE, STOP_BITS_2); } - virtual void mouse_trans(int dx, int dy, int nb, int mbc); + virtual void set_frame() override { set_data_frame(1, 7, PARITY_NONE, STOP_BITS_2); } + virtual void mouse_trans(int dx, int dy, int nb, int mbc) override; }; extern const device_type MSFT_SERIAL_MOUSE; @@ -72,8 +72,8 @@ public: mouse_systems_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void set_frame() { set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2); } - virtual void mouse_trans(int dx, int dy, int nb, int mbc); + virtual void set_frame() override { set_data_frame(1, 8, PARITY_NONE, STOP_BITS_2); } + virtual void mouse_trans(int dx, int dy, int nb, int mbc) override; }; extern const device_type MSYSTEM_SERIAL_MOUSE; diff --git a/src/devices/bus/rs232/terminal.h b/src/devices/bus/rs232/terminal.h index d2c92be9920..0cde8f71f32 100644 --- a/src/devices/bus/rs232/terminal.h +++ b/src/devices/bus/rs232/terminal.h @@ -14,20 +14,20 @@ class serial_terminal_device : public generic_terminal_device, public: serial_terminal_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) { device_serial_interface::rx_w(state); } + virtual DECLARE_WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } DECLARE_WRITE_LINE_MEMBER(update_serial); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); - virtual void send_key(UINT8 code); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; + virtual void send_key(UINT8 code) override; private: required_ioport m_rs232_txbaud; diff --git a/src/devices/bus/rs232/xvd701.h b/src/devices/bus/rs232/xvd701.h index e25f91fd662..5f7b6a7ba64 100644 --- a/src/devices/bus/rs232/xvd701.h +++ b/src/devices/bus/rs232/xvd701.h @@ -11,21 +11,21 @@ class jvc_xvd701_device : public device_t, { public: jvc_xvd701_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual WRITE_LINE_MEMBER( input_txd ) { device_serial_interface::rx_w(state); } + virtual WRITE_LINE_MEMBER( input_txd ) override { device_serial_interface::rx_w(state); } DECLARE_WRITE_LINE_MEMBER(update_serial); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; private: static const int TIMER_RESPONSE = 1; diff --git a/src/devices/bus/s100/dj2db.h b/src/devices/bus/s100/dj2db.h index 460a45ff3dc..a8504cee1cf 100644 --- a/src/devices/bus/s100/dj2db.h +++ b/src/devices/bus/s100/dj2db.h @@ -32,9 +32,9 @@ public: s100_dj2db_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_WRITE_LINE_MEMBER( fr_w ); @@ -43,15 +43,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_s100_card_interface overrides - virtual UINT8 s100_smemr_r(address_space &space, offs_t offset); - virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT8 s100_sinp_r(address_space &space, offs_t offset); - virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data); - virtual void s100_phantom_w(int state); + virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override; + virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT8 s100_sinp_r(address_space &space, offs_t offset) override; + virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void s100_phantom_w(int state) override; private: // internal state diff --git a/src/devices/bus/s100/djdma.h b/src/devices/bus/s100/djdma.h index edbf8bb8a35..e1ac5d2d95d 100644 --- a/src/devices/bus/s100/djdma.h +++ b/src/devices/bus/s100/djdma.h @@ -31,13 +31,13 @@ public: s100_djdma_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/bus/s100/mm65k16s.h b/src/devices/bus/s100/mm65k16s.h index 35d9cbc21c5..7a9c50ad1aa 100644 --- a/src/devices/bus/s100/mm65k16s.h +++ b/src/devices/bus/s100/mm65k16s.h @@ -30,18 +30,18 @@ public: s100_mm65k16s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_s100_card_interface overrides - virtual UINT8 s100_smemr_r(address_space &space, offs_t offset); - virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data); - virtual void s100_phantom_w(int state); + virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override; + virtual void s100_mwrt_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void s100_phantom_w(int state) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/s100/nsmdsa.h b/src/devices/bus/s100/nsmdsa.h index 88a2f330391..bdf170fb869 100644 --- a/src/devices/bus/s100/nsmdsa.h +++ b/src/devices/bus/s100/nsmdsa.h @@ -31,16 +31,16 @@ public: s100_mds_a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_s100_card_interface overrides - virtual UINT8 s100_smemr_r(address_space &space, offs_t offset); + virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override; private: required_device<floppy_connector> m_floppy0; diff --git a/src/devices/bus/s100/nsmdsad.h b/src/devices/bus/s100/nsmdsad.h index 1c156590ba1..0f524af48bd 100644 --- a/src/devices/bus/s100/nsmdsad.h +++ b/src/devices/bus/s100/nsmdsad.h @@ -31,16 +31,16 @@ public: s100_mds_ad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_s100_card_interface overrides - virtual UINT8 s100_smemr_r(address_space &space, offs_t offset); + virtual UINT8 s100_smemr_r(address_space &space, offs_t offset) override; private: required_device<floppy_connector> m_floppy0; diff --git a/src/devices/bus/s100/s100.h b/src/devices/bus/s100/s100.h index 9d622b573b6..97d067f62e8 100644 --- a/src/devices/bus/s100/s100.h +++ b/src/devices/bus/s100/s100.h @@ -257,8 +257,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write_line m_write_irq; @@ -293,7 +293,7 @@ public: s100_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: s100_bus_t *m_bus; diff --git a/src/devices/bus/s100/wunderbus.h b/src/devices/bus/s100/wunderbus.h index 9b51f9afaee..53aae135b06 100644 --- a/src/devices/bus/s100/wunderbus.h +++ b/src/devices/bus/s100/wunderbus.h @@ -32,8 +32,8 @@ public: s100_wunderbus_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_WRITE_LINE_MEMBER( pic_int_w ); @@ -41,15 +41,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_s100_card_interface overrides - virtual void s100_vi0_w(int state); - virtual void s100_vi1_w(int state); - virtual void s100_vi2_w(int state); - virtual UINT8 s100_sinp_r(address_space &space, offs_t offset); - virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data); + virtual void s100_vi0_w(int state) override; + virtual void s100_vi1_w(int state) override; + virtual void s100_vi2_w(int state) override; + virtual UINT8 s100_sinp_r(address_space &space, offs_t offset) override; + virtual void s100_sout_w(address_space &space, offs_t offset, UINT8 data) override; private: required_device<pic8259_device> m_pic; diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h index c4402431caf..c50fc3c9e2f 100644 --- a/src/devices/bus/saturn/bram.h +++ b/src/devices/bus/saturn/bram.h @@ -17,13 +17,13 @@ public: saturn_bram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file) { if (!m_ext_bram.empty()) file.read(&m_ext_bram[0], m_ext_bram.size()); } - virtual void nvram_write(emu_file &file) { if (!m_ext_bram.empty()) file.write(&m_ext_bram[0], m_ext_bram.size()); } + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override { if (!m_ext_bram.empty()) file.read(&m_ext_bram[0], m_ext_bram.size()); } + virtual void nvram_write(emu_file &file) override { if (!m_ext_bram.empty()) file.write(&m_ext_bram[0], m_ext_bram.size()); } // reading and writing virtual DECLARE_READ32_MEMBER(read_ext_bram); diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h index 53bf97d8468..8a286fd560f 100644 --- a/src/devices/bus/saturn/dram.h +++ b/src/devices/bus/saturn/dram.h @@ -16,8 +16,8 @@ public: saturn_dram_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ32_MEMBER(read_ext_dram0); diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h index 021526bcce4..c5f241faab9 100644 --- a/src/devices/bus/saturn/rom.h +++ b/src/devices/bus/saturn/rom.h @@ -17,8 +17,8 @@ public: saturn_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ32_MEMBER(read_rom); diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h index a0b17e42ad0..075848ee409 100644 --- a/src/devices/bus/saturn/sat_slot.h +++ b/src/devices/bus/saturn/sat_slot.h @@ -68,28 +68,28 @@ public: virtual ~sat_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_cart_type(); - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "sat_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "sat_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ32_MEMBER(read_rom); diff --git a/src/devices/bus/scsi/acb4070.h b/src/devices/bus/scsi/acb4070.h index e396c6eb58f..ea9b1583c28 100644 --- a/src/devices/bus/scsi/acb4070.h +++ b/src/devices/bus/scsi/acb4070.h @@ -13,8 +13,8 @@ public: // construction/destruction acb4070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void ExecCommand(); - virtual void WriteData( UINT8 *data, int dataLength ); + virtual void ExecCommand() override; + virtual void WriteData( UINT8 *data, int dataLength ) override; private: struct adaptec_sense_t diff --git a/src/devices/bus/scsi/cdu76s.h b/src/devices/bus/scsi/cdu76s.h index a0997ea6c05..d10a23c1246 100644 --- a/src/devices/bus/scsi/cdu76s.h +++ b/src/devices/bus/scsi/cdu76s.h @@ -21,8 +21,8 @@ class sony_cdu76s_device : public scsicd_device public: sony_cdu76s_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void ExecCommand(); - virtual void ReadData( UINT8 *data, int dataLength ); + virtual void ExecCommand() override; + virtual void ReadData( UINT8 *data, int dataLength ) override; }; // device type definition diff --git a/src/devices/bus/scsi/d9060hd.h b/src/devices/bus/scsi/d9060hd.h index f3fa504cf81..2daed5e40af 100644 --- a/src/devices/bus/scsi/d9060hd.h +++ b/src/devices/bus/scsi/d9060hd.h @@ -13,7 +13,7 @@ public: // construction/destruction d9060hd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void ExecCommand(); + virtual void ExecCommand() override; }; // device type definition diff --git a/src/devices/bus/scsi/omti5100.h b/src/devices/bus/scsi/omti5100.h index f07be338226..63ac7b8a4dc 100644 --- a/src/devices/bus/scsi/omti5100.h +++ b/src/devices/bus/scsi/omti5100.h @@ -13,13 +13,13 @@ class omti5100_device : public scsihd_device public: omti5100_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; //virtual const rom_entry *device_rom_region() const; - virtual void ExecCommand(); - virtual void ReadData( UINT8 *data, int dataLength ); - virtual void WriteData( UINT8 *data, int dataLength ); - void device_start(); + virtual void ExecCommand() override; + virtual void ReadData( UINT8 *data, int dataLength ) override; + virtual void WriteData( UINT8 *data, int dataLength ) override; + void device_start() override; private: required_device<harddisk_image_device> m_image0; diff --git a/src/devices/bus/scsi/pc9801_sasi.h b/src/devices/bus/scsi/pc9801_sasi.h index 44ef5f5e0cc..b3e5816573d 100644 --- a/src/devices/bus/scsi/pc9801_sasi.h +++ b/src/devices/bus/scsi/pc9801_sasi.h @@ -11,7 +11,7 @@ public: // construction/destruction pc9801_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void ExecCommand(); + virtual void ExecCommand() override; }; // device type definition diff --git a/src/devices/bus/scsi/s1410.h b/src/devices/bus/scsi/s1410.h index b7834f56c88..519c013b066 100644 --- a/src/devices/bus/scsi/s1410.h +++ b/src/devices/bus/scsi/s1410.h @@ -20,12 +20,12 @@ public: s1410_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void ExecCommand(); - virtual void WriteData( UINT8 *data, int dataLength ); - virtual void ReadData( UINT8 *data, int dataLength ); + virtual void ExecCommand() override; + virtual void WriteData( UINT8 *data, int dataLength ) override; + virtual void ReadData( UINT8 *data, int dataLength ) override; }; diff --git a/src/devices/bus/scsi/sa1403d.h b/src/devices/bus/scsi/sa1403d.h index 5f92ff11240..308be3b5b48 100644 --- a/src/devices/bus/scsi/sa1403d.h +++ b/src/devices/bus/scsi/sa1403d.h @@ -21,12 +21,12 @@ public: sa1403d_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; - virtual void ExecCommand(); - virtual void WriteData( UINT8 *data, int dataLength ); + virtual void ExecCommand() override; + virtual void WriteData( UINT8 *data, int dataLength ) override; }; diff --git a/src/devices/bus/scsi/scsi.h b/src/devices/bus/scsi/scsi.h index dd8c88635ed..19fec347f53 100644 --- a/src/devices/bus/scsi/scsi.h +++ b/src/devices/bus/scsi/scsi.h @@ -139,8 +139,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; void update_bsy(); void update_sel(); @@ -236,8 +236,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; protected: scsi_port_interface *m_dev; diff --git a/src/devices/bus/scsi/scsicd.h b/src/devices/bus/scsi/scsicd.h index c7667ee3321..3acfffe2ad6 100644 --- a/src/devices/bus/scsi/scsicd.h +++ b/src/devices/bus/scsi/scsicd.h @@ -19,10 +19,10 @@ public: // construction/destruction scsicd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); scsicd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); + virtual void device_start() override; }; // device type definition diff --git a/src/devices/bus/scsi/scsihd.h b/src/devices/bus/scsi/scsihd.h index db151095847..41b535a15b1 100644 --- a/src/devices/bus/scsi/scsihd.h +++ b/src/devices/bus/scsi/scsihd.h @@ -19,10 +19,10 @@ public: // construction/destruction scsihd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); scsihd_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); + virtual void device_start() override; }; // device type definition diff --git a/src/devices/bus/scsi/scsihle.h b/src/devices/bus/scsi/scsihle.h index 5f638149ffd..4963210726c 100644 --- a/src/devices/bus/scsi/scsihle.h +++ b/src/devices/bus/scsi/scsihle.h @@ -26,24 +26,24 @@ public: virtual int GetDeviceID(); // hack for legacy_scsi_host_adapter::get_device - virtual DECLARE_WRITE_LINE_MEMBER( input_sel ); - virtual DECLARE_WRITE_LINE_MEMBER( input_ack ); - virtual DECLARE_WRITE_LINE_MEMBER( input_rst ); - virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) { if (state) m_input_data |= 0x04; else m_input_data &= ~0x04; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) { if (state) m_input_data |= 0x08; else m_input_data &= ~0x08; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) { if (state) m_input_data |= 0x10; else m_input_data &= ~0x10; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) { if (state) m_input_data |= 0x20; else m_input_data &= ~0x20; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) { if (state) m_input_data |= 0x40; else m_input_data &= ~0x40; } - virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } + virtual DECLARE_WRITE_LINE_MEMBER( input_sel ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_ack ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_rst ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_data0 ) override { if (state) m_input_data |= 0x01; else m_input_data &= ~0x01; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data1 ) override { if (state) m_input_data |= 0x02; else m_input_data &= ~0x02; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data2 ) override { if (state) m_input_data |= 0x04; else m_input_data &= ~0x04; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data3 ) override { if (state) m_input_data |= 0x08; else m_input_data &= ~0x08; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data4 ) override { if (state) m_input_data |= 0x10; else m_input_data &= ~0x10; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data5 ) override { if (state) m_input_data |= 0x20; else m_input_data &= ~0x20; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data6 ) override { if (state) m_input_data |= 0x40; else m_input_data &= ~0x40; } + virtual DECLARE_WRITE_LINE_MEMBER( input_data7 ) override { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } protected: // device-level overrides - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: required_ioport m_scsi_id; diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h index 412f72acfef..85f21422cc8 100644 --- a/src/devices/bus/scv/rom.h +++ b/src/devices/bus/scv/rom.h @@ -17,8 +17,8 @@ public: scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -59,8 +59,8 @@ public: scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -81,8 +81,8 @@ public: scv_rom64_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -102,8 +102,8 @@ public: scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -123,8 +123,8 @@ public: scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h index 41dad59f49f..1befef08f28 100644 --- a/src/devices/bus/scv/slot.h +++ b/src/devices/bus/scv/slot.h @@ -64,31 +64,31 @@ public: virtual ~scv_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_cart_type(UINT8 *ROM, UINT32 len); void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "scv_cart"; } - virtual const char *file_extensions() const { return "bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "scv_cart"; } + virtual const char *file_extensions() const override { return "bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); diff --git a/src/devices/bus/sega8/ccatch.h b/src/devices/bus/sega8/ccatch.h index ece120c0a57..945f04b9aea 100644 --- a/src/devices/bus/sega8/ccatch.h +++ b/src/devices/bus/sega8/ccatch.h @@ -17,9 +17,9 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: required_device<sega8_card_slot_device> m_card; diff --git a/src/devices/bus/sega8/mgear.h b/src/devices/bus/sega8/mgear.h index 2e4afa40466..960545c7350 100644 --- a/src/devices/bus/sega8/mgear.h +++ b/src/devices/bus/sega8/mgear.h @@ -16,16 +16,16 @@ public: sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return m_subslot->read_cart(space, offset); } - virtual DECLARE_WRITE8_MEMBER(write_cart) { m_subslot->write_cart(space, offset, data); } - virtual DECLARE_WRITE8_MEMBER(write_mapper) { m_subslot->write_mapper(space, offset, data); } - virtual int get_lphaser_xoffs() { return m_subslot->m_cart ? m_subslot->m_cart->get_lphaser_xoffs() : -1; } + virtual DECLARE_READ8_MEMBER(read_cart) override { return m_subslot->read_cart(space, offset); } + virtual DECLARE_WRITE8_MEMBER(write_cart) override { m_subslot->write_cart(space, offset, data); } + virtual DECLARE_WRITE8_MEMBER(write_mapper) override { m_subslot->write_mapper(space, offset, data); } + virtual int get_lphaser_xoffs() override { return m_subslot->m_cart ? m_subslot->m_cart->get_lphaser_xoffs() : -1; } - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: required_device<sega8_cart_slot_device> m_subslot; diff --git a/src/devices/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h index c04a149fdc9..686a033c092 100644 --- a/src/devices/bus/sega8/rom.h +++ b/src/devices/bus/sega8/rom.h @@ -17,10 +17,10 @@ public: sega8_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -47,7 +47,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} }; @@ -62,7 +62,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} }; @@ -77,7 +77,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} // has internal RAM which overwrites the system one! virtual DECLARE_READ8_MEMBER(read_ram); @@ -96,7 +96,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} // has internal RAM which overwrites the system one! virtual DECLARE_READ8_MEMBER(read_ram); @@ -113,9 +113,9 @@ public: sega8_terebi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual ioport_constructor device_input_ports() const; - virtual void device_reset(); + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_reset() override; required_ioport m_tvdraw_x; required_ioport m_tvdraw_y; @@ -124,7 +124,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} protected: UINT8 m_tvdraw_data; @@ -142,7 +142,7 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} // has internal RAM which overwrites the system one! virtual DECLARE_READ8_MEMBER(read_ram); @@ -160,8 +160,8 @@ public: // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart) {} - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_cart) override {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} // has internal RAM which overwrites the system one! virtual DECLARE_READ8_MEMBER(read_ram); @@ -181,11 +181,11 @@ public: sega8_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -211,10 +211,10 @@ public: sega8_codemasters_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -237,8 +237,8 @@ public: sega8_4pak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -260,10 +260,10 @@ public: sega8_zemina_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -285,7 +285,7 @@ public: // construction/destruction sega8_nemesis_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void late_bank_setup(); + virtual void late_bank_setup() override; }; @@ -299,9 +299,9 @@ public: sega8_janggun_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { save_item(NAME(m_rom_bank_base)); } + virtual void device_start() override { save_item(NAME(m_rom_bank_base)); } - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -322,13 +322,13 @@ public: sega8_hicom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() { save_item(NAME(m_rom_bank_base)); } + virtual void device_start() override { save_item(NAME(m_rom_bank_base)); } - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart) {} + virtual DECLARE_WRITE8_MEMBER(write_cart) override {} virtual DECLARE_WRITE8_MEMBER(write_mapper); protected: @@ -344,11 +344,11 @@ public: // construction/destruction sega8_korean_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void late_bank_setup(); + virtual void late_bank_setup() override; // reading and writing virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} }; @@ -361,7 +361,7 @@ public: sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // reading and writing - virtual DECLARE_WRITE8_MEMBER(write_mapper) {} + virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} }; diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h index 69c42e54a4f..64f332e5e81 100644 --- a/src/devices/bus/sega8/sega8_slot.h +++ b/src/devices/bus/sega8/sega8_slot.h @@ -107,13 +107,13 @@ public: virtual ~sega8_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete() { update_names(SEGA8_CART_SLOT, "cartridge", "cart"); } + virtual void device_start() override; + virtual void device_config_complete() override { update_names(SEGA8_CART_SLOT, "cartridge", "cart"); } // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_cart_type(UINT8 *ROM, UINT32 len); @@ -129,18 +129,18 @@ public: void set_intf(const char * interface) { m_interface = interface; } void set_ext(const char * extensions) { m_extensions = extensions; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return m_must_be_loaded; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_extensions; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return m_must_be_loaded; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_extensions; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_cart); @@ -166,7 +166,7 @@ public: // construction/destruction sega8_card_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_config_complete() { update_names(SEGA8_CARD_SLOT, "card", "card"); } + virtual void device_config_complete() override { update_names(SEGA8_CARD_SLOT, "card", "card"); } }; diff --git a/src/devices/bus/sms_ctrl/graphic.h b/src/devices/bus/sms_ctrl/graphic.h index 852a6f7a71b..82d624c07b5 100644 --- a/src/devices/bus/sms_ctrl/graphic.h +++ b/src/devices/bus/sms_ctrl/graphic.h @@ -31,15 +31,15 @@ public: sms_graphic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); - virtual void peripheral_w(UINT8 data); + virtual UINT8 peripheral_r() override; + virtual void peripheral_w(UINT8 data) override; private: required_ioport m_buttons; diff --git a/src/devices/bus/sms_ctrl/joypad.h b/src/devices/bus/sms_ctrl/joypad.h index ed7b1141b03..a67dd5f78b0 100644 --- a/src/devices/bus/sms_ctrl/joypad.h +++ b/src/devices/bus/sms_ctrl/joypad.h @@ -31,14 +31,14 @@ public: sms_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); + virtual UINT8 peripheral_r() override; private: required_ioport m_joypad; diff --git a/src/devices/bus/sms_ctrl/lphaser.h b/src/devices/bus/sms_ctrl/lphaser.h index ed0687a9f6e..7d2f9ca1ed6 100644 --- a/src/devices/bus/sms_ctrl/lphaser.h +++ b/src/devices/bus/sms_ctrl/lphaser.h @@ -32,18 +32,18 @@ public: sms_light_phaser_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_CUSTOM_INPUT_MEMBER( th_pin_r ); DECLARE_INPUT_CHANGED_MEMBER( position_changed ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); + virtual UINT8 peripheral_r() override; private: required_ioport m_lphaser_pins; @@ -54,7 +54,7 @@ private: emu_timer *m_lphaser_timer; static const device_timer_id TIMER_LPHASER = 0; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void sensor_check(); int bright_aim_area( emu_timer *timer, int lgun_x, int lgun_y ); UINT16 screen_hpos_nonscaled(int scaled_hpos); diff --git a/src/devices/bus/sms_ctrl/multitap.h b/src/devices/bus/sms_ctrl/multitap.h index 9fc8de8b745..bf3e79e5616 100644 --- a/src/devices/bus/sms_ctrl/multitap.h +++ b/src/devices/bus/sms_ctrl/multitap.h @@ -34,12 +34,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); - virtual void peripheral_w(UINT8 data); + virtual UINT8 peripheral_r() override; + virtual void peripheral_w(UINT8 data) override; private: required_device<sms_control_port_device> m_subctrl1_port; diff --git a/src/devices/bus/sms_ctrl/paddle.h b/src/devices/bus/sms_ctrl/paddle.h index 984b5a87082..8e092d63afe 100644 --- a/src/devices/bus/sms_ctrl/paddle.h +++ b/src/devices/bus/sms_ctrl/paddle.h @@ -31,17 +31,17 @@ public: sms_paddle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_CUSTOM_INPUT_MEMBER( dir_pins_r ); DECLARE_CUSTOM_INPUT_MEMBER( tr_pin_r ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); + virtual UINT8 peripheral_r() override; private: required_ioport m_paddle_pins; diff --git a/src/devices/bus/sms_ctrl/rfu.h b/src/devices/bus/sms_ctrl/rfu.h index a27ef0aca02..adc9a3443ba 100644 --- a/src/devices/bus/sms_ctrl/rfu.h +++ b/src/devices/bus/sms_ctrl/rfu.h @@ -31,19 +31,19 @@ public: sms_rapid_fire_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER(th_pin_w); DECLARE_READ32_MEMBER(pixel_r); protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); - virtual void peripheral_w(UINT8 data); + virtual UINT8 peripheral_r() override; + virtual void peripheral_w(UINT8 data) override; private: required_ioport m_rfire_sw; diff --git a/src/devices/bus/sms_ctrl/smsctrl.h b/src/devices/bus/sms_ctrl/smsctrl.h index 950e620c99b..4cce2437149 100644 --- a/src/devices/bus/sms_ctrl/smsctrl.h +++ b/src/devices/bus/sms_ctrl/smsctrl.h @@ -80,7 +80,7 @@ public: //protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_sms_control_port_interface *m_device; diff --git a/src/devices/bus/sms_ctrl/sports.h b/src/devices/bus/sms_ctrl/sports.h index f303b140a5b..fe98c9e5e70 100644 --- a/src/devices/bus/sms_ctrl/sports.h +++ b/src/devices/bus/sms_ctrl/sports.h @@ -31,7 +31,7 @@ public: sms_sports_pad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_CUSTOM_INPUT_MEMBER( dir_pins_r ); DECLARE_CUSTOM_INPUT_MEMBER( th_pin_r ); @@ -39,11 +39,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); - virtual void peripheral_w(UINT8 data); + virtual UINT8 peripheral_r() override; + virtual void peripheral_w(UINT8 data) override; private: required_ioport m_sports_in; @@ -59,7 +59,7 @@ private: emu_timer *m_sportspad_timer; static const device_timer_id TIMER_SPORTSPAD = 0; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/devices/bus/sms_ctrl/sportsjp.h b/src/devices/bus/sms_ctrl/sportsjp.h index 082546221e6..c20f15bd845 100644 --- a/src/devices/bus/sms_ctrl/sportsjp.h +++ b/src/devices/bus/sms_ctrl/sportsjp.h @@ -36,16 +36,16 @@ public: sms_sports_pad_jp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; CUSTOM_INPUT_MEMBER( dir_pins_r ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_sms_control_port_interface overrides - virtual UINT8 peripheral_r(); + virtual UINT8 peripheral_r() override; private: required_ioport m_sports_jp_in; diff --git a/src/devices/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h index 2b8503da968..093bdc94485 100644 --- a/src/devices/bus/sms_exp/gender.h +++ b/src/devices/bus/sms_exp/gender.h @@ -38,12 +38,12 @@ public: virtual DECLARE_READ8_MEMBER(read_ram); virtual DECLARE_WRITE8_MEMBER(write_ram); - virtual int get_lphaser_xoffs(); + virtual int get_lphaser_xoffs() override; protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: required_device<sega8_cart_slot_device> m_subslot; diff --git a/src/devices/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h index 58d1a33228d..2d575b6da40 100644 --- a/src/devices/bus/sms_exp/smsexp.h +++ b/src/devices/bus/sms_exp/smsexp.h @@ -57,7 +57,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/bus/snes/bsx.h b/src/devices/bus/snes/bsx.h index a91e713560d..25a485e8335 100644 --- a/src/devices/bus/snes/bsx.h +++ b/src/devices/bus/snes/bsx.h @@ -38,9 +38,9 @@ public: sns_rom_bsx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -79,8 +79,8 @@ public: sns_rom_bsxlo_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -99,8 +99,8 @@ public: sns_rom_bsxhi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -120,8 +120,8 @@ public: sns_rom_bsmempak_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); diff --git a/src/devices/bus/snes/event.h b/src/devices/bus/snes/event.h index 1bd3e0c97e0..7841c12c6e1 100644 --- a/src/devices/bus/snes/event.h +++ b/src/devices/bus/snes/event.h @@ -17,16 +17,16 @@ public: sns_pfest94_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; required_device<upd7725_device> m_upd7725; required_ioport m_dsw; - virtual void speedup_addon_bios_access(); + virtual void speedup_addon_bios_access() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); diff --git a/src/devices/bus/snes/rom.h b/src/devices/bus/snes/rom.h index bdcbd8ed92c..f2a9f27f638 100644 --- a/src/devices/bus/snes/rom.h +++ b/src/devices/bus/snes/rom.h @@ -17,7 +17,7 @@ public: sns_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -33,8 +33,8 @@ public: sns_rom_obc1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // additional reading and writing virtual DECLARE_READ8_MEMBER(chip_read); @@ -57,8 +57,8 @@ public: sns_rom_pokemon_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(chip_read); // protection device @@ -75,8 +75,8 @@ public: sns_rom_tekken2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(chip_read); // protection device @@ -110,8 +110,8 @@ public: sns_rom_mcpirate1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -129,8 +129,8 @@ public: sns_rom_mcpirate2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -148,7 +148,7 @@ public: sns_rom_20col_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -184,8 +184,8 @@ public: sns_rom_bugs_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(chip_read); // protection device diff --git a/src/devices/bus/snes/rom21.h b/src/devices/bus/snes/rom21.h index a70d9fdc6c8..f91be3556f3 100644 --- a/src/devices/bus/snes/rom21.h +++ b/src/devices/bus/snes/rom21.h @@ -17,8 +17,8 @@ public: sns_rom21_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -34,8 +34,8 @@ public: sns_rom21_srtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(chip_read); diff --git a/src/devices/bus/snes/sa1.h b/src/devices/bus/snes/sa1.h index d388303f9f9..1ae93f78704 100644 --- a/src/devices/bus/snes/sa1.h +++ b/src/devices/bus/snes/sa1.h @@ -17,9 +17,9 @@ public: sns_sa1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); diff --git a/src/devices/bus/snes/sdd1.h b/src/devices/bus/snes/sdd1.h index be7604cff92..9a2643f206f 100644 --- a/src/devices/bus/snes/sdd1.h +++ b/src/devices/bus/snes/sdd1.h @@ -153,8 +153,8 @@ public: sns_rom_sdd1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); diff --git a/src/devices/bus/snes/sfx.h b/src/devices/bus/snes/sfx.h index 04a2313fd92..1f11caadb26 100644 --- a/src/devices/bus/snes/sfx.h +++ b/src/devices/bus/snes/sfx.h @@ -17,9 +17,9 @@ public: sns_rom_superfx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<superfx_device> m_superfx; diff --git a/src/devices/bus/snes/sgb.h b/src/devices/bus/snes/sgb.h index 01bfd6ea887..3bc55b5b973 100644 --- a/src/devices/bus/snes/sgb.h +++ b/src/devices/bus/snes/sgb.h @@ -23,9 +23,9 @@ public: sns_rom_sgb_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); diff --git a/src/devices/bus/snes/snes_slot.h b/src/devices/bus/snes/snes_slot.h index ab52e105e96..8b433d1128a 100644 --- a/src/devices/bus/snes/snes_slot.h +++ b/src/devices/bus/snes/snes_slot.h @@ -153,13 +153,13 @@ public: virtual ~base_sns_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; void get_cart_type_addon(UINT8 *ROM, UINT32 len, int &type, int &addon); UINT32 snes_skip_header(UINT8 *ROM, UINT32 snes_rom_size); @@ -171,16 +171,16 @@ public: void save_ram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); if (m_cart && m_cart->get_rtc_ram_size()) m_cart->save_rtc_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -216,8 +216,8 @@ class sns_cart_slot_device : public base_sns_cart_slot_device public: // construction/destruction sns_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const char *image_interface() const { return "snes_cart"; } - virtual const char *file_extensions() const { return "sfc"; } + virtual const char *image_interface() const override { return "snes_cart"; } + virtual const char *file_extensions() const override { return "sfc"; } }; // ======================> sns_sufami_cart_slot_device @@ -227,9 +227,9 @@ class sns_sufami_cart_slot_device : public base_sns_cart_slot_device public: // construction/destruction sns_sufami_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const char *image_interface() const { return "st_cart"; } - virtual const char *file_extensions() const { return "st"; } - virtual bool must_be_loaded() const { return 0; } + virtual const char *image_interface() const override { return "st_cart"; } + virtual const char *file_extensions() const override { return "st"; } + virtual bool must_be_loaded() const override { return 0; } }; // ======================> sns_sufami_cart_slot_device @@ -239,9 +239,9 @@ class sns_bsx_cart_slot_device : public base_sns_cart_slot_device public: // construction/destruction sns_bsx_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const char *image_interface() const { return "bspack"; } - virtual const char *file_extensions() const { return "bs"; } - virtual bool must_be_loaded() const { return 0; } + virtual const char *image_interface() const override { return "bspack"; } + virtual const char *file_extensions() const override { return "bs"; } + virtual bool must_be_loaded() const override { return 0; } }; diff --git a/src/devices/bus/snes/spc7110.h b/src/devices/bus/snes/spc7110.h index 128c3ecc5a8..8bc902c3940 100644 --- a/src/devices/bus/snes/spc7110.h +++ b/src/devices/bus/snes/spc7110.h @@ -93,7 +93,7 @@ public: sns_rom_spc7110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -207,7 +207,7 @@ public: sns_rom_spc7110rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing diff --git a/src/devices/bus/snes/sufami.h b/src/devices/bus/snes/sufami.h index c56f566777f..274a8a15238 100644 --- a/src/devices/bus/snes/sufami.h +++ b/src/devices/bus/snes/sufami.h @@ -16,8 +16,8 @@ public: sns_rom_sufami_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); @@ -39,7 +39,7 @@ public: sns_rom_strom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // additional reading and writing virtual DECLARE_READ8_MEMBER(read_l); diff --git a/src/devices/bus/snes/upd.h b/src/devices/bus/snes/upd.h index 28fdf077f11..b22dead362b 100644 --- a/src/devices/bus/snes/upd.h +++ b/src/devices/bus/snes/upd.h @@ -18,9 +18,9 @@ public: sns_rom20_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void speedup_addon_bios_access(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void speedup_addon_bios_access() override; required_device<upd7725_device> m_upd7725; @@ -45,9 +45,9 @@ public: sns_rom21_necdsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void speedup_addon_bios_access(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void speedup_addon_bios_access() override; required_device<upd7725_device> m_upd7725; @@ -71,8 +71,8 @@ public: sns_rom_setadsp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void speedup_addon_bios_access(); + virtual void device_start() override; + virtual void speedup_addon_bios_access() override; required_device<upd96050_device> m_upd96050; @@ -96,7 +96,7 @@ public: sns_rom_seta10dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; // ======================> sns_rom_seta11dsp_device [Faster CPU than ST010] @@ -108,7 +108,7 @@ public: sns_rom_seta11dsp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -130,8 +130,8 @@ public: sns_rom20_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom20_necdsp1b_legacy_device : public sns_rom20_necdsp_device @@ -141,8 +141,8 @@ public: sns_rom20_necdsp1b_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom20_necdsp2_legacy_device : public sns_rom20_necdsp_device @@ -152,8 +152,8 @@ public: sns_rom20_necdsp2_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom20_necdsp3_legacy_device : public sns_rom20_necdsp_device @@ -163,8 +163,8 @@ public: sns_rom20_necdsp3_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom20_necdsp4_legacy_device : public sns_rom20_necdsp_device @@ -174,8 +174,8 @@ public: sns_rom20_necdsp4_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom21_necdsp1_legacy_device : public sns_rom21_necdsp_device @@ -185,8 +185,8 @@ public: sns_rom21_necdsp1_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom_seta10dsp_legacy_device : public sns_rom_setadsp_device @@ -196,8 +196,8 @@ public: sns_rom_seta10dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; class sns_rom_seta11dsp_legacy_device : public sns_rom_setadsp_device @@ -207,8 +207,8 @@ public: sns_rom_seta11dsp_legacy_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; }; extern const device_type SNS_LOROM_NECDSP1_LEG; diff --git a/src/devices/bus/snes_ctrl/bcbattle.h b/src/devices/bus/snes_ctrl/bcbattle.h index 120c289c894..d336c31b6a7 100644 --- a/src/devices/bus/snes_ctrl/bcbattle.h +++ b/src/devices/bus/snes_ctrl/bcbattle.h @@ -29,17 +29,17 @@ public: // construction/destruction snes_bcbattle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual UINT8 read_pin4(); - virtual void write_strobe(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual void write_strobe(UINT8 data) override; + virtual void port_poll() override; int read_current_bit(); diff --git a/src/devices/bus/snes_ctrl/ctrl.h b/src/devices/bus/snes_ctrl/ctrl.h index d2ef092e4e7..94a6a7b8ce8 100644 --- a/src/devices/bus/snes_ctrl/ctrl.h +++ b/src/devices/bus/snes_ctrl/ctrl.h @@ -69,7 +69,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_snes_control_port_interface *m_device; }; diff --git a/src/devices/bus/snes_ctrl/joypad.h b/src/devices/bus/snes_ctrl/joypad.h index 2133f396d0f..8daa922f20a 100644 --- a/src/devices/bus/snes_ctrl/joypad.h +++ b/src/devices/bus/snes_ctrl/joypad.h @@ -29,17 +29,17 @@ public: snes_joypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 read_pin4(); - virtual void write_strobe(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual void write_strobe(UINT8 data) override; + virtual void port_poll() override; private: required_ioport m_joypad; diff --git a/src/devices/bus/snes_ctrl/miracle.h b/src/devices/bus/snes_ctrl/miracle.h index 2a814050593..a89b41accaf 100644 --- a/src/devices/bus/snes_ctrl/miracle.h +++ b/src/devices/bus/snes_ctrl/miracle.h @@ -33,13 +33,13 @@ public: // construction/destruction snes_miracle_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual machine_config_constructor device_mconfig_additions() const override; // serial overrides - virtual void rcv_complete(); // Rx completed receiving byte - virtual void tra_complete(); // Tx completed sending byte - virtual void tra_callback(); // Tx send bit + virtual void rcv_complete() override; // Rx completed receiving byte + virtual void tra_complete() override; // Tx completed sending byte + virtual void tra_callback() override; // Tx send bit void xmit_char(UINT8 data); @@ -47,12 +47,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - UINT8 read_pin4(); - void write_pin6(UINT8 data); - void write_strobe(UINT8 data); + UINT8 read_pin4() override; + void write_pin6(UINT8 data) override; + void write_strobe(UINT8 data) override; static const device_timer_id TIMER_STROBE_ON = 0; emu_timer *strobe_timer; diff --git a/src/devices/bus/snes_ctrl/mouse.h b/src/devices/bus/snes_ctrl/mouse.h index 56608e40992..53602b96be3 100644 --- a/src/devices/bus/snes_ctrl/mouse.h +++ b/src/devices/bus/snes_ctrl/mouse.h @@ -29,17 +29,17 @@ public: snes_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 read_pin4(); - virtual void write_strobe(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual void write_strobe(UINT8 data) override; + virtual void port_poll() override; private: required_ioport m_buttons; diff --git a/src/devices/bus/snes_ctrl/multitap.h b/src/devices/bus/snes_ctrl/multitap.h index 1720fe6280e..e978a9d13ca 100644 --- a/src/devices/bus/snes_ctrl/multitap.h +++ b/src/devices/bus/snes_ctrl/multitap.h @@ -29,20 +29,20 @@ public: snes_multitap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 read_pin4(); - virtual UINT8 read_pin5(); - virtual void write_strobe(UINT8 data); - virtual void write_pin6(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual UINT8 read_pin5() override; + virtual void write_strobe(UINT8 data) override; + virtual void write_pin6(UINT8 data) override; + virtual void port_poll() override; private: required_device<snes_control_port_device> m_port1; diff --git a/src/devices/bus/snes_ctrl/pachinko.h b/src/devices/bus/snes_ctrl/pachinko.h index ae47adc40b4..149d5775157 100644 --- a/src/devices/bus/snes_ctrl/pachinko.h +++ b/src/devices/bus/snes_ctrl/pachinko.h @@ -29,17 +29,17 @@ public: snes_pachinko_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 read_pin4(); - virtual void write_strobe(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual void write_strobe(UINT8 data) override; + virtual void port_poll() override; private: required_ioport m_dial; diff --git a/src/devices/bus/snes_ctrl/sscope.h b/src/devices/bus/snes_ctrl/sscope.h index a207a29d9a6..064ee0c941d 100644 --- a/src/devices/bus/snes_ctrl/sscope.h +++ b/src/devices/bus/snes_ctrl/sscope.h @@ -29,17 +29,17 @@ public: snes_sscope_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 read_pin4(); - virtual void write_strobe(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual void write_strobe(UINT8 data) override; + virtual void port_poll() override; private: required_ioport m_buttons; diff --git a/src/devices/bus/snes_ctrl/twintap.h b/src/devices/bus/snes_ctrl/twintap.h index 4474ec1e6da..5adf0bf1cc1 100644 --- a/src/devices/bus/snes_ctrl/twintap.h +++ b/src/devices/bus/snes_ctrl/twintap.h @@ -29,17 +29,17 @@ public: snes_twintap_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sms_control_port_interface overrides - virtual UINT8 read_pin4(); - virtual void write_strobe(UINT8 data); - virtual void port_poll(); + virtual UINT8 read_pin4() override; + virtual void write_strobe(UINT8 data) override; + virtual void port_poll() override; private: required_ioport m_inputs; diff --git a/src/devices/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h index c2a398401d5..e48e9efe3c8 100644 --- a/src/devices/bus/spc1000/exp.h +++ b/src/devices/bus/spc1000/exp.h @@ -29,7 +29,7 @@ public: virtual ~spc1000_exp_device(); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual DECLARE_READ8_MEMBER(read); diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h index 4d384e2ee44..6952e8d2b6c 100644 --- a/src/devices/bus/spc1000/fdd.h +++ b/src/devices/bus/spc1000/fdd.h @@ -22,13 +22,13 @@ public: spc1000_fdd_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; public: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); @@ -54,7 +54,7 @@ private: UINT8 m_i8255_1_pc; UINT8 m_i8255_portb; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; static const device_timer_id TIMER_TC = 0; }; diff --git a/src/devices/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h index d7311f8c104..aea48bf478e 100644 --- a/src/devices/bus/spc1000/vdp.h +++ b/src/devices/bus/spc1000/vdp.h @@ -21,12 +21,12 @@ public: spc1000_vdp_exp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; public: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); diff --git a/src/devices/bus/ti99_peb/bwg.h b/src/devices/bus/ti99_peb/bwg.h index a1012e06257..2b3af9f6b58 100644 --- a/src/devices/bus/ti99_peb/bwg.h +++ b/src/devices/bus/ti99_peb/bwg.h @@ -40,16 +40,16 @@ public: DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); protected: - void device_start(); - void device_reset(); - void device_config_complete(); + void device_start() override; + void device_reset() override; + void device_config_complete() override; - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + const rom_entry *device_rom_region() const override; + machine_config_constructor device_mconfig_additions() const override; + ioport_constructor device_input_ports() const override; private: - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // Debugger accessors void debug_read(offs_t offset, UINT8* value); diff --git a/src/devices/bus/ti99_peb/evpc.h b/src/devices/bus/ti99_peb/evpc.h index 86ec224246e..6a1801b35f3 100644 --- a/src/devices/bus/ti99_peb/evpc.h +++ b/src/devices/bus/ti99_peb/evpc.h @@ -40,16 +40,16 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual void device_stop(void); + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual void device_stop(void) override; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; - void nvram_default(); - void nvram_read(emu_file &file); - void nvram_write(emu_file &file); + void nvram_default() override; + void nvram_read(emu_file &file) override; + void nvram_write(emu_file &file) override; private: UINT8* m_dsrrom; diff --git a/src/devices/bus/ti99_peb/hfdc.h b/src/devices/bus/ti99_peb/hfdc.h index a49e6062c44..34e96a26b81 100644 --- a/src/devices/bus/ti99_peb/hfdc.h +++ b/src/devices/bus/ti99_peb/hfdc.h @@ -48,16 +48,16 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: - void device_config_complete(); + void device_config_complete() override; private: - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - void device_start(); - void device_reset(); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + void device_start() override; + void device_reset() override; - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; - ioport_constructor device_input_ports() const; + const rom_entry *device_rom_region() const override; + machine_config_constructor device_mconfig_additions() const override; + ioport_constructor device_input_ports() const override; // Debug accessors void debug_read(offs_t offset, UINT8* value); diff --git a/src/devices/bus/ti99_peb/horizon.h b/src/devices/bus/ti99_peb/horizon.h index f1241c001ad..a196fef2de7 100644 --- a/src/devices/bus/ti99_peb/horizon.h +++ b/src/devices/bus/ti99_peb/horizon.h @@ -32,15 +32,15 @@ public: DECLARE_INPUT_CHANGED_MEMBER( ks_changed ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; - void nvram_default(); - void nvram_read(emu_file &file); - void nvram_write(emu_file &file); + void nvram_default() override; + void nvram_read(emu_file &file) override; + void nvram_write(emu_file &file) override; private: void setbit(int& page, int pattern, bool set); diff --git a/src/devices/bus/ti99_peb/hsgpl.h b/src/devices/bus/ti99_peb/hsgpl.h index bb87cc77a38..7b0fd9c307d 100644 --- a/src/devices/bus/ti99_peb/hsgpl.h +++ b/src/devices/bus/ti99_peb/hsgpl.h @@ -33,13 +33,13 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual void device_stop(void); - virtual void device_config_complete(void); - virtual ioport_constructor device_input_ports() const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual void device_stop(void) override; + virtual void device_config_complete(void) override; + virtual ioport_constructor device_input_ports() const override; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; private: at29c040a_device* m_dsr_eeprom; diff --git a/src/devices/bus/ti99_peb/memex.h b/src/devices/bus/ti99_peb/memex.h index bccc4da161c..829e8d1fae1 100644 --- a/src/devices/bus/ti99_peb/memex.h +++ b/src/devices/bus/ti99_peb/memex.h @@ -29,10 +29,10 @@ public: DECLARE_WRITE8_MEMBER(cruwrite) { }; protected: - virtual void device_start(); - virtual void device_reset(); - virtual ioport_constructor device_input_ports() const; - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; + virtual const rom_entry *device_rom_region() const override; private: bool access_enabled(offs_t offset); diff --git a/src/devices/bus/ti99_peb/myarcmem.h b/src/devices/bus/ti99_peb/myarcmem.h index a28c4d989b2..4d73438fc74 100644 --- a/src/devices/bus/ti99_peb/myarcmem.h +++ b/src/devices/bus/ti99_peb/myarcmem.h @@ -29,10 +29,10 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual const rom_entry *device_rom_region(void) const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual const rom_entry *device_rom_region(void) const override; + virtual ioport_constructor device_input_ports() const override; private: int get_base(int offset); diff --git a/src/devices/bus/ti99_peb/pcode.h b/src/devices/bus/ti99_peb/pcode.h index 4630d127f13..e89b00700c4 100644 --- a/src/devices/bus/ti99_peb/pcode.h +++ b/src/devices/bus/ti99_peb/pcode.h @@ -34,12 +34,12 @@ public: DECLARE_INPUT_CHANGED_MEMBER( switch_changed ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; private: ti99_grom_device* m_grom[8]; diff --git a/src/devices/bus/ti99_peb/peribox.h b/src/devices/bus/ti99_peb/peribox.h index 5ab71620f7b..d41df85e9ea 100644 --- a/src/devices/bus/ti99_peb/peribox.h +++ b/src/devices/bus/ti99_peb/peribox.h @@ -61,10 +61,10 @@ public: void set_genmod(bool set); protected: - virtual void device_start(void); - virtual void device_config_complete(void); + virtual void device_start(void) override; + virtual void device_config_complete(void) override; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // Next three methods call back the console devcb_write_line m_console_inta; // INTA line (Box to console) @@ -101,7 +101,7 @@ public: peribox_ev_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; /* @@ -113,7 +113,7 @@ public: peribox_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; /* @@ -125,7 +125,7 @@ public: peribox_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; /* @@ -137,7 +137,7 @@ public: peribox_998_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; /***************************************************************************** @@ -172,8 +172,8 @@ public: device_t* get_drive(const char* name); protected: - void device_start(void); - void device_config_complete(void); + void device_start(void) override; + void device_config_complete(void) override; private: int get_index_from_tagname(); diff --git a/src/devices/bus/ti99_peb/samsmem.h b/src/devices/bus/ti99_peb/samsmem.h index 0dd5e959755..ef5b2c2be1b 100644 --- a/src/devices/bus/ti99_peb/samsmem.h +++ b/src/devices/bus/ti99_peb/samsmem.h @@ -31,9 +31,9 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual const rom_entry *device_rom_region(void) const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual const rom_entry *device_rom_region(void) const override; private: UINT8* m_ram; diff --git a/src/devices/bus/ti99_peb/spchsyn.h b/src/devices/bus/ti99_peb/spchsyn.h index 0984cf4de2e..9a9729153ec 100644 --- a/src/devices/bus/ti99_peb/spchsyn.h +++ b/src/devices/bus/ti99_peb/spchsyn.h @@ -37,11 +37,11 @@ public: DECLARE_WRITE8_MEMBER( spchrom_read_and_branch ); protected: - virtual void device_start(); - virtual void device_reset(void); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_reset(void) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_config_complete() override; private: cd2501e_device *m_vsp; diff --git a/src/devices/bus/ti99_peb/ti_32kmem.h b/src/devices/bus/ti99_peb/ti_32kmem.h index 5e0e1f2c5cf..699f10c4266 100644 --- a/src/devices/bus/ti99_peb/ti_32kmem.h +++ b/src/devices/bus/ti99_peb/ti_32kmem.h @@ -27,8 +27,8 @@ public: DECLARE_WRITE8_MEMBER(cruwrite) { }; protected: - virtual void device_start(); - virtual const rom_entry *device_rom_region() const; + virtual void device_start() override; + virtual const rom_entry *device_rom_region() const override; private: UINT8* m_ram_ptr; }; diff --git a/src/devices/bus/ti99_peb/ti_fdc.h b/src/devices/bus/ti99_peb/ti_fdc.h index 9fedb1c2590..204d707147b 100644 --- a/src/devices/bus/ti99_peb/ti_fdc.h +++ b/src/devices/bus/ti99_peb/ti_fdc.h @@ -40,14 +40,14 @@ public: // bool dvena_r(); protected: - void device_start(); - void device_reset(); - void device_config_complete(); + void device_start() override; + void device_reset() override; + void device_config_complete() override; - const rom_entry *device_rom_region() const; - machine_config_constructor device_mconfig_additions() const; + const rom_entry *device_rom_region() const override; + machine_config_constructor device_mconfig_additions() const override; - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: // Wait state logic diff --git a/src/devices/bus/ti99_peb/ti_rs232.h b/src/devices/bus/ti99_peb/ti_rs232.h index 516cd2cde1a..a46f3eee7a6 100644 --- a/src/devices/bus/ti99_peb/ti_rs232.h +++ b/src/devices/bus/ti99_peb/ti_rs232.h @@ -48,12 +48,12 @@ public: DECLARE_WRITE_LINE_MEMBER( senila ); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual void device_stop(void); - virtual const rom_entry *device_rom_region(void) const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual void device_stop(void) override; + virtual const rom_entry *device_rom_region(void) const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; private: void incoming_dtr(int uartind, line_state value); @@ -120,21 +120,21 @@ class ti_rs232_attached_device : public device_t, public device_image_interface public: ti_rs232_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - iodevice_t image_type() const { return IO_SERIAL; } - bool is_readable() const { return true; } - bool is_writeable() const { return true; } - bool is_creatable() const { return true; } - bool must_be_loaded() const { return false; } - bool is_reset_on_load() const { return false; } - const char *image_interface() const { return ""; } - const char *file_extensions() const { return ""; } - const option_guide *create_option_guide() const { return nullptr; } + iodevice_t image_type() const override { return IO_SERIAL; } + bool is_readable() const override { return true; } + bool is_writeable() const override { return true; } + bool is_creatable() const override { return true; } + bool must_be_loaded() const override { return false; } + bool is_reset_on_load() const override { return false; } + const char *image_interface() const override { return ""; } + const char *file_extensions() const override { return ""; } + const option_guide *create_option_guide() const override { return nullptr; } protected: - virtual void device_start(void); - bool call_load(); - void call_unload(); - virtual void device_config_complete(); + virtual void device_start(void) override; + bool call_load() override; + void call_unload() override; + virtual void device_config_complete() override; private: int get_index_from_tagname(); @@ -148,21 +148,21 @@ class ti_pio_attached_device : public device_t, public device_image_interface public: ti_pio_attached_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - iodevice_t image_type() const { return IO_PARALLEL; } - bool is_readable() const { return true; } - bool is_writeable() const { return true; } - bool is_creatable() const { return true; } - bool must_be_loaded() const { return false; } - bool is_reset_on_load() const { return false; } - const char *image_interface() const { return ""; } - const char *file_extensions() const { return ""; } - const option_guide *create_option_guide() const { return nullptr; } + iodevice_t image_type() const override { return IO_PARALLEL; } + bool is_readable() const override { return true; } + bool is_writeable() const override { return true; } + bool is_creatable() const override { return true; } + bool must_be_loaded() const override { return false; } + bool is_reset_on_load() const override { return false; } + const char *image_interface() const override { return ""; } + const char *file_extensions() const override { return ""; } + const option_guide *create_option_guide() const override { return nullptr; } protected: - virtual void device_start(void); - bool call_load(); - void call_unload(); - virtual void device_config_complete(); + virtual void device_start(void) override; + bool call_load() override; + void call_unload() override; + virtual void device_config_complete() override; }; #endif diff --git a/src/devices/bus/ti99_peb/tn_ide.h b/src/devices/bus/ti99_peb/tn_ide.h index bb9371e4cfb..42a9c559c78 100644 --- a/src/devices/bus/ti99_peb/tn_ide.h +++ b/src/devices/bus/ti99_peb/tn_ide.h @@ -38,11 +38,11 @@ public: DECLARE_WRITE_LINE_MEMBER(ide_interrupt_callback); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; private: rtc65271_device* m_rtc; diff --git a/src/devices/bus/ti99_peb/tn_usbsm.h b/src/devices/bus/ti99_peb/tn_usbsm.h index 951565b0367..c2fca9f31ab 100644 --- a/src/devices/bus/ti99_peb/tn_usbsm.h +++ b/src/devices/bus/ti99_peb/tn_usbsm.h @@ -32,10 +32,10 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; private: diff --git a/src/devices/bus/ti99x/990_dk.h b/src/devices/bus/ti99x/990_dk.h index 2f83660ae75..ffb7f79784a 100644 --- a/src/devices/bus/ti99x/990_dk.h +++ b/src/devices/bus/ti99x/990_dk.h @@ -24,8 +24,8 @@ public: } private: - void device_start(void); - void device_reset(void); + void device_start(void) override; + void device_reset(void) override; void set_interrupt_line(); int read_id(int unit, int head, int *cylinder_id, int *sector_id); diff --git a/src/devices/bus/ti99x/990_hd.h b/src/devices/bus/ti99x/990_hd.h index 4c5e85f928d..f6468a807f9 100644 --- a/src/devices/bus/ti99x/990_hd.h +++ b/src/devices/bus/ti99x/990_hd.h @@ -26,8 +26,8 @@ public: DECLARE_DEVICE_IMAGE_UNLOAD_MEMBER( ti990_hd ); protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; int get_id_from_device( device_t *device ); diff --git a/src/devices/bus/ti99x/990_tap.cpp b/src/devices/bus/ti99x/990_tap.cpp index 978931d35de..3f6e48ddc52 100644 --- a/src/devices/bus/ti99x/990_tap.cpp +++ b/src/devices/bus/ti99x/990_tap.cpp @@ -895,23 +895,23 @@ public: ti990_tape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual iodevice_t image_type() const { return IO_MAGTAPE; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return nullptr; } - virtual const char *file_extensions() const { return "tap"; } - virtual const option_guide *create_option_guide() const { return nullptr; } - - virtual bool call_load(); - virtual void call_unload(); + virtual iodevice_t image_type() const override { return IO_MAGTAPE; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return nullptr; } + virtual const char *file_extensions() const override { return "tap"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + + virtual bool call_load() override; + virtual void call_unload() override; protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; private: int tape_get_id(); }; diff --git a/src/devices/bus/ti99x/990_tap.h b/src/devices/bus/ti99x/990_tap.h index 09e2e30da0a..6622e2af587 100644 --- a/src/devices/bus/ti99x/990_tap.h +++ b/src/devices/bus/ti99x/990_tap.h @@ -37,9 +37,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_config_complete() override; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: int cur_tape_unit(); diff --git a/src/devices/bus/ti99x/998board.h b/src/devices/bus/ti99x/998board.h index 3412a00d23e..513849a4cb4 100644 --- a/src/devices/bus/ti99x/998board.h +++ b/src/devices/bus/ti99x/998board.h @@ -127,7 +127,7 @@ public: ti998_oso_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); - void device_start(); + void device_start() override; private: UINT8 m_data; @@ -162,10 +162,10 @@ public: DECLARE_WRITE8_MEMBER( spchrom_read_and_branch ); protected: - virtual void device_start(); - virtual void device_reset(void); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset(void) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; private: tms5220_device *m_vsp; @@ -209,9 +209,9 @@ public: void clock_in(int state); protected: - void device_start(void); - void device_reset(void); - machine_config_constructor device_mconfig_additions() const; + void device_start(void) override; + void device_reset(void) override; + machine_config_constructor device_mconfig_additions() const override; private: bool access_logical_r(address_space& space, offs_t offset, UINT8 *value, UINT8 mem_mask ); diff --git a/src/devices/bus/ti99x/datamux.h b/src/devices/bus/ti99x/datamux.h index 577da6da6ac..a93fd6b4740 100644 --- a/src/devices/bus/ti99x/datamux.h +++ b/src/devices/bus/ti99x/datamux.h @@ -84,10 +84,10 @@ public: protected: /* Constructor */ - void device_start(); - void device_stop(); - void device_reset(); - ioport_constructor device_input_ports() const; + void device_start() override; + void device_stop() override; + void device_reset() override; + ioport_constructor device_input_ports() const override; private: // Keeps the address space pointer diff --git a/src/devices/bus/ti99x/genboard.h b/src/devices/bus/ti99x/genboard.h index d9905ba9168..2248c64f9fe 100644 --- a/src/devices/bus/ti99x/genboard.h +++ b/src/devices/bus/ti99x/genboard.h @@ -34,9 +34,9 @@ public: line_state left_button(); // left button is not connected to the V9938 but to a TMS9901 pin protected: - virtual void device_start(); - virtual void device_reset(); - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual ioport_constructor device_input_ports() const override; private: v9938_device* m_v9938; @@ -66,11 +66,11 @@ public: template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<geneve_keyboard_device &>(device).m_interrupt.set_callback(object); } protected: - void device_start(); - void device_reset(); - ioport_constructor device_input_ports() const; + void device_start() override; + void device_reset() override; + ioport_constructor device_input_ports() const override; devcb_write_line m_interrupt; // Keyboard interrupt to console - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void post_in_key_queue(int keycode); @@ -134,8 +134,8 @@ public: template<class _Object> static devcb_base &static_set_ready_callback(device_t &device, _Object object) { return downcast<geneve_mapper_device &>(device).m_ready.set_callback(object); } protected: - void device_start(); - void device_reset(); + void device_start() override; + void device_reset() override; private: // GROM simulation diff --git a/src/devices/bus/ti99x/grom.h b/src/devices/bus/ti99x/grom.h index 19a9a973b81..a3129b6997f 100644 --- a/src/devices/bus/ti99x/grom.h +++ b/src/devices/bus/ti99x/grom.h @@ -43,8 +43,8 @@ public: template<class _Object> static devcb_base &set_ready_wr_callback(device_t &device, _Object object) { return downcast<ti99_grom_device &>(device).m_gromready.set_callback(object); } - DECLARE_READ8Z_MEMBER(readz); - DECLARE_WRITE8_MEMBER(write); + DECLARE_READ8Z_MEMBER(readz) override; + DECLARE_WRITE8_MEMBER(write) override; private: // Is this a GRAM (never seen actually, but obviously planned) @@ -95,9 +95,9 @@ private: // CPU into wait state mode. A timer is set to raise READY again. void clear_ready(); - virtual void device_start(void); - virtual void device_reset(void); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; }; diff --git a/src/devices/bus/ti99x/gromport.h b/src/devices/bus/ti99x/gromport.h index 880f5d95d64..bbec430d056 100644 --- a/src/devices/bus/ti99x/gromport.h +++ b/src/devices/bus/ti99x/gromport.h @@ -38,10 +38,10 @@ public: UINT16 get_grom_mask() { return m_grommask; } protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; + virtual ioport_constructor device_input_ports() const override; private: ti99_cartridge_connector_device* m_connector; @@ -87,28 +87,28 @@ public: UINT16 grom_mask(); protected: - virtual void device_start() { }; - virtual void device_config_complete(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry* device_rom_region() const; + virtual void device_start() override { }; + virtual void device_config_complete() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry* device_rom_region() const override; // Image handling: implementation of methods which are abstract in the parent - bool call_load(); - void call_unload(); - bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + bool call_load() override; + void call_unload() override; + bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; void prepare_cartridge(); // device_image_interface - iodevice_t image_type() const { return IO_CARTSLOT; } - bool is_readable() const { return true; } - bool is_writeable() const { return false; } - bool is_creatable() const { return false; } - bool must_be_loaded() const { return false; } - bool is_reset_on_load() const { return false; } - const char *image_interface() const { return "ti99_cart"; } - const char *file_extensions() const { return "rpk"; } - const option_guide *create_option_guide() const { return nullptr; } + iodevice_t image_type() const override { return IO_CARTSLOT; } + bool is_readable() const override { return true; } + bool is_writeable() const override { return false; } + bool is_creatable() const override { return false; } + bool must_be_loaded() const override { return false; } + bool is_reset_on_load() const override { return false; } + const char *image_interface() const override { return "ti99_cart"; } + const char *file_extensions() const override { return "rpk"; } + const option_guide *create_option_guide() const override { return nullptr; } private: bool m_softlist; @@ -145,7 +145,7 @@ public: protected: ti99_cartridge_connector_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void device_config_complete(); + virtual void device_config_complete() override; gromport_device* m_gromport; }; @@ -164,9 +164,9 @@ public: DECLARE_WRITE8_MEMBER(cruwrite); protected: - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: ti99_cartridge_device *m_cartridge; @@ -191,14 +191,14 @@ public: DECLARE_READ8Z_MEMBER(crureadz); DECLARE_WRITE8_MEMBER(cruwrite); - void insert(int index, ti99_cartridge_device* cart); - void remove(int index); + void insert(int index, ti99_cartridge_device* cart) override; + void remove(int index) override; protected: - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; private: int m_active_slot; @@ -224,22 +224,22 @@ public: DECLARE_READ8Z_MEMBER(crureadz); DECLARE_WRITE8_MEMBER(cruwrite); - void insert(int index, ti99_cartridge_device* cart); - void remove(int index); + void insert(int index, ti99_cartridge_device* cart) override; + void remove(int index) override; DECLARE_INPUT_CHANGED_MEMBER( gk_changed ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry* device_rom_region() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry* device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; // device_nvram_interface - void nvram_default(); - void nvram_read(emu_file &file); - void nvram_write(emu_file &file); + void nvram_default() override; + void nvram_read(emu_file &file) override; + void nvram_write(emu_file &file) override; private: int m_gk_switch[6]; // Used to cache the switch settings. diff --git a/src/devices/bus/ti99x/handset.h b/src/devices/bus/ti99x/handset.h index ccecd741034..17b2eac8190 100644 --- a/src/devices/bus/ti99x/handset.h +++ b/src/devices/bus/ti99x/handset.h @@ -29,17 +29,17 @@ class ti99_handset_device : public joyport_attached_device public: ti99_handset_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - UINT8 read_dev(); - void write_dev(UINT8 data); + UINT8 read_dev() override; + void write_dev(UINT8 data) override; - void pulse_clock(); + void pulse_clock() override; protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual ioport_constructor device_input_ports() const; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual ioport_constructor device_input_ports() const override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void do_task(); @@ -74,13 +74,13 @@ class ti99_twin_joystick : public joyport_attached_device public: ti99_twin_joystick(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); DECLARE_READ8_MEMBER( read ); - virtual void device_start(void); + virtual void device_start(void) override; - UINT8 read_dev(); - void write_dev(UINT8 data); + UINT8 read_dev() override; + void write_dev(UINT8 data) override; protected: - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; private: // Which joystick is selected? diff --git a/src/devices/bus/ti99x/joyport.h b/src/devices/bus/ti99x/joyport.h index 5344b62fa36..82129db726e 100644 --- a/src/devices/bus/ti99x/joyport.h +++ b/src/devices/bus/ti99x/joyport.h @@ -41,7 +41,7 @@ public: virtual void pulse_clock() { }; protected: - virtual void device_config_complete(); + virtual void device_config_complete() override; joyport_device* m_joyport; }; @@ -60,8 +60,8 @@ public: template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<joyport_device &>(device).m_interrupt.set_callback(object); } protected: - void device_start(); - void device_config_complete(); + void device_start() override; + void device_config_complete() override; private: devcb_write_line m_interrupt; diff --git a/src/devices/bus/ti99x/mecmouse.h b/src/devices/bus/ti99x/mecmouse.h index 8a915b681ab..37390a7461c 100644 --- a/src/devices/bus/ti99x/mecmouse.h +++ b/src/devices/bus/ti99x/mecmouse.h @@ -24,14 +24,14 @@ class mecmouse_device : public joyport_attached_device public: mecmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - UINT8 read_dev(); - void write_dev(UINT8 data); + UINT8 read_dev() override; + void write_dev(UINT8 data) override; protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual ioport_constructor device_input_ports() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: int m_last_select; diff --git a/src/devices/bus/ti99x/videowrp.h b/src/devices/bus/ti99x/videowrp.h index f45cfabc865..2544b8de98a 100644 --- a/src/devices/bus/ti99x/videowrp.h +++ b/src/devices/bus/ti99x/videowrp.h @@ -29,10 +29,10 @@ protected: /* Constructor */ ti_video_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void device_start(void); - virtual void device_reset(void); - virtual DECLARE_READ8Z_MEMBER(readz) { }; - virtual DECLARE_WRITE8_MEMBER(write) { }; + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual DECLARE_READ8Z_MEMBER(readz) override { }; + virtual DECLARE_WRITE8_MEMBER(write) override { }; }; /* @@ -45,7 +45,7 @@ public: DECLARE_READ8Z_MEMBER(readz); DECLARE_WRITE8_MEMBER(write); - void reset_vdp(int state) { m_tms9928a->reset_line(state); } + void reset_vdp(int state) override { m_tms9928a->reset_line(state); } }; /* @@ -60,10 +60,10 @@ public: DECLARE_WRITE8_MEMBER(write); DECLARE_READ16_MEMBER(read16); DECLARE_WRITE16_MEMBER(write16); - void reset_vdp(int state) { m_v9938->reset_line(state); } + void reset_vdp(int state) override { m_v9938->reset_line(state); } protected: - virtual void device_start(void); + virtual void device_start(void) override; v9938_device *m_v9938; }; @@ -96,7 +96,7 @@ public: template<class _Object> static devcb_base &static_set_int_callback(device_t &device, _Object object) { return downcast<ti_sound_system_device &>(device).m_console_ready.set_callback(object); } protected: - virtual void device_start(void); + virtual void device_start(void) override; virtual machine_config_constructor device_mconfig_additions() const =0; private: @@ -113,7 +113,7 @@ public: ti_sound_sn94624_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; /* @@ -125,7 +125,7 @@ public: ti_sound_sn76496_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/devices/bus/tiki100/8088.h b/src/devices/bus/tiki100/8088.h index 6bfa5e723bc..7ce0fe64776 100644 --- a/src/devices/bus/tiki100/8088.h +++ b/src/devices/bus/tiki100/8088.h @@ -31,20 +31,20 @@ public: tiki100_8088_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_tiki100bus_card_interface overrides - virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data); - virtual void iorq_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data) override; + virtual void iorq_w(address_space &space, offs_t offset, UINT8 data) override; private: required_device<i8088_cpu_device> m_maincpu; diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h index e41b18e7831..511d449beea 100644 --- a/src/devices/bus/tiki100/exp.h +++ b/src/devices/bus/tiki100/exp.h @@ -113,13 +113,13 @@ public: tiki100_bus_slot_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; protected: // device_z80daisy_interface overrides - virtual int z80daisy_irq_state() { return get_card_device() ? m_card->z80daisy_irq_state() : 0; } - virtual int z80daisy_irq_ack() { return get_card_device() ? m_card->z80daisy_irq_ack() : 0; } - virtual void z80daisy_irq_reti() { if (get_card_device()) m_card->z80daisy_irq_reti(); } + virtual int z80daisy_irq_state() override { return get_card_device() ? m_card->z80daisy_irq_state() : 0; } + virtual int z80daisy_irq_ack() override { return get_card_device() ? m_card->z80daisy_irq_ack() : 0; } + virtual void z80daisy_irq_reti() override { if (get_card_device()) m_card->z80daisy_irq_reti(); } private: // configuration @@ -167,7 +167,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: devcb_write_line m_irq_cb; diff --git a/src/devices/bus/tiki100/hdc.h b/src/devices/bus/tiki100/hdc.h index fefde73c2e7..0d533bf7f96 100644 --- a/src/devices/bus/tiki100/hdc.h +++ b/src/devices/bus/tiki100/hdc.h @@ -32,16 +32,16 @@ public: tiki100_hdc_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_tiki100bus_card_interface overrides - virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data); - virtual void iorq_w(address_space &space, offs_t offset, UINT8 data); + virtual UINT8 iorq_r(address_space &space, offs_t offset, UINT8 data) override; + virtual void iorq_w(address_space &space, offs_t offset, UINT8 data) override; private: required_device<wd2010_device> m_hdc; diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h index 6a321ae5599..5e1ae1a32e2 100644 --- a/src/devices/bus/tvc/hbf.h +++ b/src/devices/bus/tvc/hbf.h @@ -26,18 +26,18 @@ public: tvc_hbf_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // tvcexp_interface overrides - virtual UINT8 id_r() { return 0x02; } // ID_A to GND, ID_B to VCC + virtual UINT8 id_r() override { return 0x02; } // ID_A to GND, ID_B to VCC virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); virtual DECLARE_READ8_MEMBER(io_read); diff --git a/src/devices/bus/tvc/tvc.h b/src/devices/bus/tvc/tvc.h index 181806f8195..9fa9e89fd2b 100644 --- a/src/devices/bus/tvc/tvc.h +++ b/src/devices/bus/tvc/tvc.h @@ -94,7 +94,7 @@ public: template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<tvcexp_slot_device &>(device).m_out_nmi_cb.set_callback(object); } // device-level overrides - virtual void device_start(); + virtual void device_start() override; // reading and writing virtual UINT8 id_r(); diff --git a/src/devices/bus/vboy/rom.h b/src/devices/bus/vboy/rom.h index 0f26468892b..b581f2f8798 100644 --- a/src/devices/bus/vboy/rom.h +++ b/src/devices/bus/vboy/rom.h @@ -17,7 +17,7 @@ public: vboy_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} + virtual void device_start() override {} // reading and writing virtual DECLARE_READ32_MEMBER(read_cart); diff --git a/src/devices/bus/vboy/slot.h b/src/devices/bus/vboy/slot.h index fea483bbd7f..3f2b15698ce 100644 --- a/src/devices/bus/vboy/slot.h +++ b/src/devices/bus/vboy/slot.h @@ -60,31 +60,31 @@ public: virtual ~vboy_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_cart_type(UINT8 *ROM, UINT32 len); void save_eeprom() { if (m_cart && m_cart->get_eeprom_size()) m_cart->save_eeprom(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "vboy_cart"; } - virtual const char *file_extensions() const { return "vb,bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "vboy_cart"; } + virtual const char *file_extensions() const override { return "vb,bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ32_MEMBER(read_cart); diff --git a/src/devices/bus/vc4000/rom.h b/src/devices/bus/vc4000/rom.h index ae4502f57a2..ddfc29ff3b0 100644 --- a/src/devices/bus/vc4000/rom.h +++ b/src/devices/bus/vc4000/rom.h @@ -17,8 +17,8 @@ public: vc4000_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vc4000/slot.h b/src/devices/bus/vc4000/slot.h index e7b3b1a8a91..089bdf5fc3a 100644 --- a/src/devices/bus/vc4000/slot.h +++ b/src/devices/bus/vc4000/slot.h @@ -62,30 +62,30 @@ public: virtual ~vc4000_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "vc4000_cart"; } - virtual const char *file_extensions() const { return "bin,rom"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "vc4000_cart"; } + virtual const char *file_extensions() const override { return "bin,rom"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -106,7 +106,7 @@ public: h21_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual ~h21_cart_slot_device(); - virtual const char *image_interface() const { return "h21_cart"; } + virtual const char *image_interface() const override { return "h21_cart"; } }; // device type definition diff --git a/src/devices/bus/vcs/compumat.h b/src/devices/bus/vcs/compumat.h index 3db7f5fa0e6..6d35247eacd 100644 --- a/src/devices/bus/vcs/compumat.h +++ b/src/devices/bus/vcs/compumat.h @@ -18,9 +18,9 @@ public: a26_rom_cm_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual ioport_constructor device_input_ports() const; - virtual void device_reset(); + virtual void device_start() override; + virtual ioport_constructor device_input_ports() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vcs/dpc.h b/src/devices/bus/vcs/dpc.h index 9d79553fbb8..b4b3d1c5465 100644 --- a/src/devices/bus/vcs/dpc.h +++ b/src/devices/bus/vcs/dpc.h @@ -38,11 +38,11 @@ public: UINT8 *m_displaydata; void set_display_data(UINT8 *data) { m_displaydata = data; } - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); @@ -71,9 +71,9 @@ public: a26_rom_dpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; required_device<dpc_device> m_dpc; @@ -82,7 +82,7 @@ public: virtual DECLARE_WRITE8_MEMBER(write_bank); virtual DECLARE_DIRECT_UPDATE_MEMBER(cart_opbase); - virtual void setup_addon_ptr(UINT8 *ptr); + virtual void setup_addon_ptr(UINT8 *ptr) override; }; diff --git a/src/devices/bus/vcs/harmony_melody.h b/src/devices/bus/vcs/harmony_melody.h index 3bc520c10b9..d780f4ae828 100644 --- a/src/devices/bus/vcs/harmony_melody.h +++ b/src/devices/bus/vcs/harmony_melody.h @@ -16,9 +16,9 @@ public: a26_rom_harmony_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vcs/rom.h b/src/devices/bus/vcs/rom.h index e7139e0d18e..95927880a80 100755 --- a/src/devices/bus/vcs/rom.h +++ b/src/devices/bus/vcs/rom.h @@ -17,8 +17,8 @@ public: a26_rom_2k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -50,8 +50,8 @@ public: a26_rom_f6_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -72,7 +72,7 @@ public: a26_rom_f4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -104,7 +104,7 @@ public: a26_rom_f8_sw_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; }; @@ -131,8 +131,8 @@ public: a26_rom_fe_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -155,8 +155,8 @@ public: a26_rom_3e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -179,7 +179,7 @@ public: a26_rom_3f_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -199,8 +199,8 @@ public: a26_rom_e0_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -220,8 +220,8 @@ public: a26_rom_e7_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -241,7 +241,7 @@ public: a26_rom_ua_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -287,8 +287,8 @@ public: a26_rom_fv_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -322,7 +322,7 @@ public: a26_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -338,8 +338,8 @@ public: a26_rom_8in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -358,7 +358,7 @@ public: a26_rom_32in1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vcs/scharger.h b/src/devices/bus/vcs/scharger.h index d2f669b0bbd..c5d0ce63669 100644 --- a/src/devices/bus/vcs/scharger.h +++ b/src/devices/bus/vcs/scharger.h @@ -19,9 +19,9 @@ public: a26_rom_ss_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_reset(); + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_reset() override; required_device<cassette_image_device> m_cassette; diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h index ce774e826c0..f77eda9056c 100755 --- a/src/devices/bus/vcs/vcs_slot.h +++ b/src/devices/bus/vcs/vcs_slot.h @@ -90,29 +90,29 @@ public: virtual ~vcs_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_cart_type() { return m_type; }; int identify_cart_type(UINT8 *ROM, UINT32 len); - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "a2600_cart"; } - virtual const char *file_extensions() const { return "bin,a26"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "a2600_cart"; } + virtual const char *file_extensions() const override { return "bin,a26"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vcs_ctrl/ctrl.h b/src/devices/bus/vcs_ctrl/ctrl.h index b23671b7cb3..bdcc9f5abe0 100644 --- a/src/devices/bus/vcs_ctrl/ctrl.h +++ b/src/devices/bus/vcs_ctrl/ctrl.h @@ -105,7 +105,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; device_vcs_control_port_interface *m_device; diff --git a/src/devices/bus/vcs_ctrl/joybooster.h b/src/devices/bus/vcs_ctrl/joybooster.h index 3b08f8b9577..d04be025ab9 100644 --- a/src/devices/bus/vcs_ctrl/joybooster.h +++ b/src/devices/bus/vcs_ctrl/joybooster.h @@ -31,19 +31,19 @@ public: vcs_joystick_booster_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 vcs_joy_r(); - virtual UINT8 vcs_pot_x_r(); - virtual UINT8 vcs_pot_y_r(); + virtual UINT8 vcs_joy_r() override; + virtual UINT8 vcs_pot_x_r() override; + virtual UINT8 vcs_pot_y_r() override; - virtual bool has_pot_x() { return true; } - virtual bool has_pot_y() { return true; } + virtual bool has_pot_x() override { return true; } + virtual bool has_pot_y() override { return true; } private: required_ioport m_joy; diff --git a/src/devices/bus/vcs_ctrl/joystick.h b/src/devices/bus/vcs_ctrl/joystick.h index 9e4d6eebed5..d43f6912dff 100644 --- a/src/devices/bus/vcs_ctrl/joystick.h +++ b/src/devices/bus/vcs_ctrl/joystick.h @@ -30,14 +30,14 @@ public: vcs_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 vcs_joy_r(); + virtual UINT8 vcs_joy_r() override; private: required_ioport m_joy; diff --git a/src/devices/bus/vcs_ctrl/keypad.h b/src/devices/bus/vcs_ctrl/keypad.h index 8c1cc25dbee..ffa4c1fed63 100644 --- a/src/devices/bus/vcs_ctrl/keypad.h +++ b/src/devices/bus/vcs_ctrl/keypad.h @@ -30,20 +30,20 @@ public: vcs_keypad_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 vcs_joy_r(); - virtual void vcs_joy_w( UINT8 data ); - virtual UINT8 vcs_pot_x_r(); - virtual UINT8 vcs_pot_y_r(); + virtual UINT8 vcs_joy_r() override; + virtual void vcs_joy_w( UINT8 data ) override; + virtual UINT8 vcs_pot_x_r() override; + virtual UINT8 vcs_pot_y_r() override; - virtual bool has_pot_x() { return true; } - virtual bool has_pot_y() { return true; } + virtual bool has_pot_x() override { return true; } + virtual bool has_pot_y() override { return true; } private: required_ioport m_keypad; diff --git a/src/devices/bus/vcs_ctrl/lightpen.h b/src/devices/bus/vcs_ctrl/lightpen.h index 61849e789ad..0aed6ac85a4 100644 --- a/src/devices/bus/vcs_ctrl/lightpen.h +++ b/src/devices/bus/vcs_ctrl/lightpen.h @@ -30,16 +30,16 @@ public: vcs_lightpen_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_INPUT_CHANGED_MEMBER( trigger ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 vcs_joy_r(); + virtual UINT8 vcs_joy_r() override; private: required_ioport m_joy; diff --git a/src/devices/bus/vcs_ctrl/paddles.h b/src/devices/bus/vcs_ctrl/paddles.h index 90e8dc910ab..65ffd394fef 100644 --- a/src/devices/bus/vcs_ctrl/paddles.h +++ b/src/devices/bus/vcs_ctrl/paddles.h @@ -30,19 +30,19 @@ public: vcs_paddles_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 vcs_joy_r(); - virtual UINT8 vcs_pot_x_r(); - virtual UINT8 vcs_pot_y_r(); + virtual UINT8 vcs_joy_r() override; + virtual UINT8 vcs_pot_x_r() override; + virtual UINT8 vcs_pot_y_r() override; - virtual bool has_pot_x() { return true; } - virtual bool has_pot_y() { return true; } + virtual bool has_pot_x() override { return true; } + virtual bool has_pot_y() override { return true; } private: required_ioport m_joy; diff --git a/src/devices/bus/vcs_ctrl/wheel.h b/src/devices/bus/vcs_ctrl/wheel.h index 5ae4fc8a9d7..9cb8818144e 100644 --- a/src/devices/bus/vcs_ctrl/wheel.h +++ b/src/devices/bus/vcs_ctrl/wheel.h @@ -30,14 +30,14 @@ public: vcs_wheel_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vcs_control_port_interface overrides - virtual UINT8 vcs_joy_r(); + virtual UINT8 vcs_joy_r() override; private: required_ioport m_joy; diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h index eac8ef812f3..5263fc780eb 100644 --- a/src/devices/bus/vectrex/rom.h +++ b/src/devices/bus/vectrex/rom.h @@ -17,8 +17,8 @@ public: vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start() {} - virtual void device_reset() {} + virtual void device_start() override {} + virtual void device_reset() override {} // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); @@ -33,8 +33,8 @@ public: vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h index 5a5a7d795eb..f9007ca01a6 100644 --- a/src/devices/bus/vectrex/slot.h +++ b/src/devices/bus/vectrex/slot.h @@ -62,29 +62,29 @@ public: virtual ~vectrex_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload() {} - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override {} + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_vec3d() { return m_vec3d; } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "vectrex_cart"; } - virtual const char *file_extensions() const { return "bin,gam,vec"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "vectrex_cart"; } + virtual const char *file_extensions() const override { return "bin,gam,vec"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom); diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h index 4d39dcc0b9a..f334668ada8 100644 --- a/src/devices/bus/vic10/exp.h +++ b/src/devices/bus/vic10/exp.h @@ -114,27 +114,27 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; + virtual void device_reset() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "vic10_cart"; } - virtual const char *file_extensions() const { return "80,e0"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "vic10_cart"; } + virtual const char *file_extensions() const override { return "80,e0"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; devcb_write_line m_write_irq; devcb_write_line m_write_res; diff --git a/src/devices/bus/vic10/std.h b/src/devices/bus/vic10/std.h index cdbaef140de..5f7e206a166 100644 --- a/src/devices/bus/vic10/std.h +++ b/src/devices/bus/vic10/std.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vic10_expansion_card_interface overrides - virtual UINT8 vic10_cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram); - virtual void vic10_cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram); + virtual UINT8 vic10_cd_r(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram) override; + virtual void vic10_cd_w(address_space &space, offs_t offset, UINT8 data, int lorom, int uprom, int exram) override; }; diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h index b852c5e0958..e95e682ae1d 100644 --- a/src/devices/bus/vic20/4cga.h +++ b/src/devices/bus/vic20/4cga.h @@ -31,7 +31,7 @@ public: c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER(write_joy3_0) { if (state) m_joy3 |= 1; else m_joy3 &= ~1; update_output(); } DECLARE_WRITE_LINE_MEMBER(write_joy3_1) { if (state) m_joy3 |= 2; else m_joy3 &= ~2; update_output(); } @@ -45,10 +45,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_l ); + virtual DECLARE_WRITE_LINE_MEMBER( input_l ) override; private: void update_output(); diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h index c613977d2e8..ddcffa82569 100644 --- a/src/devices/bus/vic20/exp.h +++ b/src/devices/bus/vic20/exp.h @@ -105,27 +105,27 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; + virtual void device_reset() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "vic1001_cart"; } - virtual const char *file_extensions() const { return "20,40,60,70,a0,b0,crt"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "vic1001_cart"; } + virtual const char *file_extensions() const override { return "20,40,60,70,a0,b0,crt"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; devcb_write_line m_write_irq; devcb_write_line m_write_nmi; diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h index f42ae0e2f94..93669f5ace3 100644 --- a/src/devices/bus/vic20/fe3.h +++ b/src/devices/bus/vic20/fe3.h @@ -31,17 +31,17 @@ public: vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: enum diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h index 5e9f82b10bf..678ddac1cff 100644 --- a/src/devices/bus/vic20/megacart.h +++ b/src/devices/bus/vic20/megacart.h @@ -31,21 +31,21 @@ public: vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default() { } - virtual void nvram_read(emu_file &file) { file.read(m_nvram, m_nvram.bytes()); } - virtual void nvram_write(emu_file &file) { file.write(m_nvram, m_nvram.bytes()); } + virtual void nvram_default() override { } + virtual void nvram_read(emu_file &file) override { file.read(m_nvram, m_nvram.bytes()); } + virtual void nvram_write(emu_file &file) override { file.write(m_nvram, m_nvram.bytes()); } // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: int m_nvram_en; diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h index e7a70d338e5..0ea4cdec1ab 100644 --- a/src/devices/bus/vic20/std.h +++ b/src/devices/bus/vic20/std.h @@ -31,10 +31,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; }; diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h index 56f194635b8..a481ba9cb08 100644 --- a/src/devices/bus/vic20/vic1010.h +++ b/src/devices/bus/vic20/vic1010.h @@ -38,16 +38,16 @@ public: vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: required_device<vic20_expansion_slot_device> m_slot1; diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h index 9ec16e5fd2a..0e5b104b0e3 100644 --- a/src/devices/bus/vic20/vic1011.h +++ b/src/devices/bus/vic20/vic1011.h @@ -30,19 +30,19 @@ public: vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // device_pet_user_port_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( input_d ); - virtual DECLARE_WRITE_LINE_MEMBER( input_e ); - virtual DECLARE_WRITE_LINE_MEMBER( input_j ); - virtual DECLARE_WRITE_LINE_MEMBER( input_m ); + virtual DECLARE_WRITE_LINE_MEMBER( input_d ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_e ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_j ) override; + virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override; DECLARE_WRITE_LINE_MEMBER( output_rxd ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: required_device<rs232_port_device> m_rs232; diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h index 4b6aecebd5a..21a4660d282 100644 --- a/src/devices/bus/vic20/vic1110.h +++ b/src/devices/bus/vic20/vic1110.h @@ -30,15 +30,15 @@ public: vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h index e20dc4a8e2d..83783da6878 100644 --- a/src/devices/bus/vic20/vic1111.h +++ b/src/devices/bus/vic20/vic1111.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h index 6149866c020..fce5971c533 100644 --- a/src/devices/bus/vic20/vic1112.h +++ b/src/devices/bus/vic20/vic1112.h @@ -35,7 +35,7 @@ public: vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); @@ -45,12 +45,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: required_device<via6522_device> m_via0; diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h index 904336dd6c0..90de25cddae 100644 --- a/src/devices/bus/vic20/vic1210.h +++ b/src/devices/bus/vic20/vic1210.h @@ -32,11 +32,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h index c6f12a227f4..2579d92a08d 100644 --- a/src/devices/bus/vidbrain/exp.h +++ b/src/devices/bus/vidbrain/exp.h @@ -131,26 +131,26 @@ public: protected: // device-level overrides - virtual void device_config_complete() { update_names(); } - virtual void device_start(); + virtual void device_config_complete() override { update_names(); } + virtual void device_start() override; // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; - virtual iodevice_t image_type() const { return IO_CARTSLOT; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 1; } - virtual const char *image_interface() const { return "vidbrain_cart"; } - virtual const char *file_extensions() const { return "bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const char *image_interface() const override { return "vidbrain_cart"; } + virtual const char *file_extensions() const override { return "bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; devcb_write_line m_write_extres; diff --git a/src/devices/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h index 9cdd6c8f4e6..b32723338f9 100644 --- a/src/devices/bus/vidbrain/money_minder.h +++ b/src/devices/bus/vidbrain/money_minder.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_videobrain_expansion_card_interface overrides - virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2); - virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2); + virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override; + virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2) override; }; diff --git a/src/devices/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h index 74e9b4096e8..8cde3c70db4 100644 --- a/src/devices/bus/vidbrain/std.h +++ b/src/devices/bus/vidbrain/std.h @@ -31,10 +31,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_videobrain_expansion_card_interface overrides - virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2); + virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override; }; diff --git a/src/devices/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h index 6f57c04d32f..ac59726dfb7 100644 --- a/src/devices/bus/vidbrain/timeshare.h +++ b/src/devices/bus/vidbrain/timeshare.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_videobrain_expansion_card_interface overrides - virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2); - virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2); + virtual UINT8 videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override; + virtual void videobrain_bo_w(address_space &space, offs_t offset, UINT8 data, int cs1, int cs2) override; }; diff --git a/src/devices/bus/vip/byteio.h b/src/devices/bus/vip/byteio.h index fd696975c7c..8871e1f0d72 100644 --- a/src/devices/bus/vip/byteio.h +++ b/src/devices/bus/vip/byteio.h @@ -88,8 +88,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; devcb_write_line m_write_inst; diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h index 37a33482db8..8aad60fafc8 100644 --- a/src/devices/bus/vip/exp.h +++ b/src/devices/bus/vip/exp.h @@ -109,7 +109,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; devcb_write_line m_write_int; devcb_write_line m_write_dma_out; diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h index 1045871b5d7..99ba25b64fd 100644 --- a/src/devices/bus/vip/vp550.h +++ b/src/devices/bus/vip/vp550.h @@ -31,7 +31,7 @@ public: vp550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_WRITE8_MEMBER( octave_w ); @@ -41,14 +41,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_vip_expansion_card_interface overrides - virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh); - virtual void vip_sc_w(int data); - virtual void vip_q_w(int state); - virtual void vip_run_w(int state); + virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override; + virtual void vip_sc_w(int data) override; + virtual void vip_q_w(int state) override; + virtual void vip_run_w(int state) override; private: required_device<cdp1863_device> m_pfg_a; diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h index 2a382a064f5..745b96cff95 100644 --- a/src/devices/bus/vip/vp570.h +++ b/src/devices/bus/vip/vp570.h @@ -30,15 +30,15 @@ public: vp570_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh); - virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh); + virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override; + virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override; private: optional_shared_ptr<UINT8> m_ram; diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h index 83ea31fd277..a91bf188aef 100644 --- a/src/devices/bus/vip/vp575.h +++ b/src/devices/bus/vip/vp575.h @@ -38,7 +38,7 @@ public: vp575_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_WRITE_LINE_MEMBER( exp1_int_w ) { m_int[0] = state; update_interrupts(); } @@ -63,22 +63,22 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh); - virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh); - virtual UINT8 vip_io_r(address_space &space, offs_t offset); - virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT8 vip_dma_r(address_space &space, offs_t offset); - virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual int vip_ef1_r(); - virtual int vip_ef3_r(); - virtual int vip_ef4_r(); - virtual void vip_sc_w(int data); - virtual void vip_q_w(int state); - virtual void vip_run_w(int state); + virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override; + virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override; + virtual UINT8 vip_io_r(address_space &space, offs_t offset) override; + virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT8 vip_dma_r(address_space &space, offs_t offset) override; + virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; + virtual int vip_ef1_r() override; + virtual int vip_ef3_r() override; + virtual int vip_ef4_r() override; + virtual void vip_sc_w(int data) override; + virtual void vip_q_w(int state) override; + virtual void vip_run_w(int state) override; private: vip_expansion_slot_device *m_expansion_slot[MAX_SLOTS]; diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h index 2bda8647c57..8ae23737b64 100644 --- a/src/devices/bus/vip/vp585.h +++ b/src/devices/bus/vip/vp585.h @@ -30,16 +30,16 @@ public: vp585_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data); - virtual int vip_ef3_r(); - virtual int vip_ef4_r(); + virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override; + virtual int vip_ef3_r() override; + virtual int vip_ef4_r() override; private: required_ioport m_j1; diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h index e4be2ab48fa..fe006db8e6d 100644 --- a/src/devices/bus/vip/vp590.h +++ b/src/devices/bus/vip/vp590.h @@ -32,8 +32,8 @@ public: vp590_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; // not really public DECLARE_READ_LINE_MEMBER( rd_r ); @@ -42,15 +42,15 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh); - virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data); - virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data); - virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual int vip_ef3_r(); - virtual int vip_ef4_r(); + virtual void vip_program_w(address_space &space, offs_t offset, UINT8 data, int cdef, int *minh) override; + virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void vip_dma_w(address_space &space, offs_t offset, UINT8 data) override; + virtual UINT32 vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; + virtual int vip_ef3_r() override; + virtual int vip_ef4_r() override; private: required_device<cdp1862_device> m_cgc; diff --git a/src/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h index bd7bcdbdbe7..43dcebd6d57 100644 --- a/src/devices/bus/vip/vp595.h +++ b/src/devices/bus/vip/vp595.h @@ -31,15 +31,15 @@ public: vp595_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data); - virtual void vip_q_w(int state); + virtual void vip_io_w(address_space &space, offs_t offset, UINT8 data) override; + virtual void vip_q_w(int state) override; private: required_device<cdp1863_device> m_pfg; diff --git a/src/devices/bus/vip/vp620.h b/src/devices/bus/vip/vp620.h index 67400cd2304..036cf482e68 100644 --- a/src/devices/bus/vip/vp620.h +++ b/src/devices/bus/vip/vp620.h @@ -31,18 +31,18 @@ public: vp620_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_WRITE8_MEMBER( kb_w ); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_byteio_port_interface overrides - virtual UINT8 vip_in_r(); - virtual int vip_ef4_r(); + virtual UINT8 vip_in_r() override; + virtual int vip_ef4_r() override; private: UINT8 m_keydata; diff --git a/src/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h index 8f521199d76..2631dc01c62 100644 --- a/src/devices/bus/vip/vp700.h +++ b/src/devices/bus/vip/vp700.h @@ -31,14 +31,14 @@ public: vp700_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh); + virtual UINT8 vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h index 7948a9ae932..c8ec78042d6 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.h +++ b/src/devices/bus/vtech/ioexp/ioexp.h @@ -60,8 +60,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_ioexp_interface *m_cart; }; diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h index 7c6612fc3fc..1575dde42f2 100644 --- a/src/devices/bus/vtech/ioexp/joystick.h +++ b/src/devices/bus/vtech/ioexp/joystick.h @@ -33,9 +33,9 @@ public: DECLARE_READ8_MEMBER( joystick_r ); protected: - virtual ioport_constructor device_input_ports() const; - virtual void device_start(); - virtual void device_reset(); + virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_ioport m_joy0; diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h index ddf2ce9726c..0f2b8746400 100644 --- a/src/devices/bus/vtech/ioexp/printer.h +++ b/src/devices/bus/vtech/ioexp/printer.h @@ -35,9 +35,9 @@ public: DECLARE_WRITE8_MEMBER( strobe_w ); protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_device<centronics_device> m_centronics; diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h index 91c332332c1..7b01c742d07 100644 --- a/src/devices/bus/vtech/memexp/floppy.h +++ b/src/devices/bus/vtech/memexp/floppy.h @@ -39,10 +39,10 @@ public: DECLARE_READ8_MEMBER(wpt_r); protected: - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; required_device<memexp_slot_device> m_memexp; required_device<floppy_connector> m_floppy0, m_floppy1; diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index d0de2049b5b..9085c2ce6cb 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -93,8 +93,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; device_memexp_interface *m_cart; diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h index e45d65c83fe..87518d20123 100644 --- a/src/devices/bus/vtech/memexp/memory.h +++ b/src/devices/bus/vtech/memexp/memory.h @@ -28,8 +28,8 @@ public: laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: std::vector<UINT8> m_ram; @@ -44,8 +44,8 @@ public: laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: std::vector<UINT8> m_ram; @@ -60,8 +60,8 @@ public: laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: std::vector<UINT8> m_ram; @@ -78,8 +78,8 @@ public: DECLARE_WRITE8_MEMBER( bankswitch_w ); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: std::vector<UINT8> m_ram; diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h index c89133e5a33..20508d86469 100644 --- a/src/devices/bus/vtech/memexp/rs232.h +++ b/src/devices/bus/vtech/memexp/rs232.h @@ -33,10 +33,10 @@ public: DECLARE_WRITE8_MEMBER( transmit_data_w ); protected: - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; private: required_device<rs232_port_device> m_rs232; diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h index 8626787f16e..79e78735cd4 100644 --- a/src/devices/bus/vtech/memexp/wordpro.h +++ b/src/devices/bus/vtech/memexp/wordpro.h @@ -28,9 +28,9 @@ public: wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual const rom_entry *device_rom_region() const; - virtual void device_start(); - virtual void device_reset(); + virtual const rom_entry *device_rom_region() const override; + virtual void device_start() override; + virtual void device_reset() override; }; // device type definition diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h index 169cb68a428..f40f7fe4e1c 100644 --- a/src/devices/bus/wangpc/emb.h +++ b/src/devices/bus/wangpc/emb.h @@ -31,14 +31,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); + virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; private: optional_shared_ptr<UINT16> m_ram; diff --git a/src/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h index 5fb1d792bcd..98f9f83fd3a 100644 --- a/src/devices/bus/wangpc/lic.h +++ b/src/devices/bus/wangpc/lic.h @@ -30,19 +30,19 @@ public: wangpc_lic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); + virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; }; diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h index 9f758f24c06..ada6f261fd3 100644 --- a/src/devices/bus/wangpc/lvc.h +++ b/src/devices/bus/wangpc/lvc.h @@ -31,7 +31,7 @@ public: wangpc_lvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public MC6845_UPDATE_ROW( crtc_update_row ); @@ -39,14 +39,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); + virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; private: inline void set_irq(int state); diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h index a87be116251..54b0b868e45 100644 --- a/src/devices/bus/wangpc/mcc.h +++ b/src/devices/bus/wangpc/mcc.h @@ -31,16 +31,16 @@ public: wangpc_mcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; private: inline void set_irq(int state); diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h index 6521aee33a4..eed98d499f0 100644 --- a/src/devices/bus/wangpc/mvc.h +++ b/src/devices/bus/wangpc/mvc.h @@ -31,7 +31,7 @@ public: wangpc_mvc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public MC6845_UPDATE_ROW( crtc_update_row ); @@ -39,14 +39,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); + virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; private: inline void set_irq(int state); diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h index 1162c743f23..f59de8c8139 100644 --- a/src/devices/bus/wangpc/rtc.h +++ b/src/devices/bus/wangpc/rtc.h @@ -34,20 +34,20 @@ public: wangpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; - virtual ioport_constructor device_input_ports() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual ioport_constructor device_input_ports() const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); + virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; private: required_device<cpu_device> m_maincpu; diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h index 66b29c0ad3d..8f9f8f9a5eb 100644 --- a/src/devices/bus/wangpc/tig.h +++ b/src/devices/bus/wangpc/tig.h @@ -31,8 +31,8 @@ public: wangpc_tig_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); @@ -40,15 +40,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT8 wangpcbus_dack_r(address_space &space, int line); - virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data); - virtual bool wangpcbus_have_dack(int line); + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT8 wangpcbus_dack_r(address_space &space, int line) override; + virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data) override; + virtual bool wangpcbus_have_dack(int line) override; private: // internal state diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h index 2870a4e4ec5..e892cc3b880 100644 --- a/src/devices/bus/wangpc/wangpc.h +++ b/src/devices/bus/wangpc/wangpc.h @@ -86,7 +86,7 @@ public: wangpcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // inline configuration static void static_set_wangpcbus_slot(device_t &device, int sid); @@ -162,7 +162,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: devcb_write_line m_write_irq2; diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index 156dc4c10a9..fd8edbcbfdf 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -33,8 +33,8 @@ public: wangpc_wdc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // not really public DECLARE_READ8_MEMBER( port_r ); @@ -50,17 +50,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask); - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data); - virtual UINT8 wangpcbus_dack_r(address_space &space, int line); - virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data); - virtual bool wangpcbus_have_dack(int line); + virtual UINT16 wangpcbus_mrdc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT16 wangpcbus_iorc_r(address_space &space, offs_t offset, UINT16 mem_mask) override; + virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, UINT16 mem_mask, UINT16 data) override; + virtual UINT8 wangpcbus_dack_r(address_space &space, int line) override; + virtual void wangpcbus_dack_w(address_space &space, int line, UINT8 data) override; + virtual bool wangpcbus_have_dack(int line) override; private: inline void set_irq(int state); diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h index e3ac0134c84..b4b306c55ac 100644 --- a/src/devices/bus/wswan/rom.h +++ b/src/devices/bus/wswan/rom.h @@ -17,9 +17,9 @@ public: ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom20); @@ -57,8 +57,8 @@ public: ws_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_ram); @@ -79,8 +79,8 @@ public: ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // reading and writing virtual DECLARE_READ8_MEMBER(read_io); diff --git a/src/devices/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h index 621b2192901..59dd49550ca 100644 --- a/src/devices/bus/wswan/slot.h +++ b/src/devices/bus/wswan/slot.h @@ -70,13 +70,13 @@ public: virtual ~ws_cart_slot_device(); // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; int get_type() { return m_type; } int get_is_rotated() { return m_cart->get_is_rotated(); } @@ -85,18 +85,18 @@ public: void save_nvram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); } - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 1; } - virtual bool is_reset_on_load() const { return 1; } - virtual const option_guide *create_option_guide() const { return nullptr; } - virtual const char *image_interface() const { return "wswan_cart"; } - virtual const char *file_extensions() const { return "ws,wsc,bin"; } + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 1; } + virtual bool is_reset_on_load() const override { return 1; } + virtual const option_guide *create_option_guide() const override { return nullptr; } + virtual const char *image_interface() const override { return "wswan_cart"; } + virtual const char *file_extensions() const override { return "ws,wsc,bin"; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read_rom20); diff --git a/src/devices/bus/x68k/x68k_neptunex.h b/src/devices/bus/x68k/x68k_neptunex.h index ad6f1b9560c..6700f1bea3b 100644 --- a/src/devices/bus/x68k/x68k_neptunex.h +++ b/src/devices/bus/x68k/x68k_neptunex.h @@ -27,7 +27,7 @@ public: x68k_neptune_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; void x68k_neptune_irq_w(int state); DECLARE_READ8_MEMBER(x68k_neptune_mem_read); @@ -37,8 +37,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: x68k_expansion_slot_device *m_slot; diff --git a/src/devices/bus/x68k/x68k_scsiext.h b/src/devices/bus/x68k/x68k_scsiext.h index 93f6fa24b79..7cd45c2c6da 100644 --- a/src/devices/bus/x68k/x68k_scsiext.h +++ b/src/devices/bus/x68k/x68k_scsiext.h @@ -21,8 +21,8 @@ public: x68k_scsiext_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual const rom_entry *device_rom_region() const; + virtual machine_config_constructor device_mconfig_additions() const override; + virtual const rom_entry *device_rom_region() const override; void irq_w(int state); void drq_w(int state); @@ -31,8 +31,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: x68k_expansion_slot_device *m_slot; diff --git a/src/devices/bus/x68k/x68kexp.h b/src/devices/bus/x68k/x68kexp.h index 9a016b7ebbe..b3a07242180 100644 --- a/src/devices/bus/x68k/x68kexp.h +++ b/src/devices/bus/x68k/x68kexp.h @@ -131,8 +131,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; devcb_write_line m_out_irq2_cb; devcb_write_line m_out_irq4_cb; diff --git a/src/devices/bus/z88/flash.h b/src/devices/bus/z88/flash.h index 8ea09040e39..cfa0b7b1318 100644 --- a/src/devices/bus/z88/flash.h +++ b/src/devices/bus/z88/flash.h @@ -23,17 +23,17 @@ public: z88_1024k_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // z88cart_interface overrides virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); - virtual UINT8* get_cart_base(); - virtual UINT32 get_cart_size() { return 0x100000; } + virtual UINT8* get_cart_base() override; + virtual UINT32 get_cart_size() override { return 0x100000; } private: required_device<intelfsh8_device> m_flash; diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h index 0f8dc4a4ff7..c869cb5d34e 100644 --- a/src/devices/bus/z88/ram.h +++ b/src/devices/bus/z88/ram.h @@ -24,13 +24,13 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // z88cart_interface overrides virtual DECLARE_READ8_MEMBER(read); virtual DECLARE_WRITE8_MEMBER(write); - virtual UINT8* get_cart_base(); - virtual UINT32 get_cart_size() { return 0x8000; } + virtual UINT8* get_cart_base() override; + virtual UINT32 get_cart_size() override { return 0x8000; } protected: // internal state @@ -47,7 +47,7 @@ public: protected: // z88cart_interface overrides - virtual UINT32 get_cart_size() { return 0x20000; } + virtual UINT32 get_cart_size() override { return 0x20000; } }; // ======================> z88_512k_ram_device @@ -60,7 +60,7 @@ public: protected: // z88cart_interface overrides - virtual UINT32 get_cart_size() { return 0x80000; } + virtual UINT32 get_cart_size() override { return 0x80000; } }; // ======================> z88_1024k_ram_device @@ -73,7 +73,7 @@ public: protected: // z88cart_interface overrides - virtual UINT32 get_cart_size() { return 0x100000; } + virtual UINT32 get_cart_size() override { return 0x100000; } }; // device type definition diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h index 41cdbc4a771..d98d858b022 100644 --- a/src/devices/bus/z88/rom.h +++ b/src/devices/bus/z88/rom.h @@ -24,12 +24,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // z88cart_interface overrides virtual DECLARE_READ8_MEMBER(read); - virtual UINT8* get_cart_base(); - virtual UINT32 get_cart_size() { return 0x8000; } + virtual UINT8* get_cart_base() override; + virtual UINT32 get_cart_size() override { return 0x8000; } protected: // internal state @@ -46,7 +46,7 @@ public: protected: // z88cart_interface overrides - virtual UINT32 get_cart_size() { return 0x20000; } + virtual UINT32 get_cart_size() override { return 0x20000; } }; // ======================> z88_256k_rom_device @@ -59,7 +59,7 @@ public: protected: // z88cart_interface overrides - virtual UINT32 get_cart_size() { return 0x200000; } + virtual UINT32 get_cart_size() override { return 0x200000; } }; // device type definition diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h index aab70382445..19785d4a7b1 100644 --- a/src/devices/bus/z88/z88.h +++ b/src/devices/bus/z88/z88.h @@ -89,27 +89,27 @@ public: template<class _Object> static devcb_base &set_out_flp_callback(device_t &device, _Object object) { return downcast<z88cart_slot_device &>(device).m_out_flp_cb.set_callback(object); } // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_config_complete() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry); - - virtual iodevice_t image_type() const { return IO_CARTSLOT; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return "z88_cart"; } - virtual const char *file_extensions() const { return "epr,bin"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override; + + virtual iodevice_t image_type() const override { return IO_CARTSLOT; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return "z88_cart"; } + virtual const char *file_extensions() const override { return "epr,bin"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // slot interface overrides - virtual void get_default_card_software(std::string &result); + virtual void get_default_card_software(std::string &result) override; // reading and writing virtual DECLARE_READ8_MEMBER(read); diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h index 615d8d41023..210abe73cf6 100644 --- a/src/devices/cpu/arm7/arm7.h +++ b/src/devices/cpu/arm7/arm7.h @@ -55,28 +55,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 3; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 4; } /* There are actually only 2 input lines: we use 3 variants of the ABORT line while there is only 1 real one */ - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 3; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 4; } /* There are actually only 2 input lines: we use 3 variants of the ABORT line while there is only 1 real one */ + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; // device_state_interface overrides - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; diff --git a/src/devices/cpu/arm7/lpc210x.h b/src/devices/cpu/arm7/lpc210x.h index 0fc502d31bd..1d083f39dbc 100644 --- a/src/devices/cpu/arm7/lpc210x.h +++ b/src/devices/cpu/arm7/lpc210x.h @@ -76,11 +76,11 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; diff --git a/src/devices/cpu/g65816/g65816.h b/src/devices/cpu/g65816/g65816.h index 070a4cadb58..54294ad4f74 100644 --- a/src/devices/cpu/g65816/g65816.h +++ b/src/devices/cpu/g65816/g65816.h @@ -66,28 +66,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 20; } - virtual UINT32 execute_input_lines() const { return 5; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 20; } + virtual UINT32 execute_input_lines() const override { return 5; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; @@ -1546,12 +1546,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; }; diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index a6271a2dc3a..60eea10264d 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -40,30 +40,30 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_debug_setup(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_debug_setup() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 40; } - virtual UINT32 execute_input_lines() const { return 32; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 40; } + virtual UINT32 execute_input_lines() const override { return 32; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } - virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address); + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual bool memory_translate(address_spacenum spacenum, int intention, offs_t &address) override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 15; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 15; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; address_space_config m_io_config; @@ -1430,8 +1430,8 @@ public: i486_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1443,9 +1443,9 @@ public: pentium_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void execute_set_input(int inputnum, int state); - virtual void device_start(); - virtual void device_reset(); + virtual void execute_set_input(int inputnum, int state) override; + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1456,8 +1456,8 @@ public: mediagx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1468,8 +1468,8 @@ public: pentium_pro_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1480,8 +1480,8 @@ public: pentium_mmx_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1492,8 +1492,8 @@ public: pentium2_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1504,8 +1504,8 @@ public: pentium3_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; @@ -1516,8 +1516,8 @@ public: pentium4_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/cpu/i8085/i8085.h b/src/devices/cpu/i8085/i8085.h index 85a66c9da02..59d630393db 100644 --- a/src/devices/cpu/i8085/i8085.h +++ b/src/devices/cpu/i8085/i8085.h @@ -68,31 +68,31 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 4; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual UINT32 execute_input_lines() const { return 4; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 2 - 1) / 2; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } + virtual UINT32 execute_min_cycles() const override { return 4; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual UINT32 execute_input_lines() const override { return 4; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 2 - 1) / 2; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); - void state_export(const device_state_entry &entry); - void state_import(const device_state_entry &entry); + void state_string_export(const device_state_entry &entry, std::string &str) override; + void state_export(const device_state_entry &entry) override; + void state_import(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; @@ -155,9 +155,9 @@ public: i8080_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return clocks; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return cycles; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return clocks; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles; } }; @@ -168,9 +168,9 @@ public: i8080a_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return clocks; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return cycles; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return clocks; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles; } }; diff --git a/src/devices/cpu/i86/i186.h b/src/devices/cpu/i86/i186.h index 91eb7cda668..cff4c9f8606 100644 --- a/src/devices/cpu/i86/i186.h +++ b/src/devices/cpu/i86/i186.h @@ -32,25 +32,25 @@ public: DECLARE_WRITE_LINE_MEMBER(int3_w) { external_int(3, state); } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks / 2); } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 2); } - virtual void execute_run(); - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT8 fetch_op(); - virtual UINT8 fetch(); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks / 2); } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 2); } + virtual void execute_run() override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT8 fetch_op() override; + virtual UINT8 fetch() override; UINT32 pc() { return m_pc = (m_sregs[CS] << 4) + m_ip; } - virtual UINT8 read_port_byte(UINT16 port); - virtual UINT16 read_port_word(UINT16 port); - virtual void write_port_byte(UINT16 port, UINT8 data); - virtual void write_port_word(UINT16 port, UINT16 data); + virtual UINT8 read_port_byte(UINT16 port) override; + virtual UINT16 read_port_word(UINT16 port) override; + virtual void write_port_byte(UINT16 port, UINT8 data) override; + virtual void write_port_word(UINT16 port, UINT16 data) override; static const UINT8 m_i80186_timing[200]; diff --git a/src/devices/cpu/i86/i86.h b/src/devices/cpu/i86/i86.h index fbf475b97b7..a142d6672f2 100644 --- a/src/devices/cpu/i86/i86.h +++ b/src/devices/cpu/i86/i86.h @@ -113,21 +113,21 @@ protected: enum WREGS { AX=0, CX, DX, BX, SP, BP, SI, DI }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 50; } - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 50; } + virtual void execute_set_input(int inputnum, int state) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; virtual void interrupt(int int_num, int trap = 1); bool common_op(UINT8 op); @@ -345,14 +345,14 @@ public: i8086_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, int data_bus_size); // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } protected: - virtual void execute_run(); - virtual void device_start(); - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT8 fetch_op(); - virtual UINT8 fetch(); + virtual void execute_run() override; + virtual void device_start() override; + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT8 fetch_op() override; + virtual UINT8 fetch() override; UINT32 pc() { return m_pc = (m_sregs[CS] << 4) + m_ip; } address_space_config m_program_config; diff --git a/src/devices/cpu/lr35902/lr35902.h b/src/devices/cpu/lr35902/lr35902.h index ecbeeeb4e1d..0a9999ba10c 100644 --- a/src/devices/cpu/lr35902/lr35902.h +++ b/src/devices/cpu/lr35902/lr35902.h @@ -56,26 +56,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 16; } - virtual UINT32 execute_input_lines() const { return 5; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 16; } + virtual UINT32 execute_input_lines() const override { return 5; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; inline void cycles_passed(UINT8 cycles); inline UINT8 mem_read_byte(UINT16 addr); diff --git a/src/devices/cpu/m6502/m6502.h b/src/devices/cpu/m6502/m6502.h index 33b13f3afb6..6f5ef092891 100644 --- a/src/devices/cpu/m6502/m6502.h +++ b/src/devices/cpu/m6502/m6502.h @@ -57,17 +57,17 @@ protected: class mi_default_normal : public memory_interface { public: virtual ~mi_default_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; class mi_default_nd : public mi_default_normal { public: virtual ~mi_default_nd() {} - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; }; struct disasm_entry { @@ -128,28 +128,28 @@ protected: virtual void init(); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config program_config, sprogram_config; diff --git a/src/devices/cpu/m6502/m6504.h b/src/devices/cpu/m6502/m6504.h index f272b059333..6a4e4f5f9df 100644 --- a/src/devices/cpu/m6502/m6504.h +++ b/src/devices/cpu/m6502/m6504.h @@ -21,20 +21,20 @@ protected: class mi_6504_normal : public memory_interface { public: virtual ~mi_6504_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; class mi_6504_nd : public mi_6504_normal { public: virtual ~mi_6504_nd() {} - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; }; - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/cpu/m6502/m6510.h b/src/devices/cpu/m6502/m6510.h index 86aaa60ffaa..be555b866df 100644 --- a/src/devices/cpu/m6502/m6510.h +++ b/src/devices/cpu/m6502/m6510.h @@ -35,9 +35,9 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; protected: class mi_6510_normal : public memory_interface { @@ -46,18 +46,18 @@ protected: mi_6510_normal(m6510_device *base); virtual ~mi_6510_normal() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; class mi_6510_nd : public mi_6510_normal { public: mi_6510_nd(m6510_device *base); virtual ~mi_6510_nd() {} - virtual UINT8 read_sync(UINT16 adr); - virtual UINT8 read_arg(UINT16 adr); + virtual UINT8 read_sync(UINT16 adr) override; + virtual UINT8 read_arg(UINT16 adr) override; }; devcb_read8 read_port; @@ -65,8 +65,8 @@ protected: UINT8 pullup, floating, dir, port, drive; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 dir_r(); void dir_w(UINT8 data); diff --git a/src/devices/cpu/m6502/m65c02.h b/src/devices/cpu/m6502/m65c02.h index 5eda5593fee..6a929368512 100644 --- a/src/devices/cpu/m6502/m65c02.h +++ b/src/devices/cpu/m6502/m65c02.h @@ -21,9 +21,9 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; protected: #define O(o) void o ## _full(); void o ## _partial() diff --git a/src/devices/cpu/m6502/m65ce02.h b/src/devices/cpu/m6502/m65ce02.h index f8e03867d82..3b5dc800954 100644 --- a/src/devices/cpu/m6502/m65ce02.h +++ b/src/devices/cpu/m6502/m65ce02.h @@ -20,21 +20,21 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; protected: UINT16 TMP3; /* temporary internal values */ UINT8 Z; /* Z index register */ UINT16 B; /* Zero page base address (always xx00) */ - virtual void init(); - virtual void device_start(); - virtual void device_reset(); - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void init() override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; inline void dec_SP_ce() { if(P & F_E) SP = set_l(SP, SP-1); else SP--; } inline void inc_SP_ce() { if(P & F_E) SP = set_l(SP, SP+1); else SP++; } diff --git a/src/devices/cpu/m6502/r65c02.h b/src/devices/cpu/m6502/r65c02.h index ed3f65f40ad..75077aab749 100644 --- a/src/devices/cpu/m6502/r65c02.h +++ b/src/devices/cpu/m6502/r65c02.h @@ -20,9 +20,9 @@ public: static const disasm_entry disasm_entries[0x100]; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void do_exec_full(); - virtual void do_exec_partial(); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void do_exec_full() override; + virtual void do_exec_partial() override; }; enum { diff --git a/src/devices/cpu/m6800/m6800.h b/src/devices/cpu/m6800/m6800.h index abbd1373a19..45c24d2e039 100644 --- a/src/devices/cpu/m6800/m6800.h +++ b/src/devices/cpu/m6800/m6800.h @@ -72,27 +72,27 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 12; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 12; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; address_space_config m_program_config; address_space_config m_decrypted_opcodes_config; @@ -438,9 +438,9 @@ public: void m6801_clock_serial(); protected: - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -451,9 +451,9 @@ public: m6802_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source, const m6800_cpu_device::op_func *insn, const UINT8 *cycles); protected: - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -463,7 +463,7 @@ public: m6803_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -473,7 +473,7 @@ public: m6808_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -484,7 +484,7 @@ public: hd6301_cpu_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -494,7 +494,7 @@ public: hd63701_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -504,7 +504,7 @@ public: nsc8105_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index 0f881437cf9..4fb372fdf12 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -143,27 +143,27 @@ public: void clear_all(void); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; - virtual UINT32 execute_input_lines() const { return 8; }; // number of input lines - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; + virtual UINT32 execute_input_lines() const override { return 8; }; // number of input lines + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // address spaces const address_space_config m_program_config, m_oprogram_config; @@ -394,12 +394,12 @@ public: inline void cpu_execute(void); // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_memory_interface overrides - virtual bool memory_translate(address_spacenum space, int intention, offs_t &address); + virtual bool memory_translate(address_spacenum space, int intention, offs_t &address) override; }; @@ -416,17 +416,17 @@ public: - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68301_device : public m68000_base_device @@ -435,17 +435,17 @@ public: // construction/destruction m68301_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; @@ -457,17 +457,17 @@ public: // construction/destruction m68008_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68008plcc_device : public m68000_base_device @@ -476,17 +476,17 @@ public: // construction/destruction m68008plcc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68010_device : public m68000_base_device @@ -495,17 +495,17 @@ public: // construction/destruction m68010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68ec020_device : public m68000_base_device @@ -514,17 +514,17 @@ public: // construction/destruction m68ec020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68020_device : public m68000_base_device @@ -533,17 +533,17 @@ public: // construction/destruction m68020_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68020fpu_device : public m68000_base_device @@ -552,17 +552,17 @@ public: // construction/destruction m68020fpu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68020pmmu_device : public m68000_base_device @@ -571,17 +571,17 @@ public: // construction/destruction m68020pmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68020hmmu_device : public m68000_base_device @@ -590,19 +590,19 @@ public: // construction/destruction m68020hmmu_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; - virtual bool memory_translate(address_spacenum space, int intention, offs_t &address); + virtual bool memory_translate(address_spacenum space, int intention, offs_t &address) override; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68ec030_device : public m68000_base_device @@ -611,17 +611,17 @@ public: // construction/destruction m68ec030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68030_device : public m68000_base_device @@ -630,17 +630,17 @@ public: // construction/destruction m68030_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68ec040_device : public m68000_base_device @@ -649,17 +649,17 @@ public: // construction/destruction m68ec040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68lc040_device : public m68000_base_device @@ -668,17 +668,17 @@ public: // construction/destruction m68lc040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class m68040_device : public m68000_base_device @@ -687,17 +687,17 @@ public: // construction/destruction m68040_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; class scc68070_device : public m68000_base_device @@ -706,17 +706,17 @@ public: // construction/destruction scc68070_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; @@ -731,17 +731,17 @@ public: fscpu32_device(const machine_config &mconfig, const char *name, const char *tag, device_t *owner, UINT32 clock, const device_type type, UINT32 prg_data_width, UINT32 prg_address_bits, address_map_constructor internal_map, const char *shortname, const char *source); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; @@ -752,18 +752,18 @@ public: // construction/destruction mcf5206e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 20; }; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 20; }; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - virtual UINT32 execute_min_cycles() const { return 2; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 2; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; - virtual UINT32 execute_default_irq_vector() const { return -1; }; + virtual UINT32 execute_default_irq_vector() const override { return -1; }; // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/cpu/m6805/m6805.h b/src/devices/cpu/m6805/m6805.h index 26bccefbd15..dc85fd6eaaa 100644 --- a/src/devices/cpu/m6805/m6805.h +++ b/src/devices/cpu/m6805/m6805.h @@ -30,28 +30,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state) = 0; - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const; - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const; + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override = 0; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override; + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; private: // opcode/condition tables @@ -298,7 +298,7 @@ public: : m6805_base_device(mconfig, tag, owner, clock, M6805, "M6805", 12, "m6805", __FILE__) { } protected: - virtual void execute_set_input(int inputnum, int state); + virtual void execute_set_input(int inputnum, int state) override; }; // ======================> m68hc05eg_device @@ -312,11 +312,11 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; - virtual void execute_set_input(int inputnum, int state); + virtual void execute_set_input(int inputnum, int state) override; - virtual void interrupt_vector(); + virtual void interrupt_vector() override; }; // ======================> m68705_device @@ -330,11 +330,11 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; - virtual void execute_set_input(int inputnum, int state); + virtual void execute_set_input(int inputnum, int state) override; - virtual void interrupt(); + virtual void interrupt() override; }; // ======================> hd63705_device @@ -348,16 +348,16 @@ public: protected: // device-level overrides - virtual void device_reset(); + virtual void device_reset() override; - virtual void execute_set_input(int inputnum, int state); + virtual void execute_set_input(int inputnum, int state) override; - virtual void interrupt_vector(); + virtual void interrupt_vector() override; // opcodes - virtual void bil(); - virtual void bih(); - virtual void swi(); + virtual void bil() override; + virtual void bih() override; + virtual void swi() override; }; enum { M6805_PC=1, M6805_S, M6805_CC, M6805_A, M6805_X, M6805_IRQ_STATE }; diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index ad914e4abc5..53ca385f81c 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -54,37 +54,37 @@ protected: class mi_default : public memory_interface { public: virtual ~mi_default() {} - virtual UINT8 read(UINT16 adr); - virtual UINT8 read_opcode(UINT16 adr); - virtual UINT8 read_opcode_arg(UINT16 adr); - virtual void write(UINT16 adr, UINT8 val); + virtual UINT8 read(UINT16 adr) override; + virtual UINT8 read_opcode(UINT16 adr) override; + virtual UINT8 read_opcode_arg(UINT16 adr) override; + virtual void write(UINT16 adr, UINT8 val) override; }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_pre_save(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_pre_save() override; + virtual void device_post_load() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const; - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const; + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override; + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // addressing modes enum diff --git a/src/devices/cpu/mcs51/mcs51.h b/src/devices/cpu/mcs51/mcs51.h index f3ac520da4b..3babfda9f50 100644 --- a/src/devices/cpu/mcs51/mcs51.h +++ b/src/devices/cpu/mcs51/mcs51.h @@ -87,34 +87,34 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 12 - 1) / 12; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 12); } - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 20; } - virtual UINT32 execute_input_lines() const { return 6; } - virtual UINT32 execute_default_irq_vector() const { return 0; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 12 - 1) / 12; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 12); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 20; } + virtual UINT32 execute_input_lines() const override { return 6; } + virtual UINT32 execute_default_irq_vector() const override { return 0; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 5; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 5; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; protected: address_space_config m_program_config; @@ -388,11 +388,11 @@ public: i8052_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; /* SFR Callbacks */ - virtual void sfr_write(size_t offset, UINT8 data); - virtual UINT8 sfr_read(size_t offset); + virtual void sfr_write(size_t offset, UINT8 data) override; + virtual UINT8 sfr_read(size_t offset) override; }; class i8032_device : public i8052_device @@ -416,7 +416,7 @@ public: i80c31_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -428,7 +428,7 @@ public: i80c51_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; class i87c51_device : public i80c51_device @@ -447,11 +447,11 @@ public: i80c52_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, int program_width, int data_width, UINT8 features = 0); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; /* SFR Callbacks */ - virtual void sfr_write(size_t offset, UINT8 data); - virtual UINT8 sfr_read(size_t offset); + virtual void sfr_write(size_t offset, UINT8 data) override; + virtual UINT8 sfr_read(size_t offset) override; }; class i80c32_device : public i80c52_device @@ -507,11 +507,11 @@ public: static void set_crc(device_t &device, UINT8 crc) { downcast<ds5002fp_device &>(device).m_ds5002fp.crc = crc; } protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; /* SFR Callbacks */ - virtual void sfr_write(size_t offset, UINT8 data); - virtual UINT8 sfr_read(size_t offset); + virtual void sfr_write(size_t offset, UINT8 data) override; + virtual UINT8 sfr_read(size_t offset) override; }; diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index 69644b6b6f9..50a3adc7656 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -27,29 +27,29 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 80; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual UINT32 execute_default_irq_vector() const { return 0xff; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 80; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual UINT32 execute_default_irq_vector() const override { return 0xff; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + void state_string_export(const device_state_entry &entry, std::string &str) override; + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 8; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 8; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/ssp1601/ssp1601.h b/src/devices/cpu/ssp1601/ssp1601.h index 3370ccffc46..5d67827b288 100644 --- a/src/devices/cpu/ssp1601/ssp1601.h +++ b/src/devices/cpu/ssp1601/ssp1601.h @@ -26,26 +26,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 4; } - virtual UINT32 execute_input_lines() const { return 3; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 4; } + virtual UINT32 execute_input_lines() const override { return 3; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : nullptr); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ((spacenum == AS_IO) ? &m_io_config : nullptr); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/superfx/superfx.h b/src/devices/cpu/superfx/superfx.h index 9c18b07d375..1de27856668 100644 --- a/src/devices/cpu/superfx/superfx.h +++ b/src/devices/cpu/superfx/superfx.h @@ -107,26 +107,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 1; } - virtual UINT32 execute_input_lines() const { return 0; } - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 1; } + virtual UINT32 execute_input_lines() const override { return 0; } + virtual void execute_run() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 3; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 3; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/tms32010/tms32010.h b/src/devices/cpu/tms32010/tms32010.h index a5ea27871be..2185e324346 100644 --- a/src/devices/cpu/tms32010/tms32010.h +++ b/src/devices/cpu/tms32010/tms32010.h @@ -56,28 +56,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 3; } - virtual UINT32 execute_input_lines() const { return 1; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 3; } + virtual UINT32 execute_input_lines() const override { return 1; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : ( (spacenum == AS_DATA) ? &m_data_config : nullptr ) ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 2; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; private: address_space_config m_program_config; diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index c0e6d9d0fba..fc24c82801d 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -76,26 +76,26 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_set_input(int irqline, int state); - virtual void execute_run(); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_set_input(int irqline, int state) override; + virtual void execute_run() override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; - const address_space_config* memory_space_config(address_spacenum spacenum) const; + const address_space_config* memory_space_config(address_spacenum spacenum) const override; - UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return clocks / 4.0; } - UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return cycles * 4.0; } + UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return clocks / 4.0; } + UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return cycles * 4.0; } // Variant of the TMS9995 without internal RAM and decrementer bool m_mp9537; @@ -104,9 +104,9 @@ private: // State / debug management UINT16 m_state_any; static const char* s_statename[]; - void state_import(const device_state_entry &entry); - void state_export(const device_state_entry &entry); - void state_string_export(const device_state_entry &entry, std::string &str); + void state_import(const device_state_entry &entry) override; + void state_export(const device_state_entry &entry) override; + void state_string_export(const device_state_entry &entry, std::string &str) override; UINT16 read_workspace_register_debug(int reg); void write_workspace_register_debug(int reg, UINT16 data); diff --git a/src/devices/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h index d10094073c3..063360e6d34 100644 --- a/src/devices/cpu/upd7725/upd7725.h +++ b/src/devices/cpu/upd7725/upd7725.h @@ -94,28 +94,28 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const; - virtual UINT32 execute_max_cycles() const; - virtual UINT32 execute_input_lines() const; - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override; + virtual UINT32 execute_max_cycles() const override; + virtual UINT32 execute_input_lines() const override; + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_state_interface overrides - virtual void state_import(const device_state_entry &entry); - virtual void state_export(const device_state_entry &entry); - virtual void state_string_export(const device_state_entry &entry, std::string &str); + virtual void state_import(const device_state_entry &entry) override; + virtual void state_export(const device_state_entry &entry) override; + virtual void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const; - virtual UINT32 disasm_max_opcode_bytes() const; - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override; + virtual UINT32 disasm_max_opcode_bytes() const override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // inline data const address_space_config m_program_config, m_data_config; diff --git a/src/devices/cpu/upd7810/upd7810.h b/src/devices/cpu/upd7810/upd7810.h index 8b0feb79347..d25b22e49a7 100644 --- a/src/devices/cpu/upd7810/upd7810.h +++ b/src/devices/cpu/upd7810/upd7810.h @@ -156,26 +156,26 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_execute_interface overrides - virtual UINT32 execute_min_cycles() const { return 1; } - virtual UINT32 execute_max_cycles() const { return 40; } - virtual UINT32 execute_input_lines() const { return 2; } - virtual void execute_run(); - virtual void execute_set_input(int inputnum, int state); + virtual UINT32 execute_min_cycles() const override { return 1; } + virtual UINT32 execute_max_cycles() const override { return 40; } + virtual UINT32 execute_input_lines() const override { return 2; } + virtual void execute_run() override; + virtual void execute_set_input(int inputnum, int state) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : ( (spacenum == AS_IO) ? &m_io_config : nullptr ); } // device_state_interface overrides - void state_string_export(const device_state_entry &entry, std::string &str); + void state_string_export(const device_state_entry &entry, std::string &str) override; // device_disasm_interface overrides - virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - virtual UINT32 disasm_max_opcode_bytes() const { return 4; } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + virtual UINT32 disasm_max_opcode_bytes() const override { return 4; } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; virtual void handle_timers(int cycles); virtual void upd7810_take_irq(); @@ -1376,7 +1376,7 @@ public: upd7807_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; }; @@ -1387,11 +1387,11 @@ public: upd7801_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_reset(); - virtual void execute_set_input(int inputnum, int state); - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void handle_timers(int cycles); - virtual void upd7810_take_irq(); + virtual void device_reset() override; + virtual void execute_set_input(int inputnum, int state) override; + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void handle_timers(int cycles) override; + virtual void upd7810_take_irq() override; }; @@ -1403,12 +1403,12 @@ public: upd78c05_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const { return (clocks + 4 - 1) / 4; } - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const { return (cycles * 4); } - virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); - virtual void handle_timers(int cycles); + virtual void device_start() override; + virtual void device_reset() override; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override { return (clocks + 4 - 1) / 4; } + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override { return (cycles * 4); } + virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; + virtual void handle_timers(int cycles) override; }; diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h index 225a658edc3..559d7350602 100644 --- a/src/devices/cpu/z80/tmpz84c015.h +++ b/src/devices/cpu/z80/tmpz84c015.h @@ -209,14 +209,14 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; const address_space_config m_io_space_config; - const address_space_config *memory_space_config(address_spacenum spacenum) const + const address_space_config *memory_space_config(address_spacenum spacenum) const override { switch (spacenum) { diff --git a/src/devices/imagedev/bitbngr.h b/src/devices/imagedev/bitbngr.h index f2a486a04a7..cd0f38df516 100644 --- a/src/devices/imagedev/bitbngr.h +++ b/src/devices/imagedev/bitbngr.h @@ -17,27 +17,27 @@ public: bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual bool call_load(); - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); + virtual bool call_load() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_SERIAL; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return ""; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_SERIAL; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return ""; } + virtual const option_guide *create_option_guide() const override { return nullptr; } void output(UINT8 data); UINT32 input(void *buffer, UINT32 length); protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; }; // device type definition diff --git a/src/devices/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h index 5bdd7e4122a..5303b474045 100644 --- a/src/devices/imagedev/chd_cd.h +++ b/src/devices/imagedev/chd_cd.h @@ -31,28 +31,28 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<cdrom_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } - virtual iodevice_t image_type() const { return IO_CDROM; } + virtual iodevice_t image_type() const override { return IO_CDROM; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_extension_list; } - virtual const option_guide *create_option_guide() const; + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_extension_list; } + virtual const option_guide *create_option_guide() const override; // specific implementation cdrom_file *get_cdrom_file() { return m_cdrom_handle; } protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; chd_file m_self_chd; cdrom_file *m_cdrom_handle; diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 4d1b4cc6800..9d4333cfae2 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -98,21 +98,21 @@ public: template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); } - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); - - virtual iodevice_t image_type() const { return IO_FLOPPY; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const; - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const; - virtual const char *file_extensions() const { return m_extension_list; } - virtual const option_guide *create_option_guide() const { return floppy_option_guide; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; + + virtual iodevice_t image_type() const override { return IO_FLOPPY; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override; + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override; + virtual const char *file_extensions() const override { return m_extension_list; } + virtual const option_guide *create_option_guide() const override { return floppy_option_guide; } floppy_image_legacy *flopimg_get_image(); void floppy_drive_set_geometry(floppy_type_t type); @@ -166,8 +166,8 @@ private: protected: // device overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; /* callbacks */ devcb_write_line m_out_idx_func; diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h index f72dc0553f1..7c3da504a5a 100644 --- a/src/devices/imagedev/harddriv.h +++ b/src/devices/imagedev/harddriv.h @@ -32,21 +32,21 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<harddisk_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual bool call_create(int create_format, option_resolution *create_args); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } - - virtual iodevice_t image_type() const { return IO_HARDDISK; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return "chd,hd"; } - virtual const option_guide *create_option_guide() const; + virtual bool call_load() override; + virtual bool call_create(int create_format, option_resolution *create_args) override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + + virtual iodevice_t image_type() const override { return IO_HARDDISK; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return "chd,hd"; } + virtual const option_guide *create_option_guide() const override; // specific implementation hard_disk_file *get_hard_disk_file() { return m_hard_disk_handle; } @@ -56,9 +56,9 @@ protected: harddisk_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; int internal_load_hd(); diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index b42a212c2a5..fe55ad12989 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -88,8 +88,8 @@ public: // Head select void headsel_w(int head) { m_current_head = head & 0x0f; } - bool call_load(); - void call_unload(); + bool call_load() override; + void call_unload() override; // Tells us the time when the track ends (next index pulse). Needed by the controller. attotime track_end_time(); @@ -102,10 +102,10 @@ public: int get_actual_heads(); protected: - void device_start(); - void device_stop(); - void device_reset(); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_start() override; + void device_stop() override; + void device_reset() override; + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; std::string tts(const attotime &t); @@ -217,8 +217,8 @@ public: void configure(mfmhd_enc_t encoding, int spinupms, int cache, mfmhd_format_type format); protected: - void device_start() { }; - void device_config_complete(); + void device_start() override { }; + void device_config_complete() override; private: mfmhd_enc_t m_encoding; diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h index 42c6873cb4f..b4c04d1e549 100644 --- a/src/devices/imagedev/midiin.h +++ b/src/devices/imagedev/midiin.h @@ -31,31 +31,31 @@ public: template<class _Object> static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast<midiin_device &>(device).m_input_cb.set_callback(object); } // image-level overrides - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_MIDIIN; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "mid"; } - virtual bool core_opens_image_file() const { return FALSE; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_MIDIIN; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "mid"; } + virtual bool core_opens_image_file() const override { return FALSE; } + virtual const option_guide *create_option_guide() const override { return nullptr; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_config_complete(); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_config_complete() override; // serial overrides - virtual void tra_complete(); // Tx completed sending byte - virtual void tra_callback(); // Tx send bit + virtual void tra_complete() override; // Tx completed sending byte + virtual void tra_callback() override; // Tx send bit private: static const int XMIT_RING_SIZE = (8192*4*4); diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h index d6da8c732c2..b154773ddea 100644 --- a/src/devices/imagedev/midiout.h +++ b/src/devices/imagedev/midiout.h @@ -34,32 +34,32 @@ public: midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_MIDIOUT; } - virtual bool is_readable() const { return 0; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "mid"; } - virtual bool core_opens_image_file() const { return FALSE; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_MIDIOUT; } + virtual bool is_readable() const override { return 0; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "mid"; } + virtual bool core_opens_image_file() const override { return FALSE; } + virtual const option_guide *create_option_guide() const override { return nullptr; } virtual void tx(UINT8 state) { rx_w(state); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void device_config_complete(); + virtual void device_config_complete() override; // serial overrides - virtual void rcv_complete(); // Rx completed receiving byte + virtual void rcv_complete() override; // Rx completed receiving byte private: osd_midi_device *m_midi; diff --git a/src/devices/imagedev/printer.h b/src/devices/imagedev/printer.h index ccd388d6663..8db31298bf7 100644 --- a/src/devices/imagedev/printer.h +++ b/src/devices/imagedev/printer.h @@ -30,19 +30,19 @@ public: template<class _Object> static devcb_base &set_online_callback(device_t &device, _Object object) { return downcast<printer_image_device &>(device).m_online_cb.set_callback(object); } // image-level overrides - virtual bool call_load(); - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); + virtual bool call_load() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_PRINTER; } - virtual bool is_readable() const { return 0; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "prn"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_PRINTER; } + virtual bool is_readable() const override { return 0; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "prn"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // specific implementation @@ -52,8 +52,8 @@ public: void output(UINT8 data); protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; devcb_write_line m_online_cb; }; diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index 5ef6f1dc191..3b88319a121 100644 --- a/src/devices/imagedev/snapquik.h +++ b/src/devices/imagedev/snapquik.h @@ -26,25 +26,25 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<snapshot_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual iodevice_t image_type() const { return IO_SNAPSHOT; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_file_extensions; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } + virtual iodevice_t image_type() const override { return IO_SNAPSHOT; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_file_extensions; } + virtual const option_guide *create_option_guide() const override { return nullptr; } TIMER_CALLBACK_MEMBER(process_snapshot_or_quickload); void set_handler(snapquick_load_delegate load, const char *ext, seconds_t sec) { m_load = load; m_file_extensions = ext; m_delay_seconds = sec; }; protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; snapquick_load_delegate m_load; /* loading function */ const char * m_file_extensions; /* file extensions */ @@ -65,7 +65,7 @@ public: // construction/destruction quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual iodevice_t image_type() const { return IO_QUICKLOAD; } + virtual iodevice_t image_type() const override { return IO_QUICKLOAD; } }; // device type definition diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h index bc632c8cdca..09411a0d3e3 100644 --- a/src/devices/machine/40105.h +++ b/src/devices/machine/40105.h @@ -53,8 +53,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write_line m_write_dir; diff --git a/src/devices/machine/64h156.h b/src/devices/machine/64h156.h index d21ce389dd0..6cab8bb369d 100644 --- a/src/devices/machine/64h156.h +++ b/src/devices/machine/64h156.h @@ -121,9 +121,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum { diff --git a/src/devices/machine/6522via.h b/src/devices/machine/6522via.h index 0b882ee7195..467ff0885fb 100644 --- a/src/devices/machine/6522via.h +++ b/src/devices/machine/6522via.h @@ -130,9 +130,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: static const device_timer_id TIMER_SHIFT = 0; diff --git a/src/devices/machine/6525tpi.h b/src/devices/machine/6525tpi.h index 5a2e07d12dd..a1699ea213b 100644 --- a/src/devices/machine/6525tpi.h +++ b/src/devices/machine/6525tpi.h @@ -83,8 +83,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/6821pia.h b/src/devices/machine/6821pia.h index cc686114feb..64631184d29 100644 --- a/src/devices/machine/6821pia.h +++ b/src/devices/machine/6821pia.h @@ -131,8 +131,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 reg_r(UINT8 offset); diff --git a/src/devices/machine/6840ptm.h b/src/devices/machine/6840ptm.h index d00577d62d0..5eb1cdd211c 100644 --- a/src/devices/machine/6840ptm.h +++ b/src/devices/machine/6840ptm.h @@ -83,9 +83,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void subtract_from_counter(int counter, int count); diff --git a/src/devices/machine/6850acia.h b/src/devices/machine/6850acia.h index 8bb1a3891bd..efaf153bc0c 100644 --- a/src/devices/machine/6850acia.h +++ b/src/devices/machine/6850acia.h @@ -50,7 +50,7 @@ protected: acia6850_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; virtual void update_irq(); int calculate_txirq(); diff --git a/src/devices/machine/am9517a.h b/src/devices/machine/am9517a.h index 817cf5ce9df..7d5bd2601f4 100644 --- a/src/devices/machine/am9517a.h +++ b/src/devices/machine/am9517a.h @@ -86,9 +86,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void execute_run(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_run() override; int m_icount; UINT32 m_address_mask; @@ -161,13 +161,13 @@ public: // construction/destruction upd71071_v53_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_READ8_MEMBER( read ); - virtual DECLARE_WRITE8_MEMBER( write ); + virtual DECLARE_READ8_MEMBER( read ) override; + virtual DECLARE_WRITE8_MEMBER( write ) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; int m_selected_channel; int m_base; diff --git a/src/devices/machine/at29x.h b/src/devices/machine/at29x.h index 91c81c585cf..6c8eb6531eb 100644 --- a/src/devices/machine/at29x.h +++ b/src/devices/machine/at29x.h @@ -39,14 +39,14 @@ public: DECLARE_WRITE8_MEMBER( write ); protected: - virtual void device_start(void); - virtual void device_reset(void); - virtual void device_stop(void); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - - void nvram_default(); - void nvram_read(emu_file &file); - void nvram_write(emu_file &file); + virtual void device_start(void) override; + virtual void device_reset(void) override; + virtual void device_stop(void) override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + + void nvram_default() override; + void nvram_read(emu_file &file) override; + void nvram_write(emu_file &file) override; int get_sector_number(offs_t address) { return address / m_sector_size; } diff --git a/src/devices/machine/at_keybc.h b/src/devices/machine/at_keybc.h index 2051071da5f..d6ff52d6975 100644 --- a/src/devices/machine/at_keybc.h +++ b/src/devices/machine/at_keybc.h @@ -75,12 +75,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual const rom_entry *device_rom_region() const; - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; private: // internal state diff --git a/src/devices/machine/ataintf.h b/src/devices/machine/ataintf.h index 01ee67e159f..d1752d5923b 100644 --- a/src/devices/machine/ataintf.h +++ b/src/devices/machine/ataintf.h @@ -31,8 +31,8 @@ public: ata_device_interface *dev() { return m_dev; } protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; private: ata_device_interface *m_dev; @@ -95,8 +95,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; virtual void set_irq(int state); virtual void set_dmarq(int state); diff --git a/src/devices/machine/bankdev.h b/src/devices/machine/bankdev.h index aaff8fca996..946faef53f0 100644 --- a/src/devices/machine/bankdev.h +++ b/src/devices/machine/bankdev.h @@ -51,11 +51,11 @@ public: void set_bank(offs_t offset); protected: - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_PROGRAM) ? &m_program_config : nullptr; } private: // internal state diff --git a/src/devices/machine/buffer.h b/src/devices/machine/buffer.h index cab1b9914f4..7c719c918af 100644 --- a/src/devices/machine/buffer.h +++ b/src/devices/machine/buffer.h @@ -21,7 +21,7 @@ public: DECLARE_WRITE_LINE_MEMBER(write_bit7) { if (state) m_input_data |= 0x80; else m_input_data &= ~0x80; } protected: - virtual void device_start(); + virtual void device_start() override; UINT8 m_input_data; }; diff --git a/src/devices/machine/clock.h b/src/devices/machine/clock.h index 9f3712327aa..4be97128bfe 100644 --- a/src/devices/machine/clock.h +++ b/src/devices/machine/clock.h @@ -18,9 +18,9 @@ public: template<class _Object> static devcb_base &set_signal_handler(device_t &device, _Object object) { return downcast<clock_device &>(device).m_signal_handler.set_callback(object); } protected: - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_clock_changed(); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_clock_changed() override; private: void update_timer(); diff --git a/src/devices/machine/com8116.h b/src/devices/machine/com8116.h index a423f3782d7..119f40d4b3d 100644 --- a/src/devices/machine/com8116.h +++ b/src/devices/machine/com8116.h @@ -68,9 +68,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int m_param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int m_param, void *ptr) override; private: enum diff --git a/src/devices/machine/corvushd.h b/src/devices/machine/corvushd.h index bc83fa2585d..cb3bee03594 100644 --- a/src/devices/machine/corvushd.h +++ b/src/devices/machine/corvushd.h @@ -190,8 +190,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum diff --git a/src/devices/machine/dmac.h b/src/devices/machine/dmac.h index 52c5d64ff5d..2d86c427013 100644 --- a/src/devices/machine/dmac.h +++ b/src/devices/machine/dmac.h @@ -96,11 +96,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // amiga_autoconfig overrides - virtual void autoconfig_base_address(offs_t address); + virtual void autoconfig_base_address(offs_t address) override; private: diff --git a/src/devices/machine/dp8390.h b/src/devices/machine/dp8390.h index 46889b3b025..09dd590f176 100644 --- a/src/devices/machine/dp8390.h +++ b/src/devices/machine/dp8390.h @@ -49,12 +49,12 @@ public: DECLARE_READ16_MEMBER( dp8390_r ); DECLARE_WRITE_LINE_MEMBER( dp8390_cs ); DECLARE_WRITE_LINE_MEMBER( dp8390_reset ); - void recv_cb(UINT8 *buf, int len); + void recv_cb(UINT8 *buf, int len) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; int m_type; diff --git a/src/devices/machine/ds128x.h b/src/devices/machine/ds128x.h index d07e785340f..7dbd2deb92c 100644 --- a/src/devices/machine/ds128x.h +++ b/src/devices/machine/ds128x.h @@ -17,7 +17,7 @@ public: ds12885_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int data_size() { return 128; } + virtual int data_size() override { return 128; } }; // device type definition diff --git a/src/devices/machine/ds1302.h b/src/devices/machine/ds1302.h index 15a6fad80c8..515613579b2 100644 --- a/src/devices/machine/ds1302.h +++ b/src/devices/machine/ds1302.h @@ -52,18 +52,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); - virtual bool rtc_feature_leap_year() { return true; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; + virtual bool rtc_feature_leap_year() override { return true; } private: void load_shift_register(); diff --git a/src/devices/machine/ds1315.h b/src/devices/machine/ds1315.h index 0d5a7abc802..1894a05aac7 100644 --- a/src/devices/machine/ds1315.h +++ b/src/devices/machine/ds1315.h @@ -44,9 +44,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/e05a03.h b/src/devices/machine/e05a03.h index 03fa2aca98a..86b36b673b0 100644 --- a/src/devices/machine/e05a03.h +++ b/src/devices/machine/e05a03.h @@ -57,8 +57,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/e05a30.h b/src/devices/machine/e05a30.h index 95e4fadb37c..f05b3fd35c9 100644 --- a/src/devices/machine/e05a30.h +++ b/src/devices/machine/e05a30.h @@ -75,8 +75,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: /* callbacks */ diff --git a/src/devices/machine/eeprom.h b/src/devices/machine/eeprom.h index d6db74f5a21..23ba81cf42f 100644 --- a/src/devices/machine/eeprom.h +++ b/src/devices/machine/eeprom.h @@ -81,17 +81,17 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; // internal read/write without side-effects UINT32 internal_read(offs_t address); diff --git a/src/devices/machine/eeprompar.h b/src/devices/machine/eeprompar.h index c9ae497f70f..e8ed153dd97 100644 --- a/src/devices/machine/eeprompar.h +++ b/src/devices/machine/eeprompar.h @@ -55,8 +55,8 @@ protected: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/machine/eepromser.h b/src/devices/machine/eepromser.h index 49161ba883f..cbba81bfbbe 100644 --- a/src/devices/machine/eepromser.h +++ b/src/devices/machine/eepromser.h @@ -94,8 +94,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // read interfaces differ between implementations @@ -191,7 +191,7 @@ public: protected: // subclass overrides - virtual void parse_command_and_address(); + virtual void parse_command_and_address() override; }; @@ -215,7 +215,7 @@ public: protected: // subclass overrides - virtual void parse_command_and_address(); + virtual void parse_command_and_address() override; }; @@ -240,13 +240,13 @@ public: protected: // subclass overrides - virtual void parse_command_and_address(); - void handle_event(eeprom_event event); + virtual void parse_command_and_address() override; + void handle_event(eeprom_event event) override; virtual void parse_command_and_address_2_bit(); - void execute_command(); + void execute_command() override; void copy_ram_to_eeprom(); void copy_eeprom_to_ram(); - void device_start(); + void device_start() override; UINT8 m_ram_length; UINT16 m_ram_data[16]; UINT16 m_reading; diff --git a/src/devices/machine/hdc92x4.h b/src/devices/machine/hdc92x4.h index da3c5b6d954..fccf23666d7 100644 --- a/src/devices/machine/hdc92x4.h +++ b/src/devices/machine/hdc92x4.h @@ -115,8 +115,8 @@ public: void connect_hard_drive(mfm_harddisk_device *harddisk); protected: - void device_start(); - void device_reset(); + void device_start() override; + void device_reset() override; bool m_is_hdc9234; @@ -173,7 +173,7 @@ protected: // emu_timer *m_live_timer; // Timer callback - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // Handlers for incoming signals void ready_handler(); diff --git a/src/devices/machine/i2cmem.h b/src/devices/machine/i2cmem.h index ce1bbdb3141..d17d6f2f277 100644 --- a/src/devices/machine/i2cmem.h +++ b/src/devices/machine/i2cmem.h @@ -111,17 +111,17 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const; + virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read( emu_file &file ); - virtual void nvram_write( emu_file &file ); + virtual void nvram_default() override; + virtual void nvram_read( emu_file &file ) override; + virtual void nvram_write( emu_file &file ) override; // internal helpers int address_mask(); diff --git a/src/devices/machine/i8251.h b/src/devices/machine/i8251.h index eb5fdd612e4..7a2f7ec55fd 100644 --- a/src/devices/machine/i8251.h +++ b/src/devices/machine/i8251.h @@ -83,9 +83,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void update_rx_ready(); void update_tx_ready(); diff --git a/src/devices/machine/i8255.h b/src/devices/machine/i8255.h index c232b2105e0..1fa41e727a5 100644 --- a/src/devices/machine/i8255.h +++ b/src/devices/machine/i8255.h @@ -92,8 +92,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: inline void check_interrupt(int port); diff --git a/src/devices/machine/idectrl.h b/src/devices/machine/idectrl.h index d31490e2385..695970425ee 100644 --- a/src/devices/machine/idectrl.h +++ b/src/devices/machine/idectrl.h @@ -92,10 +92,10 @@ public: DECLARE_WRITE32_MEMBER( bmdma_w ); protected: - virtual void device_start(); + virtual void device_start() override; - virtual void set_irq(int state); - virtual void set_dmarq(int state); + virtual void set_irq(int state) override; + virtual void set_dmarq(int state) override; private: void execute_dma(); diff --git a/src/devices/machine/ins8250.h b/src/devices/machine/ins8250.h index 9415c2b70ce..547c3dea602 100644 --- a/src/devices/machine/ins8250.h +++ b/src/devices/machine/ins8250.h @@ -37,12 +37,12 @@ public: DECLARE_WRITE_LINE_MEMBER( rx_w ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void rcv_complete(); - virtual void tra_complete(); - virtual void tra_callback(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void rcv_complete() override; + virtual void tra_complete() override; + virtual void tra_callback() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void set_fcr(UINT8 data) {} virtual void push_tx(UINT8 data) {} @@ -110,14 +110,14 @@ class ns16550_device : public ins8250_uart_device public: ns16550_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void rcv_complete(); - virtual void tra_complete(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void set_fcr(UINT8 data); - virtual void push_tx(UINT8 data); - virtual UINT8 pop_rx(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void rcv_complete() override; + virtual void tra_complete() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void set_fcr(UINT8 data) override; + virtual void push_tx(UINT8 data) override; + virtual UINT8 pop_rx() override; private: void set_timer() { m_timeout->adjust(attotime::from_hz((clock()*4*8)/(m_regs.dl*16))); } int m_rintlvl; @@ -137,7 +137,7 @@ public: DECLARE_WRITE8_MEMBER(write) { ((offset & 8) ? m_chan1 : m_chan0)->ins8250_w(space, offset & 7, data, mem_mask); } protected: - virtual void device_start(); + virtual void device_start() override; private: ns16550_device *m_chan0; diff --git a/src/devices/machine/intelfsh.h b/src/devices/machine/intelfsh.h index 5e4b86f10d2..c52856e0cef 100644 --- a/src/devices/machine/intelfsh.h +++ b/src/devices/machine/intelfsh.h @@ -147,16 +147,16 @@ protected: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; // derived helpers UINT32 read_full(UINT32 offset); diff --git a/src/devices/machine/kb3600.h b/src/devices/machine/kb3600.h index 57a42c906fb..1d0529e7a0c 100644 --- a/src/devices/machine/kb3600.h +++ b/src/devices/machine/kb3600.h @@ -126,9 +126,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: static const int MAX_KEYS_DOWN = 4; diff --git a/src/devices/machine/keyboard.h b/src/devices/machine/keyboard.h index 8658cf3f92f..79a91f923c9 100644 --- a/src/devices/machine/keyboard.h +++ b/src/devices/machine/keyboard.h @@ -26,8 +26,8 @@ public: template<class _Object> static devcb_base &set_keyboard_callback(device_t &device, _Object object) { return downcast<generic_keyboard_device &>(device).m_keyboard_cb.set_callback(object); } - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: required_ioport m_io_kbd0; required_ioport m_io_kbd1; @@ -41,9 +41,9 @@ protected: required_ioport m_io_kbd9; required_ioport m_io_kbdc; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void send_key(UINT8 code) { m_keyboard_cb((offs_t)0, code); } emu_timer *m_timer; private: diff --git a/src/devices/machine/latch.h b/src/devices/machine/latch.h index f184fd3a865..66e08614b66 100644 --- a/src/devices/machine/latch.h +++ b/src/devices/machine/latch.h @@ -45,7 +45,7 @@ public: DECLARE_WRITE8_MEMBER(write) { write(data); } protected: - virtual void device_start(); + virtual void device_start() override; private: bool m_resolved; diff --git a/src/devices/machine/legscsi.h b/src/devices/machine/legscsi.h index c7382fa9ad0..b3d8800972c 100644 --- a/src/devices/machine/legscsi.h +++ b/src/devices/machine/legscsi.h @@ -18,7 +18,7 @@ public: static void set_scsi_port(device_t &device, const char *tag) { downcast<legacy_scsi_host_adapter &>(device).m_scsi_port.set_tag(tag); } protected: - virtual void device_start(); + virtual void device_start() override; void reset_bus(); bool select(int id); diff --git a/src/devices/machine/mb89352.h b/src/devices/machine/mb89352.h index 05776ca4e34..faae5c4ab3f 100644 --- a/src/devices/machine/mb89352.h +++ b/src/devices/machine/mb89352.h @@ -73,10 +73,10 @@ public: protected: // device-level overrides (none are required, but these are common) - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: // internal device state goes here diff --git a/src/devices/machine/mc146818.h b/src/devices/machine/mc146818.h index 341bd1d2f8d..c1c30eae17e 100644 --- a/src/devices/machine/mc146818.h +++ b/src/devices/machine/mc146818.h @@ -75,14 +75,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; static const unsigned char ALARM_DONTCARE = 0xc0; static const unsigned char HOURS_PM = 0x80; diff --git a/src/devices/machine/mc2661.h b/src/devices/machine/mc2661.h index 5cc2f3e27fc..a18aa0141f1 100644 --- a/src/devices/machine/mc2661.h +++ b/src/devices/machine/mc2661.h @@ -107,14 +107,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; private: devcb_write_line m_write_txd; diff --git a/src/devices/machine/mc6843.h b/src/devices/machine/mc6843.h index 3a855d1c196..9dea3271e0d 100644 --- a/src/devices/machine/mc6843.h +++ b/src/devices/machine/mc6843.h @@ -33,9 +33,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum diff --git a/src/devices/machine/mc6852.h b/src/devices/machine/mc6852.h index 859d9e8bef2..68cd76f6126 100644 --- a/src/devices/machine/mc6852.h +++ b/src/devices/machine/mc6852.h @@ -89,14 +89,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int m_param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int m_param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; private: devcb_write_line m_write_tx_data; diff --git a/src/devices/machine/mc6854.h b/src/devices/machine/mc6854.h index 2808255c0f6..9c665d0429b 100644 --- a/src/devices/machine/mc6854.h +++ b/src/devices/machine/mc6854.h @@ -70,8 +70,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/mm58167.h b/src/devices/machine/mm58167.h index 83714042433..c1a7e0b320e 100644 --- a/src/devices/machine/mm58167.h +++ b/src/devices/machine/mm58167.h @@ -44,13 +44,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); - virtual bool rtc_feature_leap_year() { return true; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; + virtual bool rtc_feature_leap_year() override { return true; } void set_irq(int bit); void update_rtc(); diff --git a/src/devices/machine/mm58274c.h b/src/devices/machine/mm58274c.h index 225340721ea..f92a795c6db 100644 --- a/src/devices/machine/mm58274c.h +++ b/src/devices/machine/mm58274c.h @@ -24,8 +24,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/mos6526.h b/src/devices/machine/mos6526.h index da54967e080..99bfab3abc3 100644 --- a/src/devices/machine/mos6526.h +++ b/src/devices/machine/mos6526.h @@ -148,10 +148,10 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void execute_run(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void execute_run() override; int m_icount; int m_variant; @@ -269,7 +269,7 @@ public: DECLARE_WRITE8_MEMBER( write ); protected: - virtual inline void clock_tod(); + virtual inline void clock_tod() override; }; diff --git a/src/devices/machine/mos6530n.h b/src/devices/machine/mos6530n.h index c19d8d2eb2d..71688040e89 100644 --- a/src/devices/machine/mos6530n.h +++ b/src/devices/machine/mos6530n.h @@ -248,9 +248,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; enum { @@ -383,11 +383,11 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; - void update_pb(); - void update_irq(); - UINT8 get_irq_flags(); + void update_pb() override; + void update_irq() override; + UINT8 get_irq_flags() override; }; @@ -406,7 +406,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/machine/mos6551.h b/src/devices/machine/mos6551.h index 7ba7d6bc7f3..9567ccc02a4 100644 --- a/src/devices/machine/mos6551.h +++ b/src/devices/machine/mos6551.h @@ -76,9 +76,9 @@ public: void set_xtal(UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: enum diff --git a/src/devices/machine/mos6702.h b/src/devices/machine/mos6702.h index d0675e5140b..191bff45bcc 100644 --- a/src/devices/machine/mos6702.h +++ b/src/devices/machine/mos6702.h @@ -54,7 +54,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/machine/mos8726.h b/src/devices/machine/mos8726.h index 324d99794de..8edc5e001d9 100644 --- a/src/devices/machine/mos8726.h +++ b/src/devices/machine/mos8726.h @@ -81,9 +81,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void execute_run(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_run() override; int m_icount; int m_bs; diff --git a/src/devices/machine/mpu401.h b/src/devices/machine/mpu401.h index 58acb3ab98e..4d3b8347eda 100644 --- a/src/devices/machine/mpu401.h +++ b/src/devices/machine/mpu401.h @@ -26,7 +26,7 @@ public: mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; required_device<m6801_cpu_device> m_ourcpu; @@ -53,10 +53,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual const rom_entry *device_rom_region() const; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual const rom_entry *device_rom_region() const override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: UINT8 m_port2; diff --git a/src/devices/machine/msm5832.h b/src/devices/machine/msm5832.h index 68b72a3f8bf..a437501f23b 100644 --- a/src/devices/machine/msm5832.h +++ b/src/devices/machine/msm5832.h @@ -64,12 +64,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: static const device_timer_id TIMER_CLOCK = 0; diff --git a/src/devices/machine/msm6242.h b/src/devices/machine/msm6242.h index 4d44fd1b860..f53e4b60f01 100644 --- a/src/devices/machine/msm6242.h +++ b/src/devices/machine/msm6242.h @@ -36,14 +36,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_pre_save(); - virtual void device_post_load(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_pre_save() override; + virtual void device_post_load() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // rtc overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: static const int RTC_TICKS = ~0; diff --git a/src/devices/machine/ncr5380n.h b/src/devices/machine/ncr5380n.h index e9a142d78e5..444ef1af32d 100644 --- a/src/devices/machine/ncr5380n.h +++ b/src/devices/machine/ncr5380n.h @@ -50,15 +50,15 @@ public: DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); - virtual void scsi_ctrl_changed(); + virtual void scsi_ctrl_changed() override; UINT8 dma_r(); void dma_w(UINT8 val); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum { MODE_D, MODE_T, MODE_I }; diff --git a/src/devices/machine/nscsi_bus.h b/src/devices/machine/nscsi_bus.h index 2aa4a57db7e..c0b35af248e 100644 --- a/src/devices/machine/nscsi_bus.h +++ b/src/devices/machine/nscsi_bus.h @@ -27,9 +27,9 @@ public: UINT32 data_r() const; protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_config_complete() override; private: struct dev_t { @@ -57,7 +57,7 @@ public: nscsi_device *get_device(); protected: - virtual void device_start(); + virtual void device_start() override; }; class nscsi_device : public device_t, @@ -95,7 +95,7 @@ protected: int scsi_refid; nscsi_bus_device *scsi_bus; - virtual void device_start(); + virtual void device_start() override; }; class nscsi_full_device : public nscsi_device @@ -103,7 +103,7 @@ class nscsi_full_device : public nscsi_device public: nscsi_full_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void scsi_ctrl_changed(); + virtual void scsi_ctrl_changed() override; protected: enum { SCSI_TIMER = 100 }; @@ -276,9 +276,9 @@ protected: int scsi_cmdsize; UINT8 scsi_identify; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual void scsi_message(); virtual void scsi_command(); diff --git a/src/devices/machine/nscsi_cd.h b/src/devices/machine/nscsi_cd.h index a890848152d..a251d1a3e98 100644 --- a/src/devices/machine/nscsi_cd.h +++ b/src/devices/machine/nscsi_cd.h @@ -10,14 +10,14 @@ class nscsi_cdrom_device : public nscsi_full_device { public: nscsi_cdrom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void scsi_command(); - virtual UINT8 scsi_get_data(int id, int pos); + virtual void scsi_command() override; + virtual UINT8 scsi_get_data(int id, int pos) override; private: UINT8 block[2048]; diff --git a/src/devices/machine/nscsi_hd.h b/src/devices/machine/nscsi_hd.h index 855c125294d..2206b3e3a73 100644 --- a/src/devices/machine/nscsi_hd.h +++ b/src/devices/machine/nscsi_hd.h @@ -12,15 +12,15 @@ public: nscsi_harddisk_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); nscsi_harddisk_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void scsi_command(); - virtual UINT8 scsi_get_data(int id, int pos); - virtual void scsi_put_data(int buf, int offset, UINT8 data); + virtual void scsi_command() override; + virtual UINT8 scsi_get_data(int id, int pos) override; + virtual void scsi_put_data(int buf, int offset, UINT8 data) override; UINT8 block[512]; hard_disk_file *harddisk; diff --git a/src/devices/machine/nvram.h b/src/devices/machine/nvram.h index 10c3954a83c..ac6b62e7bca 100644 --- a/src/devices/machine/nvram.h +++ b/src/devices/machine/nvram.h @@ -88,12 +88,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; // internal helpers void determine_final_base(); diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h index 159bb89a59b..a8a0dfa1733 100644 --- a/src/devices/machine/pc_fdc.h +++ b/src/devices/machine/pc_fdc.h @@ -35,10 +35,10 @@ public: virtual DECLARE_ADDRESS_MAP(map, 8); - virtual void tc_w(bool state); - virtual UINT8 dma_r(); - virtual void dma_w(UINT8 data); - virtual UINT8 do_dir_r(); + virtual void tc_w(bool state) override; + virtual UINT8 dma_r() override; + virtual void dma_w(UINT8 data) override; + virtual UINT8 do_dir_r() override; READ8_MEMBER(dor_r); WRITE8_MEMBER(dor_w); @@ -48,9 +48,9 @@ public: DECLARE_WRITE_LINE_MEMBER( drq_w ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; bool irq, drq, fdc_drq, fdc_irq; devcb_write_line intrq_cb, drq_cb; diff --git a/src/devices/machine/pc_lpt.h b/src/devices/machine/pc_lpt.h index 08de865ce94..ca2a71f6524 100644 --- a/src/devices/machine/pc_lpt.h +++ b/src/devices/machine/pc_lpt.h @@ -40,9 +40,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: void update_irq(); diff --git a/src/devices/machine/pic8259.h b/src/devices/machine/pic8259.h index 19e3d95ee2f..d02c74bca4f 100644 --- a/src/devices/machine/pic8259.h +++ b/src/devices/machine/pic8259.h @@ -68,9 +68,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: static const device_timer_id TIMER_CHECK_IRQ = 0; diff --git a/src/devices/machine/pit8253.h b/src/devices/machine/pit8253.h index 67e3f86b23b..e31ce8a3d19 100644 --- a/src/devices/machine/pit8253.h +++ b/src/devices/machine/pit8253.h @@ -91,9 +91,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // internal state struct pit8253_timer @@ -164,7 +164,7 @@ public: pit8254_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void readback_command(UINT8 data); + virtual void readback_command(UINT8 data) override; }; extern const device_type PIT8254; diff --git a/src/devices/machine/pla.h b/src/devices/machine/pla.h index 10dbc850370..9f14a155ac5 100644 --- a/src/devices/machine/pla.h +++ b/src/devices/machine/pla.h @@ -104,7 +104,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: void parse_fusemap(); diff --git a/src/devices/machine/rtc65271.h b/src/devices/machine/rtc65271.h index b81e92755d5..c5d554e75fd 100644 --- a/src/devices/machine/rtc65271.h +++ b/src/devices/machine/rtc65271.h @@ -25,11 +25,11 @@ public: rtc65271_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; public: template<class _Object> static devcb_base &set_interrupt_callback(device_t &device, _Object object) { return downcast<rtc65271_device &>(device).m_interrupt_cb.set_callback(object); } diff --git a/src/devices/machine/spchrom.h b/src/devices/machine/spchrom.h index 520c7fc967b..c72af249529 100644 --- a/src/devices/machine/spchrom.h +++ b/src/devices/machine/spchrom.h @@ -23,7 +23,7 @@ public: void set_reverse_bit_order(bool reverse) { m_reverse = reverse; } // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: UINT8 *m_speechrom_data; /* pointer to speech ROM data */ diff --git a/src/devices/machine/steppers.h b/src/devices/machine/steppers.h index 1ed62da6885..4b180e75355 100644 --- a/src/devices/machine/steppers.h +++ b/src/devices/machine/steppers.h @@ -154,8 +154,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 m_pattern; /* coil pattern */ diff --git a/src/devices/machine/strata.h b/src/devices/machine/strata.h index c037a24396b..1d1835f0812 100644 --- a/src/devices/machine/strata.h +++ b/src/devices/machine/strata.h @@ -19,13 +19,13 @@ public: protected: // device-level overrides - void device_config_complete(); + void device_config_complete() override; - void device_start(); + void device_start() override; - void nvram_default(); - void nvram_read(emu_file &file); - void nvram_write(emu_file &file); + void nvram_default() override; + void nvram_read(emu_file &file) override; + void nvram_write(emu_file &file) override; private: diff --git a/src/devices/machine/t10mmc.h b/src/devices/machine/t10mmc.h index 47706a098f7..07056e22795 100644 --- a/src/devices/machine/t10mmc.h +++ b/src/devices/machine/t10mmc.h @@ -16,15 +16,15 @@ t10mmc.h class t10mmc : public virtual t10spc { public: - virtual void SetDevice( void *device ); - virtual void GetDevice( void **device ); - virtual void ExecCommand(); - virtual void WriteData( UINT8 *data, int dataLength ); - virtual void ReadData( UINT8 *data, int dataLength ); + virtual void SetDevice( void *device ) override; + virtual void GetDevice( void **device ) override; + virtual void ExecCommand() override; + virtual void WriteData( UINT8 *data, int dataLength ) override; + virtual void ReadData( UINT8 *data, int dataLength ) override; protected: - virtual void t10_start(device_t &device); - virtual void t10_reset(); + virtual void t10_start(device_t &device) override; + virtual void t10_reset() override; enum { diff --git a/src/devices/machine/t10sbc.h b/src/devices/machine/t10sbc.h index 03acda90c83..889b73c53a0 100644 --- a/src/devices/machine/t10sbc.h +++ b/src/devices/machine/t10sbc.h @@ -15,15 +15,15 @@ t10sbc.h class t10sbc : public virtual t10spc { public: - virtual void SetDevice( void *device ); - virtual void GetDevice( void **device ); - virtual void ExecCommand(); - virtual void WriteData( UINT8 *data, int dataLength ); - virtual void ReadData( UINT8 *data, int dataLength ); + virtual void SetDevice( void *device ) override; + virtual void GetDevice( void **device ) override; + virtual void ExecCommand() override; + virtual void WriteData( UINT8 *data, int dataLength ) override; + virtual void ReadData( UINT8 *data, int dataLength ) override; protected: - virtual void t10_start(device_t &device); - virtual void t10_reset(); + virtual void t10_start(device_t &device) override; + virtual void t10_reset() override; harddisk_image_device *m_image; diff --git a/src/devices/machine/terminal.h b/src/devices/machine/terminal.h index 0a0e2ff9b77..0f6901629af 100644 --- a/src/devices/machine/terminal.h +++ b/src/devices/machine/terminal.h @@ -35,15 +35,15 @@ public: DECLARE_WRITE8_MEMBER(kbd_put); UINT32 update(screen_device &device, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual ioport_constructor device_input_ports() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual ioport_constructor device_input_ports() const override; + virtual machine_config_constructor device_mconfig_additions() const override; protected: optional_device<palette_device> m_palette; required_ioport m_io_term_conf; virtual void term_write(UINT8 data); - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual void send_key(UINT8 code) { m_keyboard_cb((offs_t)0, code); } UINT8 m_buffer[TERMINAL_WIDTH*50]; // make big enough for teleprinter UINT8 m_x_pos; diff --git a/src/devices/machine/tms9901.h b/src/devices/machine/tms9901.h index d6859bf21c5..87d314e0685 100644 --- a/src/devices/machine/tms9901.h +++ b/src/devices/machine/tms9901.h @@ -87,13 +87,13 @@ public: private: static const device_timer_id DECREMENTER = 0; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void timer_reload(void); void field_interrupts(void); - void device_start(void); - void device_stop(void); - void device_reset(void); + void device_start(void) override; + void device_stop(void) override; + void device_reset(void) override; // State of the INT1-INT15 lines (must be inverted when queried) // Note that the levels must also be delivered when reading the pins, which diff --git a/src/devices/machine/tms9902.h b/src/devices/machine/tms9902.h index ba775d3caa1..f0ccf6c2b41 100644 --- a/src/devices/machine/tms9902.h +++ b/src/devices/machine/tms9902.h @@ -71,10 +71,10 @@ public: DECLARE_WRITE8_MEMBER( cruwrite ); protected: - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; private: void field_interrupts(); diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h index 745f6c6e648..3c80670ec8e 100644 --- a/src/devices/machine/upd1990a.h +++ b/src/devices/machine/upd1990a.h @@ -71,11 +71,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; enum { diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index a3465887943..19da61d4712 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -101,7 +101,7 @@ public: template<class _Object> static devcb_base &set_drq_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).drq_cb.set_callback(object); } template<class _Object> static devcb_base &set_hdl_wr_callback(device_t &device, _Object object) { return downcast<upd765_family_device &>(device).hdl_cb.set_callback(object); } - virtual DECLARE_ADDRESS_MAP(map, 8) = 0; + virtual DECLARE_ADDRESS_MAP(map, 8) override = 0; DECLARE_READ8_MEMBER (sra_r); DECLARE_READ8_MEMBER (srb_r); @@ -116,10 +116,10 @@ public: DECLARE_READ8_MEMBER (dir_r); DECLARE_WRITE8_MEMBER(ccr_w); - virtual UINT8 do_dir_r(); + virtual UINT8 do_dir_r() override; - UINT8 dma_r(); - void dma_w(UINT8 data); + UINT8 dma_r() override; + void dma_w(UINT8 data) override; // Same as the previous ones, but as memory-mappable members DECLARE_READ8_MEMBER(mdma_r); @@ -127,7 +127,7 @@ public: bool get_irq() const; bool get_drq() const; - void tc_w(bool val); + void tc_w(bool val) override; void ready_w(bool val); void set_rate(int rate); // rate in bps, to be used when the fdc is externally frequency-controlled @@ -139,9 +139,9 @@ public: void soft_reset(); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; enum { TIMER_DRIVE_READY_POLLING = 4 @@ -419,70 +419,70 @@ class upd765a_device : public upd765_family_device { public: upd765a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class upd765b_device : public upd765_family_device { public: upd765b_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class i8272a_device : public upd765_family_device { public: i8272a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class smc37c78_device : public upd765_family_device { public: smc37c78_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class upd72065_device : public upd765_family_device { public: upd72065_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class n82077aa_device : public upd765_family_device { public: n82077aa_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class pc_fdc_superio_device : public upd765_family_device { public: pc_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class dp8473_device : public upd765_family_device { public: dp8473_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class pc8477a_device : public upd765_family_device { public: pc8477a_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class wd37c65c_device : public upd765_family_device { public: wd37c65c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; class mcs3201_device : public upd765_family_device { @@ -492,11 +492,11 @@ public: // static configuration helpers template<class _Object> static devcb_base &set_input_handler(device_t &device, _Object object) { return downcast<mcs3201_device &>(device).m_input_handler.set_callback(object); } - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; DECLARE_READ8_MEMBER( input_r ); protected: - virtual void device_start(); + virtual void device_start() override; private: devcb_read8 m_input_handler; @@ -506,12 +506,12 @@ class tc8566af_device : public upd765_family_device { public: tc8566af_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; DECLARE_WRITE8_MEMBER(cr1_w); protected: - virtual void device_start(); + virtual void device_start() override; private: UINT8 m_cr1; diff --git a/src/devices/machine/wd11c00_17.h b/src/devices/machine/wd11c00_17.h index adc8a9f2c64..7104e20c4dc 100644 --- a/src/devices/machine/wd11c00_17.h +++ b/src/devices/machine/wd11c00_17.h @@ -97,8 +97,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: inline void check_interrupt(); diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h index 678844f28d6..204cb768385 100644 --- a/src/devices/machine/wd2010.h +++ b/src/devices/machine/wd2010.h @@ -100,10 +100,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void compute_correction(UINT8 data); diff --git a/src/devices/machine/wd33c93.h b/src/devices/machine/wd33c93.h index 68ca8acfc58..b749131d692 100644 --- a/src/devices/machine/wd33c93.h +++ b/src/devices/machine/wd33c93.h @@ -68,8 +68,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: UINT8 getunit( void ); diff --git a/src/devices/machine/wd_fdc.h b/src/devices/machine/wd_fdc.h index 7af735a7bef..4abc761e74b 100644 --- a/src/devices/machine/wd_fdc.h +++ b/src/devices/machine/wd_fdc.h @@ -202,9 +202,9 @@ protected: static const int fd179x_step_times[4]; static const int fd176x_step_times[4]; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; virtual int calc_sector_size(UINT8 size, UINT8 command) const; virtual int settle_time() const; @@ -449,14 +449,14 @@ public: wd_fdc_analog_t(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void pll_reset(bool fm, bool enmf, const attotime &when); - virtual void pll_start_writing(const attotime &tm); - virtual void pll_commit(floppy_image_device *floppy, const attotime &tm); - virtual void pll_stop_writing(floppy_image_device *floppy, const attotime &tm); - virtual int pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit); - virtual bool pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit); - virtual void pll_save_checkpoint(); - virtual void pll_retrieve_checkpoint(); + virtual void pll_reset(bool fm, bool enmf, const attotime &when) override; + virtual void pll_start_writing(const attotime &tm) override; + virtual void pll_commit(floppy_image_device *floppy, const attotime &tm) override; + virtual void pll_stop_writing(floppy_image_device *floppy, const attotime &tm) override; + virtual int pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit) override; + virtual bool pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit) override; + virtual void pll_save_checkpoint() override; + virtual void pll_retrieve_checkpoint() override; private: fdc_pll_t cur_pll, checkpoint_pll; @@ -469,14 +469,14 @@ public: protected: static const int wd_digital_step_times[4]; - virtual void pll_reset(bool fm, bool enmf, const attotime &when); - virtual void pll_start_writing(const attotime &tm); - virtual void pll_commit(floppy_image_device *floppy, const attotime &tm); - virtual void pll_stop_writing(floppy_image_device *floppy, const attotime &tm); - virtual int pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit); - virtual bool pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit); - virtual void pll_save_checkpoint(); - virtual void pll_retrieve_checkpoint(); + virtual void pll_reset(bool fm, bool enmf, const attotime &when) override; + virtual void pll_start_writing(const attotime &tm) override; + virtual void pll_commit(floppy_image_device *floppy, const attotime &tm) override; + virtual void pll_stop_writing(floppy_image_device *floppy, const attotime &tm) override; + virtual int pll_get_next_bit(attotime &tm, floppy_image_device *floppy, const attotime &limit) override; + virtual bool pll_write_next_bit(bool bit, attotime &tm, floppy_image_device *floppy, const attotime &limit) override; + virtual void pll_save_checkpoint() override; + virtual void pll_retrieve_checkpoint() override; private: struct digital_pll_t { @@ -511,7 +511,7 @@ public: fd1771_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class fd1781_t : public wd_fdc_analog_t { @@ -519,7 +519,7 @@ public: fd1781_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class fd1791_t : public wd_fdc_analog_t { @@ -552,7 +552,7 @@ public: fd1795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class fd1797_t : public wd_fdc_analog_t { @@ -560,7 +560,7 @@ public: fd1797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class mb8866_t : public wd_fdc_analog_t { @@ -593,7 +593,7 @@ public: fd1765_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class fd1767_t : public wd_fdc_analog_t { @@ -601,7 +601,7 @@ public: fd1767_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class wd2791_t : public wd_fdc_analog_t { @@ -621,7 +621,7 @@ public: wd2795_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class wd2797_t : public wd_fdc_analog_t { @@ -629,7 +629,7 @@ public: wd2797_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int calc_sector_size(UINT8 size, UINT8 command) const; + virtual int calc_sector_size(UINT8 size, UINT8 command) const override; }; class wd1770_t : public wd_fdc_digital_t { @@ -642,7 +642,7 @@ public: wd1772_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int settle_time() const; + virtual int settle_time() const override; }; class wd1773_t : public wd_fdc_digital_t { diff --git a/src/devices/machine/wozfdc.h b/src/devices/machine/wozfdc.h index dea7d7f9164..75247f62c8b 100644 --- a/src/devices/machine/wozfdc.h +++ b/src/devices/machine/wozfdc.h @@ -33,15 +33,15 @@ public: wozfdc_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // optional information overrides - virtual const rom_entry *device_rom_region() const; + virtual const rom_entry *device_rom_region() const override; DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; floppy_connector *floppy0, *floppy1, *floppy2, *floppy3; floppy_image_device *floppy; @@ -85,7 +85,7 @@ class diskii_fdc : public wozfdc_device public: diskii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_reset(); + virtual void device_reset() override; void set_floppies(floppy_connector *f0, floppy_connector *f1); }; @@ -95,7 +95,7 @@ class appleiii_fdc : public wozfdc_device public: appleiii_fdc(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void device_reset(); + virtual void device_reset() override; void set_floppies_4(floppy_connector *f0, floppy_connector *f1, floppy_connector *f2, floppy_connector *f3); diff --git a/src/devices/machine/ym2148.h b/src/devices/machine/ym2148.h index 58d2d5cb360..729b28e8fc2 100644 --- a/src/devices/machine/ym2148.h +++ b/src/devices/machine/ym2148.h @@ -49,9 +49,9 @@ public: UINT8 get_irq_vector(); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: devcb_write_line m_txd_handler; diff --git a/src/devices/machine/z80ctc.h b/src/devices/machine/z80ctc.h index fb5e9b5b522..2c3002e1166 100644 --- a/src/devices/machine/z80ctc.h +++ b/src/devices/machine/z80ctc.h @@ -77,13 +77,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; private: // internal helpers diff --git a/src/devices/machine/z80dart.h b/src/devices/machine/z80dart.h index 2674f84758a..d1efa05fd30 100644 --- a/src/devices/machine/z80dart.h +++ b/src/devices/machine/z80dart.h @@ -252,15 +252,15 @@ public: z80dart_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_callback(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_callback() override; + virtual void rcv_complete() override; UINT8 control_read(); void control_write(UINT8 data); @@ -531,14 +531,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; // internal interrupt management void check_interrupts(); diff --git a/src/devices/machine/z80dma.h b/src/devices/machine/z80dma.h index 389112e6f19..fc1c3c1175c 100644 --- a/src/devices/machine/z80dma.h +++ b/src/devices/machine/z80dma.h @@ -94,13 +94,13 @@ public: private: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; // internal helpers int is_ready(); diff --git a/src/devices/machine/z80pio.h b/src/devices/machine/z80pio.h index 80a458dd4fd..623f586891f 100644 --- a/src/devices/machine/z80pio.h +++ b/src/devices/machine/z80pio.h @@ -178,13 +178,13 @@ private: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; // internal helpers void check_interrupts(); diff --git a/src/devices/machine/z80sti.h b/src/devices/machine/z80sti.h index 1691695147c..f0db981ac9e 100644 --- a/src/devices/machine/z80sti.h +++ b/src/devices/machine/z80sti.h @@ -177,19 +177,19 @@ private: static const int PRESCALER[]; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; // internal helpers void check_interrupts(); diff --git a/src/devices/sound/2151intf.h b/src/devices/sound/2151intf.h index 79952d76228..e14892e9867 100644 --- a/src/devices/sound/2151intf.h +++ b/src/devices/sound/2151intf.h @@ -55,12 +55,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal helpers diff --git a/src/devices/sound/2413intf.h b/src/devices/sound/2413intf.h index 0edf7d1a696..6c188877000 100644 --- a/src/devices/sound/2413intf.h +++ b/src/devices/sound/2413intf.h @@ -22,13 +22,13 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/sound/262intf.h b/src/devices/sound/262intf.h index 2ff45f3190c..7dcdbbec065 100644 --- a/src/devices/sound/262intf.h +++ b/src/devices/sound/262intf.h @@ -26,17 +26,17 @@ public: void _timer_handler(int c, const attotime &period); void _ymf262_update_request(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state sound_stream * m_stream; diff --git a/src/devices/sound/3526intf.h b/src/devices/sound/3526intf.h index 4f0d59f1c74..20ef0876292 100644 --- a/src/devices/sound/3526intf.h +++ b/src/devices/sound/3526intf.h @@ -33,15 +33,15 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/sound/3812intf.h b/src/devices/sound/3812intf.h index ee87e8a43d9..a62c88302ab 100644 --- a/src/devices/sound/3812intf.h +++ b/src/devices/sound/3812intf.h @@ -33,15 +33,15 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: sound_stream * m_stream; diff --git a/src/devices/sound/8950intf.h b/src/devices/sound/8950intf.h index 42db5339696..53a35111f77 100644 --- a/src/devices/sound/8950intf.h +++ b/src/devices/sound/8950intf.h @@ -53,15 +53,15 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/sound/ay8910.h b/src/devices/sound/ay8910.h index 30ef634b766..6fda797d679 100644 --- a/src/devices/sound/ay8910.h +++ b/src/devices/sound/ay8910.h @@ -150,11 +150,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal helpers diff --git a/src/devices/sound/beep.h b/src/devices/sound/beep.h index 4b587bd3c89..68fddb54a29 100644 --- a/src/devices/sound/beep.h +++ b/src/devices/sound/beep.h @@ -20,10 +20,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; public: void set_state(int on); diff --git a/src/devices/sound/cdda.h b/src/devices/sound/cdda.h index 7650348a099..4e6da29919e 100644 --- a/src/devices/sound/cdda.h +++ b/src/devices/sound/cdda.h @@ -31,11 +31,11 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: void get_audio_data(stream_sample_t *bufL, stream_sample_t *bufR, UINT32 samples_wanted); diff --git a/src/devices/sound/cdp1863.h b/src/devices/sound/cdp1863.h index 910be5153fd..738d6368e5f 100644 --- a/src/devices/sound/cdp1863.h +++ b/src/devices/sound/cdp1863.h @@ -62,10 +62,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // internal callbacks - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: sound_stream *m_stream; diff --git a/src/devices/sound/dac.h b/src/devices/sound/dac.h index fadc1a7e324..bd5bdf16d62 100644 --- a/src/devices/sound/dac.h +++ b/src/devices/sound/dac.h @@ -51,11 +51,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; // internal state sound_stream * m_stream; diff --git a/src/devices/sound/disc_cls.h b/src/devices/sound/disc_cls.h index 255b0958c15..20ae8c4e940 100644 --- a/src/devices/sound/disc_cls.h +++ b/src/devices/sound/disc_cls.h @@ -90,7 +90,7 @@ class DISCRETE_CLASS_NAME(special): public discrete_base_node DISCRETE_CLASS_CONSTRUCTOR(special, base) DISCRETE_CLASS_DESTRUCTOR(special) public: - int max_output(void) { return 0; } + int max_output(void) override { return 0; } }; class DISCRETE_CLASS_NAME(unimplemented): public discrete_base_node @@ -98,7 +98,7 @@ class DISCRETE_CLASS_NAME(unimplemented): public discrete_base_node DISCRETE_CLASS_CONSTRUCTOR(unimplemented, base) DISCRETE_CLASS_DESTRUCTOR(unimplemented) public: - int max_output(void) { return 0; } + int max_output(void) override { return 0; } }; /************************************* @@ -114,14 +114,14 @@ class DISCRETE_CLASS_NAME(dso_output): public discrete_base_node, DISCRETE_CLASS_CONSTRUCTOR(dso_output, base) DISCRETE_CLASS_DESTRUCTOR(dso_output) public: - void step(void) { + void step(void) override { /* Add gain to the output and put into the buffers */ /* Clipping will be handled by the main sound system */ double val = DISCRETE_INPUT(0) * DISCRETE_INPUT(1); *m_ptr++ = val; } - int max_output(void) { return 0; } - void set_output_ptr(stream_sample_t *ptr) { m_ptr = ptr; } + int max_output(void) override { return 0; } + void set_output_ptr(stream_sample_t *ptr) override { m_ptr = ptr; } private: stream_sample_t *m_ptr; }; @@ -148,8 +148,8 @@ class DISCRETE_CLASS_NAME(dss_adjustment): public discrete_base_node, public dis DISCRETE_CLASS_CONSTRUCTOR(dss_adjustment, base) DISCRETE_CLASS_DESTRUCTOR(dss_adjustment) public: - void step(void); - void reset(void); + void step(void) override; + void reset(void) override; private: ioport_port *m_port; INT32 m_lastpval; @@ -166,8 +166,8 @@ class DISCRETE_CLASS_NAME(dss_input_data): public discrete_base_node, public dis DISCRETE_CLASS_DESTRUCTOR(dss_input_data) DISCRETE_CLASS_CONSTRUCTOR(dss_input_data, base) public: - void reset(void); - void input_write(int sub_node, UINT8 data ); + void reset(void) override; + void input_write(int sub_node, UINT8 data ) override; private: double m_gain; /* node gain */ double m_offset; /* node offset */ @@ -179,8 +179,8 @@ class DISCRETE_CLASS_NAME(dss_input_logic): public discrete_base_node, public di DISCRETE_CLASS_CONSTRUCTOR(dss_input_logic, base) DISCRETE_CLASS_DESTRUCTOR(dss_input_logic) public: - void reset(void); - void input_write(int sub_node, UINT8 data ); + void reset(void) override; + void input_write(int sub_node, UINT8 data ) override; private: double m_gain; /* node gain */ double m_offset; /* node offset */ @@ -192,8 +192,8 @@ class DISCRETE_CLASS_NAME(dss_input_not): public discrete_base_node, public disc DISCRETE_CLASS_CONSTRUCTOR(dss_input_not, base) DISCRETE_CLASS_DESTRUCTOR(dss_input_not) public: - void reset(void); - void input_write(int sub_node, UINT8 data ); + void reset(void) override; + void input_write(int sub_node, UINT8 data ) override; private: double m_gain; /* node gain */ double m_offset; /* node offset */ @@ -205,9 +205,9 @@ class DISCRETE_CLASS_NAME(dss_input_pulse): public discrete_base_node, public di DISCRETE_CLASS_CONSTRUCTOR(dss_input_pulse, base) DISCRETE_CLASS_DESTRUCTOR(dss_input_pulse) public: - void step(void); - void reset(void); - void input_write(int sub_node, UINT8 data ); + void step(void) override; + void reset(void) override; + void input_write(int sub_node, UINT8 data ) override; private: //double m_gain; /* node gain */ //double m_offset; /* node offset */ @@ -219,10 +219,10 @@ class DISCRETE_CLASS_NAME(dss_input_stream): public discrete_base_node, public d DISCRETE_CLASS_CONSTRUCTOR(dss_input_stream, base) DISCRETE_CLASS_DESTRUCTOR(dss_input_stream) public: - void step(void); - void reset(void); - void start(void); - void input_write(int sub_node, UINT8 data ); + void step(void) override; + void reset(void) override; + void start(void) override; + void input_write(int sub_node, UINT8 data ) override; virtual bool is_buffered(void) { return false; } /* This is called by discrete_sound_device */ @@ -247,7 +247,7 @@ class DISCRETE_CLASS_NAME(dss_input_buffer): public DISCRETE_CLASS_NAME(dss_inpu DISCRETE_CLASS_CONSTRUCTOR(dss_input_buffer, dss_input_stream) DISCRETE_CLASS_DESTRUCTOR(dss_input_buffer) public: - bool is_buffered(void) { return true; } + bool is_buffered(void) override { return true; } }; #include "disc_wav.h" diff --git a/src/devices/sound/disc_mth.h b/src/devices/sound/disc_mth.h index e7324b4cc83..31a44f1a32c 100644 --- a/src/devices/sound/disc_mth.h +++ b/src/devices/sound/disc_mth.h @@ -129,8 +129,8 @@ public: TOK_OR, /* Bitwise OR */ TOK_XOR /* Bitwise XOR */ }; - void step(void); - void reset(void); + void step(void) override; + void reset(void) override; private: DISCRETE_CLASS_INPUT(I_IN0, 0); DISCRETE_CLASS_INPUT(I_IN1, 1); diff --git a/src/devices/sound/disc_wav.h b/src/devices/sound/disc_wav.h index 4775dd8fe68..dfc9d4d215f 100644 --- a/src/devices/sound/disc_wav.h +++ b/src/devices/sound/disc_wav.h @@ -124,8 +124,8 @@ public: TYPE_MASK = 0x0f, OUT_IS_LOGIC = 0x10 }; - void step(void); - void reset(void); + void step(void) override; + void reset(void) override; protected: inline double tftab(double x); inline double tf(double x); diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h index 7c945824e5f..148763be1bc 100644 --- a/src/devices/sound/discrete.h +++ b/src/devices/sound/discrete.h @@ -4321,9 +4321,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; // configuration state const discrete_block *m_intf; @@ -4376,17 +4376,17 @@ public: /* --------------------------------- */ - virtual void update_to_current_time(void) const { m_stream->update(); } + virtual void update_to_current_time(void) const override { m_stream->update(); } sound_stream *get_stream(void) { return m_stream; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: /* the output stream */ @@ -4492,7 +4492,7 @@ template <class C> class discrete_node_factory : public discrete_node_base_factory { public: - discrete_base_node *Create(discrete_device * pdev, const discrete_block *block); + discrete_base_node *Create(discrete_device * pdev, const discrete_block *block) override; }; template <class C> diff --git a/src/devices/sound/dmadac.h b/src/devices/sound/dmadac.h index 65bfe16b3ff..c4be88e5596 100644 --- a/src/devices/sound/dmadac.h +++ b/src/devices/sound/dmadac.h @@ -27,10 +27,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state /* sound stream and buffers */ diff --git a/src/devices/sound/k051649.h b/src/devices/sound/k051649.h index ee4ffcbfb8e..4fec1b7659f 100644 --- a/src/devices/sound/k051649.h +++ b/src/devices/sound/k051649.h @@ -51,11 +51,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; public: DECLARE_WRITE8_MEMBER( k051649_waveform_w ); diff --git a/src/devices/sound/mos6581.h b/src/devices/sound/mos6581.h index 4699bdc51d7..f0e31e7dab0 100644 --- a/src/devices/sound/mos6581.h +++ b/src/devices/sound/mos6581.h @@ -74,11 +74,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: devcb_read8 m_read_potx; diff --git a/src/devices/sound/nes_apu.h b/src/devices/sound/nes_apu.h index c545639141a..6c1b51cc8fd 100644 --- a/src/devices/sound/nes_apu.h +++ b/src/devices/sound/nes_apu.h @@ -58,10 +58,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/sound/pokey.h b/src/devices/sound/pokey.h index 96c9f672246..f555ae4b5b0 100644 --- a/src/devices/sound/pokey.h +++ b/src/devices/sound/pokey.h @@ -243,16 +243,16 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_clock_changed(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_clock_changed() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; - virtual void execute_run(); + virtual void execute_run() override; //virtual UINT32 execute_min_cycles() const { return 114; } // other internal states diff --git a/src/devices/sound/saa1099.h b/src/devices/sound/saa1099.h index 1909efa1c52..b2c67e66edd 100644 --- a/src/devices/sound/saa1099.h +++ b/src/devices/sound/saa1099.h @@ -76,10 +76,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; public: DECLARE_WRITE8_MEMBER( control_w ); diff --git a/src/devices/sound/sn76496.h b/src/devices/sound/sn76496.h index f374b4d1293..28a685959ad 100644 --- a/src/devices/sound/sn76496.h +++ b/src/devices/sound/sn76496.h @@ -36,8 +36,8 @@ public: DECLARE_READ_LINE_MEMBER( ready_r ) { return m_ready_state ? 1 : 0; } protected: - virtual void device_start(); - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void device_start() override; + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: inline bool in_noise_mode(); diff --git a/src/devices/sound/sp0256.h b/src/devices/sound/sp0256.h index f4ceb61bb68..c1e486883d6 100644 --- a/src/devices/sound/sp0256.h +++ b/src/devices/sound/sp0256.h @@ -89,11 +89,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: UINT32 getb(int len); diff --git a/src/devices/sound/speaker.h b/src/devices/sound/speaker.h index 67819769926..8b2bce895d0 100644 --- a/src/devices/sound/speaker.h +++ b/src/devices/sound/speaker.h @@ -36,11 +36,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/sound/t6721a.h b/src/devices/sound/t6721a.h index ff969fa60be..51f952cdf80 100644 --- a/src/devices/sound/t6721a.h +++ b/src/devices/sound/t6721a.h @@ -84,10 +84,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: enum diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index 12edc66e5c3..2f764eecb80 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -61,14 +61,14 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; void set_variant(int variant); @@ -213,7 +213,7 @@ public: tms5220c_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; extern const device_type TMS5220C; @@ -224,7 +224,7 @@ public: cd2501e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; extern const device_type CD2501E; @@ -235,7 +235,7 @@ public: tms5200_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; extern const device_type TMS5200; @@ -246,7 +246,7 @@ public: cd2501ecd_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; extern const device_type CD2501ECD; diff --git a/src/devices/sound/vlm5030.h b/src/devices/sound/vlm5030.h index 94a5b846b39..cf2c620f13f 100644 --- a/src/devices/sound/vlm5030.h +++ b/src/devices/sound/vlm5030.h @@ -32,11 +32,11 @@ protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/sound/votrax.h b/src/devices/sound/votrax.h index 891d1699b1a..540f2b5feb1 100644 --- a/src/devices/sound/votrax.h +++ b/src/devices/sound/votrax.h @@ -46,14 +46,14 @@ public: protected: // device-level overrides - virtual const rom_entry *device_rom_region() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_clock_changed(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual const rom_entry *device_rom_region() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_clock_changed() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal helpers diff --git a/src/devices/sound/vrc6.h b/src/devices/sound/vrc6.h index db2cdffd542..ba4bf2026bb 100644 --- a/src/devices/sound/vrc6.h +++ b/src/devices/sound/vrc6.h @@ -38,10 +38,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: UINT8 m_freqctrl, m_pulsectrl[2], m_sawrate; diff --git a/src/devices/sound/wave.h b/src/devices/sound/wave.h index d4ff4865551..fde443b90e4 100644 --- a/src/devices/sound/wave.h +++ b/src/devices/sound/wave.h @@ -22,11 +22,11 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: const char *m_cassette_tag; diff --git a/src/devices/sound/ymf278b.h b/src/devices/sound/ymf278b.h index 56a9526e474..8037af45d82 100644 --- a/src/devices/sound/ymf278b.h +++ b/src/devices/sound/ymf278b.h @@ -29,18 +29,18 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const { return (spacenum == AS_0) ? &m_space_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { return (spacenum == AS_0) ? &m_space_config : nullptr; } // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: struct YMF278BSlot diff --git a/src/devices/video/cdp1862.h b/src/devices/video/cdp1862.h index 159c12f8a3c..36e04689500 100644 --- a/src/devices/video/cdp1862.h +++ b/src/devices/video/cdp1862.h @@ -87,8 +87,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: inline void initialize_palette(); diff --git a/src/devices/video/clgd542x.h b/src/devices/video/clgd542x.h index 20300d160fd..ba9b442b360 100644 --- a/src/devices/video/clgd542x.h +++ b/src/devices/video/clgd542x.h @@ -18,21 +18,21 @@ public: // construction/destruction cirrus_gd5428_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); cirrus_gd5428_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual READ8_MEMBER(port_03c0_r); - virtual WRITE8_MEMBER(port_03c0_w); - virtual READ8_MEMBER(port_03b0_r); - virtual WRITE8_MEMBER(port_03b0_w); - virtual READ8_MEMBER(port_03d0_r); - virtual WRITE8_MEMBER(port_03d0_w); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); - - virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual READ8_MEMBER(port_03c0_r) override; + virtual WRITE8_MEMBER(port_03c0_w) override; + virtual READ8_MEMBER(port_03b0_r) override; + virtual WRITE8_MEMBER(port_03b0_w) override; + virtual READ8_MEMBER(port_03d0_r) override; + virtual WRITE8_MEMBER(port_03d0_w) override; + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; + + virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual UINT16 offset(); + virtual void device_start() override; + virtual void device_reset() override; + virtual UINT16 offset() override; UINT8 m_chip_id; @@ -106,7 +106,7 @@ class cirrus_gd5430_device : public cirrus_gd5428_device public: cirrus_gd5430_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); + virtual void device_start() override; }; // device type definition diff --git a/src/devices/video/crtc_ega.h b/src/devices/video/crtc_ega.h index b06fa31560c..0030d865d76 100644 --- a/src/devices/video/crtc_ega.h +++ b/src/devices/video/crtc_ega.h @@ -106,10 +106,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: devcb_write_line m_res_out_de_cb; diff --git a/src/devices/video/mc6845.h b/src/devices/video/mc6845.h index 3d39d449a4e..9bad2348640 100644 --- a/src/devices/video/mc6845.h +++ b/src/devices/video/mc6845.h @@ -170,10 +170,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; bool m_supports_disp_start_addr_r; bool m_supports_vert_sync_width; @@ -332,8 +332,8 @@ public: mc6845_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class r6545_1_device : public mc6845_device @@ -342,8 +342,8 @@ public: r6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class c6545_1_device : public mc6845_device @@ -352,8 +352,8 @@ public: c6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class h46505_device : public mc6845_device @@ -362,8 +362,8 @@ public: h46505_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class hd6845_device : public mc6845_device @@ -372,8 +372,8 @@ public: hd6845_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class sy6545_1_device : public mc6845_device @@ -382,8 +382,8 @@ public: sy6545_1_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class sy6845e_device : public mc6845_device @@ -392,8 +392,8 @@ public: sy6845e_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class hd6345_device : public mc6845_device @@ -402,8 +402,8 @@ public: hd6345_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class ams40041_device : public mc6845_device @@ -412,8 +412,8 @@ public: ams40041_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class ams40489_device : public mc6845_device @@ -422,8 +422,8 @@ public: ams40489_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class mos8563_device : public mc6845_device, @@ -433,7 +433,7 @@ public: mos8563_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); mos8563_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; DECLARE_PALETTE_INIT(mos8563); @@ -449,10 +449,10 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; const address_space_config m_videoram_space_config; required_device<palette_device> m_palette; @@ -482,8 +482,8 @@ protected: int m_revision; - virtual void update_cursor_state(); - virtual UINT8 draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual void update_cursor_state() override; + virtual UINT8 draw_scanline(int y, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; static const device_timer_id TIMER_BLOCK_COPY = 9; @@ -497,8 +497,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/video/pc_vga.h b/src/devices/video/pc_vga.h index 0eae272f068..9c729ba7a6e 100644 --- a/src/devices/video/pc_vga.h +++ b/src/devices/video/pc_vga.h @@ -58,8 +58,8 @@ public: virtual TIMER_CALLBACK_MEMBER(vblank_timer_cb); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void vga_vh_text(bitmap_rgb32 &bitmap, const rectangle &cliprect); void vga_vh_ega(bitmap_rgb32 &bitmap, const rectangle &cliprect); @@ -245,16 +245,16 @@ public: // construction/destruction svga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void zero(); - virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual void zero() override; + virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; protected: void svga_vh_rgb8(bitmap_rgb32 &bitmap, const rectangle &cliprect); void svga_vh_rgb15(bitmap_rgb32 &bitmap, const rectangle &cliprect); void svga_vh_rgb16(bitmap_rgb32 &bitmap, const rectangle &cliprect); void svga_vh_rgb24(bitmap_rgb32 &bitmap, const rectangle &cliprect); void svga_vh_rgb32(bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual UINT8 pc_vga_choosevideomode(); - virtual void device_start(); + virtual UINT8 pc_vga_choosevideomode() override; + virtual void device_start() override; struct { UINT8 bank_r,bank_w; @@ -378,8 +378,8 @@ public: } ibm8514; protected: - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; vga_device* m_vga; // for pass-through std::string m_vga_tag; // pass-through device tag private: @@ -441,7 +441,7 @@ public: READ16_MEMBER(mach8_clksel_r) { return mach8.clksel; } protected: - virtual void device_start(); + virtual void device_start() override; struct { UINT16 scratch0; @@ -470,17 +470,17 @@ public: // construction/destruction tseng_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual READ8_MEMBER(port_03b0_r); - virtual WRITE8_MEMBER(port_03b0_w); - virtual READ8_MEMBER(port_03c0_r); - virtual WRITE8_MEMBER(port_03c0_w); - virtual READ8_MEMBER(port_03d0_r); - virtual WRITE8_MEMBER(port_03d0_w); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); + virtual READ8_MEMBER(port_03b0_r) override; + virtual WRITE8_MEMBER(port_03b0_w) override; + virtual READ8_MEMBER(port_03c0_r) override; + virtual WRITE8_MEMBER(port_03c0_w) override; + virtual READ8_MEMBER(port_03d0_r) override; + virtual WRITE8_MEMBER(port_03d0_w) override; + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; protected: - virtual void device_start(); + virtual void device_start() override; private: void tseng_define_video_mode(); @@ -518,20 +518,20 @@ public: ati_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); ati_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; // VGA registers - virtual READ8_MEMBER(port_03c0_r); + virtual READ8_MEMBER(port_03c0_r) override; READ8_MEMBER(ati_port_ext_r); WRITE8_MEMBER(ati_port_ext_w); - virtual machine_config_constructor device_mconfig_additions() const; - virtual UINT16 offset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual UINT16 offset() override; mach8_device* get_8514() { return m_8514; } protected: - virtual void device_start(); + virtual void device_start() override; private: void ati_define_video_mode(); struct @@ -556,24 +556,24 @@ public: s3_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); s3_vga_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual READ8_MEMBER(port_03b0_r); - virtual WRITE8_MEMBER(port_03b0_w); - virtual READ8_MEMBER(port_03c0_r); - virtual WRITE8_MEMBER(port_03c0_w); - virtual READ8_MEMBER(port_03d0_r); - virtual WRITE8_MEMBER(port_03d0_w); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); + virtual READ8_MEMBER(port_03b0_r) override; + virtual WRITE8_MEMBER(port_03b0_w) override; + virtual READ8_MEMBER(port_03c0_r) override; + virtual WRITE8_MEMBER(port_03c0_w) override; + virtual READ8_MEMBER(port_03d0_r) override; + virtual WRITE8_MEMBER(port_03d0_w) override; + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; - virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + virtual UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; ibm8514a_device* get_8514() { return m_8514; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; struct { UINT8 memory_config; @@ -620,7 +620,7 @@ protected: UINT8 cursor_bg_ptr; UINT8 extended_dac_ctrl; } s3; - virtual UINT16 offset(); + virtual UINT16 offset() override; private: UINT8 s3_crtc_reg_read(UINT8 index); @@ -643,14 +643,14 @@ public: gamtor_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual READ8_MEMBER(port_03b0_r); - virtual WRITE8_MEMBER(port_03b0_w); - virtual READ8_MEMBER(port_03c0_r); - virtual WRITE8_MEMBER(port_03c0_w); - virtual READ8_MEMBER(port_03d0_r); - virtual WRITE8_MEMBER(port_03d0_w); - virtual READ8_MEMBER(mem_r); - virtual WRITE8_MEMBER(mem_w); + virtual READ8_MEMBER(port_03b0_r) override; + virtual WRITE8_MEMBER(port_03b0_w) override; + virtual READ8_MEMBER(port_03c0_r) override; + virtual WRITE8_MEMBER(port_03c0_w) override; + virtual READ8_MEMBER(port_03d0_r) override; + virtual WRITE8_MEMBER(port_03d0_w) override; + virtual READ8_MEMBER(mem_r) override; + virtual WRITE8_MEMBER(mem_w) override; }; diff --git a/src/devices/video/tms9928a.h b/src/devices/video/tms9928a.h index 8c68bc48f83..8107a1b0d62 100644 --- a/src/devices/video/tms9928a.h +++ b/src/devices/video/tms9928a.h @@ -102,12 +102,12 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_DATA) const { return (spacenum == AS_DATA) ? &m_space_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_DATA) const override { return (spacenum == AS_DATA) ? &m_space_config : nullptr; } private: void change_register(UINT8 reg, UINT8 val); diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h index 4a8be071cac..3f96783f7ec 100644 --- a/src/devices/video/upd7220.h +++ b/src/devices/video/upd7220.h @@ -106,14 +106,14 @@ public: DECLARE_WRITE8_MEMBER( vram_w ); UINT32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - virtual const rom_entry *device_rom_region() const; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const rom_entry *device_rom_region() const override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum diff --git a/src/devices/video/v9938.h b/src/devices/video/v9938.h index e61dee96b70..c2f9d356666 100644 --- a/src/devices/video/v9938.h +++ b/src/devices/video/v9938.h @@ -125,12 +125,12 @@ protected: int m_model; // device overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_DATA) const { return (spacenum == AS_DATA) ? &m_space_config : nullptr; } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_DATA) const override { return (spacenum == AS_DATA) ? &m_space_config : nullptr; } void configure_pal_ntsc(); void set_screen_parameters(); @@ -281,7 +281,7 @@ public: DECLARE_PALETTE_INIT(v9938); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; class v9958_device : public v99x8_device @@ -292,7 +292,7 @@ public: DECLARE_PALETTE_INIT(v9958); protected: - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; diff --git a/src/lib/formats/abc800_dsk.h b/src/lib/formats/abc800_dsk.h index 96a15d3817e..28d5e5b01ad 100644 --- a/src/lib/formats/abc800_dsk.h +++ b/src/lib/formats/abc800_dsk.h @@ -17,9 +17,9 @@ class abc800_format : public wd177x_format { public: abc800_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/abcfd2_dsk.h b/src/lib/formats/abcfd2_dsk.h index a97e46cb5ed..b9eacfb55ba 100644 --- a/src/lib/formats/abcfd2_dsk.h +++ b/src/lib/formats/abcfd2_dsk.h @@ -17,9 +17,9 @@ class abc_fd2_format : public wd177x_format { public: abc_fd2_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/adam_dsk.h b/src/lib/formats/adam_dsk.h index 717c81cbe7f..0f378edcb58 100644 --- a/src/lib/formats/adam_dsk.h +++ b/src/lib/formats/adam_dsk.h @@ -17,9 +17,9 @@ class adam_format : public wd177x_format { public: adam_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/ap2_dsk.h b/src/lib/formats/ap2_dsk.h index a5bd53f0926..19e55e05ff0 100644 --- a/src/lib/formats/ap2_dsk.h +++ b/src/lib/formats/ap2_dsk.h @@ -39,14 +39,14 @@ class a2_16sect_format : public floppy_image_format_t public: a2_16sect_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; private: static const desc_e mac_gcr[]; @@ -64,14 +64,14 @@ class a2_rwts18_format : public floppy_image_format_t public: a2_rwts18_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; private: static const desc_e mac_gcr[]; @@ -88,13 +88,13 @@ class a2_edd_format : public floppy_image_format_t public: a2_edd_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool supports_save() const override; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static UINT8 pick(const UINT8 *data, int pos); diff --git a/src/lib/formats/apollo_dsk.h b/src/lib/formats/apollo_dsk.h index 05013d79055..51f9eb4aebc 100644 --- a/src/lib/formats/apollo_dsk.h +++ b/src/lib/formats/apollo_dsk.h @@ -17,10 +17,10 @@ class apollo_format : public upd765_format { public: apollo_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/c3040_dsk.h b/src/lib/formats/c3040_dsk.h index cbf320273a8..659b2748571 100644 --- a/src/lib/formats/c3040_dsk.h +++ b/src/lib/formats/c3040_dsk.h @@ -17,15 +17,15 @@ class c3040_format : public d64_format { public: c3040_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: - virtual int get_sectors_per_track(const format &f, int track) { return c3040_sectors_per_track[track]; } - virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2); - virtual int get_gap2(const format &f, int head, int track) { return c3040_gap2[track]; } - virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size); + virtual int get_sectors_per_track(const format &f, int track) override { return c3040_sectors_per_track[track]; } + virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) override; + virtual int get_gap2(const format &f, int head, int track) override { return c3040_gap2[track]; } + virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size) override; static const format file_formats[]; diff --git a/src/lib/formats/c4040_dsk.h b/src/lib/formats/c4040_dsk.h index 231b961c765..591fcd42925 100644 --- a/src/lib/formats/c4040_dsk.h +++ b/src/lib/formats/c4040_dsk.h @@ -17,14 +17,14 @@ class c4040_format : public d64_format { public: c4040_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: - virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2); - virtual int get_gap2(const format &f, int head, int track) { return c4040_gap2[track]; } - virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size); + virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) override; + virtual int get_gap2(const format &f, int head, int track) override { return c4040_gap2[track]; } + virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size) override; static const format file_formats[]; diff --git a/src/lib/formats/c8280_dsk.h b/src/lib/formats/c8280_dsk.h index eed34f5d846..b30ea667241 100644 --- a/src/lib/formats/c8280_dsk.h +++ b/src/lib/formats/c8280_dsk.h @@ -17,9 +17,9 @@ class c8280_format : public wd177x_format { public: c8280_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/ccvf_dsk.h b/src/lib/formats/ccvf_dsk.h index 9577c180c24..671b0c0f88c 100644 --- a/src/lib/formats/ccvf_dsk.h +++ b/src/lib/formats/ccvf_dsk.h @@ -32,13 +32,13 @@ public: ccvf_format(); ccvf_format(const format *formats); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool supports_save() const override; protected: const format *formats; diff --git a/src/lib/formats/cgenie_dsk.h b/src/lib/formats/cgenie_dsk.h index 1eda22404c5..0cd402225d9 100644 --- a/src/lib/formats/cgenie_dsk.h +++ b/src/lib/formats/cgenie_dsk.h @@ -20,13 +20,13 @@ class cgenie_format : public wd177x_format public: cgenie_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: - virtual int get_track_dam_fm(const format &f, int head, int track); - virtual int get_track_dam_mfm(const format &f, int head, int track); + virtual int get_track_dam_fm(const format &f, int head, int track) override; + virtual int get_track_dam_mfm(const format &f, int head, int track) override; private: static const format formats[]; diff --git a/src/lib/formats/comx35_dsk.h b/src/lib/formats/comx35_dsk.h index 03a298673e5..1dc91806e3c 100644 --- a/src/lib/formats/comx35_dsk.h +++ b/src/lib/formats/comx35_dsk.h @@ -17,9 +17,9 @@ class comx35_format : public wd177x_format { public: comx35_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/concept_dsk.h b/src/lib/formats/concept_dsk.h index 171798c0fc6..87444c31ab0 100644 --- a/src/lib/formats/concept_dsk.h +++ b/src/lib/formats/concept_dsk.h @@ -18,14 +18,14 @@ class cc525dsdd_format : public floppy_image_format_t public: cc525dsdd_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; static const desc_e cc_9_desc[]; diff --git a/src/lib/formats/cpis_dsk.h b/src/lib/formats/cpis_dsk.h index 3879c6a17c6..98d303c85fe 100644 --- a/src/lib/formats/cpis_dsk.h +++ b/src/lib/formats/cpis_dsk.h @@ -17,9 +17,9 @@ class cpis_format : public upd765_format { public: cpis_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/d64_dsk.h b/src/lib/formats/d64_dsk.h index ec99a36251b..5eaecc3b042 100644 --- a/src/lib/formats/d64_dsk.h +++ b/src/lib/formats/d64_dsk.h @@ -30,14 +30,14 @@ public: d64_format(); d64_format(const format *formats); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const { return true; } + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override { return true; } protected: enum diff --git a/src/lib/formats/d71_dsk.h b/src/lib/formats/d71_dsk.h index 5dc8a356186..eff2cff2c2a 100644 --- a/src/lib/formats/d71_dsk.h +++ b/src/lib/formats/d71_dsk.h @@ -17,9 +17,9 @@ class d71_format : public d64_format { public: d71_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: static const format formats[]; diff --git a/src/lib/formats/d80_dsk.h b/src/lib/formats/d80_dsk.h index e48984b2322..d823b85a9bc 100644 --- a/src/lib/formats/d80_dsk.h +++ b/src/lib/formats/d80_dsk.h @@ -18,19 +18,19 @@ public: d80_format(); d80_format(const format *formats); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: const format *formats; - virtual int get_physical_track(const format &f, int head, int track); - virtual UINT32 get_cell_size(const format &f, int track); - virtual int get_sectors_per_track(const format &f, int track); - virtual int get_disk_id_offset(const format &f); - virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2); - virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size); + virtual int get_physical_track(const format &f, int head, int track) override; + virtual UINT32 get_cell_size(const format &f, int track) override; + virtual int get_sectors_per_track(const format &f, int track) override; + virtual int get_disk_id_offset(const format &f) override; + virtual floppy_image_format_t::desc_e* get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) override; + virtual void fix_end_gap(floppy_image_format_t::desc_e* desc, int remaining_size) override; static const format file_formats[]; diff --git a/src/lib/formats/d81_dsk.h b/src/lib/formats/d81_dsk.h index 6ea96c70b17..80c95b2a91d 100644 --- a/src/lib/formats/d81_dsk.h +++ b/src/lib/formats/d81_dsk.h @@ -17,11 +17,11 @@ class d81_format : public wd177x_format { public: d81_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; - virtual floppy_image_format_t::desc_e* get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index); + virtual floppy_image_format_t::desc_e* get_desc_mfm(const format &f, int ¤t_size, int &end_gap_index) override; private: static const format formats[]; diff --git a/src/lib/formats/d82_dsk.h b/src/lib/formats/d82_dsk.h index 8753fc62d0c..8919deee775 100644 --- a/src/lib/formats/d82_dsk.h +++ b/src/lib/formats/d82_dsk.h @@ -17,9 +17,9 @@ class d82_format : public d80_format { public: d82_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: static const format file_formats[]; diff --git a/src/lib/formats/dmk_dsk.h b/src/lib/formats/dmk_dsk.h index f89fed8f95d..5a2f2f6cb7c 100644 --- a/src/lib/formats/dmk_dsk.h +++ b/src/lib/formats/dmk_dsk.h @@ -20,14 +20,14 @@ class dmk_format : public floppy_image_format_t public: dmk_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_DMK_FORMAT; diff --git a/src/lib/formats/ep64_dsk.h b/src/lib/formats/ep64_dsk.h index e6e3fdda21a..47d05594964 100644 --- a/src/lib/formats/ep64_dsk.h +++ b/src/lib/formats/ep64_dsk.h @@ -17,9 +17,9 @@ class ep64_format : public wd177x_format { public: ep64_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/g64_dsk.h b/src/lib/formats/g64_dsk.h index f7f06548ede..ddc12636b7e 100644 --- a/src/lib/formats/g64_dsk.h +++ b/src/lib/formats/g64_dsk.h @@ -18,14 +18,14 @@ class g64_format : public floppy_image_format_t { public: g64_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const { return true; } + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override { return true; } protected: enum diff --git a/src/lib/formats/iq151_dsk.h b/src/lib/formats/iq151_dsk.h index 9f2b69d7617..472cbaf64f9 100644 --- a/src/lib/formats/iq151_dsk.h +++ b/src/lib/formats/iq151_dsk.h @@ -17,9 +17,9 @@ class iq151_format : public upd765_format { public: iq151_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/jvc_dsk.h b/src/lib/formats/jvc_dsk.h index eaeeefb84aa..244c84a8592 100644 --- a/src/lib/formats/jvc_dsk.h +++ b/src/lib/formats/jvc_dsk.h @@ -32,14 +32,14 @@ public: int header_size; }; - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override; private: bool parse_header(io_generic *io, int &header_size, int &tracks, int &heads, int §ors, int §or_size, int &base_sector_id); diff --git a/src/lib/formats/kc85_dsk.h b/src/lib/formats/kc85_dsk.h index f13ba7f6a0d..c941a9e7647 100644 --- a/src/lib/formats/kc85_dsk.h +++ b/src/lib/formats/kc85_dsk.h @@ -17,9 +17,9 @@ class kc85_format : public upd765_format { public: kc85_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/mfm_hd.h b/src/lib/formats/mfm_hd.h index dfa4d3ffba7..45963e2c3d5 100644 --- a/src/lib/formats/mfm_hd.h +++ b/src/lib/formats/mfm_hd.h @@ -195,12 +195,12 @@ class mfmhd_generic_format : public mfmhd_image_format_t { public: mfmhd_generic_format() { m_devtag = std::string("mfmhd_generic_format"); }; - chd_error load(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head); - chd_error save(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head); + chd_error load(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head) override; + chd_error save(chd_file* chdfile, UINT16* trackimage, int tracksize, int cylinder, int head) override; // Yes, we want to save all parameters - virtual bool save_param(mfmhd_param_t type) { return true; } - virtual int get_default(mfmhd_param_t type); + virtual bool save_param(mfmhd_param_t type) override { return true; } + virtual int get_default(mfmhd_param_t type) override; protected: virtual UINT8 cylinder_to_ident(int cylinder); diff --git a/src/lib/formats/msx_dsk.h b/src/lib/formats/msx_dsk.h index 94a5411c51a..d776620624d 100644 --- a/src/lib/formats/msx_dsk.h +++ b/src/lib/formats/msx_dsk.h @@ -19,9 +19,9 @@ class msx_format: public upd765_format { public: msx_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/nascom_dsk.h b/src/lib/formats/nascom_dsk.h index 95b1e80e49e..a1c3653cdac 100644 --- a/src/lib/formats/nascom_dsk.h +++ b/src/lib/formats/nascom_dsk.h @@ -20,9 +20,9 @@ class nascom_format : public wd177x_format public: nascom_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/naslite_dsk.h b/src/lib/formats/naslite_dsk.h index e9ab87488f0..00f9df1567e 100644 --- a/src/lib/formats/naslite_dsk.h +++ b/src/lib/formats/naslite_dsk.h @@ -17,14 +17,14 @@ class naslite_format : public upd765_format { public: naslite_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; protected: static const format formats[]; - virtual void build_sector_description(const format &d, UINT8 *sectdata, desc_s *sectors, int track, int head) const; + virtual void build_sector_description(const format &d, UINT8 *sectdata, desc_s *sectors, int track, int head) const override; }; extern const floppy_format_type FLOPPY_NASLITE_FORMAT; diff --git a/src/lib/formats/oric_dsk.h b/src/lib/formats/oric_dsk.h index 97bd6e35408..3eeb719eed0 100644 --- a/src/lib/formats/oric_dsk.h +++ b/src/lib/formats/oric_dsk.h @@ -17,14 +17,14 @@ class oric_dsk_format : public floppy_image_format_t { public: oric_dsk_format(); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + virtual bool supports_save() const override; }; extern const floppy_format_type FLOPPY_ORIC_DSK_FORMAT; diff --git a/src/lib/formats/pc_dsk.h b/src/lib/formats/pc_dsk.h index f6e1fbc5637..381ad49e99a 100644 --- a/src/lib/formats/pc_dsk.h +++ b/src/lib/formats/pc_dsk.h @@ -24,9 +24,9 @@ class pc_format : public upd765_format public: pc_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/ql_dsk.h b/src/lib/formats/ql_dsk.h index 7c7f52be852..96003df6984 100644 --- a/src/lib/formats/ql_dsk.h +++ b/src/lib/formats/ql_dsk.h @@ -17,9 +17,9 @@ class ql_format : public wd177x_format { public: ql_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/ti99_dsk.h b/src/lib/formats/ti99_dsk.h index a61d3da1a69..94ae7cf1f36 100644 --- a/src/lib/formats/ti99_dsk.h +++ b/src/lib/formats/ti99_dsk.h @@ -19,9 +19,9 @@ class ti99_floppy_format : public floppy_image_format_t { public: - bool supports_save() const { return true; } - bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - bool save(io_generic *io, floppy_image *image); + bool supports_save() const override { return true; } + bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + bool save(io_generic *io, floppy_image *image) override; protected: int decode_bitstream(const UINT8 *bitstream, UINT8 *trackdata, int *sector, int cell_count, int encoding, UINT8 gapbytes, int track_size); @@ -52,19 +52,19 @@ protected: class ti99_sdf_format : public ti99_floppy_format { public: - int identify(io_generic *io, UINT32 form_factor); - const char *name() const; - const char *description() const; - const char *extensions() const; + int identify(io_generic *io, UINT32 form_factor) override; + const char *name() const override; + const char *description() const override; + const char *extensions() const override; private: - void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads); - int get_track_size(int cell_size, int sector_count); - void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes); - void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize); + void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) override; + int get_track_size(int cell_size, int sector_count) override; + void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override; + void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override; // This format supports single-sided images - int min_heads() { return 1; } + int min_heads() override { return 1; } struct ti99vib { @@ -91,19 +91,19 @@ extern const floppy_format_type FLOPPY_TI99_SDF_FORMAT; class ti99_tdf_format : public ti99_floppy_format { public: - int identify(io_generic *io, UINT32 form_factor); - const char *name() const; - const char *description() const; - const char *extensions() const; + int identify(io_generic *io, UINT32 form_factor) override; + const char *name() const override; + const char *description() const override; + const char *extensions() const override; private: - void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads); - void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize); - void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes); - int get_track_size(int cell_size, int sector_count); + void determine_sizes(io_generic *io, int& cell_size, int& sector_count, int& heads) override; + void load_track(io_generic *io, UINT8 *trackdata, int head, int track, int sectorcount, int trackcount, int cellsize) override; + void write_track(io_generic *io, UINT8 *trackdata, int *sector, int track, int head, int maxsect, int maxtrack, int numbytes) override; + int get_track_size(int cell_size, int sector_count) override; // This format only supports double-sided images - int min_heads() { return 2; } + int min_heads() override { return 2; } }; extern const floppy_format_type FLOPPY_TI99_TDF_FORMAT; diff --git a/src/lib/formats/tvc_dsk.h b/src/lib/formats/tvc_dsk.h index f6796639d03..67df189b3da 100644 --- a/src/lib/formats/tvc_dsk.h +++ b/src/lib/formats/tvc_dsk.h @@ -17,9 +17,9 @@ class tvc_format : public wd177x_format { public: tvc_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; private: static const format formats[]; diff --git a/src/lib/formats/upd765_dsk.h b/src/lib/formats/upd765_dsk.h index 6f36d1225a5..12bda75d51b 100644 --- a/src/lib/formats/upd765_dsk.h +++ b/src/lib/formats/upd765_dsk.h @@ -38,10 +38,10 @@ public: // End the array with {} upd765_format(const format *formats); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override; protected: floppy_image_format_t::desc_e* get_desc_fm(const format &f, int ¤t_size, int &end_gap_index); diff --git a/src/lib/formats/vdk_dsk.h b/src/lib/formats/vdk_dsk.h index 5570c14eab8..b685cb32f8b 100644 --- a/src/lib/formats/vdk_dsk.h +++ b/src/lib/formats/vdk_dsk.h @@ -22,14 +22,14 @@ class vdk_format : public floppy_image_format_t public: vdk_format(); - virtual const char *name() const; - virtual const char *description() const; - virtual const char *extensions() const; - - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const; + virtual const char *name() const override; + virtual const char *description() const override; + virtual const char *extensions() const override; + + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override; private: static const int SECTOR_SIZE = 256; diff --git a/src/lib/formats/wd177x_dsk.h b/src/lib/formats/wd177x_dsk.h index a932beb1ced..6c93000b02c 100644 --- a/src/lib/formats/wd177x_dsk.h +++ b/src/lib/formats/wd177x_dsk.h @@ -37,10 +37,10 @@ public: // End the array with {} wd177x_format(const format *formats); - virtual int identify(io_generic *io, UINT32 form_factor); - virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image); - virtual bool save(io_generic *io, floppy_image *image); - virtual bool supports_save() const; + virtual int identify(io_generic *io, UINT32 form_factor) override; + virtual bool load(io_generic *io, UINT32 form_factor, floppy_image *image) override; + virtual bool save(io_generic *io, floppy_image *image) override; + virtual bool supports_save() const override; protected: enum { FM_DAM = 0xf56f, FM_DDAM = 0xf56a, MFM_DAM = 0xfb, MFM_DDAM = 0xf8 }; diff --git a/src/mame/audio/dave.h b/src/mame/audio/dave.h index 9bab709bd62..de534c51bda 100644 --- a/src/mame/audio/dave.h +++ b/src/mame/audio/dave.h @@ -70,15 +70,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; DECLARE_READ8_MEMBER( program_r ); DECLARE_WRITE8_MEMBER( program_w ); diff --git a/src/mame/audio/gb.h b/src/mame/audio/gb.h index c86cad02b76..5ce8cb389f9 100644 --- a/src/mame/audio/gb.h +++ b/src/mame/audio/gb.h @@ -69,13 +69,13 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; - virtual void device_reset(); + virtual void device_reset() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: void sound_w_internal(int offset, UINT8 data); diff --git a/src/mame/includes/amstrad.h b/src/mame/includes/amstrad.h index a8723c09325..e87597da5f6 100644 --- a/src/mame/includes/amstrad.h +++ b/src/mame/includes/amstrad.h @@ -314,7 +314,7 @@ protected: void amstrad_common_init(); void enumerate_roms(); unsigned char kccomp_get_colour_element(int colour_value); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; int m_centronics_busy; UINT8 m_last_write; diff --git a/src/mame/includes/apple2.h b/src/mame/includes/apple2.h index ec8b9963db5..f353598e614 100644 --- a/src/mame/includes/apple2.h +++ b/src/mame/includes/apple2.h @@ -344,7 +344,7 @@ public: DECLARE_WRITE_LINE_MEMBER(ay3600_data_ready_w); DECLARE_WRITE_LINE_MEMBER(ay3600_iie_data_ready_w); void apple2_update_memory_postload(); - virtual void machine_reset(); + virtual void machine_reset() override; void apple2_setup_memory(const apple2_memmap_config *config); void apple2_update_memory(); inline UINT32 effective_a2(); diff --git a/src/mame/includes/coco.h b/src/mame/includes/coco.h index 363fcff5d2a..d1c2663486f 100644 --- a/src/mame/includes/coco.h +++ b/src/mame/includes/coco.h @@ -142,9 +142,9 @@ public: DECLARE_WRITE_LINE_MEMBER( cart_w ) { cart_w((bool) state); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // interrupts virtual bool firq_get_line(void); diff --git a/src/mame/includes/neogeo.h b/src/mame/includes/neogeo.h index 7fe88a53a6e..1ca7b1479d9 100644 --- a/src/mame/includes/neogeo.h +++ b/src/mame/includes/neogeo.h @@ -134,8 +134,8 @@ protected: // device overrides - virtual void machine_start(); - virtual void machine_reset(); + virtual void machine_start() override; + virtual void machine_reset() override; // devices required_device<cpu_device> m_maincpu; @@ -178,8 +178,8 @@ protected: // video hardware, including maincpu interrupts // TODO: make into a device - virtual void video_start(); - virtual void video_reset(); + virtual void video_start() override; + virtual void video_reset() override; emu_timer *m_display_position_interrupt_timer; emu_timer *m_display_position_vblank_timer; diff --git a/src/mame/includes/nes.h b/src/mame/includes/nes.h index c99ff7917c7..90c3db04aba 100644 --- a/src/mame/includes/nes.h +++ b/src/mame/includes/nes.h @@ -90,10 +90,10 @@ public: DECLARE_READ8_MEMBER(fc_in1_r); DECLARE_WRITE8_MEMBER(fc_in0_w); DECLARE_WRITE8_MEMBER(nes_vh_sprite_dma_w); - virtual void machine_start(); - virtual void machine_reset(); - virtual void video_start(); - virtual void video_reset(); + virtual void machine_start() override; + virtual void machine_reset() override; + virtual void video_start() override; + virtual void video_reset() override; DECLARE_PALETTE_INIT(nes); UINT32 screen_update_nes(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); NESCTRL_BRIGHTPIXEL_CB(bright_pixel); diff --git a/src/mame/machine/appldriv.h b/src/mame/machine/appldriv.h index cbda53a42a3..4ab7ea18479 100644 --- a/src/mame/machine/appldriv.h +++ b/src/mame/machine/appldriv.h @@ -29,8 +29,8 @@ public: // construction/destruction apple525_floppy_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; void set_params(int dividend, int divisor) { m_dividend = dividend; m_divisor = divisor;} int get_dividend() { return m_dividend; } @@ -46,7 +46,7 @@ public: UINT8 track_data[APPLE2_NIBBLE_SIZE * APPLE2_SECTOR_COUNT]; protected: - virtual void device_start(); + virtual void device_start() override; private: int m_dividend; diff --git a/src/mame/machine/applefdc.h b/src/mame/machine/applefdc.h index 38efb9036d2..6e02ddc87b2 100644 --- a/src/mame/machine/applefdc.h +++ b/src/mame/machine/applefdc.h @@ -84,9 +84,9 @@ protected: applefdc_base_device(applefdc_t fdc_type, const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // other protecteds virtual void iwm_modereg_w(UINT8 data); diff --git a/src/mame/machine/coco_vhd.h b/src/mame/machine/coco_vhd.h index 4753d055646..45f9f5fb224 100644 --- a/src/mame/machine/coco_vhd.h +++ b/src/mame/machine/coco_vhd.h @@ -27,18 +27,18 @@ public: virtual ~coco_vhd_image_device(); // image-level overrides - virtual bool call_load(); + virtual bool call_load() override; - virtual iodevice_t image_type() const { return IO_HARDDISK; } + virtual iodevice_t image_type() const override { return IO_HARDDISK; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return nullptr; } - virtual const char *file_extensions() const { return "vhd"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return nullptr; } + virtual const char *file_extensions() const override { return "vhd"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // specific implementation DECLARE_READ8_MEMBER(read) { return read(offset); } @@ -48,8 +48,8 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; void coco_vhd_readwrite(UINT8 data); diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h index f9dfd186c92..4752c1d1a67 100644 --- a/src/mame/machine/ng_memcard.h +++ b/src/mame/machine/ng_memcard.h @@ -33,23 +33,23 @@ public: // construction/destruction ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual iodevice_t image_type() const { return IO_MEMCARD; } + virtual iodevice_t image_type() const override { return IO_MEMCARD; } - virtual bool is_readable() const { return true; } - virtual bool is_writeable() const { return true; } - virtual bool is_creatable() const { return true; } - virtual bool must_be_loaded() const { return false; } - virtual bool is_reset_on_load() const { return false; } - virtual const char *file_extensions() const { return "neo"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return true; } + virtual bool is_writeable() const override { return true; } + virtual bool is_creatable() const override { return true; } + virtual bool must_be_loaded() const override { return false; } + virtual bool is_reset_on_load() const override { return false; } + virtual const char *file_extensions() const override { return "neo"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_create(int format_type, option_resolution *format_options); + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); diff --git a/src/mame/machine/smartmed.h b/src/mame/machine/smartmed.h index 5e5b2f1c80d..29268f2652e 100644 --- a/src/mame/machine/smartmed.h +++ b/src/mame/machine/smartmed.h @@ -150,8 +150,8 @@ public: void set_data_ptr(void *ptr); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; int m_page_data_size; // 256 for a 2MB card, 512 otherwise int m_page_total_size;// 264 for a 2MB card, 528 otherwise @@ -206,24 +206,24 @@ public: smartmedia_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual iodevice_t image_type() const { return IO_MEMCARD; } + virtual iodevice_t image_type() const override { return IO_MEMCARD; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return "sm_memc"; } - virtual const char *file_extensions() const { return "smc"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return "sm_memc"; } + virtual const char *file_extensions() const override { return "smc"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } protected: // device-level overrides - virtual void device_config_complete(); + virtual void device_config_complete() override; bool smartmedia_format_1(); bool smartmedia_format_2(); diff --git a/src/mame/video/gb_lcd.h b/src/mame/video/gb_lcd.h index 31bd0c30403..05d76256a13 100644 --- a/src/mame/video/gb_lcd.h +++ b/src/mame/video/gb_lcd.h @@ -57,8 +57,8 @@ protected: virtual void update_scanline(); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void common_start(); void common_reset(); @@ -147,7 +147,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; @@ -161,11 +161,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void update_sprites(); - virtual void update_scanline(); + virtual void update_sprites() override; + virtual void update_scanline() override; void refresh_border(); }; @@ -181,14 +181,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void update_sprites(); - virtual void update_scanline(); + virtual void update_sprites() override; + virtual void update_scanline() override; virtual TIMER_CALLBACK_MEMBER(lcd_timer_proc); - virtual void videoptr_restore(); + virtual void videoptr_restore() override; void hdma_trans(UINT16 length); }; diff --git a/src/mame/video/neogeo_spr.h b/src/mame/video/neogeo_spr.h index b3e6f41a728..e5151bd6f50 100644 --- a/src/mame/video/neogeo_spr.h +++ b/src/mame/video/neogeo_spr.h @@ -80,8 +80,8 @@ public: int m_bppshift; // 4 for 4bpp gfx (NeoGeo) 8 for 8bpp gfx (Midas) protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT32 get_region_mask(UINT8* rgn, UINT32 rgn_size); UINT8* m_region_sprites; UINT32 m_region_sprites_size; UINT8* m_region_fixed; UINT32 m_region_fixed_size; @@ -100,8 +100,8 @@ class neosprite_regular_device : public neosprite_base_device { public: neosprite_regular_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens); - virtual void set_sprite_region(UINT8* region_sprites, UINT32 region_sprites_size); + virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens) override; + virtual void set_sprite_region(UINT8* region_sprites, UINT32 region_sprites_size) override; }; @@ -112,9 +112,9 @@ class neosprite_optimized_device : public neosprite_base_device { public: neosprite_optimized_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void optimize_sprite_data(); - virtual void set_optimized_sprite_data(UINT8* sprdata, UINT32 mask); - virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens); + virtual void optimize_sprite_data() override; + virtual void set_optimized_sprite_data(UINT8* sprdata, UINT32 mask) override; + virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens) override; std::vector<UINT8> m_sprite_gfx; UINT8* m_spritegfx8; @@ -131,15 +131,15 @@ class neosprite_midas_device : public neosprite_base_device public: neosprite_midas_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens); + virtual void draw_pixel(int romaddr, UINT32* dst, const pen_t *line_pens) override; UINT16* m_videoram_buffer; void buffer_vram(); - virtual void draw_fixed_layer_2pixels(UINT32*&pixel_addr, int offset, UINT8* gfx_base, const pen_t* char_pens); - virtual void set_sprite_region(UINT8* region_sprites, UINT32 region_sprites_size); + virtual void draw_fixed_layer_2pixels(UINT32*&pixel_addr, int offset, UINT8* gfx_base, const pen_t* char_pens) override; + virtual void set_sprite_region(UINT8* region_sprites, UINT32 region_sprites_size) override; protected: - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/mame/video/ppu2c0x.h b/src/mame/video/ppu2c0x.h index 332695acce2..ad9daadebf7 100644 --- a/src/mame/video/ppu2c0x.h +++ b/src/mame/video/ppu2c0x.h @@ -144,11 +144,11 @@ public: DECLARE_READ8_MEMBER( palette_read ); DECLARE_WRITE8_MEMBER( palette_write ); - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_config_complete() override; // device_config_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // address space configurations const address_space_config m_space_config; |