diff options
author | 2015-12-05 21:20:22 +0100 | |
---|---|---|
committer | 2015-12-05 21:20:56 +0100 | |
commit | 7ab3a5e0fc0c2e259c4011cdfce9684f2609592a (patch) | |
tree | 4fc55cd2e12f2b99b69bacb1dd0dd7d42bde3711 /src/devices/machine | |
parent | 1db2b0d6b40ff3635b637f5e854c5fd62a9db169 (diff) |
override part 3 (nw)
Diffstat (limited to 'src/devices/machine')
161 files changed, 703 insertions, 703 deletions
diff --git a/src/devices/machine/53c7xx.h b/src/devices/machine/53c7xx.h index 937bd9d16a0..00d87c6337d 100644 --- a/src/devices/machine/53c7xx.h +++ b/src/devices/machine/53c7xx.h @@ -85,10 +85,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void execute_run(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void execute_run() override; int m_icount; @@ -137,7 +137,7 @@ private: void update_irqs(); void set_scsi_state(int state); void delay(const attotime &delay); - void scsi_ctrl_changed(); + void scsi_ctrl_changed() override; void send_byte(); void recv_byte(); void step(bool timeout); diff --git a/src/devices/machine/53c810.h b/src/devices/machine/53c810.h index f55c3cdbfb1..7ce9f444d79 100644 --- a/src/devices/machine/53c810.h +++ b/src/devices/machine/53c810.h @@ -33,7 +33,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: typedef delegate<void (void)> opcode_handler_delegate; diff --git a/src/devices/machine/6532riot.h b/src/devices/machine/6532riot.h index 2825f31dc9d..dd1699c6c48 100644 --- a/src/devices/machine/6532riot.h +++ b/src/devices/machine/6532riot.h @@ -82,11 +82,11 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } private: diff --git a/src/devices/machine/68230pit.h b/src/devices/machine/68230pit.h index b78dbc887aa..2a2f2c6824c 100644 --- a/src/devices/machine/68230pit.h +++ b/src/devices/machine/68230pit.h @@ -105,10 +105,10 @@ void portb_setbit (UINT8 bit, UINT8 state); protected: // device-level overrides -virtual void device_start (); -virtual void device_reset (); -virtual void device_timer (emu_timer &timer, device_timer_id id, int param, void *ptr); -virtual void execute_run (); +virtual void device_start () override; +virtual void device_reset () override; +virtual void device_timer (emu_timer &timer, device_timer_id id, int param, void *ptr) override; +virtual void execute_run () override; int m_icount; devcb_write8 m_write_pa; devcb_write_line m_write_h2; diff --git a/src/devices/machine/68307.h b/src/devices/machine/68307.h index 6e7c6e355fa..555a1ec39e3 100644 --- a/src/devices/machine/68307.h +++ b/src/devices/machine/68307.h @@ -111,17 +111,17 @@ public: void init16_m68307(address_space &space); void init_cpu_m68307(void); - virtual UINT32 disasm_min_opcode_bytes() const { return 2; }; - virtual UINT32 disasm_max_opcode_bytes() const { return 10; }; + virtual UINT32 disasm_min_opcode_bytes() const override { return 2; }; + virtual UINT32 disasm_max_opcode_bytes() const override { return 10; }; - virtual UINT32 execute_min_cycles() const { return 4; }; - virtual UINT32 execute_max_cycles() const { return 158; }; + virtual UINT32 execute_min_cycles() const override { return 4; }; + virtual UINT32 execute_max_cycles() const override { return 158; }; required_device<mc68681_device> m_duart; protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; }; static const device_type M68307 = &device_creator<m68307cpu_device>; diff --git a/src/devices/machine/68340.h b/src/devices/machine/68340.h index 6f1260ae1cb..4dd93bb6e51 100644 --- a/src/devices/machine/68340.h +++ b/src/devices/machine/68340.h @@ -59,8 +59,8 @@ public: void do_timer_irq(void); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/machine/68561mpcc.h b/src/devices/machine/68561mpcc.h index df036282f1c..bb0bb4c2c6d 100644 --- a/src/devices/machine/68561mpcc.h +++ b/src/devices/machine/68561mpcc.h @@ -44,9 +44,9 @@ public: DECLARE_WRITE8_MEMBER(reg_w); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: struct Chan { diff --git a/src/devices/machine/7200fifo.h b/src/devices/machine/7200fifo.h index 0f5c28e7048..044484de076 100644 --- a/src/devices/machine/7200fifo.h +++ b/src/devices/machine/7200fifo.h @@ -103,8 +103,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: void fifo_write(UINT16 data); diff --git a/src/devices/machine/74123.h b/src/devices/machine/74123.h index 93325bdbeb1..b44354b456b 100644 --- a/src/devices/machine/74123.h +++ b/src/devices/machine/74123.h @@ -113,10 +113,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } TIMER_CALLBACK_MEMBER( output_callback ); TIMER_CALLBACK_MEMBER( clear_callback ); diff --git a/src/devices/machine/74145.h b/src/devices/machine/74145.h index 9b047207f1b..a6472f69291 100644 --- a/src/devices/machine/74145.h +++ b/src/devices/machine/74145.h @@ -71,8 +71,8 @@ public: void write(UINT8 data); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write_line m_output_line_0_cb; diff --git a/src/devices/machine/74148.h b/src/devices/machine/74148.h index 294869de12f..37ca98cf0ec 100644 --- a/src/devices/machine/74148.h +++ b/src/devices/machine/74148.h @@ -68,8 +68,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state ttl74148_output_delegate m_output_cb; diff --git a/src/devices/machine/74153.h b/src/devices/machine/74153.h index bfd9967e0e4..491fce01565 100644 --- a/src/devices/machine/74153.h +++ b/src/devices/machine/74153.h @@ -63,8 +63,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/74181.h b/src/devices/machine/74181.h index 5aeb64768f7..563acb3943e 100644 --- a/src/devices/machine/74181.h +++ b/src/devices/machine/74181.h @@ -51,8 +51,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_post_load() override; private: void update(); diff --git a/src/devices/machine/7474.h b/src/devices/machine/7474.h index 9373e41d7d3..15ece073ad1 100644 --- a/src/devices/machine/7474.h +++ b/src/devices/machine/7474.h @@ -85,10 +85,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } private: // callbacks devcb_write_line m_output_func; diff --git a/src/devices/machine/8042kbdc.h b/src/devices/machine/8042kbdc.h index b8d9c4e22fd..169c2f9cb12 100644 --- a/src/devices/machine/8042kbdc.h +++ b/src/devices/machine/8042kbdc.h @@ -56,7 +56,7 @@ public: // construction/destruction kbdc8042_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; static void set_keyboard_type(device_t &device, kbdc8042_type_t keybtype) { downcast<kbdc8042_device &>(device).m_keybtype = keybtype; } template<class _Object> static devcb_base &set_system_reset_callback(device_t &device, _Object object) { return downcast<kbdc8042_device &>(device).m_system_reset_cb.set_callback(object); } @@ -79,8 +79,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 m_inport, m_outport, m_data, m_command; diff --git a/src/devices/machine/8530scc.h b/src/devices/machine/8530scc.h index af4cef88e1e..2e6e703ceb8 100644 --- a/src/devices/machine/8530scc.h +++ b/src/devices/machine/8530scc.h @@ -44,9 +44,9 @@ public: DECLARE_WRITE8_MEMBER(reg_w); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: struct Chan { diff --git a/src/devices/machine/aakart.h b/src/devices/machine/aakart.h index bd59a54838a..15eefd6bf92 100644 --- a/src/devices/machine/aakart.h +++ b/src/devices/machine/aakart.h @@ -55,10 +55,10 @@ public: void send_keycode_up(UINT8 row, UINT8 col); protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: static const device_timer_id RX_TIMER = 1; diff --git a/src/devices/machine/adc0808.h b/src/devices/machine/adc0808.h index a7d1c3eb6c5..9a863e4ef81 100644 --- a/src/devices/machine/adc0808.h +++ b/src/devices/machine/adc0808.h @@ -101,8 +101,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: devcb_write_line m_out_eoc_cb; diff --git a/src/devices/machine/adc083x.h b/src/devices/machine/adc083x.h index 60050506f81..6a97973acca 100644 --- a/src/devices/machine/adc083x.h +++ b/src/devices/machine/adc083x.h @@ -60,7 +60,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; INT32 m_mux_bits; diff --git a/src/devices/machine/adc1038.h b/src/devices/machine/adc1038.h index 1d6b0f890bc..84e6ecf2f29 100644 --- a/src/devices/machine/adc1038.h +++ b/src/devices/machine/adc1038.h @@ -39,8 +39,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/adc1213x.h b/src/devices/machine/adc1213x.h index 3f2f0dbc63c..361cd3dede8 100644 --- a/src/devices/machine/adc1213x.h +++ b/src/devices/machine/adc1213x.h @@ -42,8 +42,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void convert(int channel, int bits16, int lsbfirst); diff --git a/src/devices/machine/aicartc.h b/src/devices/machine/aicartc.h index 1b877a604ff..6e1d9e2183e 100644 --- a/src/devices/machine/aicartc.h +++ b/src/devices/machine/aicartc.h @@ -43,10 +43,10 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: emu_timer *m_clock_timer; diff --git a/src/devices/machine/akiko.h b/src/devices/machine/akiko.h index 9be2ac08185..6886a4073a4 100644 --- a/src/devices/machine/akiko.h +++ b/src/devices/machine/akiko.h @@ -70,10 +70,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: // 1X CDROM sector time in msec (300KBps) diff --git a/src/devices/machine/am53cf96.h b/src/devices/machine/am53cf96.h index 8fda3ee0e5b..1c078d6e3f6 100644 --- a/src/devices/machine/am53cf96.h +++ b/src/devices/machine/am53cf96.h @@ -54,8 +54,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: static const device_timer_id TIMER_TRANSFER = 0; diff --git a/src/devices/machine/amigafdc.h b/src/devices/machine/amigafdc.h index 77727d51a88..2cef736e6cf 100644 --- a/src/devices/machine/amigafdc.h +++ b/src/devices/machine/amigafdc.h @@ -33,9 +33,9 @@ public: DECLARE_FLOPPY_FORMATS( floppy_formats ); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: // Running states diff --git a/src/devices/machine/at28c16.h b/src/devices/machine/at28c16.h index f8f71011347..5cc51cf9078 100644 --- a/src/devices/machine/at28c16.h +++ b/src/devices/machine/at28c16.h @@ -45,19 +45,19 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_config_complete() override; + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const; + virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read( emu_file &file ); - virtual void nvram_write( emu_file &file ); + virtual void nvram_default() override; + virtual void nvram_read( emu_file &file ) override; + virtual void nvram_write( emu_file &file ) override; // internal state address_space_config m_space_config; diff --git a/src/devices/machine/at45dbxx.h b/src/devices/machine/at45dbxx.h index a1e41e88657..40688fd786e 100644 --- a/src/devices/machine/at45dbxx.h +++ b/src/devices/machine/at45dbxx.h @@ -56,13 +56,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; protected: virtual int num_pages() const { return 2048; } @@ -120,11 +120,11 @@ public: at45db081_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int num_pages() const { return 4096; } - virtual int page_size() const { return 264; } - virtual UINT8 device_id() const { return 0x20; } + virtual int num_pages() const override { return 4096; } + virtual int page_size() const override { return 264; } + virtual UINT8 device_id() const override { return 0x20; } - virtual UINT32 flash_get_page_addr(); + virtual UINT32 flash_get_page_addr() override; }; // ======================> at45db161_device @@ -135,12 +135,12 @@ public: at45db161_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual int num_pages() const { return 4096; } - virtual int page_size() const { return 528; } - virtual UINT8 device_id() const { return 0x28; } + virtual int num_pages() const override { return 4096; } + virtual int page_size() const override { return 528; } + virtual UINT8 device_id() const override { return 0x28; } - virtual UINT32 flash_get_page_addr(); - virtual UINT32 flash_get_byte_addr(); + virtual UINT32 flash_get_page_addr() override; + virtual UINT32 flash_get_byte_addr() override; }; diff --git a/src/devices/machine/ataflash.h b/src/devices/machine/ataflash.h index 3bfd198f1af..33ed7324fbb 100644 --- a/src/devices/machine/ataflash.h +++ b/src/devices/machine/ataflash.h @@ -23,13 +23,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual attotime seek_time(); - virtual void process_command(); - virtual void process_buffer(); - virtual bool is_ready(); + virtual attotime seek_time() override; + virtual void process_command() override; + virtual void process_buffer() override; + virtual bool is_ready() override; private: UINT8 m_cis[512]; diff --git a/src/devices/machine/atahle.h b/src/devices/machine/atahle.h index cd1d921fc37..1841bdb2be8 100644 --- a/src/devices/machine/atahle.h +++ b/src/devices/machine/atahle.h @@ -22,24 +22,24 @@ class ata_hle_device : public device_t, public: ata_hle_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); - virtual UINT16 read_dma(); - virtual DECLARE_READ16_MEMBER(read_cs0); - virtual DECLARE_READ16_MEMBER(read_cs1); - - virtual void write_dma(UINT16 data); - virtual DECLARE_WRITE16_MEMBER(write_cs0); - virtual DECLARE_WRITE16_MEMBER(write_cs1); - virtual DECLARE_WRITE_LINE_MEMBER(write_csel); - virtual DECLARE_WRITE_LINE_MEMBER(write_dasp); - virtual DECLARE_WRITE_LINE_MEMBER(write_dmack); - virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag); + virtual UINT16 read_dma() override; + virtual DECLARE_READ16_MEMBER(read_cs0) override; + virtual DECLARE_READ16_MEMBER(read_cs1) override; + + virtual void write_dma(UINT16 data) override; + virtual DECLARE_WRITE16_MEMBER(write_cs0) override; + virtual DECLARE_WRITE16_MEMBER(write_cs1) override; + virtual DECLARE_WRITE_LINE_MEMBER(write_csel) override; + virtual DECLARE_WRITE_LINE_MEMBER(write_dasp) override; + virtual DECLARE_WRITE_LINE_MEMBER(write_dmack) override; + virtual DECLARE_WRITE_LINE_MEMBER(write_pdiag) override; TIMER_CALLBACK_MEMBER(buffer_empty_timer_work); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void set_irq(int state); void set_dmarq(int state); diff --git a/src/devices/machine/atapicdr.h b/src/devices/machine/atapicdr.h index fdc1e50eea2..b18999839c7 100644 --- a/src/devices/machine/atapicdr.h +++ b/src/devices/machine/atapicdr.h @@ -27,11 +27,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual void perform_diagnostic(); - virtual void identify_packet_device(); + virtual void perform_diagnostic() override; + virtual void identify_packet_device() override; }; // device type definition diff --git a/src/devices/machine/atapihle.h b/src/devices/machine/atapihle.h index 4d33e60a378..d124259e577 100644 --- a/src/devices/machine/atapihle.h +++ b/src/devices/machine/atapihle.h @@ -50,16 +50,16 @@ public: }; protected: - virtual void device_start(); - virtual void device_reset(); - - virtual int sector_length() { return ATAPI_BUFFER_LENGTH; } - virtual void process_buffer(); - virtual void fill_buffer(); - virtual bool is_ready() { return false; } - virtual void signature(); - virtual void process_command(); - virtual void finished_command(); + virtual void device_start() override; + virtual void device_reset() override; + + virtual int sector_length() override { return ATAPI_BUFFER_LENGTH; } + virtual void process_buffer() override; + virtual void fill_buffer() override; + virtual bool is_ready() override { return false; } + virtual void signature() override; + virtual void process_command() override; + virtual void finished_command() override; virtual void identify_packet_device() = 0; diff --git a/src/devices/machine/ay31015.h b/src/devices/machine/ay31015.h index 2f2ae33eca8..acdf3a01536 100644 --- a/src/devices/machine/ay31015.h +++ b/src/devices/machine/ay31015.h @@ -98,8 +98,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; virtual void internal_reset(); @@ -150,7 +150,7 @@ public: ay51013_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void internal_reset(); + virtual void internal_reset() override; }; diff --git a/src/devices/machine/cdp1852.h b/src/devices/machine/cdp1852.h index 232e148e474..eb8cef75dd4 100644 --- a/src/devices/machine/cdp1852.h +++ b/src/devices/machine/cdp1852.h @@ -70,9 +70,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void set_sr_line(int state); diff --git a/src/devices/machine/cdp1871.h b/src/devices/machine/cdp1871.h index 651f9c4343d..02238822057 100644 --- a/src/devices/machine/cdp1871.h +++ b/src/devices/machine/cdp1871.h @@ -120,8 +120,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void change_output_lines(); void clock_scan_counters(); diff --git a/src/devices/machine/cr511b.h b/src/devices/machine/cr511b.h index 59a8fc13fca..b4b3529f061 100644 --- a/src/devices/machine/cr511b.h +++ b/src/devices/machine/cr511b.h @@ -104,10 +104,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - 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 void device_reset() 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; private: enum diff --git a/src/devices/machine/cr589.h b/src/devices/machine/cr589.h index 87fe1c16641..e74e2612663 100644 --- a/src/devices/machine/cr589.h +++ b/src/devices/machine/cr589.h @@ -22,19 +22,19 @@ class matsushita_cr589_device : public atapi_cdrom_device, public: matsushita_cr589_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void ExecCommand(); - virtual void WriteData( UINT8 *data, int dataLength ); - virtual void ReadData( UINT8 *data, int dataLength ); + virtual void ExecCommand() override; + virtual void WriteData( UINT8 *data, int dataLength ) override; + virtual void ReadData( UINT8 *data, int dataLength ) override; protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: int download; diff --git a/src/devices/machine/cs4031.h b/src/devices/machine/cs4031.h index e27886f7b41..9a194a8699b 100644 --- a/src/devices/machine/cs4031.h +++ b/src/devices/machine/cs4031.h @@ -85,7 +85,7 @@ public: cs4031_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; // callbacks template<class _ior> void set_ior_callback(_ior ior) { m_read_ior.set_callback(ior); } @@ -188,9 +188,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_reset_after_children(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_reset_after_children() override; private: devcb_read16 m_read_ior; diff --git a/src/devices/machine/cs8221.h b/src/devices/machine/cs8221.h index b2d04dfe89e..ea7cc4a99b4 100644 --- a/src/devices/machine/cs8221.h +++ b/src/devices/machine/cs8221.h @@ -57,8 +57,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: diff --git a/src/devices/machine/ds1204.h b/src/devices/machine/ds1204.h index 7c8f1727c37..42b68de7538 100644 --- a/src/devices/machine/ds1204.h +++ b/src/devices/machine/ds1204.h @@ -31,12 +31,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read( emu_file &file ); - virtual void nvram_write( emu_file &file ); + virtual void nvram_default() override; + virtual void nvram_read( emu_file &file ) override; + virtual void nvram_write( emu_file &file ) override; private: inline void ATTR_PRINTF( 3, 4 ) verboselog( int n_level, const char *s_fmt, ... ); diff --git a/src/devices/machine/ds2401.h b/src/devices/machine/ds2401.h index b8b1148dc37..11c05f27a02 100644 --- a/src/devices/machine/ds2401.h +++ b/src/devices/machine/ds2401.h @@ -48,9 +48,9 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // internal state int m_state, m_bit, m_shift; diff --git a/src/devices/machine/ds2404.h b/src/devices/machine/ds2404.h index 31ff35a99a6..86b9c7be05d 100644 --- a/src/devices/machine/ds2404.h +++ b/src/devices/machine/ds2404.h @@ -68,17 +68,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset() { } - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override { } + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: diff --git a/src/devices/machine/ds75160a.h b/src/devices/machine/ds75160a.h index d3ca0b38de6..5cb4898322d 100644 --- a/src/devices/machine/ds75160a.h +++ b/src/devices/machine/ds75160a.h @@ -63,7 +63,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: devcb_read8 m_read; diff --git a/src/devices/machine/ds75161a.h b/src/devices/machine/ds75161a.h index 83f129857e6..33c244f6528 100644 --- a/src/devices/machine/ds75161a.h +++ b/src/devices/machine/ds75161a.h @@ -132,7 +132,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: void update_signals(); diff --git a/src/devices/machine/e0516.h b/src/devices/machine/e0516.h index 8adcdc75948..7e95be0dfc1 100644 --- a/src/devices/machine/e0516.h +++ b/src/devices/machine/e0516.h @@ -55,9 +55,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: int m_cs; // chip select diff --git a/src/devices/machine/er2055.h b/src/devices/machine/er2055.h index 58919f30e4c..900cac15b06 100644 --- a/src/devices/machine/er2055.h +++ b/src/devices/machine/er2055.h @@ -48,15 +48,15 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; static const int SIZE_DATA = 0x40; diff --git a/src/devices/machine/f3853.h b/src/devices/machine/f3853.h index f2afc03b588..82e9610c174 100644 --- a/src/devices/machine/f3853.h +++ b/src/devices/machine/f3853.h @@ -74,10 +74,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } static TIMER_CALLBACK( f3853_timer_callback ); diff --git a/src/devices/machine/fdc37c665gt.h b/src/devices/machine/fdc37c665gt.h index f9401ab56ce..569bf8ed0e8 100644 --- a/src/devices/machine/fdc37c665gt.h +++ b/src/devices/machine/fdc37c665gt.h @@ -23,8 +23,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: required_device<ns16550_device> m_uart1; diff --git a/src/devices/machine/gayle.h b/src/devices/machine/gayle.h index 19e9cc5df73..6ea542dd392 100644 --- a/src/devices/machine/gayle.h +++ b/src/devices/machine/gayle.h @@ -80,8 +80,8 @@ public: static void set_id(device_t &device, UINT8 id); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: enum diff --git a/src/devices/machine/hd63450.h b/src/devices/machine/hd63450.h index baf6d0337f1..e303a0d28b2 100644 --- a/src/devices/machine/hd63450.h +++ b/src/devices/machine/hd63450.h @@ -117,8 +117,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write8 m_dma_end; diff --git a/src/devices/machine/hd64610.h b/src/devices/machine/hd64610.h index cb1d79d8388..021cf181c27 100644 --- a/src/devices/machine/hd64610.h +++ b/src/devices/machine/hd64610.h @@ -66,17 +66,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: inline void set_irq_line(); diff --git a/src/devices/machine/i6300esb.h b/src/devices/machine/i6300esb.h index 2349db91b73..174eb5c17aa 100644 --- a/src/devices/machine/i6300esb.h +++ b/src/devices/machine/i6300esb.h @@ -20,16 +20,16 @@ class i6300esb_lpc_device : public pci_device { public: i6300esb_lpc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void reset_all_mappings(); + virtual void reset_all_mappings() override; virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; virtual DECLARE_ADDRESS_MAP(config_map, 32); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: required_device<lpc_acpi_device> acpi; @@ -147,8 +147,8 @@ public: i6300esb_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/machine/i80130.h b/src/devices/machine/i80130.h index b7aaece8fe7..1625fd8fc45 100644 --- a/src/devices/machine/i80130.h +++ b/src/devices/machine/i80130.h @@ -64,8 +64,8 @@ public: virtual DECLARE_ADDRESS_MAP(io_map, 16); // optional information overrides - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; UINT8 inta_r() { return m_pic->acknowledge(); } @@ -88,8 +88,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; required_device<pic8259_device> m_pic; required_device<pit8254_device> m_pit; diff --git a/src/devices/machine/i8155.h b/src/devices/machine/i8155.h index c85c0a62846..085ffe15196 100644 --- a/src/devices/machine/i8155.h +++ b/src/devices/machine/i8155.h @@ -97,11 +97,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; inline UINT8 get_timer_mode(); inline void timer_output(); diff --git a/src/devices/machine/i8212.h b/src/devices/machine/i8212.h index 78e87470acd..ea62ce9eefb 100644 --- a/src/devices/machine/i8212.h +++ b/src/devices/machine/i8212.h @@ -81,8 +81,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_write_line m_write_irq; diff --git a/src/devices/machine/i8214.h b/src/devices/machine/i8214.h index 62e7f98fd51..8a9c631bc76 100644 --- a/src/devices/machine/i8214.h +++ b/src/devices/machine/i8214.h @@ -67,7 +67,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: inline void trigger_interrupt(int level); diff --git a/src/devices/machine/i8243.h b/src/devices/machine/i8243.h index 7ac782f3496..5157056491d 100644 --- a/src/devices/machine/i8243.h +++ b/src/devices/machine/i8243.h @@ -54,10 +54,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } private: diff --git a/src/devices/machine/i82541.h b/src/devices/machine/i82541.h index 810c4dc7b4a..475a94dc2be 100644 --- a/src/devices/machine/i82541.h +++ b/src/devices/machine/i82541.h @@ -15,8 +15,8 @@ public: i82541_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(registers_map, 32); diff --git a/src/devices/machine/i8257.h b/src/devices/machine/i8257.h index 9ab509d38e7..ad02ece924e 100644 --- a/src/devices/machine/i8257.h +++ b/src/devices/machine/i8257.h @@ -138,9 +138,9 @@ public: static void static_set_reverse_rw_mode(device_t &device, bool flag) { downcast<i8257_device &>(device).m_reverse_rw = flag; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void execute_run(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void execute_run() override; int m_icount; diff --git a/src/devices/machine/i8271.h b/src/devices/machine/i8271.h index d3400e95adf..dcc5f470713 100644 --- a/src/devices/machine/i8271.h +++ b/src/devices/machine/i8271.h @@ -53,9 +53,9 @@ public: void soft_reset(); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum { diff --git a/src/devices/machine/i8279.h b/src/devices/machine/i8279.h index 42a77d7634f..c5e56239b9e 100644 --- a/src/devices/machine/i8279.h +++ b/src/devices/machine/i8279.h @@ -93,10 +93,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } TIMER_CALLBACK_MEMBER( timerproc_callback ); diff --git a/src/devices/machine/i82875p.h b/src/devices/machine/i82875p.h index 8ab4a597eb2..6f42f71823b 100644 --- a/src/devices/machine/i82875p.h +++ b/src/devices/machine/i82875p.h @@ -25,10 +25,10 @@ public: void set_cpu_tag(const char *tag); void set_ram_size(int ram_size); - virtual void reset_all_mappings(); + virtual void reset_all_mappings() override; virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; virtual DECLARE_ADDRESS_MAP(config_map, 32); @@ -79,8 +79,8 @@ public: DECLARE_READ8_MEMBER( capreg2_r); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(agp_translation_map, 32); @@ -101,8 +101,8 @@ public: i82875p_agp_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class i82875p_overflow_device : public pci_device { @@ -121,8 +121,8 @@ public: protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(overflow_map, 32); diff --git a/src/devices/machine/i8355.h b/src/devices/machine/i8355.h index 33d68d0fa57..037e281cd70 100644 --- a/src/devices/machine/i8355.h +++ b/src/devices/machine/i8355.h @@ -88,11 +88,11 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; inline UINT8 read_port(int port); inline void write_port(int port, UINT8 data); diff --git a/src/devices/machine/idehd.h b/src/devices/machine/idehd.h index 4645929057e..8acc9e14474 100644 --- a/src/devices/machine/idehd.h +++ b/src/devices/machine/idehd.h @@ -37,7 +37,7 @@ public: } protected: - virtual void device_start(); + virtual void device_start() override; virtual int read_sector(UINT32 lba, void *buffer) = 0; virtual int write_sector(UINT32 lba, const void *buffer) = 0; @@ -46,14 +46,14 @@ protected: void ide_build_identify_device(); static const int IDE_DISK_SECTOR_SIZE = 512; - virtual int sector_length() { return IDE_DISK_SECTOR_SIZE; } - virtual void process_buffer(); - virtual void fill_buffer(); - virtual bool is_ready() { return true; } - virtual void process_command(); - virtual void finished_command(); - virtual void perform_diagnostic(); - virtual void signature(); + virtual int sector_length() override { return IDE_DISK_SECTOR_SIZE; } + virtual void process_buffer() override; + virtual void fill_buffer() override; + virtual bool is_ready() override { return true; } + virtual void process_command() override; + virtual void finished_command() override; + virtual void perform_diagnostic() override; + virtual void signature() override; int m_can_identify_device; UINT16 m_num_cylinders; @@ -69,7 +69,7 @@ private: void next_sector(); void security_error(); void read_first_sector(); - void soft_reset(); + void soft_reset() override; UINT32 m_cur_lba; UINT16 m_block_count; @@ -92,15 +92,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // optional information overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; - virtual int read_sector(UINT32 lba, void *buffer) { if (m_disk == nullptr) return 0; return hard_disk_read(m_disk, lba, buffer); } - virtual int write_sector(UINT32 lba, const void *buffer) { if (m_disk == nullptr) return 0; return hard_disk_write(m_disk, lba, buffer); } - virtual UINT8 calculate_status(); + virtual int read_sector(UINT32 lba, void *buffer) override { if (m_disk == nullptr) return 0; return hard_disk_read(m_disk, lba, buffer); } + virtual int write_sector(UINT32 lba, const void *buffer) override { if (m_disk == nullptr) return 0; return hard_disk_write(m_disk, lba, buffer); } + virtual UINT8 calculate_status() override; chd_file *m_handle; hard_disk_file *m_disk; diff --git a/src/devices/machine/im6402.h b/src/devices/machine/im6402.h index 46ac592b7ac..05f0b33861a 100644 --- a/src/devices/machine/im6402.h +++ b/src/devices/machine/im6402.h @@ -114,15 +114,15 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_callback(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_callback() override; + virtual void rcv_complete() override; private: inline void set_dr(int state); diff --git a/src/devices/machine/ins8154.h b/src/devices/machine/ins8154.h index 300b9763a9b..6a38a840c89 100644 --- a/src/devices/machine/ins8154.h +++ b/src/devices/machine/ins8154.h @@ -84,10 +84,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } private: diff --git a/src/devices/machine/jvsdev.h b/src/devices/machine/jvsdev.h index 97382ea1655..22a95e2b1a7 100644 --- a/src/devices/machine/jvsdev.h +++ b/src/devices/machine/jvsdev.h @@ -26,8 +26,8 @@ protected: void handle_output(ioport_port *port, UINT8 id, UINT8 val); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // JVS device overrides virtual const char *device_id(); diff --git a/src/devices/machine/jvshost.h b/src/devices/machine/jvshost.h index 872e8a774e5..a52c2d0fdf0 100644 --- a/src/devices/machine/jvshost.h +++ b/src/devices/machine/jvshost.h @@ -15,8 +15,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void push(UINT8 val); diff --git a/src/devices/machine/k033906.h b/src/devices/machine/k033906.h index bec3bc1c3ac..aa2c685df99 100644 --- a/src/devices/machine/k033906.h +++ b/src/devices/machine/k033906.h @@ -43,10 +43,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset() { } - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override { } + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } private: diff --git a/src/devices/machine/k053252.h b/src/devices/machine/k053252.h index 79bfe9fa7a4..932fdd964ab 100644 --- a/src/devices/machine/k053252.h +++ b/src/devices/machine/k053252.h @@ -48,8 +48,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/k056230.h b/src/devices/machine/k056230.h index d8ec4a70ebc..5695261f4c2 100644 --- a/src/devices/machine/k056230.h +++ b/src/devices/machine/k056230.h @@ -51,10 +51,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset() { } - virtual void device_post_load() { } - virtual void device_clock_changed() { } + virtual void device_start() override; + virtual void device_reset() override { } + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } private: diff --git a/src/devices/machine/kr2376.h b/src/devices/machine/kr2376.h index e282362d761..f1904d29f7e 100644 --- a/src/devices/machine/kr2376.h +++ b/src/devices/machine/kr2376.h @@ -70,9 +70,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual ioport_constructor device_input_ports() const; + 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; private: // internal state diff --git a/src/devices/machine/latch8.h b/src/devices/machine/latch8.h index 6c82bd0689d..dce9ea6f87a 100644 --- a/src/devices/machine/latch8.h +++ b/src/devices/machine/latch8.h @@ -99,9 +99,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_validity_check(validity_checker &valid) const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_validity_check(validity_checker &valid) const override; TIMER_CALLBACK_MEMBER( timerproc ); void update(UINT8 new_val, UINT8 mask); diff --git a/src/devices/machine/lc89510.h b/src/devices/machine/lc89510.h index 8e175375e89..0d7ebedcf71 100644 --- a/src/devices/machine/lc89510.h +++ b/src/devices/machine/lc89510.h @@ -11,8 +11,8 @@ public: protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/machine/ldpr8210.h b/src/devices/machine/ldpr8210.h index 96273dcb12a..7418df3336d 100644 --- a/src/devices/machine/ldpr8210.h +++ b/src/devices/machine/ldpr8210.h @@ -80,16 +80,16 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); - virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); - virtual void player_overlay(bitmap_yuy16 &bitmap); + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; + virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; + virtual void player_overlay(bitmap_yuy16 &bitmap) override; // internal helpers bool focus_on() const { return !(m_i8049_port1 & 0x08); } @@ -158,18 +158,18 @@ protected: }; // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // internal helpers - virtual bool override_control() const { return m_controlthis; } - virtual void update_audio_squelch() { set_audio_squelch(m_audio_squelch, m_audio_squelch); } + virtual bool override_control() const override { return m_controlthis; } + virtual void update_audio_squelch() override { set_audio_squelch(m_audio_squelch, m_audio_squelch); } public: // internal read/write handlers diff --git a/src/devices/machine/ldstub.h b/src/devices/machine/ldstub.h index d10cd0313ea..ee49e382583 100644 --- a/src/devices/machine/ldstub.h +++ b/src/devices/machine/ldstub.h @@ -59,9 +59,9 @@ public: protected: // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { } - virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { return fieldnum; } - virtual void player_overlay(bitmap_yuy16 &bitmap) { } + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override { } + virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override { return fieldnum; } + virtual void player_overlay(bitmap_yuy16 &bitmap) override { } }; @@ -83,9 +83,9 @@ public: protected: // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { } - virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { return fieldnum; } - virtual void player_overlay(bitmap_yuy16 &bitmap) { } + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override { } + virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override { return fieldnum; } + virtual void player_overlay(bitmap_yuy16 &bitmap) override { } }; @@ -105,9 +105,9 @@ public: protected: // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { } - virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) { return fieldnum; } - virtual void player_overlay(bitmap_yuy16 &bitmap) { } + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override { } + virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override { return fieldnum; } + virtual void player_overlay(bitmap_yuy16 &bitmap) override { } }; diff --git a/src/devices/machine/ldv1000.h b/src/devices/machine/ldv1000.h index bb65a24515e..c2f9ead67a6 100644 --- a/src/devices/machine/ldv1000.h +++ b/src/devices/machine/ldv1000.h @@ -66,16 +66,16 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); - virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); - virtual void player_overlay(bitmap_yuy16 &bitmap) { } + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; + virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; + virtual void player_overlay(bitmap_yuy16 &bitmap) override { } // internal helpers bool focus_on() const { return !(m_portb1 & 0x01); } diff --git a/src/devices/machine/ldvp931.h b/src/devices/machine/ldvp931.h index 636f4529d6b..8acd7ebf6bd 100644 --- a/src/devices/machine/ldvp931.h +++ b/src/devices/machine/ldvp931.h @@ -73,16 +73,16 @@ protected: }; // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual const rom_entry *device_rom_region() const; - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual const rom_entry *device_rom_region() const override; + virtual machine_config_constructor device_mconfig_additions() const override; // subclass overrides - virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); - virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime); - virtual void player_overlay(bitmap_yuy16 &bitmap) { } + virtual void player_vsync(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; + virtual INT32 player_update(const vbi_metadata &vbi, int fieldnum, const attotime &curtime) override; + virtual void player_overlay(bitmap_yuy16 &bitmap) override { } public: // internal read/write handlers diff --git a/src/devices/machine/lh5810.h b/src/devices/machine/lh5810.h index d78458ca172..63bff576958 100644 --- a/src/devices/machine/lh5810.h +++ b/src/devices/machine/lh5810.h @@ -82,8 +82,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: diff --git a/src/devices/machine/linflash.h b/src/devices/machine/linflash.h index b4bd488d55d..4d395f6d7e5 100644 --- a/src/devices/machine/linflash.h +++ b/src/devices/machine/linflash.h @@ -22,10 +22,10 @@ protected: linear_flash_pccard_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock,const char *shortname, const char *source); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const; + virtual const address_space_config *memory_space_config( address_spacenum spacenum = AS_0 ) const override; address_space_config m_space_config; address_space *m_space; @@ -41,7 +41,7 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; @@ -54,7 +54,7 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; extern const device_type LINEAR_FLASH_PCCARD_64MB; @@ -66,7 +66,7 @@ public: protected: // device-level overrides - virtual machine_config_constructor device_mconfig_additions() const; + virtual machine_config_constructor device_mconfig_additions() const override; }; #endif diff --git a/src/devices/machine/lpc-acpi.h b/src/devices/machine/lpc-acpi.h index 2abf019d408..bde29170f04 100644 --- a/src/devices/machine/lpc-acpi.h +++ b/src/devices/machine/lpc-acpi.h @@ -13,7 +13,7 @@ public: lpc_acpi_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; DECLARE_READ16_MEMBER( pm1_sts_r); DECLARE_WRITE16_MEMBER(pm1_sts_w); @@ -70,8 +70,8 @@ public: DECLARE_WRITE8_MEMBER( sw_irq_gen_w); protected: - void device_start(); - void device_reset(); + void device_start() override; + void device_reset() override; private: UINT32 pm1_cnt, proc_cnt, gpe0_sts, gpe0_en, smi_en, smi_sts; diff --git a/src/devices/machine/lpc-pit.h b/src/devices/machine/lpc-pit.h index 4a49a76c10c..a9e96a7b401 100644 --- a/src/devices/machine/lpc-pit.h +++ b/src/devices/machine/lpc-pit.h @@ -13,15 +13,15 @@ public: lpc_pit_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; DECLARE_READ8_MEMBER( status_r); DECLARE_WRITE8_MEMBER(access_w); DECLARE_WRITE8_MEMBER(control_w); protected: - void device_start(); - void device_reset(); + void device_start() override; + void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/machine/lpc-rtc.h b/src/devices/machine/lpc-rtc.h index f85c6c5cd11..f46a3ca2238 100644 --- a/src/devices/machine/lpc-rtc.h +++ b/src/devices/machine/lpc-rtc.h @@ -13,7 +13,7 @@ public: lpc_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; virtual void map_extdevice(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); @@ -28,8 +28,8 @@ public: DECLARE_WRITE8_MEMBER( exttarget_w); protected: - void device_start(); - void device_reset(); + void device_start() override; + void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/machine/lpci.h b/src/devices/machine/lpci.h index 8d420d28a07..849f27d206d 100644 --- a/src/devices/machine/lpci.h +++ b/src/devices/machine/lpci.h @@ -42,9 +42,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; private: UINT8 m_busnum; diff --git a/src/devices/machine/m6m80011ap.h b/src/devices/machine/m6m80011ap.h index 196617f2339..dfea6c06c14 100644 --- a/src/devices/machine/m6m80011ap.h +++ b/src/devices/machine/m6m80011ap.h @@ -54,13 +54,13 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: UINT8 m_latch; diff --git a/src/devices/machine/mb14241.h b/src/devices/machine/mb14241.h index 68a85c583ec..01c2d1b0dde 100644 --- a/src/devices/machine/mb14241.h +++ b/src/devices/machine/mb14241.h @@ -21,9 +21,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/mb3773.h b/src/devices/machine/mb3773.h index 3199f545bf7..fa6fdd583fa 100644 --- a/src/devices/machine/mb3773.h +++ b/src/devices/machine/mb3773.h @@ -36,10 +36,10 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void reset_timer(); diff --git a/src/devices/machine/mb8421.h b/src/devices/machine/mb8421.h index 92300e45946..d1d23ab0691 100644 --- a/src/devices/machine/mb8421.h +++ b/src/devices/machine/mb8421.h @@ -54,8 +54,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 m_ram[0x800]; diff --git a/src/devices/machine/mb87078.h b/src/devices/machine/mb87078.h index 15e68b83b22..9eeb6c7526f 100644 --- a/src/devices/machine/mb87078.h +++ b/src/devices/machine/mb87078.h @@ -50,8 +50,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/mb8795.h b/src/devices/machine/mb8795.h index 478d9487263..4811d38c04d 100644 --- a/src/devices/machine/mb8795.h +++ b/src/devices/machine/mb8795.h @@ -54,11 +54,11 @@ public: void rx_dma_r(UINT8 &data, bool &eof); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void recv_cb(UINT8 *buf, int len); + virtual void recv_cb(UINT8 *buf, int len) override; private: enum { TIMER_TX, TIMER_RX }; diff --git a/src/devices/machine/mb89363b.h b/src/devices/machine/mb89363b.h index e29f75fda41..85b1913e6d1 100644 --- a/src/devices/machine/mb89363b.h +++ b/src/devices/machine/mb89363b.h @@ -104,9 +104,9 @@ public: required_device<i8255_device> m_i8255_b; protected: - virtual machine_config_constructor device_mconfig_additions() const; - virtual void device_start(); - virtual void device_reset(); + virtual machine_config_constructor device_mconfig_additions() const override; + virtual void device_start() override; + virtual void device_reset() override; diff --git a/src/devices/machine/mb89371.h b/src/devices/machine/mb89371.h index 2f0aa11fc4f..f7d5c1a2bad 100644 --- a/src/devices/machine/mb89371.h +++ b/src/devices/machine/mb89371.h @@ -25,7 +25,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/machine/mc68328.h b/src/devices/machine/mc68328.h index 06ae394e7e1..c01e2ab471b 100644 --- a/src/devices/machine/mc68328.h +++ b/src/devices/machine/mc68328.h @@ -645,8 +645,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/mc6846.h b/src/devices/machine/mc6846.h index 0bf6b84658f..bb198ee64d7 100644 --- a/src/devices/machine/mc6846.h +++ b/src/devices/machine/mc6846.h @@ -62,8 +62,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/mc68681.h b/src/devices/machine/mc68681.h index 3e4d0b9f256..abae110dbac 100644 --- a/src/devices/machine/mc68681.h +++ b/src/devices/machine/mc68681.h @@ -41,14 +41,14 @@ public: mc68681_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial overrides - virtual void rcv_complete(); // Rx completed receiving byte - virtual void tra_complete(); // Tx completed sending byte - virtual void tra_callback(); // Tx send bit + virtual void rcv_complete() override; // Rx completed receiving byte + virtual void tra_complete() override; // Tx completed sending byte + virtual void tra_callback() override; // Tx send bit UINT8 read_chan_reg(int reg); void write_chan_reg(int reg, UINT8 data); @@ -136,9 +136,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; private: TIMER_CALLBACK_MEMBER( duart_timer_callback ); diff --git a/src/devices/machine/mc68901.h b/src/devices/machine/mc68901.h index 7147af2a478..9bbe8ee2280 100644 --- a/src/devices/machine/mc68901.h +++ b/src/devices/machine/mc68901.h @@ -130,14 +130,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; void check_interrupts(); void take_interrupt(UINT16 mask); diff --git a/src/devices/machine/mccs1850.h b/src/devices/machine/mccs1850.h index 933e67a5f8f..e4179c47e82 100644 --- a/src/devices/machine/mccs1850.h +++ b/src/devices/machine/mccs1850.h @@ -72,14 +72,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: inline void check_interrupt(); diff --git a/src/devices/machine/mcf5206e.h b/src/devices/machine/mcf5206e.h index d49b88119d3..fe67092c6f7 100644 --- a/src/devices/machine/mcf5206e.h +++ b/src/devices/machine/mcf5206e.h @@ -163,12 +163,12 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load() { } - virtual void device_clock_changed() { } - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override { } + virtual void device_clock_changed() override { } + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; address_space_config m_space_config; diff --git a/src/devices/machine/microtch.h b/src/devices/machine/microtch.h index c7ba5a3c00b..a3d64804de5 100644 --- a/src/devices/machine/microtch.h +++ b/src/devices/machine/microtch.h @@ -15,18 +15,18 @@ public: microtouch_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); template<class _Object> static devcb_base &static_set_stx_callback(device_t &device, _Object object) { return downcast<microtouch_device &>(device).m_out_stx_func.set_callback(object); } - virtual ioport_constructor device_input_ports() const; + virtual ioport_constructor device_input_ports() const override; DECLARE_WRITE_LINE_MEMBER(rx) { device_serial_interface::rx_w(state); } DECLARE_INPUT_CHANGED_MEMBER(touch); typedef delegate<int (int *, int *)> touch_cb; static void static_set_touch_callback(device_t &device, touch_cb object) { downcast<microtouch_device &>(device).m_out_touch_cb = object; } protected: - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; private: int check_command( const char* commandtocheck, int command_len, UINT8* command_data ); void send_format_table_packet(UINT8 flag, int x, int y); diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h index 88a7bfde186..4cca5f6e9c3 100644 --- a/src/devices/machine/mm74c922.h +++ b/src/devices/machine/mm74c922.h @@ -95,8 +95,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void change_output_lines(); diff --git a/src/devices/machine/mos6529.h b/src/devices/machine/mos6529.h index 0e6f00f4dd0..fe9f8a3e063 100644 --- a/src/devices/machine/mos6529.h +++ b/src/devices/machine/mos6529.h @@ -92,7 +92,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; UINT8 m_input; diff --git a/src/devices/machine/mos6530.h b/src/devices/machine/mos6530.h index d63fdd95a12..c60ff759a1b 100644 --- a/src/devices/machine/mos6530.h +++ b/src/devices/machine/mos6530.h @@ -70,9 +70,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: // internal state diff --git a/src/devices/machine/mos8706.h b/src/devices/machine/mos8706.h index 070c592b9fe..2fd710e1337 100644 --- a/src/devices/machine/mos8706.h +++ b/src/devices/machine/mos8706.h @@ -57,8 +57,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; diff --git a/src/devices/machine/mos8722.h b/src/devices/machine/mos8722.h index d342781fc4e..5cbe9681da3 100644 --- a/src/devices/machine/mos8722.h +++ b/src/devices/machine/mos8722.h @@ -91,8 +91,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: enum diff --git a/src/devices/machine/msm58321.h b/src/devices/machine/msm58321.h index 8b1ad54edd9..04d174eedc2 100644 --- a/src/devices/machine/msm58321.h +++ b/src/devices/machine/msm58321.h @@ -84,17 +84,17 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); - virtual bool rtc_feature_y2k() { return m_year0 != 0; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; + virtual bool rtc_feature_y2k() override { return m_year0 != 0; } // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: static const device_timer_id TIMER_CLOCK = 0; diff --git a/src/devices/machine/ncr5380.h b/src/devices/machine/ncr5380.h index 678460f6133..77e8adc58b0 100644 --- a/src/devices/machine/ncr5380.h +++ b/src/devices/machine/ncr5380.h @@ -51,9 +51,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_stop(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_stop() override; private: UINT8 m_5380_Registers[8]; diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h index 93cf76a5486..7dfac6f5681 100644 --- a/src/devices/machine/ncr5390.h +++ b/src/devices/machine/ncr5390.h @@ -42,15 +42,15 @@ public: DECLARE_WRITE8_MEMBER(conf_w); DECLARE_WRITE8_MEMBER(clock_w); - virtual void scsi_ctrl_changed(); + virtual void scsi_ctrl_changed() override; UINT8 dma_r(); void dma_w(UINT8 val); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: enum { MODE_D, MODE_T, MODE_I }; diff --git a/src/devices/machine/ncr539x.h b/src/devices/machine/ncr539x.h index 2280613d22f..95b3655228d 100644 --- a/src/devices/machine/ncr539x.h +++ b/src/devices/machine/ncr539x.h @@ -41,9 +41,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: void fifo_write(UINT8 data); diff --git a/src/devices/machine/netlist.h b/src/devices/machine/netlist.h index 94c9c29e36e..568199444d7 100644 --- a/src/devices/machine/netlist.h +++ b/src/devices/machine/netlist.h @@ -68,7 +68,7 @@ public: { } - bool parse(netlist::setup_t &setup, const pstring &name); + bool parse(netlist::setup_t &setup, const pstring &name) override; private: pstring m_name; }; @@ -97,7 +97,7 @@ public: protected: - void vlog(const plog_level &l, const pstring &ls) const; + void vlog(const plog_level &l, const pstring &ls) const override; private: netlist_mame_device_t &m_parent; @@ -133,15 +133,15 @@ protected: virtual void nl_register_devices() { }; // device_t overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); - virtual void device_reset(); - virtual void device_post_load(); - virtual void device_pre_save(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; + virtual void device_reset() override; + virtual void device_post_load() override; + virtual void device_pre_save() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; //virtual void device_debug_setup(); - virtual void device_clock_changed(); + virtual void device_clock_changed() override; netlist::netlist_time m_div; @@ -183,12 +183,12 @@ public: protected: // netlist_mame_device_t - virtual void nl_register_devices(); + virtual void nl_register_devices() override; // device_t overrides //virtual void device_config_complete(); - virtual void device_start(); + virtual void device_start() override; //virtual void device_stop(); //virtual void device_reset(); //virtual void device_post_load(); @@ -197,21 +197,21 @@ protected: // device_execute_interface overrides - virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const; - virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const; + virtual UINT64 execute_clocks_to_cycles(UINT64 clocks) const override; + virtual UINT64 execute_cycles_to_clocks(UINT64 cycles) const override; - ATTR_HOT virtual void execute_run(); + ATTR_HOT virtual void execute_run() override; // device_disasm_interface overrides - ATTR_COLD virtual UINT32 disasm_min_opcode_bytes() const { return 1; } - ATTR_COLD virtual UINT32 disasm_max_opcode_bytes() const { return 1; } - ATTR_COLD virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options); + ATTR_COLD virtual UINT32 disasm_min_opcode_bytes() const override { return 1; } + ATTR_COLD virtual UINT32 disasm_max_opcode_bytes() const override { return 1; } + ATTR_COLD virtual offs_t disasm_disassemble(char *buffer, offs_t pc, const UINT8 *oprom, const UINT8 *opram, UINT32 options) override; // device_memory_interface overrides address_space_config m_program_config; - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override { switch (spacenum) { @@ -223,7 +223,7 @@ protected: // device_state_interface overrides - virtual void state_string_export(const device_state_entry &entry, std::string &str) + virtual void state_string_export(const device_state_entry &entry, std::string &str) override { if (entry.index() >= 0) { @@ -263,16 +263,16 @@ public: // device_sound_interface overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; protected: // netlist_mame_device_t - virtual void nl_register_devices(); + virtual void nl_register_devices() override; // device_t overrides //virtual void device_config_complete(); - virtual void device_start(); + virtual void device_start() override; //virtual void device_stop(); //virtual void device_reset(); //virtual void device_post_load(); @@ -372,7 +372,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: netlist::param_double_t *m_param; @@ -399,8 +399,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void custom_netlist_additions(netlist::setup_t &setup); + virtual void device_start() override; + virtual void custom_netlist_additions(netlist::setup_t &setup) override; private: pstring m_in; @@ -439,8 +439,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) + virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override { if (is_sound_device()) update_to_current_time(); @@ -471,8 +471,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void custom_netlist_additions(netlist::setup_t &setup); + virtual void device_start() override; + virtual void custom_netlist_additions(netlist::setup_t &setup) override; private: UINT32 m_channel; pstring m_param_name; @@ -495,8 +495,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void custom_netlist_additions(netlist::setup_t &setup); + virtual void device_start() override; + virtual void custom_netlist_additions(netlist::setup_t &setup) override; private: UINT32 m_channel; pstring m_out_name; @@ -511,14 +511,14 @@ public: NETLIB_NAME(analog_callback)() : device_t(), m_cpu_device(nullptr), m_last(0) { } - ATTR_COLD void start() + ATTR_COLD void start() override { register_input("IN", m_in); m_cpu_device = downcast<netlist_mame_cpu_device_t *>(&downcast<netlist_mame_t &>(netlist()).parent()); save(NLNAME(m_last)); } - ATTR_COLD void reset() + ATTR_COLD void reset() override { m_last = 0.0; } @@ -528,7 +528,7 @@ public: m_callback = callback; } - ATTR_HOT void update() + ATTR_HOT void update() override { nl_double cur = INPANALOG(m_in); @@ -562,7 +562,7 @@ public: static const int BUFSIZE = 2048; - ATTR_COLD void start() + ATTR_COLD void start() override { register_input("IN", m_in); register_param("CHAN", m_channel, 0); @@ -572,7 +572,7 @@ public: save(NAME(m_last_buffer)); } - ATTR_COLD void reset() + ATTR_COLD void reset() override { m_cur = 0.0; m_last_pos = 0; @@ -590,7 +590,7 @@ public: } } - ATTR_HOT void update() + ATTR_HOT void update() override { nl_double val = INPANALOG(m_in) * m_mult.Value() + m_offset.Value(); sound_update(netlist().time()); @@ -636,7 +636,7 @@ public: static const int MAX_INPUT_CHANNELS = 10; - ATTR_COLD void start() + ATTR_COLD void start() override { // clock part register_output("Q", m_Q); @@ -655,7 +655,7 @@ public: m_num_channel = 0; } - ATTR_COLD void reset() + ATTR_COLD void reset() override { m_pos = 0; for (auto & elem : m_buffer) @@ -678,7 +678,7 @@ public: return m_num_channel; } - ATTR_HOT void update() + ATTR_HOT void update() override { for (int i=0; i<m_num_channel; i++) { diff --git a/src/devices/machine/nmc9306.h b/src/devices/machine/nmc9306.h index 95db0133025..92aba51965b 100644 --- a/src/devices/machine/nmc9306.h +++ b/src/devices/machine/nmc9306.h @@ -59,12 +59,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: inline UINT16 read(offs_t offset); diff --git a/src/devices/machine/nsc810.h b/src/devices/machine/nsc810.h index f7aea895f0b..036b197680d 100644 --- a/src/devices/machine/nsc810.h +++ b/src/devices/machine/nsc810.h @@ -33,9 +33,9 @@ public: DECLARE_WRITE8_MEMBER(write); protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: UINT8 m_portA_latch; diff --git a/src/devices/machine/nscsi_cb.h b/src/devices/machine/nscsi_cb.h index 9152ddaf8f9..547f288842b 100644 --- a/src/devices/machine/nscsi_cb.h +++ b/src/devices/machine/nscsi_cb.h @@ -48,7 +48,7 @@ public: template<class _line> void set_sel_callback(_line line) { m_write_sel.set_callback(line); } template<class _line> void set_bsy_callback(_line line) { m_write_bsy.set_callback(line); } - virtual void scsi_ctrl_changed(); + virtual void scsi_ctrl_changed() override; UINT8 read() { return scsi_bus->data_r(); } DECLARE_READ8_MEMBER( read ) { return read(); } @@ -76,8 +76,8 @@ public: DECLARE_WRITE_LINE_MEMBER( bsy_w ) { scsi_bus->ctrl_w(scsi_refid, state ? S_BSY : 0, S_BSY); } protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; devcb_write_line m_write_rst; devcb_write_line m_write_atn; diff --git a/src/devices/machine/nscsi_s1410.h b/src/devices/machine/nscsi_s1410.h index f9dc2707887..446cf18568d 100644 --- a/src/devices/machine/nscsi_s1410.h +++ b/src/devices/machine/nscsi_s1410.h @@ -62,11 +62,11 @@ protected: SC_WRITE_LONG = 0xe6 }; - virtual void device_reset(); + virtual void device_reset() override; - virtual void scsi_command(); - virtual UINT8 scsi_get_data(int id, int pos); - virtual void scsi_put_data(int buf, int offset, UINT8 data); + virtual void scsi_command() override; + virtual UINT8 scsi_get_data(int id, int pos) override; + virtual void scsi_put_data(int buf, int offset, UINT8 data) override; UINT8 params[8]; }; diff --git a/src/devices/machine/pc_fdc.h b/src/devices/machine/pc_fdc.h index a8a0dfa1733..b94fab2a2ca 100644 --- a/src/devices/machine/pc_fdc.h +++ b/src/devices/machine/pc_fdc.h @@ -33,7 +33,7 @@ public: required_device<upd765a_device> fdc; - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; virtual void tc_w(bool state) override; virtual UINT8 dma_r() override; @@ -66,7 +66,7 @@ class pc_fdc_xt_device : public pc_fdc_family_device { public: pc_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; WRITE8_MEMBER(dor_fifo_w); }; @@ -74,7 +74,7 @@ class pc_fdc_at_device : public pc_fdc_family_device { public: pc_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual DECLARE_ADDRESS_MAP(map, 8); + virtual DECLARE_ADDRESS_MAP(map, 8) override; }; extern const device_type PC_FDC_XT; diff --git a/src/devices/machine/pccard.h b/src/devices/machine/pccard.h index 7a7b9abd1ab..2068406d4b2 100644 --- a/src/devices/machine/pccard.h +++ b/src/devices/machine/pccard.h @@ -33,7 +33,7 @@ public: DECLARE_WRITE16_MEMBER(write_reg); protected: - virtual void device_start(); + virtual void device_start() override; private: // internal state diff --git a/src/devices/machine/pcf8593.h b/src/devices/machine/pcf8593.h index 2475f0a2dfe..63b3befe6b9 100644 --- a/src/devices/machine/pcf8593.h +++ b/src/devices/machine/pcf8593.h @@ -40,18 +40,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual bool rtc_feature_y2k() { return true; } - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual bool rtc_feature_y2k() override { return true; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: void clear_buffer_rx(); diff --git a/src/devices/machine/pci-apic.h b/src/devices/machine/pci-apic.h index 85b8de34b4d..4da0dc00bd3 100644 --- a/src/devices/machine/pci-apic.h +++ b/src/devices/machine/pci-apic.h @@ -13,8 +13,8 @@ public: apic_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; extern const device_type APIC; diff --git a/src/devices/machine/pci-sata.h b/src/devices/machine/pci-sata.h index 59b41635622..7075b49bb58 100644 --- a/src/devices/machine/pci-sata.h +++ b/src/devices/machine/pci-sata.h @@ -13,8 +13,8 @@ public: sata_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(primary_command_map, 32); diff --git a/src/devices/machine/pci-smbus.h b/src/devices/machine/pci-smbus.h index e149e3e547c..2ff96befc9b 100644 --- a/src/devices/machine/pci-smbus.h +++ b/src/devices/machine/pci-smbus.h @@ -49,8 +49,8 @@ public: DECLARE_READ8_MEMBER (notify_dhigh_r); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/machine/pci-usb.h b/src/devices/machine/pci-usb.h index e103e89d968..31541432efd 100644 --- a/src/devices/machine/pci-usb.h +++ b/src/devices/machine/pci-usb.h @@ -16,8 +16,8 @@ public: usb_uhci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); @@ -28,8 +28,8 @@ public: usb_ehci_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/machine/pci.h b/src/devices/machine/pci.h index 34566f5f1e6..c57d3eb3bf8 100644 --- a/src/devices/machine/pci.h +++ b/src/devices/machine/pci.h @@ -117,8 +117,8 @@ protected: UINT32 expansion_rom_base; bool is_multifunction_device; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; void skip_map_regs(int count); void add_map(UINT64 size, int flags, address_map_delegate &map); @@ -144,8 +144,8 @@ public: agp_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class pci_bridge_device : public pci_device, public device_memory_interface { @@ -153,14 +153,14 @@ public: pci_bridge_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); pci_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); - virtual void set_remap_cb(mapper_cb _remap_cb); + virtual void set_remap_cb(mapper_cb _remap_cb) override; virtual void map_device(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); - virtual void reset_all_mappings(); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; + virtual void reset_all_mappings() override; - virtual DECLARE_READ8_MEMBER(header_type_r); + virtual DECLARE_READ8_MEMBER(header_type_r) override; - virtual DECLARE_ADDRESS_MAP(config_map, 32); + virtual DECLARE_ADDRESS_MAP(config_map, 32) override; DECLARE_READ32_MEMBER (b_address_base_r); DECLARE_WRITE32_MEMBER(b_address_base_w); @@ -210,9 +210,9 @@ protected: UINT16 bridge_control, memory_base, memory_limit, prefetch_base, prefetch_limit, iobaseu, iolimitu; UINT8 primary_bus, secondary_bus, subordinate_bus, iobase, iolimit; - virtual void device_start(); - virtual void device_reset(); - virtual const address_space_config *memory_space_config(address_spacenum spacenum) const; + virtual void device_start() override; + virtual void device_reset() override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override; virtual device_t *bus_root(); virtual void regenerate_config_mapping(); @@ -233,8 +233,8 @@ public: agp_bridge_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; class pci_host_device : public pci_bridge_device { @@ -249,10 +249,10 @@ protected: UINT64 memory_window_start, memory_window_end, memory_offset; UINT64 io_window_start, io_window_end, io_offset; - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual device_t *bus_root(); + virtual device_t *bus_root() override; UINT32 config_address; @@ -272,8 +272,8 @@ public: pci_root_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); protected: - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; }; extern const device_type PCI_ROOT; diff --git a/src/devices/machine/pci9050.h b/src/devices/machine/pci9050.h index 7915e46b9ea..adb3ac969e0 100644 --- a/src/devices/machine/pci9050.h +++ b/src/devices/machine/pci9050.h @@ -48,9 +48,9 @@ public: void set_map(int id, address_map_constructor map, const char *name, device_t *device); protected: - virtual void device_start(); - virtual void device_config_complete(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_config_complete() override; + virtual void device_reset() override; private: DECLARE_ADDRESS_MAP(map, 32); diff --git a/src/devices/machine/pckeybrd.h b/src/devices/machine/pckeybrd.h index 12ca33f0f4c..69a133df2c6 100644 --- a/src/devices/machine/pckeybrd.h +++ b/src/devices/machine/pckeybrd.h @@ -37,9 +37,9 @@ public: protected: - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; void queue_insert(UINT8 data); void clear_buffer(void); @@ -91,12 +91,12 @@ public: { downcast<at_keyboard_device &>(device).m_scan_code_set = default_set; downcast<at_keyboard_device &>(device).m_type = type; } protected: - virtual void device_reset(); - virtual void device_start(); + virtual void device_reset() override; + virtual void device_start() override; private: - virtual void standard_scancode_insert(int our_code, int pressed); - virtual void extended_scancode_insert(int code, int pressed); + virtual void standard_scancode_insert(int our_code, int pressed) override; + virtual void extended_scancode_insert(int code, int pressed) override; void helper(const char *codes); void clear_buffer_and_acknowledge(void); diff --git a/src/devices/machine/r10696.h b/src/devices/machine/r10696.h index ca3b87c935e..b3e821a9ed9 100644 --- a/src/devices/machine/r10696.h +++ b/src/devices/machine/r10696.h @@ -42,8 +42,8 @@ public: template<class _Object> static devcb_base &set_iowr(device_t &device, _Object object) { return downcast<r10696_device &>(device).m_iowr.set_callback(object); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 m_io_a; //!< input/output flip-flops group A diff --git a/src/devices/machine/r10788.h b/src/devices/machine/r10788.h index af58aca65c7..d7428074abc 100644 --- a/src/devices/machine/r10788.h +++ b/src/devices/machine/r10788.h @@ -50,9 +50,9 @@ public: template<class _Object> static devcb_base &set_update(device_t &device, _Object object) { return downcast<r10788_device &>(device).m_display.set_callback(object); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: static const device_timer_id TIMER_DISPLAY = 0; diff --git a/src/devices/machine/ra17xx.h b/src/devices/machine/ra17xx.h index 3ca8877d7de..0bc1fc991e4 100644 --- a/src/devices/machine/ra17xx.h +++ b/src/devices/machine/ra17xx.h @@ -42,8 +42,8 @@ public: template<class _Object> static devcb_base &set_iowr(device_t &device, _Object object) { return downcast<ra17xx_device &>(device).m_iowr.set_callback(object); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: UINT8 m_line[16]; //!< input/output flip-flops for 16 I/O lines diff --git a/src/devices/machine/rf5c296.h b/src/devices/machine/rf5c296.h index db3b24f497f..faab5e738fb 100644 --- a/src/devices/machine/rf5c296.h +++ b/src/devices/machine/rf5c296.h @@ -25,7 +25,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: void reg_w(ATTR_UNUSED UINT8 reg, UINT8 data); diff --git a/src/devices/machine/roc10937.h b/src/devices/machine/roc10937.h index ccd76243ec2..81ab7a31a63 100644 --- a/src/devices/machine/roc10937.h +++ b/src/devices/machine/roc10937.h @@ -81,9 +81,9 @@ protected: UINT32 m_chars[16]; UINT32 m_outputs[16]; - virtual void device_start(); - virtual void device_reset(); - virtual void device_post_load(); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_post_load() override; }; diff --git a/src/devices/machine/rp5c01.h b/src/devices/machine/rp5c01.h index e0283816067..f9cf0a12609 100644 --- a/src/devices/machine/rp5c01.h +++ b/src/devices/machine/rp5c01.h @@ -63,18 +63,18 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual bool rtc_feature_leap_year() { return true; } - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual bool rtc_feature_leap_year() override { return true; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: inline void set_alarm_line(); diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h index 2f97d49d99f..03f8cd91d66 100644 --- a/src/devices/machine/rp5c15.h +++ b/src/devices/machine/rp5c15.h @@ -59,13 +59,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual bool rtc_feature_leap_year() { return true; } - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual bool rtc_feature_leap_year() override { return true; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: inline void set_alarm_line(); diff --git a/src/devices/machine/rp5h01.h b/src/devices/machine/rp5h01.h index 016f05884ae..9a72c6384de 100644 --- a/src/devices/machine/rp5h01.h +++ b/src/devices/machine/rp5h01.h @@ -49,9 +49,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; private: // internal state int m_counter; diff --git a/src/devices/machine/rtc4543.h b/src/devices/machine/rtc4543.h index c1eafb47efb..e32e37370ee 100644 --- a/src/devices/machine/rtc4543.h +++ b/src/devices/machine/rtc4543.h @@ -51,13 +51,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_rtc_interface overrides - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); - virtual bool rtc_feature_leap_year() { return true; } + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; + virtual bool rtc_feature_leap_year() override { return true; } private: devcb_write_line data_cb; diff --git a/src/devices/machine/rtc9701.h b/src/devices/machine/rtc9701.h index eaad28ad0b5..14407f157ec 100644 --- a/src/devices/machine/rtc9701.h +++ b/src/devices/machine/rtc9701.h @@ -63,14 +63,14 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; inline UINT8 rtc_read(UINT8 offset); inline void rtc_write(UINT8 offset,UINT8 data); diff --git a/src/devices/machine/s2636.h b/src/devices/machine/s2636.h index 082eeabab9f..e6bbbfff32b 100644 --- a/src/devices/machine/s2636.h +++ b/src/devices/machine/s2636.h @@ -47,10 +47,10 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // sound stream update overrides - virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples); + virtual void sound_stream_update(sound_stream &stream, stream_sample_t **inputs, stream_sample_t **outputs, int samples) override; private: // internal state diff --git a/src/devices/machine/s3520cf.h b/src/devices/machine/s3520cf.h index af7ba33a835..c277c69142a 100644 --- a/src/devices/machine/s3520cf.h +++ b/src/devices/machine/s3520cf.h @@ -54,9 +54,9 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; inline UINT8 rtc_read(UINT8 offset); inline void rtc_write(UINT8 offset,UINT8 data); diff --git a/src/devices/machine/s3c2400.h b/src/devices/machine/s3c2400.h index f274e5ad36d..5c8b6d3dcb9 100644 --- a/src/devices/machine/s3c2400.h +++ b/src/devices/machine/s3c2400.h @@ -369,8 +369,8 @@ public: static void set_lcd_flags(device_t &device, int flags) { downcast<s3c2400_device &>(device).m_flags = flags; } // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state required_device<palette_device> m_palette; diff --git a/src/devices/machine/s3c2410.h b/src/devices/machine/s3c2410.h index 6ad02c90d1e..33665eabbcb 100644 --- a/src/devices/machine/s3c2410.h +++ b/src/devices/machine/s3c2410.h @@ -461,8 +461,8 @@ public: DECLARE_WRITE_LINE_MEMBER( frnb_w ); // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state required_device<palette_device> m_palette; diff --git a/src/devices/machine/s3c2440.h b/src/devices/machine/s3c2440.h index b76148eca09..9adfce38569 100644 --- a/src/devices/machine/s3c2440.h +++ b/src/devices/machine/s3c2440.h @@ -493,8 +493,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state required_device<palette_device> m_palette; diff --git a/src/devices/machine/s3c44b0.h b/src/devices/machine/s3c44b0.h index 462bda280d2..cdf1fe6d72e 100644 --- a/src/devices/machine/s3c44b0.h +++ b/src/devices/machine/s3c44b0.h @@ -652,8 +652,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/serflash.h b/src/devices/machine/serflash.h index fdda31e3912..a5cf2c58bfb 100644 --- a/src/devices/machine/serflash.h +++ b/src/devices/machine/serflash.h @@ -58,13 +58,13 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; void flash_change_state(running_machine &machine, flash_state_t state); diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h index 799af951928..f3e7032e0e2 100644 --- a/src/devices/machine/smc91c9x.h +++ b/src/devices/machine/smc91c9x.h @@ -31,8 +31,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: // internal state diff --git a/src/devices/machine/tc009xlvc.h b/src/devices/machine/tc009xlvc.h index de7e20a5c43..9cd3cf3a11e 100644 --- a/src/devices/machine/tc009xlvc.h +++ b/src/devices/machine/tc009xlvc.h @@ -76,11 +76,11 @@ public: void screen_eof(void); protected: - virtual void device_config_complete(); - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual void device_config_complete() override; + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; address_space_config m_space_config; required_device<gfxdecode_device> m_gfxdecode; required_device<palette_device> m_palette; diff --git a/src/devices/machine/timekpr.h b/src/devices/machine/timekpr.h index 6e72f9add62..4cb11f6ea86 100644 --- a/src/devices/machine/timekpr.h +++ b/src/devices/machine/timekpr.h @@ -63,14 +63,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; private: void counters_to_ram(); diff --git a/src/devices/machine/tmp68301.h b/src/devices/machine/tmp68301.h index b96296d31f2..b22add4a6c6 100644 --- a/src/devices/machine/tmp68301.h +++ b/src/devices/machine/tmp68301.h @@ -54,9 +54,9 @@ public: IRQ_CALLBACK_MEMBER(irq_callback); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual void device_start() override; + virtual void device_reset() override; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; private: devcb_read16 m_in_parallel_cb; diff --git a/src/devices/machine/tms1024.h b/src/devices/machine/tms1024.h index a7bdb4539bf..e351f87d2fb 100644 --- a/src/devices/machine/tms1024.h +++ b/src/devices/machine/tms1024.h @@ -82,8 +82,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; UINT8 m_h; // 4-bit data latch UINT8 m_s; // 3-bit port select diff --git a/src/devices/machine/tms5501.h b/src/devices/machine/tms5501.h index 0a62f751910..b618266212c 100644 --- a/src/devices/machine/tms5501.h +++ b/src/devices/machine/tms5501.h @@ -85,14 +85,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_complete() override; DECLARE_READ8_MEMBER( rb_r ); DECLARE_READ8_MEMBER( xi_r ); diff --git a/src/devices/machine/tms6100.h b/src/devices/machine/tms6100.h index 4aed02a846b..01c24144624 100644 --- a/src/devices/machine/tms6100.h +++ b/src/devices/machine/tms6100.h @@ -22,9 +22,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; void set_variant(int variant); private: // internal state @@ -51,7 +51,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; extern const device_type M58819; diff --git a/src/devices/machine/upd4701.h b/src/devices/machine/upd4701.h index e8cb0e0243f..d559e8e00b6 100644 --- a/src/devices/machine/upd4701.h +++ b/src/devices/machine/upd4701.h @@ -36,9 +36,9 @@ public: protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_reset(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_reset() override; private: // internal state int m_cs; diff --git a/src/devices/machine/upd4992.h b/src/devices/machine/upd4992.h index 90d3f303c83..23d7dc50cea 100644 --- a/src/devices/machine/upd4992.h +++ b/src/devices/machine/upd4992.h @@ -39,11 +39,11 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void rtc_clock_updated(int year, int month, int day, int day_of_week, int hour, int minute, int second) override; private: enum diff --git a/src/devices/machine/upd7002.h b/src/devices/machine/upd7002.h index aba6bb8b36f..0875549f7e8 100644 --- a/src/devices/machine/upd7002.h +++ b/src/devices/machine/upd7002.h @@ -43,9 +43,9 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; private: // internal state diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h index 99da46f80d6..e63546a7f40 100644 --- a/src/devices/machine/upd71071.h +++ b/src/devices/machine/upd71071.h @@ -58,7 +58,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; private: // internal state diff --git a/src/devices/machine/v3021.h b/src/devices/machine/v3021.h index 3dd1c709d1e..8764c4c3eff 100644 --- a/src/devices/machine/v3021.h +++ b/src/devices/machine/v3021.h @@ -49,9 +49,9 @@ public: protected: // device-level overrides - virtual void device_validity_check(validity_checker &valid) const; - virtual void device_start(); - virtual void device_reset(); + virtual void device_validity_check(validity_checker &valid) const override; + virtual void device_start() override; + virtual void device_reset() override; inline UINT8 rtc_read(UINT8 offset); inline void rtc_write(UINT8 offset,UINT8 data); diff --git a/src/devices/machine/vrc4373.h b/src/devices/machine/vrc4373.h index 31439b58537..85ca19c5cf7 100644 --- a/src/devices/machine/vrc4373.h +++ b/src/devices/machine/vrc4373.h @@ -63,9 +63,9 @@ class vrc4373_device : public pci_host_device { public: vrc4373_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual void reset_all_mappings(); + virtual void reset_all_mappings() override; virtual void map_extra(UINT64 memory_window_start, UINT64 memory_window_end, UINT64 memory_offset, address_space *memory_space, - UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space); + UINT64 io_window_start, UINT64 io_window_end, UINT64 io_offset, address_space *io_space) override; void set_cpu_tag(const char *tag); @@ -96,9 +96,9 @@ public: protected: address_space *m_cpu_space; - virtual const address_space_config *memory_space_config(address_spacenum spacenum) const; - virtual void device_start(); - virtual void device_reset(); + virtual const address_space_config *memory_space_config(address_spacenum spacenum) const override; + virtual void device_start() override; + virtual void device_reset() override; void dma_transfer(int which); private: diff --git a/src/devices/machine/vt82c496.h b/src/devices/machine/vt82c496.h index 4e1a79a0943..d6c1c34e819 100644 --- a/src/devices/machine/vt82c496.h +++ b/src/devices/machine/vt82c496.h @@ -34,8 +34,8 @@ public: DECLARE_WRITE8_MEMBER(write); protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: const char* m_cpu_tag; diff --git a/src/devices/machine/vt83c461.h b/src/devices/machine/vt83c461.h index 18e737ed29b..1fbe3a475bb 100644 --- a/src/devices/machine/vt83c461.h +++ b/src/devices/machine/vt83c461.h @@ -38,7 +38,7 @@ public: DECLARE_WRITE32_MEMBER(write_config); protected: - virtual void device_start(); + virtual void device_start() override; private: UINT8 m_config_unknown; diff --git a/src/devices/machine/wd7600.h b/src/devices/machine/wd7600.h index 7cfada03261..25050c9fb0c 100644 --- a/src/devices/machine/wd7600.h +++ b/src/devices/machine/wd7600.h @@ -66,7 +66,7 @@ public: wd7600_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; // callbacks template<class _ior> void set_ior_callback(_ior ior) { m_read_ior.set_callback(ior); } @@ -175,8 +175,8 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; private: devcb_read16 m_read_ior; diff --git a/src/devices/machine/x2212.h b/src/devices/machine/x2212.h index 4345c8f9a64..161cf399457 100644 --- a/src/devices/machine/x2212.h +++ b/src/devices/machine/x2212.h @@ -67,15 +67,15 @@ protected: void recall(); // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_memory_interface overrides - virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const; + virtual const address_space_config *memory_space_config(address_spacenum spacenum = AS_0) const override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read(emu_file &file); - virtual void nvram_write(emu_file &file); + virtual void nvram_default() override; + virtual void nvram_read(emu_file &file) override; + virtual void nvram_write(emu_file &file) override; int SIZE_DATA; @@ -101,7 +101,7 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; }; diff --git a/src/devices/machine/x76f041.h b/src/devices/machine/x76f041.h index d1f8a8e9e46..228540969eb 100644 --- a/src/devices/machine/x76f041.h +++ b/src/devices/machine/x76f041.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read( emu_file &file ); - virtual void nvram_write( emu_file &file ); + virtual void nvram_default() override; + virtual void nvram_read( emu_file &file ) override; + virtual void nvram_write( emu_file &file ) override; private: inline void ATTR_PRINTF( 3, 4 ) verboselog( int n_level, const char *s_fmt, ... ); diff --git a/src/devices/machine/x76f100.h b/src/devices/machine/x76f100.h index dea839c4c5e..287a4a17a56 100644 --- a/src/devices/machine/x76f100.h +++ b/src/devices/machine/x76f100.h @@ -32,12 +32,12 @@ public: protected: // device-level overrides - virtual void device_start(); + virtual void device_start() override; // device_nvram_interface overrides - virtual void nvram_default(); - virtual void nvram_read( emu_file &file ); - virtual void nvram_write( emu_file &file ); + virtual void nvram_default() override; + virtual void nvram_read( emu_file &file ) override; + virtual void nvram_write( emu_file &file ) override; private: inline void verboselog(int n_level, const char *s_fmt, ...) ATTR_PRINTF(3,4); diff --git a/src/devices/machine/z80scc.h b/src/devices/machine/z80scc.h index 800a9dc3a0f..e48a670192b 100644 --- a/src/devices/machine/z80scc.h +++ b/src/devices/machine/z80scc.h @@ -118,15 +118,15 @@ public: z80scc_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_callback(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_callback() override; + virtual void rcv_complete() override; // read register handlers UINT8 do_sccreg_rr0(); @@ -588,14 +588,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; // internal interrupt management void check_interrupts(); diff --git a/src/devices/machine/z80sio.h b/src/devices/machine/z80sio.h index dc04bd5c020..278fa006d45 100644 --- a/src/devices/machine/z80sio.h +++ b/src/devices/machine/z80sio.h @@ -132,15 +132,15 @@ public: z80sio_channel(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_serial_interface overrides - virtual void tra_callback(); - virtual void tra_complete(); - virtual void rcv_callback(); - virtual void rcv_complete(); + virtual void tra_callback() override; + virtual void tra_complete() override; + virtual void rcv_callback() override; + virtual void rcv_complete() override; // read register handlers UINT8 do_sioreg_rr0(); @@ -469,14 +469,14 @@ class z80sio_device : public device_t, protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual machine_config_constructor device_mconfig_additions() const; + virtual void device_start() override; + virtual void device_reset() override; + virtual machine_config_constructor device_mconfig_additions() const override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; // internal interrupt management void check_interrupts(); diff --git a/src/devices/machine/z8536.h b/src/devices/machine/z8536.h index 96c39e0123a..45be2aab010 100644 --- a/src/devices/machine/z8536.h +++ b/src/devices/machine/z8536.h @@ -117,14 +117,14 @@ public: protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; // device_z80daisy_interface overrides - virtual int z80daisy_irq_state(); - virtual int z80daisy_irq_ack(); - virtual void z80daisy_irq_reti(); + virtual int z80daisy_irq_state() override; + virtual int z80daisy_irq_ack() override; + virtual void z80daisy_irq_reti() override; private: enum |