diff options
author | 2015-12-05 20:32:27 +0100 | |
---|---|---|
committer | 2015-12-05 21:20:53 +0100 | |
commit | 1c4865d66ff88a6891ebdde4580c3d61ee46ffa2 (patch) | |
tree | 268936fc8389b1a2adb8bfc3fa3006f12a4ccc95 /src/devices/bus/nes | |
parent | e8516832e941e39fa1db11211249afa9f015e7bb (diff) |
override part 1 (nw)
Diffstat (limited to 'src/devices/bus/nes')
49 files changed, 739 insertions, 739 deletions
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]; |