diff options
author | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-05 20:32:27 +0100 |
---|---|---|
committer | Miodrag Milanovic <mmicko@gmail.com> | 2015-12-05 21:20:53 +0100 |
commit | 1c4865d66ff88a6891ebdde4580c3d61ee46ffa2 (patch) | |
tree | 268936fc8389b1a2adb8bfc3fa3006f12a4ccc95 /src/devices/imagedev | |
parent | e8516832e941e39fa1db11211249afa9f015e7bb (diff) |
override part 1 (nw)
Diffstat (limited to 'src/devices/imagedev')
-rw-r--r-- | src/devices/imagedev/bitbngr.h | 26 | ||||
-rw-r--r-- | src/devices/imagedev/chd_cd.h | 30 | ||||
-rw-r--r-- | src/devices/imagedev/flopdrv.h | 34 | ||||
-rw-r--r-- | src/devices/imagedev/harddriv.h | 36 | ||||
-rw-r--r-- | src/devices/imagedev/mfmhd.h | 16 | ||||
-rw-r--r-- | src/devices/imagedev/midiin.h | 34 | ||||
-rw-r--r-- | src/devices/imagedev/midiout.h | 32 | ||||
-rw-r--r-- | src/devices/imagedev/printer.h | 26 | ||||
-rw-r--r-- | src/devices/imagedev/snapquik.h | 30 |
9 files changed, 132 insertions, 132 deletions
diff --git a/src/devices/imagedev/bitbngr.h b/src/devices/imagedev/bitbngr.h index f2a486a04a7..cd0f38df516 100644 --- a/src/devices/imagedev/bitbngr.h +++ b/src/devices/imagedev/bitbngr.h @@ -17,27 +17,27 @@ public: bitbanger_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual bool call_load(); - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); + virtual bool call_load() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_SERIAL; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return ""; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_SERIAL; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return ""; } + virtual const option_guide *create_option_guide() const override { return nullptr; } void output(UINT8 data); UINT32 input(void *buffer, UINT32 length); protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; }; // device type definition diff --git a/src/devices/imagedev/chd_cd.h b/src/devices/imagedev/chd_cd.h index 5bdd7e4122a..5303b474045 100644 --- a/src/devices/imagedev/chd_cd.h +++ b/src/devices/imagedev/chd_cd.h @@ -31,28 +31,28 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<cdrom_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + virtual bool call_load() override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } - virtual iodevice_t image_type() const { return IO_CDROM; } + virtual iodevice_t image_type() const override { return IO_CDROM; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_extension_list; } - virtual const option_guide *create_option_guide() const; + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_extension_list; } + virtual const option_guide *create_option_guide() const override; // specific implementation cdrom_file *get_cdrom_file() { return m_cdrom_handle; } protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; chd_file m_self_chd; cdrom_file *m_cdrom_handle; diff --git a/src/devices/imagedev/flopdrv.h b/src/devices/imagedev/flopdrv.h index 4d1b4cc6800..9d4333cfae2 100644 --- a/src/devices/imagedev/flopdrv.h +++ b/src/devices/imagedev/flopdrv.h @@ -98,21 +98,21 @@ public: template<class _Object> static devcb_base &set_out_idx_func(device_t &device, _Object object) { return downcast<legacy_floppy_image_device &>(device).m_out_idx_func.set_callback(object); } - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); - - virtual iodevice_t image_type() const { return IO_FLOPPY; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const; - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const; - virtual const char *file_extensions() const { return m_extension_list; } - virtual const option_guide *create_option_guide() const { return floppy_option_guide; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; + + virtual iodevice_t image_type() const override { return IO_FLOPPY; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override; + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override; + virtual const char *file_extensions() const override { return m_extension_list; } + virtual const option_guide *create_option_guide() const override { return floppy_option_guide; } floppy_image_legacy *flopimg_get_image(); void floppy_drive_set_geometry(floppy_type_t type); @@ -166,8 +166,8 @@ private: protected: // device overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; /* callbacks */ devcb_write_line m_out_idx_func; diff --git a/src/devices/imagedev/harddriv.h b/src/devices/imagedev/harddriv.h index f72dc0553f1..7c3da504a5a 100644 --- a/src/devices/imagedev/harddriv.h +++ b/src/devices/imagedev/harddriv.h @@ -32,21 +32,21 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<harddisk_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual bool call_create(int create_format, option_resolution *create_args); - virtual void call_unload(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } - - virtual iodevice_t image_type() const { return IO_HARDDISK; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return "chd,hd"; } - virtual const option_guide *create_option_guide() const; + virtual bool call_load() override; + virtual bool call_create(int create_format, option_resolution *create_args) override; + virtual void call_unload() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { load_software_part_region(*this, swlist, swname, start_entry ); return TRUE; } + + virtual iodevice_t image_type() const override { return IO_HARDDISK; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return "chd,hd"; } + virtual const option_guide *create_option_guide() const override; // specific implementation hard_disk_file *get_hard_disk_file() { return m_hard_disk_handle; } @@ -56,9 +56,9 @@ protected: harddisk_image_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, UINT32 clock, const char *shortname, const char *source); // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); - virtual void device_stop(); + virtual void device_config_complete() override; + virtual void device_start() override; + virtual void device_stop() override; int internal_load_hd(); diff --git a/src/devices/imagedev/mfmhd.h b/src/devices/imagedev/mfmhd.h index b42a212c2a5..fe55ad12989 100644 --- a/src/devices/imagedev/mfmhd.h +++ b/src/devices/imagedev/mfmhd.h @@ -88,8 +88,8 @@ public: // Head select void headsel_w(int head) { m_current_head = head & 0x0f; } - bool call_load(); - void call_unload(); + bool call_load() override; + void call_unload() override; // Tells us the time when the track ends (next index pulse). Needed by the controller. attotime track_end_time(); @@ -102,10 +102,10 @@ public: int get_actual_heads(); protected: - void device_start(); - void device_stop(); - void device_reset(); - void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + void device_start() override; + void device_stop() override; + void device_reset() override; + void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; std::string tts(const attotime &t); @@ -217,8 +217,8 @@ public: void configure(mfmhd_enc_t encoding, int spinupms, int cache, mfmhd_format_type format); protected: - void device_start() { }; - void device_config_complete(); + void device_start() override { }; + void device_config_complete() override; private: mfmhd_enc_t m_encoding; diff --git a/src/devices/imagedev/midiin.h b/src/devices/imagedev/midiin.h index 42c6873cb4f..b4c04d1e549 100644 --- a/src/devices/imagedev/midiin.h +++ b/src/devices/imagedev/midiin.h @@ -31,31 +31,31 @@ public: template<class _Object> static devcb_base &set_input_callback(device_t &device, _Object object) { return downcast<midiin_device &>(device).m_input_cb.set_callback(object); } // image-level overrides - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_MIDIIN; } - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "mid"; } - virtual bool core_opens_image_file() const { return FALSE; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_MIDIIN; } + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "mid"; } + virtual bool core_opens_image_file() const override { return FALSE; } + virtual const option_guide *create_option_guide() const override { return nullptr; } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); + virtual void device_start() override; + virtual void device_reset() override; - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); - virtual void device_config_complete(); + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual void device_config_complete() override; // serial overrides - virtual void tra_complete(); // Tx completed sending byte - virtual void tra_callback(); // Tx send bit + virtual void tra_complete() override; // Tx completed sending byte + virtual void tra_callback() override; // Tx send bit private: static const int XMIT_RING_SIZE = (8192*4*4); diff --git a/src/devices/imagedev/midiout.h b/src/devices/imagedev/midiout.h index d6da8c732c2..b154773ddea 100644 --- a/src/devices/imagedev/midiout.h +++ b/src/devices/imagedev/midiout.h @@ -34,32 +34,32 @@ public: midiout_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); // image-level overrides - virtual bool call_load(); - virtual void call_unload(); + virtual bool call_load() override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_MIDIOUT; } - virtual bool is_readable() const { return 0; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "mid"; } - virtual bool core_opens_image_file() const { return FALSE; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_MIDIOUT; } + virtual bool is_readable() const override { return 0; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "mid"; } + virtual bool core_opens_image_file() const override { return FALSE; } + virtual const option_guide *create_option_guide() const override { return nullptr; } virtual void tx(UINT8 state) { rx_w(state); } protected: // device-level overrides - virtual void device_start(); - virtual void device_reset(); - virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr); + virtual void device_start() override; + virtual void device_reset() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual void device_config_complete(); + virtual void device_config_complete() override; // serial overrides - virtual void rcv_complete(); // Rx completed receiving byte + virtual void rcv_complete() override; // Rx completed receiving byte private: osd_midi_device *m_midi; diff --git a/src/devices/imagedev/printer.h b/src/devices/imagedev/printer.h index ccd388d6663..8db31298bf7 100644 --- a/src/devices/imagedev/printer.h +++ b/src/devices/imagedev/printer.h @@ -30,19 +30,19 @@ public: template<class _Object> static devcb_base &set_online_callback(device_t &device, _Object object) { return downcast<printer_image_device &>(device).m_online_cb.set_callback(object); } // image-level overrides - virtual bool call_load(); - virtual bool call_create(int format_type, option_resolution *format_options); - virtual void call_unload(); + virtual bool call_load() override; + virtual bool call_create(int format_type, option_resolution *format_options) override; + virtual void call_unload() override; // image device - virtual iodevice_t image_type() const { return IO_PRINTER; } - virtual bool is_readable() const { return 0; } - virtual bool is_writeable() const { return 1; } - virtual bool is_creatable() const { return 1; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *file_extensions() const { return "prn"; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual iodevice_t image_type() const override { return IO_PRINTER; } + virtual bool is_readable() const override { return 0; } + virtual bool is_writeable() const override { return 1; } + virtual bool is_creatable() const override { return 1; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *file_extensions() const override { return "prn"; } + virtual const option_guide *create_option_guide() const override { return nullptr; } // specific implementation @@ -52,8 +52,8 @@ public: void output(UINT8 data); protected: // device-level overrides - virtual void device_start(); - virtual void device_config_complete(); + virtual void device_start() override; + virtual void device_config_complete() override; devcb_write_line m_online_cb; }; diff --git a/src/devices/imagedev/snapquik.h b/src/devices/imagedev/snapquik.h index 5ef6f1dc191..3b88319a121 100644 --- a/src/devices/imagedev/snapquik.h +++ b/src/devices/imagedev/snapquik.h @@ -26,25 +26,25 @@ public: static void static_set_interface(device_t &device, const char *_interface) { downcast<snapshot_image_device &>(device).m_interface = _interface; } // image-level overrides - virtual bool call_load(); - virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) { return load_software(swlist, swname, start_entry); } - virtual iodevice_t image_type() const { return IO_SNAPSHOT; } - - virtual bool is_readable() const { return 1; } - virtual bool is_writeable() const { return 0; } - virtual bool is_creatable() const { return 0; } - virtual bool must_be_loaded() const { return 0; } - virtual bool is_reset_on_load() const { return 0; } - virtual const char *image_interface() const { return m_interface; } - virtual const char *file_extensions() const { return m_file_extensions; } - virtual const option_guide *create_option_guide() const { return nullptr; } + virtual bool call_load() override; + virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override { return load_software(swlist, swname, start_entry); } + virtual iodevice_t image_type() const override { return IO_SNAPSHOT; } + + virtual bool is_readable() const override { return 1; } + virtual bool is_writeable() const override { return 0; } + virtual bool is_creatable() const override { return 0; } + virtual bool must_be_loaded() const override { return 0; } + virtual bool is_reset_on_load() const override { return 0; } + virtual const char *image_interface() const override { return m_interface; } + virtual const char *file_extensions() const override { return m_file_extensions; } + virtual const option_guide *create_option_guide() const override { return nullptr; } TIMER_CALLBACK_MEMBER(process_snapshot_or_quickload); void set_handler(snapquick_load_delegate load, const char *ext, seconds_t sec) { m_load = load; m_file_extensions = ext; m_delay_seconds = sec; }; protected: // device-level overrides - virtual void device_config_complete(); - virtual void device_start(); + virtual void device_config_complete() override; + virtual void device_start() override; snapquick_load_delegate m_load; /* loading function */ const char * m_file_extensions; /* file extensions */ @@ -65,7 +65,7 @@ public: // construction/destruction quickload_image_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock); - virtual iodevice_t image_type() const { return IO_QUICKLOAD; } + virtual iodevice_t image_type() const override { return IO_QUICKLOAD; } }; // device type definition |