diff options
author | Vas Crabb <vas@vastheman.com> | 2019-11-10 04:08:29 +1100 |
---|---|---|
committer | Vas Crabb <vas@vastheman.com> | 2019-11-10 04:08:29 +1100 |
commit | 13b1ebb1b4512ba808cdc5dfbdac61ed0d755d8c (patch) | |
tree | 0be119271371bb88d200c5ec598c189e88218e8d /src/mame | |
parent | 1b2acde80819ca6917c248e496725158ed4fe12e (diff) |
start putting noexcept on things that have no business throwing exceptions, starting with diimage. also fix a slight bug in the interface matching function for software list parts. (nw)
Diffstat (limited to 'src/mame')
-rw-r--r-- | src/mame/drivers/pdp1.cpp | 60 | ||||
-rw-r--r-- | src/mame/drivers/tm990189.cpp | 17 | ||||
-rw-r--r-- | src/mame/drivers/tx0.cpp | 58 | ||||
-rw-r--r-- | src/mame/includes/apollo.h | 28 | ||||
-rw-r--r-- | src/mame/machine/apexc.h | 44 | ||||
-rw-r--r-- | src/mame/machine/coco_vhd.h | 16 | ||||
-rw-r--r-- | src/mame/machine/fmt_icmem.h | 20 | ||||
-rw-r--r-- | src/mame/machine/hp48_port.h | 20 | ||||
-rw-r--r-- | src/mame/machine/hp80_optrom.h | 16 | ||||
-rw-r--r-- | src/mame/machine/hp9825_optrom.h | 16 | ||||
-rw-r--r-- | src/mame/machine/hp9825_tape.h | 11 | ||||
-rw-r--r-- | src/mame/machine/hp9845_optrom.h | 16 | ||||
-rw-r--r-- | src/mame/machine/imm6_76.h | 20 | ||||
-rw-r--r-- | src/mame/machine/ng_memcard.h | 15 | ||||
-rw-r--r-- | src/mame/machine/pce220_ser.h | 16 | ||||
-rw-r--r-- | src/mame/machine/pgm2_memcard.h | 16 | ||||
-rw-r--r-- | src/mame/machine/psion_pack.h | 20 | ||||
-rw-r--r-- | src/mame/machine/x68k_hdc.h | 22 |
18 files changed, 218 insertions, 213 deletions
diff --git a/src/mame/drivers/pdp1.cpp b/src/mame/drivers/pdp1.cpp index 3839fcce9b6..26ab0fe87c7 100644 --- a/src/mame/drivers/pdp1.cpp +++ b/src/mame/drivers/pdp1.cpp @@ -670,17 +670,18 @@ public: pdp1_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } + virtual iodevice_t image_type() const noexcept override { return IO_PUNCHTAPE; } - 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 "tap,rim"; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return false; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap,rim"; } virtual image_init_result call_load() override; virtual void call_unload() override; + protected: // device-level overrides virtual void device_start() override { } @@ -702,17 +703,18 @@ public: pdp1_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } + virtual iodevice_t image_type() const noexcept override { return IO_PUNCHTAPE; } - 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 "tap,rim"; } + virtual bool is_readable() const noexcept override { return false; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap,rim"; } virtual image_init_result call_load() override; virtual void call_unload() override; + protected: // device-level overrides virtual void device_start() override { } @@ -735,17 +737,18 @@ public: pdp1_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PRINTER; } + virtual iodevice_t image_type() const noexcept 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 "typ"; } + virtual bool is_readable() const noexcept override { return false; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "typ"; } virtual image_init_result call_load() override; virtual void call_unload() override; + protected: // device-level overrides virtual void device_start() override { } @@ -767,17 +770,18 @@ public: pdp1_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_CYLINDER; } + virtual iodevice_t image_type() const noexcept override { return IO_CYLINDER; } - 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 "drm"; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "drm"; } virtual image_init_result call_load() override; virtual void call_unload() override; + protected: // device-level overrides virtual void device_start() override { } diff --git a/src/mame/drivers/tm990189.cpp b/src/mame/drivers/tm990189.cpp index 4aa4acbb96e..b27d7907ecc 100644 --- a/src/mame/drivers/tm990189.cpp +++ b/src/mame/drivers/tm990189.cpp @@ -476,16 +476,14 @@ public: tm990_189_rs232_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_SERIAL; } + virtual iodevice_t image_type() const noexcept 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 void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return ""; } virtual image_init_result call_load() override; virtual void call_unload() override; @@ -493,6 +491,7 @@ public: protected: // device-level overrides virtual void device_start() override; + virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; required_device<tms9902_device> m_tms9902; }; diff --git a/src/mame/drivers/tx0.cpp b/src/mame/drivers/tx0.cpp index 8cd353f7202..87e9f7d8e7f 100644 --- a/src/mame/drivers/tx0.cpp +++ b/src/mame/drivers/tx0.cpp @@ -362,14 +362,14 @@ public: tx0_readtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } + virtual iodevice_t image_type() const noexcept override { return IO_PUNCHTAPE; } - 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 "tap,rim"; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return false; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap,rim"; } virtual image_init_result call_load() override; virtual void call_unload() override; @@ -399,14 +399,14 @@ public: tx0_punchtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } + virtual iodevice_t image_type() const noexcept override { return IO_PUNCHTAPE; } - 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 "tap,rim"; } + virtual bool is_readable() const noexcept override { return false; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap,rim"; } virtual image_init_result call_load() override; virtual void call_unload() override; @@ -437,14 +437,14 @@ public: tx0_printer_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PRINTER; } + virtual iodevice_t image_type() const noexcept 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 "typ"; } + virtual bool is_readable() const noexcept override { return false; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "typ"; } virtual image_init_result call_load() override; virtual void call_unload() override; @@ -474,14 +474,14 @@ public: tx0_magtape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_MAGTAPE; } - - virtual bool is_readable() const override { return 1; } - virtual bool is_writeable() const override { return 1; } - virtual bool is_creatable() const override { return 1; } - virtual bool must_be_loaded() const override { return 0; } - virtual bool is_reset_on_load() const override { return 0; } - virtual const char *file_extensions() const override { return "tap"; } + virtual iodevice_t image_type() const noexcept override { return IO_MAGTAPE; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap"; } virtual image_init_result call_load() override; virtual void call_unload() override; diff --git a/src/mame/includes/apollo.h b/src/mame/includes/apollo.h index fc352344f2e..d4a36adb45d 100644 --- a/src/mame/includes/apollo.h +++ b/src/mame/includes/apollo.h @@ -367,25 +367,25 @@ public: apollo_ni(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~apollo_ni(); - virtual iodevice_t image_type() const override { return IO_ROM; } - - 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 bool support_command_line_image_creation() const override { return 1; } - virtual const char *file_extensions() const override { return "ani,bin"; } + // image-level overrides + virtual iodevice_t image_type() const noexcept override { return IO_ROM; } - DECLARE_WRITE16_MEMBER(write); - DECLARE_READ16_MEMBER(read); + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual bool support_command_line_image_creation() const noexcept override { return true; } + virtual const char *file_extensions() const noexcept override { return "ani,bin"; } - // image-level overrides virtual image_init_result call_load() override; virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; virtual void call_unload() override; - virtual const char *custom_instance_name() const override { return "node_id"; } - virtual const char *custom_brief_instance_name() const override { return "ni"; } + virtual const char *custom_instance_name() const noexcept override { return "node_id"; } + virtual const char *custom_brief_instance_name() const noexcept override { return "ni"; } + + DECLARE_WRITE16_MEMBER(write); + DECLARE_READ16_MEMBER(read); void set_node_id_from_disk(); diff --git a/src/mame/machine/apexc.h b/src/mame/machine/apexc.h index 8d1d9587a2d..8d2ba5f59d5 100644 --- a/src/mame/machine/apexc.h +++ b/src/mame/machine/apexc.h @@ -32,14 +32,14 @@ public: apexc_cylinder_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // image-level overrides - virtual iodevice_t image_type() const override { return IO_CYLINDER; } + virtual iodevice_t image_type() const noexcept override { return IO_CYLINDER; } - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return false; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return true; } - virtual const char *file_extensions() const override { return "apc"; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return true; } + virtual const char *file_extensions() const noexcept override { return "apc"; } virtual image_init_result call_load() override; virtual void call_unload() override; @@ -102,14 +102,14 @@ public: apexc_tape_puncher_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } + virtual iodevice_t image_type() const noexcept override { return IO_PUNCHTAPE; } - virtual bool is_readable() const override { return false; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return true; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual const char *file_extensions() const override { return "tap"; } + virtual bool is_readable() const noexcept override { return false; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap"; } DECLARE_WRITE8_MEMBER(write); @@ -129,14 +129,14 @@ public: apexc_tape_reader_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // image-level overrides - virtual iodevice_t image_type() const override { return IO_PUNCHTAPE; } - - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return false; } - virtual bool is_creatable() const override { return false; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual const char *file_extensions() const override { return "tap"; } + virtual iodevice_t image_type() const noexcept override { return IO_PUNCHTAPE; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return false; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "tap"; } DECLARE_READ8_MEMBER(read); private: diff --git a/src/mame/machine/coco_vhd.h b/src/mame/machine/coco_vhd.h index dc436466bf7..cd8f82b226b 100644 --- a/src/mame/machine/coco_vhd.h +++ b/src/mame/machine/coco_vhd.h @@ -36,14 +36,14 @@ public: // image-level overrides virtual image_init_result call_load() override; - virtual iodevice_t image_type() const override { return IO_HARDDISK; } - - virtual bool is_readable() const override { return 1; } - virtual bool is_writeable() const override { return 1; } - virtual bool is_creatable() const override { return 1; } - virtual bool must_be_loaded() const override { return 0; } - virtual bool is_reset_on_load() const override { return 0; } - virtual const char *file_extensions() const override { return "vhd"; } + virtual iodevice_t image_type() const noexcept override { return IO_HARDDISK; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "vhd"; } // specific implementation DECLARE_READ8_MEMBER(read) { return read(offset); } diff --git a/src/mame/machine/fmt_icmem.h b/src/mame/machine/fmt_icmem.h index cec31aabdf6..d13d978cc71 100644 --- a/src/mame/machine/fmt_icmem.h +++ b/src/mame/machine/fmt_icmem.h @@ -24,22 +24,19 @@ public: // construction/destruction fmt_icmem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual iodevice_t image_type() const override { return IO_MEMCARD; } + virtual iodevice_t image_type() const noexcept override { return IO_MEMCARD; } - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return true; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual const char *file_extensions() const override { return "icm"; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "icm"; } virtual image_init_result call_load() override; virtual void call_unload() override; virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; - // device-level overrides - virtual void device_start() override; - DECLARE_READ8_MEMBER(static_mem_read); DECLARE_WRITE8_MEMBER(static_mem_write); DECLARE_READ8_MEMBER(mem_read); @@ -48,9 +45,10 @@ public: DECLARE_READ8_MEMBER(bank_r); DECLARE_WRITE8_MEMBER(bank_w); - protected: + // device_t implementation virtual ioport_constructor device_input_ports() const override; + virtual void device_start() override; private: required_ioport m_writeprotect; diff --git a/src/mame/machine/hp48_port.h b/src/mame/machine/hp48_port.h index b50bb8ae3bb..887c702910a 100644 --- a/src/mame/machine/hp48_port.h +++ b/src/mame/machine/hp48_port.h @@ -35,16 +35,16 @@ public: } // image-level overrides - virtual iodevice_t image_type() const override { return IO_MEMCARD; } - - 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 "crd"; } - virtual const char *custom_instance_name() const override { return "port"; } - virtual const char *custom_brief_instance_name() const override { return "p"; } + virtual iodevice_t image_type() const noexcept override { return IO_MEMCARD; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "crd"; } + virtual const char *custom_instance_name() const noexcept override { return "port"; } + virtual const char *custom_brief_instance_name() const noexcept override { return "p"; } virtual image_init_result call_load() override; virtual void call_unload() override; diff --git a/src/mame/machine/hp80_optrom.h b/src/mame/machine/hp80_optrom.h index f0e272f60c8..7ab35cd7967 100644 --- a/src/mame/machine/hp80_optrom.h +++ b/src/mame/machine/hp80_optrom.h @@ -42,14 +42,14 @@ protected: virtual void call_unload() override; virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); } - virtual iodevice_t image_type() const override { return IO_ROM; } - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return false; } - virtual bool is_creatable() const override { return false; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return true; } - virtual const char *image_interface() const override { return "hp80_rom"; } - virtual const char *file_extensions() const override { return "bin"; } + virtual iodevice_t image_type() const noexcept override { return IO_ROM; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return false; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return true; } + virtual const char *image_interface() const noexcept override { return "hp80_rom"; } + virtual const char *file_extensions() const noexcept override { return "bin"; } uint8_t m_select_code; }; diff --git a/src/mame/machine/hp9825_optrom.h b/src/mame/machine/hp9825_optrom.h index 390c6a43eea..d83cd9563a8 100644 --- a/src/mame/machine/hp9825_optrom.h +++ b/src/mame/machine/hp9825_optrom.h @@ -38,14 +38,14 @@ protected: virtual void call_unload() override; virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); } - virtual iodevice_t image_type() const override { return IO_ROM; } - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return false; } - virtual bool is_creatable() const override { return false; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return true; } - virtual const char *image_interface() const override { return "hp9825_rom"; } - virtual const char *file_extensions() const override { return "bin"; } + virtual iodevice_t image_type() const noexcept override { return IO_ROM; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return false; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return true; } + virtual const char *image_interface() const noexcept override { return "hp9825_rom"; } + virtual const char *file_extensions() const noexcept override { return "bin"; } offs_t m_rom_limit; unsigned m_loaded_regions; diff --git a/src/mame/machine/hp9825_tape.h b/src/mame/machine/hp9825_tape.h index 7605db758cb..5cbc6fc0927 100644 --- a/src/mame/machine/hp9825_tape.h +++ b/src/mame/machine/hp9825_tape.h @@ -23,11 +23,6 @@ public: // construction/destruction hp9825_tape_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // device-level overrides - virtual void device_add_mconfig(machine_config &config) override; - virtual void device_start() override; - virtual void device_reset() override; - DECLARE_READ16_MEMBER(tape_r); DECLARE_WRITE16_MEMBER(tape_w); @@ -46,6 +41,12 @@ public: DECLARE_WRITE_LINE_MEMBER(rd_bit_w); DECLARE_READ_LINE_MEMBER(wr_bit_r); +protected: + // device-level overrides + virtual void device_add_mconfig(machine_config &config) override; + virtual void device_start() override; + virtual void device_reset() override; + private: devcb_write_line m_flg_handler; devcb_write_line m_sts_handler; diff --git a/src/mame/machine/hp9845_optrom.h b/src/mame/machine/hp9845_optrom.h index 289c3b2c7bc..0345474c94d 100644 --- a/src/mame/machine/hp9845_optrom.h +++ b/src/mame/machine/hp9845_optrom.h @@ -32,14 +32,14 @@ protected: virtual void call_unload() override; virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); } - virtual iodevice_t image_type() const override { return IO_ROM; } - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return false; } - virtual bool is_creatable() const override { return false; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return true; } - virtual const char *image_interface() const override { return "hp9845b_rom"; } - virtual const char *file_extensions() const override { return "bin"; } + virtual iodevice_t image_type() const noexcept override { return IO_ROM; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return false; } + virtual bool is_creatable() const noexcept override { return false; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return true; } + virtual const char *image_interface() const noexcept override { return "hp9845b_rom"; } + virtual const char *file_extensions() const noexcept override { return "bin"; } offs_t m_base_addr; offs_t m_end_addr; diff --git a/src/mame/machine/imm6_76.h b/src/mame/machine/imm6_76.h index e63a786e5d6..e004f3b234a 100644 --- a/src/mame/machine/imm6_76.h +++ b/src/mame/machine/imm6_76.h @@ -157,16 +157,16 @@ public: virtual void call_unload() override; // device_image_interface static info - virtual iodevice_t image_type() const override { return IO_ROM; } - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return true; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual bool support_command_line_image_creation() const override { return true; } - virtual char const *file_extensions() const override { return "rom,bin"; } - virtual char const *custom_instance_name() const override { return "promimage"; } - virtual char const *custom_brief_instance_name() const override { return "prom"; } + virtual iodevice_t image_type() const noexcept override { return IO_ROM; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual bool support_command_line_image_creation() const noexcept override { return true; } + virtual char const *file_extensions() const noexcept override { return "rom,bin"; } + virtual char const *custom_instance_name() const noexcept override { return "promimage"; } + virtual char const *custom_brief_instance_name() const noexcept override { return "prom"; } void di_w(u8 data); void a_w(u8 data); diff --git a/src/mame/machine/ng_memcard.h b/src/mame/machine/ng_memcard.h index 7c507bf5b40..1daae091e94 100644 --- a/src/mame/machine/ng_memcard.h +++ b/src/mame/machine/ng_memcard.h @@ -21,15 +21,14 @@ public: // construction/destruction ng_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual iodevice_t image_type() const override { return IO_MEMCARD; } - // device_image_interface implementation - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return true; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual const char *file_extensions() const override { return "neo"; } + virtual iodevice_t image_type() const noexcept override { return IO_MEMCARD; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "neo"; } virtual image_init_result call_load() override; virtual void call_unload() override; diff --git a/src/mame/machine/pce220_ser.h b/src/mame/machine/pce220_ser.h index d80b31a7e38..c9249bf5853 100644 --- a/src/mame/machine/pce220_ser.h +++ b/src/mame/machine/pce220_ser.h @@ -33,14 +33,14 @@ public: virtual void call_unload() override; virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; - 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 "txt,ihx"; } + virtual iodevice_t image_type() const noexcept override { return IO_SERIAL; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "txt,ihx"; } // specific implementation uint8_t in_xin(void) { return m_xin & 0x01; } diff --git a/src/mame/machine/pgm2_memcard.h b/src/mame/machine/pgm2_memcard.h index 5f6d5455a97..41ec6ea2a59 100644 --- a/src/mame/machine/pgm2_memcard.h +++ b/src/mame/machine/pgm2_memcard.h @@ -27,14 +27,14 @@ public: // construction/destruction pgm2_memcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual iodevice_t image_type() const override { return IO_MEMCARD; } - - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return true; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual const char *file_extensions() const override { return "pg2,bin,mem"; } + virtual iodevice_t image_type() const noexcept override { return IO_MEMCARD; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "pg2,bin,mem"; } virtual image_init_result call_load() override; virtual void call_unload() override; diff --git a/src/mame/machine/psion_pack.h b/src/mame/machine/psion_pack.h index 884ee306ea0..35e69338d38 100644 --- a/src/mame/machine/psion_pack.h +++ b/src/mame/machine/psion_pack.h @@ -30,16 +30,15 @@ public: virtual image_init_result call_load() override; virtual void call_unload() override; virtual image_init_result call_create(int format_type, util::option_resolution *create_args) override; - virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); } - virtual iodevice_t image_type() const override { return IO_CARTSLOT; } - virtual bool is_readable() const override { return 1; } - virtual bool is_writeable() const override { return 1; } - virtual bool is_creatable() const override { return 1; } - virtual bool must_be_loaded() const override { return 0; } - virtual bool is_reset_on_load() const override { return 0; } - virtual const char *image_interface() const override { return "psion_pack"; } - virtual const char *file_extensions() const override { return "opk"; } + virtual iodevice_t image_type() const noexcept override { return IO_CARTSLOT; } + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *image_interface() const noexcept override { return "psion_pack"; } + virtual const char *file_extensions() const noexcept override { return "opk"; } virtual const util::option_guide &create_option_guide() const override; // specific implementation @@ -56,6 +55,9 @@ protected: virtual void device_start() override; virtual void device_config_complete() override; + // device_image_interface implementation + virtual const software_list_loader &get_software_list_loader() const override { return image_software_list_loader::instance(); } + private: // internal device state uint8_t m_id; //datapack ID diff --git a/src/mame/machine/x68k_hdc.h b/src/mame/machine/x68k_hdc.h index 728043447c3..bf945dd9839 100644 --- a/src/mame/machine/x68k_hdc.h +++ b/src/mame/machine/x68k_hdc.h @@ -97,23 +97,25 @@ public: x68k_hdc_image_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0); // image-level overrides - virtual iodevice_t image_type() const override { return IO_HARDDISK; } - - virtual bool is_readable() const override { return true; } - virtual bool is_writeable() const override { return true; } - virtual bool is_creatable() const override { return true; } - virtual bool must_be_loaded() const override { return false; } - virtual bool is_reset_on_load() const override { return false; } - virtual const char *file_extensions() const override { return "hdf"; } - virtual const char *custom_instance_name() const override { return "sasihd"; } - virtual const char *custom_brief_instance_name() const override { return "sasi"; } + virtual iodevice_t image_type() const noexcept override { return IO_HARDDISK; } + + virtual bool is_readable() const noexcept override { return true; } + virtual bool is_writeable() const noexcept override { return true; } + virtual bool is_creatable() const noexcept override { return true; } + virtual bool must_be_loaded() const noexcept override { return false; } + virtual bool is_reset_on_load() const noexcept override { return false; } + virtual const char *file_extensions() const noexcept override { return "hdf"; } + virtual const char *custom_instance_name() const noexcept override { return "sasihd"; } + virtual const char *custom_brief_instance_name() const noexcept override { return "sasi"; } virtual image_init_result call_create(int format_type, util::option_resolution *format_options) override; DECLARE_WRITE16_MEMBER( hdc_w ); DECLARE_READ16_MEMBER( hdc_r ); + protected: // device-level overrides virtual void device_start() override; + private: TIMER_CALLBACK_MEMBER(req_timer_callback); |