From ae373baa246e69a52e6e8249e6e8c7897ba1e1fe Mon Sep 17 00:00:00 2001 From: 0kmg <9137159+0kmg@users.noreply.github.com> Date: Sun, 6 Feb 2022 13:59:38 -0900 Subject: [PATCH] devices/*: Removed extra semicolons after function bodies in headers. (#9275) --- src/devices/bus/a7800/a78_slot.h | 2 +- src/devices/bus/a800/a800_slot.h | 2 +- src/devices/bus/abcbus/ram.h | 2 +- src/devices/bus/archimedes/podule/slot.h | 4 +- src/devices/bus/ata/idehd.h | 2 +- src/devices/bus/bbc/analogue/analogue.h | 4 +- src/devices/bus/bbc/rom/slot.h | 2 +- src/devices/bus/c64/exp.h | 4 +- src/devices/bus/cbm2/exp.h | 4 +- src/devices/bus/hp_dio/hp_dio.h | 2 +- src/devices/bus/hp_hil/hlebase.h | 2 +- src/devices/bus/hp_hil/hp_hil.h | 4 +- src/devices/bus/interpro/sr/edge.h | 22 +++--- src/devices/bus/isa/3c505.h | 4 +- src/devices/bus/isa/myb3k_fdc.h | 2 +- src/devices/bus/jakks_gamekey/rom.h | 4 +- src/devices/bus/mc10/mc10_cart.h | 2 +- src/devices/bus/megadrive/md_slot.h | 14 ++-- src/devices/bus/pc_kbd/pc83.h | 4 +- src/devices/bus/pc_kbd/pcat84.h | 4 +- src/devices/bus/pce/pce_slot.h | 2 +- src/devices/bus/pet/exp.h | 4 +- src/devices/bus/pofo/exp.h | 4 +- src/devices/bus/spectrum/beta.h | 6 +- src/devices/bus/spectrum/beta128.h | 6 +- src/devices/bus/spectrum/d40.h | 8 +- src/devices/bus/spectrum/exp.h | 8 +- src/devices/bus/spectrum/floppyone.h | 10 +-- src/devices/bus/spectrum/fuller.h | 8 +- src/devices/bus/spectrum/intf1.h | 4 +- src/devices/bus/spectrum/kempdisc.h | 8 +- src/devices/bus/spectrum/logitek.h | 6 +- src/devices/bus/spectrum/lprint.h | 16 ++-- src/devices/bus/spectrum/melodik.h | 8 +- src/devices/bus/spectrum/mface.h | 12 +-- src/devices/bus/spectrum/mgt.h | 2 +- src/devices/bus/spectrum/opus.h | 6 +- src/devices/bus/spectrum/sixword.h | 10 +-- src/devices/bus/spectrum/speccydos.h | 8 +- src/devices/bus/spectrum/specmate.h | 8 +- src/devices/bus/spectrum/wafa.h | 4 +- src/devices/bus/svi3x8/slot/slot.h | 6 +- src/devices/bus/ti99/internal/992board.h | 2 +- src/devices/bus/ti99/peb/cc_fdc.h | 4 +- src/devices/bus/ti99/peb/forti.h | 4 +- src/devices/bus/ti99/peb/myarcfdc.h | 2 +- src/devices/bus/ti99/peb/peribox.h | 2 +- src/devices/bus/ti99/peb/pgram.h | 2 +- src/devices/bus/ti99/peb/ti_rs232.h | 4 +- src/devices/bus/vcs/vcs_slot.h | 2 +- src/devices/bus/vic20/exp.h | 4 +- src/devices/bus/vtech/ioexp/ioexp.h | 2 +- src/devices/bus/vtech/memexp/memexp.h | 4 +- src/devices/cpu/adsp2100/adsp2100.h | 2 +- src/devices/cpu/alpha/alphad.h | 4 +- src/devices/cpu/dsp56156/dsp56pcu.h | 4 +- src/devices/cpu/i386/i386.h | 6 +- src/devices/cpu/m68000/m68000.h | 76 +++++++++---------- src/devices/cpu/m6809/hd6309.h | 2 +- src/devices/cpu/m6809/m6809.h | 2 +- src/devices/cpu/mcs51/axc51-core_dasm.h | 2 +- src/devices/cpu/nec/nec.h | 2 +- src/devices/cpu/nec/v25.h | 2 +- src/devices/cpu/pps41/mm76.h | 8 +- src/devices/cpu/pps41/mm78.h | 6 +- src/devices/cpu/sh/sh.h | 2 +- src/devices/cpu/tms7000/tms7000.h | 4 +- src/devices/cpu/tms9900/tms9995.h | 4 +- src/devices/cpu/v30mz/v30mz.h | 2 +- src/devices/imagedev/floppy.h | 4 +- src/devices/machine/ataflash.h | 2 +- src/devices/machine/atmel_arm_aic.h | 44 +++++------ .../machine/generalplus_gpl16250soc_video.h | 2 +- src/devices/machine/gt64xxx.h | 6 +- src/devices/machine/ncr5390.h | 10 +-- src/devices/machine/pci-ide.h | 4 +- src/devices/machine/ram.h | 2 +- src/devices/machine/smc91c9x.h | 32 ++++---- src/devices/machine/spg110_video.h | 2 +- src/devices/machine/spg2xx.h | 2 +- src/devices/machine/spg2xx_io.h | 14 ++-- src/devices/machine/spg2xx_video.h | 4 +- src/devices/machine/upd765.h | 6 +- src/devices/machine/vrc4373.h | 4 +- src/devices/machine/vrc5074.h | 2 +- src/devices/sound/dac76.h | 16 ++-- src/devices/sound/discrete.h | 4 +- src/devices/sound/es5506.h | 2 +- src/devices/sound/gb.h | 2 +- src/devices/sound/upd7759.h | 2 +- src/devices/sound/ymz770.h | 12 +-- src/devices/video/315_5124.h | 4 +- src/devices/video/315_5313.h | 4 +- src/devices/video/fixfreq.h | 2 +- src/devices/video/imagetek_i4100.h | 2 +- src/devices/video/ims_cvc.h | 4 +- src/devices/video/topcat.h | 2 +- 97 files changed, 300 insertions(+), 300 deletions(-) diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h index 97eec9c2f3c..678de644f0d 100644 --- a/src/devices/bus/a7800/a78_slot.h +++ b/src/devices/bus/a7800/a78_slot.h @@ -114,7 +114,7 @@ public: // slot interface overrides virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; - int get_cart_type() { return m_type; }; + int get_cart_type() { return m_type; } bool has_cart() { return m_cart != nullptr; } // reading and writing diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h index 4a59d20ebad..233fa922583 100644 --- a/src/devices/bus/a800/a800_slot.h +++ b/src/devices/bus/a800/a800_slot.h @@ -114,7 +114,7 @@ public: // slot interface overrides virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; - int get_cart_type() { return m_type; }; + int get_cart_type() { return m_type; } int identify_cart_type(const uint8_t *header) const; bool has_cart() { return m_cart != nullptr; } diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h index ddb191cd5cf..cf552c6412f 100644 --- a/src/devices/bus/abcbus/ram.h +++ b/src/devices/bus/abcbus/ram.h @@ -32,7 +32,7 @@ protected: virtual void device_start() override; // device_abcbus_interface overrides - virtual void abcbus_cs(uint8_t data) override { }; + virtual void abcbus_cs(uint8_t data) override { } virtual uint8_t abcbus_xmemfl(offs_t offset) override; virtual void abcbus_xmemw(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/archimedes/podule/slot.h b/src/devices/bus/archimedes/podule/slot.h index cff826408cb..eca2c54865f 100644 --- a/src/devices/bus/archimedes/podule/slot.h +++ b/src/devices/bus/archimedes/podule/slot.h @@ -143,8 +143,8 @@ protected: virtual void interface_pre_start() override; virtual void interface_post_start() override; - virtual void ioc_map(address_map &map) { }; - virtual void memc_map(address_map &map) { }; + virtual void ioc_map(address_map &map) { } + virtual void memc_map(address_map &map) { } archimedes_exp_device *m_exp; const char *m_exp_slottag; diff --git a/src/devices/bus/ata/idehd.h b/src/devices/bus/ata/idehd.h index 2c57efdc2e9..01d4f908929 100644 --- a/src/devices/bus/ata/idehd.h +++ b/src/devices/bus/ata/idehd.h @@ -34,7 +34,7 @@ public: m_user_password_enable = (password != nullptr); } - void set_dma_transfer_time(const attotime time) { m_dma_transfer_time = time; }; + void set_dma_transfer_time(const attotime time) { m_dma_transfer_time = time; } protected: ata_mass_storage_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/bbc/analogue/analogue.h b/src/devices/bus/bbc/analogue/analogue.h index 60d890b591c..bb58d2d0148 100644 --- a/src/devices/bus/bbc/analogue/analogue.h +++ b/src/devices/bus/bbc/analogue/analogue.h @@ -81,8 +81,8 @@ private: class device_bbc_analogue_interface : public device_interface { public: - virtual uint8_t ch_r(int channel) { return 0x00; }; - virtual uint8_t pb_r() { return 0x30; }; + virtual uint8_t ch_r(int channel) { return 0x00; } + virtual uint8_t pb_r() { return 0x30; } protected: device_bbc_analogue_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/bbc/rom/slot.h b/src/devices/bus/bbc/rom/slot.h index f1049030f38..986d796dd0d 100644 --- a/src/devices/bus/bbc/rom/slot.h +++ b/src/devices/bus/bbc/rom/slot.h @@ -131,7 +131,7 @@ public: uint32_t get_nvram_size() { return m_nvram.size(); } // decrypt data lines - virtual void decrypt_rom() { }; + virtual void decrypt_rom() { } protected: device_bbc_rom_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h index 640d429d419..d5861b0c4a3 100644 --- a/src/devices/bus/c64/exp.h +++ b/src/devices/bus/c64/exp.h @@ -133,8 +133,8 @@ public: // construction/destruction virtual ~device_c64_expansion_card_interface(); - virtual uint8_t c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { return data; }; - virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { }; + virtual uint8_t c64_cd_r(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { return data; } + virtual void c64_cd_w(offs_t offset, uint8_t data, int sphi2, int ba, int roml, int romh, int io1, int io2) { } virtual int c64_game_r(offs_t offset, int sphi2, int ba, int rw) { return m_game; } virtual int c64_exrom_r(offs_t offset, int sphi2, int ba, int rw) { return m_exrom; } diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h index 0cc76756215..19ed3d01dac 100644 --- a/src/devices/bus/cbm2/exp.h +++ b/src/devices/bus/cbm2/exp.h @@ -93,8 +93,8 @@ public: // construction/destruction virtual ~device_cbm2_expansion_card_interface(); - virtual uint8_t cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { return data; }; - virtual void cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { }; + virtual uint8_t cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { return data; } + virtual void cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { } protected: device_cbm2_expansion_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/hp_dio/hp_dio.h b/src/devices/bus/hp_dio/hp_dio.h index 744c4940dc5..c3ad5e0d178 100644 --- a/src/devices/bus/hp_dio/hp_dio.h +++ b/src/devices/bus/hp_dio/hp_dio.h @@ -184,7 +184,7 @@ protected: virtual void interface_pre_start() override; - int get_index() { return m_index; }; + int get_index() { return m_index; } address_space &program_space() { return m_dio_dev->program_space(); } DECLARE_WRITE_LINE_MEMBER(irq1_out) { m_dio_dev->set_irq(m_index, 0, state); } diff --git a/src/devices/bus/hp_hil/hlebase.h b/src/devices/bus/hp_hil/hlebase.h index 2ea81239560..96efcdd2073 100644 --- a/src/devices/bus/hp_hil/hlebase.h +++ b/src/devices/bus/hp_hil/hlebase.h @@ -29,7 +29,7 @@ protected: // device_hp_hil_interface overrides virtual bool hil_write(uint16_t *data) override; virtual void hil_idd() = 0; - virtual void hil_typematic(uint8_t command) {}; + virtual void hil_typematic(uint8_t command) {} virtual int hil_poll() = 0; private: diff --git a/src/devices/bus/hp_hil/hp_hil.h b/src/devices/bus/hp_hil/hp_hil.h index 20742ec0179..c50c4742340 100644 --- a/src/devices/bus/hp_hil/hp_hil.h +++ b/src/devices/bus/hp_hil/hp_hil.h @@ -168,8 +168,8 @@ public: // inline configuration void set_hp_hil_mlc(hp_hil_mlc_device &mlc_device) { m_hp_hil_mlc = &mlc_device; } - virtual bool hil_write(uint16_t *data) { return true; }; - int device_id() { return m_device_id; }; + virtual bool hil_write(uint16_t *data) { return true; } + int device_id() { return m_device_id; } protected: device_hp_hil_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/interpro/sr/edge.h b/src/devices/bus/interpro/sr/edge.h index d12bfc45394..d96896dd187 100644 --- a/src/devices/bus/interpro/sr/edge.h +++ b/src/devices/bus/interpro/sr/edge.h @@ -34,16 +34,16 @@ protected: u32 reg0_r(); void reg0_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_reg0); } - u32 control_r() { return m_control; }; + u32 control_r() { return m_control; } void control_w(offs_t offset, u32 data, u32 mem_mask = ~0); - u32 status_r() { return m_status; }; + u32 status_r() { return m_status; } void status_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_status); } - u32 fifo_r() { return m_fifo; }; + u32 fifo_r() { return m_fifo; } void fifo_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_fifo); } - u32 kernel_r() { return m_kernel; }; + u32 kernel_r() { return m_kernel; } void kernel_w(offs_t offset, u32 data, u32 mem_mask = ~0); - u32 attention_r() { return m_attention; }; + u32 attention_r() { return m_attention; } void attention_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_attention); } void ififo_lwm_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_ififo_lwm); } @@ -81,7 +81,7 @@ protected: virtual void map(address_map &map) override; - virtual void device_start() override {}; + virtual void device_start() override {} }; class edge2_framebuffer_device_base : public device_t, public device_srx_card_interface @@ -91,7 +91,7 @@ protected: virtual void map(address_map &map) override; - virtual void device_start() override {}; + virtual void device_start() override {} }; class edge2plus_processor_device_base : public device_t, public device_srx_card_interface @@ -112,14 +112,14 @@ protected: DECLARE_WRITE_LINE_MEMBER(holda); DECLARE_WRITE_LINE_MEMBER(scc_irq); - u32 control_r() { return m_control; }; + u32 control_r() { return m_control; } void control_w(offs_t offset, u32 data, u32 mem_mask = ~0); - u32 status_r() { return m_status; }; + u32 status_r() { return m_status; } void status_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_status); } - u32 kernel_r() { return m_kernel; }; + u32 kernel_r() { return m_kernel; } void kernel_w(offs_t offset, u32 data, u32 mem_mask = ~0); void mapping_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_mapping); } - u32 attention_r() { return m_attention; }; + u32 attention_r() { return m_attention; } void attention_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_attention); } void ififo_lwm_w(offs_t offset, u32 data, u32 mem_mask = ~0) { COMBINE_DATA(&m_ififo_lwm); } diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h index 115c0c9978e..4c1c22383a2 100644 --- a/src/devices/bus/isa/3c505.h +++ b/src/devices/bus/isa/3c505.h @@ -90,8 +90,8 @@ protected: // adapter register helpers u8 acmd_r(); - u8 acr_r() { return m_acr; }; - u8 asr_r() { return m_asr; }; + u8 acr_r() { return m_acr; } + u8 asr_r() { return m_asr; } u16 adata_r(); void acmd_w(u8 data); void acr_w(u8 data); diff --git a/src/devices/bus/isa/myb3k_fdc.h b/src/devices/bus/isa/myb3k_fdc.h index 2da81d33d43..b2a645423d6 100644 --- a/src/devices/bus/isa/myb3k_fdc.h +++ b/src/devices/bus/isa/myb3k_fdc.h @@ -25,7 +25,7 @@ protected: // device-level overrides virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - virtual void device_reset() override { }; + virtual void device_reset() override { } void map(address_map &map); diff --git a/src/devices/bus/jakks_gamekey/rom.h b/src/devices/bus/jakks_gamekey/rom.h index bcccda73c8a..efd9f8d9c7b 100644 --- a/src/devices/bus/jakks_gamekey/rom.h +++ b/src/devices/bus/jakks_gamekey/rom.h @@ -21,8 +21,8 @@ public: virtual uint16_t read_cart(offs_t offset) override; virtual void write_cart(offs_t offset, uint16_t data) override; - virtual uint8_t read_cart_seeprom(void) override { return 1; }; - virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override { }; + virtual uint8_t read_cart_seeprom(void) override { return 1; } + virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override { } virtual uint16_t read_rom(offs_t offset); virtual void write_rom(offs_t offset, uint16_t data); diff --git a/src/devices/bus/mc10/mc10_cart.h b/src/devices/bus/mc10/mc10_cart.h index 428316527e2..4a4fc02df7c 100644 --- a/src/devices/bus/mc10/mc10_cart.h +++ b/src/devices/bus/mc10/mc10_cart.h @@ -47,7 +47,7 @@ public: auto nmi_callback() { return m_nmi_callback.bind(); } // address map manipulations - address_space &memspace() const { return *m_memspace; }; + address_space &memspace() const { return *m_memspace; } // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/megadrive/md_slot.h b/src/devices/bus/megadrive/md_slot.h index 4ffb7407eee..ca16a38ba92 100644 --- a/src/devices/bus/megadrive/md_slot.h +++ b/src/devices/bus/megadrive/md_slot.h @@ -109,15 +109,15 @@ public: virtual int read_test() { return 0; } // used by Virtua Racing test // this probably should do more, like make Genesis V2 'die' if the SEGA string is not written promptly - virtual void write_tmss_bank(offs_t offset, uint16_t data) { device().logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); }; + virtual void write_tmss_bank(offs_t offset, uint16_t data) { device().logerror("Write to TMSS bank: offset %x data %x\n", 0xa14000 + (offset << 1), data); } virtual void rom_alloc(size_t size, const char *tag); virtual void nvram_alloc(size_t size); - virtual uint16_t* get_rom_base() { return m_rom; }; - virtual uint16_t* get_nvram_base() { return &m_nvram[0]; }; - virtual uint32_t get_rom_size() { return m_rom_size; }; - virtual uint32_t get_nvram_size() { return m_nvram.size()*sizeof(uint16_t); }; - virtual void set_bank_to_rom(const char *banktag, uint32_t offset) {}; + virtual uint16_t* get_rom_base() { return m_rom; } + virtual uint16_t* get_nvram_base() { return &m_nvram[0]; } + virtual uint32_t get_rom_size() { return m_rom_size; } + virtual uint32_t get_nvram_size() { return m_nvram.size()*sizeof(uint16_t); } + virtual void set_bank_to_rom(const char *banktag, uint32_t offset) {} void save_nvram() { device().save_item(NAME(m_nvram)); } @@ -184,7 +184,7 @@ public: virtual void write_a13(offs_t offset, uint16_t data); virtual uint16_t read_a15(offs_t offset); virtual void write_a15(offs_t offset, uint16_t data); - virtual void write_tmss_bank(offs_t offset, uint16_t data) { if (m_cart) m_cart->write_tmss_bank(offset, data); }; + virtual void write_tmss_bank(offs_t offset, uint16_t data) { if (m_cart) m_cart->write_tmss_bank(offset, data); } virtual int read_test() { if (m_cart) return m_cart->read_test(); else return 0; } // used by Virtua Racing test diff --git a/src/devices/bus/pc_kbd/pc83.h b/src/devices/bus/pc_kbd/pc83.h index 1401a96ff13..44b58dfbc7f 100644 --- a/src/devices/bus/pc_kbd/pc83.h +++ b/src/devices/bus/pc_kbd/pc83.h @@ -41,8 +41,8 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { }; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { }; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { } + virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { } private: void bus_w(uint8_t data); diff --git a/src/devices/bus/pc_kbd/pcat84.h b/src/devices/bus/pc_kbd/pcat84.h index 7ddb9494e78..3953786f900 100644 --- a/src/devices/bus/pc_kbd/pcat84.h +++ b/src/devices/bus/pc_kbd/pcat84.h @@ -43,8 +43,8 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_pc_kbd_interface overrides - virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); }; - virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { }; + virtual DECLARE_WRITE_LINE_MEMBER( clock_write ) override { m_maincpu->set_input_line(MCS48_INPUT_IRQ, state); } + virtual DECLARE_WRITE_LINE_MEMBER( data_write ) override { } private: void bus_w(uint8_t data); diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h index 473c389aa61..0d2a032cb38 100644 --- a/src/devices/bus/pce/pce_slot.h +++ b/src/devices/bus/pce/pce_slot.h @@ -35,7 +35,7 @@ public: // reading and writing virtual uint8_t read_cart(offs_t offset) { return 0xff; } - virtual void write_cart(offs_t offset, uint8_t data) {}; + virtual void write_cart(offs_t offset, uint8_t data) {} void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h index 14fe9296a8d..e8018bdd732 100644 --- a/src/devices/bus/pet/exp.h +++ b/src/devices/bus/pet/exp.h @@ -103,8 +103,8 @@ protected: // runtime virtual int pet_norom_r(offs_t offset, int sel) { return 1; } - virtual uint8_t pet_bd_r(offs_t offset, uint8_t data, int &sel) { return data; }; - virtual void pet_bd_w(offs_t offset, uint8_t data, int &sel) { }; + virtual uint8_t pet_bd_r(offs_t offset, uint8_t data, int &sel) { return data; } + virtual void pet_bd_w(offs_t offset, uint8_t data, int &sel) { } virtual int pet_diag_r() { return 1; } virtual void pet_irq_w(int state) { } diff --git a/src/devices/bus/pofo/exp.h b/src/devices/bus/pofo/exp.h index 4078535e2c7..0790aa04123 100644 --- a/src/devices/bus/pofo/exp.h +++ b/src/devices/bus/pofo/exp.h @@ -109,8 +109,8 @@ public: bool pdet_r() { return (m_card != nullptr) ? m_card->pdet() : 0; } bool cdet_r() { return (m_card != nullptr) ? m_card->cdet() : 1; } - uint8_t iack_r() { return (m_card != nullptr) ? m_card->iack_r() : 0xff; }; - uint8_t eack_r() { return (m_card != nullptr) ? m_card->eack_r() : 0xff; }; + uint8_t iack_r() { return (m_card != nullptr) ? m_card->iack_r() : 0xff; } + uint8_t eack_r() { return (m_card != nullptr) ? m_card->eack_r() : 0xff; } uint8_t nrdi_r(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { return (m_card != nullptr) ? m_card->nrdi_r(offset, data, iom, bcom, ncc1) : data; } void nwri_w(offs_t offset, uint8_t data, bool iom, bool bcom, bool ncc1) { if (m_card != nullptr) m_card->nwri_w(offset, data, iom, bcom, ncc1); } diff --git a/src/devices/bus/spectrum/beta.h b/src/devices/bus/spectrum/beta.h index 77f8d95777e..1827c741355 100644 --- a/src/devices/bus/spectrum/beta.h +++ b/src/devices/bus/spectrum/beta.h @@ -51,8 +51,8 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } required_memory_region m_rom; @@ -154,7 +154,7 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - virtual DECLARE_READ_LINE_MEMBER(romcs) override { return 1; }; + virtual DECLARE_READ_LINE_MEMBER(romcs) override { return 1; } required_device m_ppi; required_device m_acia; diff --git a/src/devices/bus/spectrum/beta128.h b/src/devices/bus/spectrum/beta128.h index 97259ae73af..bcbc889c94d 100644 --- a/src/devices/bus/spectrum/beta128.h +++ b/src/devices/bus/spectrum/beta128.h @@ -47,9 +47,9 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } required_memory_region m_rom; diff --git a/src/devices/bus/spectrum/d40.h b/src/devices/bus/spectrum/d40.h index 9bd36ce0025..250b2feccd8 100644 --- a/src/devices/bus/spectrum/d40.h +++ b/src/devices/bus/spectrum/d40.h @@ -45,10 +45,10 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; virtual DECLARE_READ_LINE_MEMBER(romcs) override; - virtual uint8_t fdc0_r(offs_t offset) { return 0xff; }; - virtual uint8_t fdc1_r(offs_t offset) { return 0xff; }; - virtual void fdc0_w(offs_t offset, uint8_t data) { }; - virtual void fdc1_w(offs_t offset, uint8_t data) { }; + virtual uint8_t fdc0_r(offs_t offset) { return 0xff; } + virtual uint8_t fdc1_r(offs_t offset) { return 0xff; } + virtual void fdc0_w(offs_t offset, uint8_t data) { } + virtual void fdc1_w(offs_t offset, uint8_t data) { } virtual void nmi_check(); required_memory_region m_rom; diff --git a/src/devices/bus/spectrum/exp.h b/src/devices/bus/spectrum/exp.h index 5b6d3c8fecf..04e3e942889 100644 --- a/src/devices/bus/spectrum/exp.h +++ b/src/devices/bus/spectrum/exp.h @@ -112,10 +112,10 @@ class device_spectrum_expansion_interface : public device_interface { public: // reading and writing - virtual void pre_opcode_fetch(offs_t offset) { }; - virtual void post_opcode_fetch(offs_t offset) { }; - virtual void pre_data_fetch(offs_t offset) { }; - virtual void post_data_fetch(offs_t offset) { }; + virtual void pre_opcode_fetch(offs_t offset) { } + virtual void post_opcode_fetch(offs_t offset) { } + virtual void pre_data_fetch(offs_t offset) { } + virtual void post_data_fetch(offs_t offset) { } virtual uint8_t mreq_r(offs_t offset) { return 0xff; } virtual void mreq_w(offs_t offset, uint8_t data) { } virtual uint8_t iorq_r(offs_t offset) { return offset & 1 ? m_slot->fb_r() : 0xff; } diff --git a/src/devices/bus/spectrum/floppyone.h b/src/devices/bus/spectrum/floppyone.h index 0357c83ad23..8eeea6bad0f 100644 --- a/src/devices/bus/spectrum/floppyone.h +++ b/src/devices/bus/spectrum/floppyone.h @@ -31,7 +31,7 @@ public: spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); static void floppy_formats(format_registration &fr); - DECLARE_INPUT_CHANGED_MEMBER(snapshot_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); }; + DECLARE_INPUT_CHANGED_MEMBER(snapshot_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } protected: // device-level overrides @@ -50,13 +50,13 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_memory_region m_rom; required_memory_region m_prom; diff --git a/src/devices/bus/spectrum/fuller.h b/src/devices/bus/spectrum/fuller.h index f75e621289f..fa16ec01579 100644 --- a/src/devices/bus/spectrum/fuller.h +++ b/src/devices/bus/spectrum/fuller.h @@ -41,10 +41,10 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } virtual DECLARE_READ_LINE_MEMBER(romcs) override { return m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/intf1.h b/src/devices/bus/spectrum/intf1.h index 33e1e42d312..787c64b843d 100644 --- a/src/devices/bus/spectrum/intf1.h +++ b/src/devices/bus/spectrum/intf1.h @@ -45,8 +45,8 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } private: diff --git a/src/devices/bus/spectrum/kempdisc.h b/src/devices/bus/spectrum/kempdisc.h index 3bc38cd9b63..3a3b5118402 100644 --- a/src/devices/bus/spectrum/kempdisc.h +++ b/src/devices/bus/spectrum/kempdisc.h @@ -45,10 +45,10 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } required_memory_region m_rom; diff --git a/src/devices/bus/spectrum/logitek.h b/src/devices/bus/spectrum/logitek.h index 079d3f9ca72..a6d807d7236 100644 --- a/src/devices/bus/spectrum/logitek.h +++ b/src/devices/bus/spectrum/logitek.h @@ -30,7 +30,7 @@ public: static constexpr feature_type unemulated_features() { return feature::DISK; } - DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); }; + DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } protected: // device-level overrides @@ -45,8 +45,8 @@ protected: void fetch(offs_t offset); - virtual void pre_opcode_fetch(offs_t offset) override { fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { fetch(offset); } virtual uint8_t mreq_r(offs_t offset) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/spectrum/lprint.h b/src/devices/bus/spectrum/lprint.h index 9b673402e63..d58793607c6 100644 --- a/src/devices/bus/spectrum/lprint.h +++ b/src/devices/bus/spectrum/lprint.h @@ -41,7 +41,7 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; virtual DECLARE_READ_LINE_MEMBER(romcs) override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_memory_region m_rom; required_device m_centronics; @@ -74,13 +74,13 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_memory_region m_rom; required_device m_centronics; @@ -111,7 +111,7 @@ protected: virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_device m_centronics; @@ -145,7 +145,7 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; virtual DECLARE_READ_LINE_MEMBER(romcs) override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_memory_region m_rom; required_device m_centronics; diff --git a/src/devices/bus/spectrum/melodik.h b/src/devices/bus/spectrum/melodik.h index 043aaab15a0..6c0d4f6b3fd 100644 --- a/src/devices/bus/spectrum/melodik.h +++ b/src/devices/bus/spectrum/melodik.h @@ -40,10 +40,10 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t mreq_r(offs_t offset) override { return m_exp->romcs() ? m_exp->mreq_r(offset) : 0xff; } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } virtual DECLARE_READ_LINE_MEMBER(romcs) override { return m_exp->romcs(); } diff --git a/src/devices/bus/spectrum/mface.h b/src/devices/bus/spectrum/mface.h index 781201295c8..7b3fbf03e72 100644 --- a/src/devices/bus/spectrum/mface.h +++ b/src/devices/bus/spectrum/mface.h @@ -23,7 +23,7 @@ public: // construction/destruction spectrum_mface_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? CLEAR_LINE : ASSERT_LINE); }; + virtual DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? CLEAR_LINE : ASSERT_LINE); } protected: spectrum_mface_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -42,13 +42,13 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } - void nmi(line_state state) { m_slot->nmi_w(state); m_nmi_pending = state; }; + void nmi(line_state state) { m_slot->nmi_w(state); m_nmi_pending = state; } required_memory_region m_rom; required_device m_exp; @@ -223,7 +223,7 @@ protected: virtual void iorq_w(offs_t offset, uint8_t data) override; private: - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_device m_centronics; diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h index 13654adccc9..628477c1f8a 100644 --- a/src/devices/bus/spectrum/mgt.h +++ b/src/devices/bus/spectrum/mgt.h @@ -71,7 +71,7 @@ public: // construction/destruction spectrum_disciple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_INPUT_CHANGED_MEMBER(inhibit_button) { if (!newval) m_romcs = 0; }; + DECLARE_INPUT_CHANGED_MEMBER(inhibit_button) { if (!newval) m_romcs = 0; } protected: enum diff --git a/src/devices/bus/spectrum/opus.h b/src/devices/bus/spectrum/opus.h index a85dd21af26..2c175621820 100644 --- a/src/devices/bus/spectrum/opus.h +++ b/src/devices/bus/spectrum/opus.h @@ -49,9 +49,9 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } private: diff --git a/src/devices/bus/spectrum/sixword.h b/src/devices/bus/spectrum/sixword.h index 32370577080..c11108454f6 100644 --- a/src/devices/bus/spectrum/sixword.h +++ b/src/devices/bus/spectrum/sixword.h @@ -30,7 +30,7 @@ public: spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); static void floppy_formats(format_registration &fr); - DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_rombank |= newval << 12; m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); }; + DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_rombank |= newval << 12; m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } protected: spectrum_swiftdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -52,9 +52,9 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_opcode_fetch(offs_t offset) override { m_exp->pre_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } required_memory_region m_rom; @@ -92,7 +92,7 @@ protected: virtual void mreq_w(offs_t offset, uint8_t data) override; virtual uint8_t iorq_r(offs_t offset) override; virtual void iorq_w(offs_t offset, uint8_t data) override; - DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; }; + DECLARE_WRITE_LINE_MEMBER(busy_w) { m_busy = state; } required_device m_centronics; required_ioport m_conf; diff --git a/src/devices/bus/spectrum/speccydos.h b/src/devices/bus/spectrum/speccydos.h index 03e0a42c6c6..3cdb29b7b38 100644 --- a/src/devices/bus/spectrum/speccydos.h +++ b/src/devices/bus/spectrum/speccydos.h @@ -28,7 +28,7 @@ public: spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); static void floppy_formats(format_registration &fr); - DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); }; + DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } protected: // device-level overrides @@ -47,9 +47,9 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } diff --git a/src/devices/bus/spectrum/specmate.h b/src/devices/bus/spectrum/specmate.h index 2bb43f925b3..cc361b49171 100644 --- a/src/devices/bus/spectrum/specmate.h +++ b/src/devices/bus/spectrum/specmate.h @@ -23,7 +23,7 @@ public: // construction/destruction spectrum_specmate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_INPUT_CHANGED_MEMBER(freeze_button) { m_slot->nmi_w(newval ? CLEAR_LINE : ASSERT_LINE); }; + DECLARE_INPUT_CHANGED_MEMBER(freeze_button) { m_slot->nmi_w(newval ? CLEAR_LINE : ASSERT_LINE); } protected: // device-level overrides @@ -40,9 +40,9 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); }; - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void post_opcode_fetch(offs_t offset) override { m_exp->post_opcode_fetch(offset); } + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } virtual uint8_t iorq_r(offs_t offset) override { return m_exp->iorq_r(offset); } virtual void iorq_w(offs_t offset, uint8_t data) override { m_exp->iorq_w(offset, data); } diff --git a/src/devices/bus/spectrum/wafa.h b/src/devices/bus/spectrum/wafa.h index aeaf84a0268..6ca1f4d256a 100644 --- a/src/devices/bus/spectrum/wafa.h +++ b/src/devices/bus/spectrum/wafa.h @@ -47,8 +47,8 @@ protected: virtual DECLARE_READ_LINE_MEMBER(romcs) override; // passthru - virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); }; - virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); }; + virtual void pre_data_fetch(offs_t offset) override { m_exp->pre_data_fetch(offset); } + virtual void post_data_fetch(offs_t offset) override { m_exp->post_data_fetch(offset); } virtual void mreq_w(offs_t offset, uint8_t data) override { if (m_exp->romcs()) m_exp->mreq_w(offset, data); } private: diff --git a/src/devices/bus/svi3x8/slot/slot.h b/src/devices/bus/svi3x8/slot/slot.h index bba55731a88..11b94d07e5d 100644 --- a/src/devices/bus/svi3x8/slot/slot.h +++ b/src/devices/bus/svi3x8/slot/slot.h @@ -64,9 +64,9 @@ public: void add_card(device_svi_slot_interface &card); // from slot - DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); }; - DECLARE_WRITE_LINE_MEMBER( romdis_w ) { m_romdis_handler(state); }; - DECLARE_WRITE_LINE_MEMBER( ramdis_w ) { m_ramdis_handler(state); }; + DECLARE_WRITE_LINE_MEMBER( int_w ) { m_int_handler(state); } + DECLARE_WRITE_LINE_MEMBER( romdis_w ) { m_romdis_handler(state); } + DECLARE_WRITE_LINE_MEMBER( ramdis_w ) { m_ramdis_handler(state); } // from host uint8_t mreq_r(offs_t offset); diff --git a/src/devices/bus/ti99/internal/992board.h b/src/devices/bus/ti99/internal/992board.h index 1a88622f62c..78ca51193cd 100644 --- a/src/devices/bus/ti99/internal/992board.h +++ b/src/devices/bus/ti99/internal/992board.h @@ -199,7 +199,7 @@ public: void write(offs_t offset, uint8_t data); protected: - virtual void device_start() override { }; + virtual void device_start() override { } virtual void device_config_complete() override; private: diff --git a/src/devices/bus/ti99/peb/cc_fdc.h b/src/devices/bus/ti99/peb/cc_fdc.h index 179ba10e0e5..e72bfa3ea57 100644 --- a/src/devices/bus/ti99/peb/cc_fdc.h +++ b/src/devices/bus/ti99/peb/cc_fdc.h @@ -149,7 +149,7 @@ public: protected: ccfdc_dec_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - void device_start() override { }; + void device_start() override { } void device_config_complete() override; corcomp_fdc_device* m_board; @@ -169,7 +169,7 @@ public: protected: ccfdc_sel_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - void device_start() override { }; + void device_start() override { } virtual void device_config_complete() override =0; corcomp_fdc_device* m_board; diff --git a/src/devices/bus/ti99/peb/forti.h b/src/devices/bus/ti99/peb/forti.h index 7328c965eea..69ad6ddfcab 100644 --- a/src/devices/bus/ti99/peb/forti.h +++ b/src/devices/bus/ti99/peb/forti.h @@ -28,8 +28,8 @@ public: forti_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void write(offs_t offset, uint8_t data) override; void readz(offs_t offset, uint8_t *value) override; - void crureadz(offs_t offset, uint8_t *value) override { }; - void cruwrite(offs_t offset, uint8_t data) override { }; + void crureadz(offs_t offset, uint8_t *value) override { } + void cruwrite(offs_t offset, uint8_t data) override { } DECLARE_WRITE_LINE_MEMBER( ready_sound ); diff --git a/src/devices/bus/ti99/peb/myarcfdc.h b/src/devices/bus/ti99/peb/myarcfdc.h index 6917d67c146..7eacdd79f26 100644 --- a/src/devices/bus/ti99/peb/myarcfdc.h +++ b/src/devices/bus/ti99/peb/myarcfdc.h @@ -119,7 +119,7 @@ public: bool cs259(); private: - void device_start() override { }; + void device_start() override { } void device_config_complete() override; myarc_fdc_device* m_board; diff --git a/src/devices/bus/ti99/peb/peribox.h b/src/devices/bus/ti99/peb/peribox.h index 1deca0a26c6..157c2099106 100644 --- a/src/devices/bus/ti99/peb/peribox.h +++ b/src/devices/bus/ti99/peb/peribox.h @@ -179,7 +179,7 @@ public: virtual void write(offs_t offset, uint8_t data) = 0; virtual void crureadz(offs_t offset, uint8_t *value) = 0; virtual void cruwrite(offs_t offset, uint8_t data) = 0; - virtual void setaddress_dbin(offs_t offset, int state) { }; + virtual void setaddress_dbin(offs_t offset, int state) { } virtual DECLARE_WRITE_LINE_MEMBER(clock_in) { } virtual DECLARE_WRITE_LINE_MEMBER(reset_in) { } diff --git a/src/devices/bus/ti99/peb/pgram.h b/src/devices/bus/ti99/peb/pgram.h index 68238f5a6b2..d050c3deac7 100644 --- a/src/devices/bus/ti99/peb/pgram.h +++ b/src/devices/bus/ti99/peb/pgram.h @@ -32,7 +32,7 @@ public: pgram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); void write(offs_t offset, uint8_t data) override; void readz(offs_t offset, uint8_t *value) override; - void crureadz(offs_t offset, uint8_t *value) override { }; + void crureadz(offs_t offset, uint8_t *value) override { } void cruwrite(offs_t offset, uint8_t data) override; DECLARE_INPUT_CHANGED_MEMBER( sw1_changed ); DECLARE_INPUT_CHANGED_MEMBER( sw2_changed ); diff --git a/src/devices/bus/ti99/peb/ti_rs232.h b/src/devices/bus/ti99/peb/ti_rs232.h index 91f7572754d..e7970538504 100644 --- a/src/devices/bus/ti99/peb/ti_rs232.h +++ b/src/devices/bus/ti99/peb/ti_rs232.h @@ -145,7 +145,7 @@ public: void connect(tms9902_device *dev) { m_uart = dev; } protected: - void device_start() override { }; + void device_start() override { } image_init_result call_load() override; void call_unload() override; @@ -173,7 +173,7 @@ public: const char *file_extensions() const noexcept override { return ""; } protected: - void device_start() override { }; + void device_start() override { } image_init_result call_load() override; void call_unload() override; }; diff --git a/src/devices/bus/vcs/vcs_slot.h b/src/devices/bus/vcs/vcs_slot.h index 673db585543..0f1b7d22509 100644 --- a/src/devices/bus/vcs/vcs_slot.h +++ b/src/devices/bus/vcs/vcs_slot.h @@ -112,7 +112,7 @@ public: // slot interface overrides virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; - int get_cart_type() { return m_type; }; + int get_cart_type() { return m_type; } static int identify_cart_type(const uint8_t *ROM, uint32_t len); // reading and writing diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h index a9bfc781638..124bc7bb9c1 100644 --- a/src/devices/bus/vic20/exp.h +++ b/src/devices/bus/vic20/exp.h @@ -113,8 +113,8 @@ public: // construction/destruction virtual ~device_vic20_expansion_card_interface(); - virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; }; - virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { }; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; } + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { } protected: device_vic20_expansion_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h index a4854483376..c851d0e0d48 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.h +++ b/src/devices/bus/vtech/ioexp/ioexp.h @@ -100,7 +100,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - virtual void io_map(address_map &map) { }; + virtual void io_map(address_map &map) { } required_device m_io; }; diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index a4ab93e92f7..5fd3ee6a449 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -126,8 +126,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; virtual void device_start() override; - virtual void mem_map(address_map &map) { }; - virtual void io_map(address_map &map) { }; + virtual void mem_map(address_map &map) { } + virtual void io_map(address_map &map) { } required_device m_mem; required_device m_io; diff --git a/src/devices/cpu/adsp2100/adsp2100.h b/src/devices/cpu/adsp2100/adsp2100.h index d17988edbf9..046e10fa6ba 100644 --- a/src/devices/cpu/adsp2100/adsp2100.h +++ b/src/devices/cpu/adsp2100/adsp2100.h @@ -196,7 +196,7 @@ public: // public interfaces void load_boot_data(uint8_t *srcdata, uint32_t *dstdata); // Returns base address for circular dag - uint32_t get_ibase(int index) { return m_base[index]; }; + uint32_t get_ibase(int index) { return m_base[index]; } protected: enum diff --git a/src/devices/cpu/alpha/alphad.h b/src/devices/cpu/alpha/alphad.h index 3c3475e5730..6ee5404a382 100644 --- a/src/devices/cpu/alpha/alphad.h +++ b/src/devices/cpu/alpha/alphad.h @@ -20,10 +20,10 @@ public: alpha_disassembler(alpha_disassembler::dasm_type type = TYPE_UNKNOWN) : m_dasm_type(type) { - }; + } virtual ~alpha_disassembler() = default; - virtual u32 opcode_alignment() const override { return 4; }; + virtual u32 opcode_alignment() const override { return 4; } virtual offs_t disassemble(std::ostream &stream, offs_t pc, const data_buffer &opcodes, const data_buffer ¶ms) override; private: diff --git a/src/devices/cpu/dsp56156/dsp56pcu.h b/src/devices/cpu/dsp56156/dsp56pcu.h index a04f7bf1f26..152f9c971bf 100644 --- a/src/devices/cpu/dsp56156/dsp56pcu.h +++ b/src/devices/cpu/dsp56156/dsp56pcu.h @@ -121,8 +121,8 @@ void MA_bit_set(dsp56156_core* cpustate, uint8_t value); uint8_t UF_bit(const dsp56156_core* cpustate); uint8_t SE_bit(const dsp56156_core* cpustate); -//void UF_bit_set(dsp56156_core* cpustate, uint8_t value) {}; -//void SE_bit_set(dsp56156_core* cpustate, uint8_t value) {}; +//void UF_bit_set(dsp56156_core* cpustate, uint8_t value) {} +//void SE_bit_set(dsp56156_core* cpustate, uint8_t value) {} // HACK - Bootstrap modes diff --git a/src/devices/cpu/i386/i386.h b/src/devices/cpu/i386/i386.h index d1080b9608c..f9f5f84913d 100644 --- a/src/devices/cpu/i386/i386.h +++ b/src/devices/cpu/i386/i386.h @@ -1530,9 +1530,9 @@ public: i386sx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); protected: - virtual u8 mem_pr8(offs_t address) override { return macache16.read_byte(address); }; - virtual u16 mem_pr16(offs_t address) override { return macache16.read_word(address); }; - virtual u32 mem_pr32(offs_t address) override { return macache16.read_dword(address); }; + virtual u8 mem_pr8(offs_t address) override { return macache16.read_byte(address); } + virtual u16 mem_pr16(offs_t address) override { return macache16.read_word(address); } + virtual u32 mem_pr32(offs_t address) override { return macache16.read_dword(address); } virtual uint16_t READ16PL(uint32_t ea, uint8_t privilege) override; virtual uint32_t READ32PL(uint32_t ea, uint8_t privilege) override; diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h index b5b19c03690..b2647526ba6 100644 --- a/src/devices/cpu/m68000/m68000.h +++ b/src/devices/cpu/m68000/m68000.h @@ -135,9 +135,9 @@ protected: virtual std::unique_ptr create_disassembler() override; // device_execute_interface overrides - virtual u32 execute_min_cycles() const noexcept override { return 4; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; - virtual u32 execute_input_lines() const noexcept override { return m_interrupt_mixer ? 8 : 3; }; // number of input lines + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } + virtual u32 execute_input_lines() const noexcept override { return m_interrupt_mixer ? 8 : 3; } // number of input lines virtual bool execute_input_edge_triggered(int inputnum) const noexcept override { return m_interrupt_mixer ? inputnum == M68K_IRQ_7 : false; } virtual void execute_run() override; virtual void execute_set_input(int inputnum, int state) override; @@ -165,7 +165,7 @@ public: template void set_tas_write_callback(T &&... args) { m_tas_write_callback.set(std::forward(args)...); } u16 get_fc(); void set_hmmu_enable(int enable); - int get_pmmu_enable() const {return m_pmmu_enabled;}; + int get_pmmu_enable() const {return m_pmmu_enabled;} void set_fpu_enable(int enable); void set_buserror_details(u32 fault_addr, u8 rw, u8 fc); void disable_interrupt_mixer() { m_interrupt_mixer = false; } @@ -448,8 +448,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 4; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -472,8 +472,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 4; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -487,8 +487,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 4; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -502,8 +502,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 4; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -517,8 +517,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -532,8 +532,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -547,8 +547,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -562,8 +562,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -577,8 +577,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } virtual bool memory_translate(int space, int intention, offs_t &address) override; @@ -594,8 +594,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -609,8 +609,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -624,8 +624,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -639,8 +639,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -654,8 +654,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -666,8 +666,8 @@ class scc68070_base_device : public m68000_base_device protected: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 4; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 4; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -687,8 +687,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides virtual void device_start() override; @@ -708,8 +708,8 @@ public: virtual std::unique_ptr create_disassembler() override; - virtual u32 execute_min_cycles() const noexcept override { return 2; }; - virtual u32 execute_max_cycles() const noexcept override { return 158; }; + virtual u32 execute_min_cycles() const noexcept override { return 2; } + virtual u32 execute_max_cycles() const noexcept override { return 158; } // device-level overrides diff --git a/src/devices/cpu/m6809/hd6309.h b/src/devices/cpu/m6809/hd6309.h index daf9579db14..99065882116 100644 --- a/src/devices/cpu/m6809/hd6309.h +++ b/src/devices/cpu/m6809/hd6309.h @@ -48,7 +48,7 @@ protected: // device_disasm_interface overrides virtual std::unique_ptr create_disassembler() override; - virtual bool is_6809() override { return false; }; + virtual bool is_6809() override { return false; } private: typedef m6809_base_device super; diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index 16a678a4271..3fc0b8bae1d 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -79,7 +79,7 @@ protected: virtual void state_import(const device_state_entry &entry) override; virtual void state_string_export(const device_state_entry &entry, std::string &str) const override; - virtual bool is_6809() { return true; }; + virtual bool is_6809() { return true; } // addressing modes enum diff --git a/src/devices/cpu/mcs51/axc51-core_dasm.h b/src/devices/cpu/mcs51/axc51-core_dasm.h index 0e9bd5c3ed2..575e3f8270e 100644 --- a/src/devices/cpu/mcs51/axc51-core_dasm.h +++ b/src/devices/cpu/mcs51/axc51-core_dasm.h @@ -22,7 +22,7 @@ class axc51core_disassembler : public mcs51_disassembler public: axc51core_disassembler(); - axc51core_disassembler(const mem_info* names) : mcs51_disassembler(names) {}; + axc51core_disassembler(const mem_info* names) : mcs51_disassembler(names) {} virtual ~axc51core_disassembler() = default; diff --git a/src/devices/cpu/nec/nec.h b/src/devices/cpu/nec/nec.h index 025aecc17fc..764afdd76c1 100644 --- a/src/devices/cpu/nec/nec.h +++ b/src/devices/cpu/nec/nec.h @@ -53,7 +53,7 @@ protected: // device_disasm_interface overrides virtual std::unique_ptr create_disassembler() override; - virtual int get_mode() const override { return m_MF; }; + virtual int get_mode() const override { return m_MF; } virtual u8 io_read_byte(offs_t a) { return m_io->read_byte(a); } virtual u16 io_read_word(offs_t a) { return m_io->read_word_unaligned(a); } diff --git a/src/devices/cpu/nec/v25.h b/src/devices/cpu/nec/v25.h index e3cf7e9a80b..1afeb9a7eb5 100644 --- a/src/devices/cpu/nec/v25.h +++ b/src/devices/cpu/nec/v25.h @@ -71,7 +71,7 @@ protected: // device_disasm_interface overrides virtual std::unique_ptr create_disassembler() override; - virtual int get_mode() const override { return 1; }; + virtual int get_mode() const override { return 1; } private: address_space_config m_program_config; diff --git a/src/devices/cpu/pps41/mm76.h b/src/devices/cpu/pps41/mm76.h index 82956e1829e..54db25fc93b 100644 --- a/src/devices/cpu/pps41/mm76.h +++ b/src/devices/cpu/pps41/mm76.h @@ -71,10 +71,10 @@ protected: void op_illegal(); void op_todo(); - virtual bool op_is_tr(u8 op) override { return (op & 0xf0) == 0x30; }; - virtual bool op_is_eob(u8 op) { return (op & 0xfc) == 0x1c; }; - virtual bool op_is_lb(u8 op) { return (op & 0xf0) == 0x20; }; - virtual bool op_is_lai(u8 op) { return (op & 0xf0) == 0x70; }; + virtual bool op_is_tr(u8 op) override { return (op & 0xf0) == 0x30; } + virtual bool op_is_eob(u8 op) { return (op & 0xfc) == 0x1c; } + virtual bool op_is_lb(u8 op) { return (op & 0xf0) == 0x20; } + virtual bool op_is_lai(u8 op) { return (op & 0xf0) == 0x70; } // opcode handlers virtual void op_xab(); diff --git a/src/devices/cpu/pps41/mm78.h b/src/devices/cpu/pps41/mm78.h index 14765f01749..d901d87988c 100644 --- a/src/devices/cpu/pps41/mm78.h +++ b/src/devices/cpu/pps41/mm78.h @@ -68,9 +68,9 @@ protected: void program_2k(address_map &map); // opcode helpers - virtual bool op_is_eob(u8 op) override { return (op & 0xf8) == 0x08; }; - virtual bool op_is_lb(u8 op) override { return (op & 0xf0) == 0x10; }; - virtual bool op_is_lai(u8 op) override { return (op & 0xf0) == 0x40; }; + virtual bool op_is_eob(u8 op) override { return (op & 0xf8) == 0x08; } + virtual bool op_is_lb(u8 op) override { return (op & 0xf0) == 0x10; } + virtual bool op_is_lai(u8 op) override { return (op & 0xf0) == 0x40; } // opcode handlers virtual void op_lba() override; diff --git a/src/devices/cpu/sh/sh.h b/src/devices/cpu/sh/sh.h index 09a97128a56..d87c1e9742d 100644 --- a/src/devices/cpu/sh/sh.h +++ b/src/devices/cpu/sh/sh.h @@ -420,7 +420,7 @@ public: uml::code_label labelnum; /* index for local labels */ }; - virtual void sh2_exception(const char *message, int irqline) { fatalerror("sh2_exception in base classs\n"); }; + virtual void sh2_exception(const char *message, int irqline) { fatalerror("sh2_exception in base classs\n"); } virtual void generate_update_cycles(drcuml_block &block, compiler_state &compiler, uml::parameter param, bool allow_exception) = 0; diff --git a/src/devices/cpu/tms7000/tms7000.h b/src/devices/cpu/tms7000/tms7000.h index a35656422ff..d1e871e839b 100644 --- a/src/devices/cpu/tms7000/tms7000.h +++ b/src/devices/cpu/tms7000/tms7000.h @@ -49,8 +49,8 @@ public: void set_divide_by_2() { m_divider = 2; } void set_divide_by_4() { m_divider = 4; } - uint8_t tms7000_unmapped_rf_r(offs_t offset) { if (!machine().side_effects_disabled()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag(), m_pc, offset + 0x80); return 0; }; - void tms7000_unmapped_rf_w(offs_t offset, uint8_t data) { logerror("'%s' (%04X): unmapped_rf_w @ $%04x = $%02x\n", tag(), m_pc, offset + 0x80, data); }; + uint8_t tms7000_unmapped_rf_r(offs_t offset) { if (!machine().side_effects_disabled()) logerror("'%s' (%04X): unmapped_rf_r @ $%04x\n", tag(), m_pc, offset + 0x80); return 0; } + void tms7000_unmapped_rf_w(offs_t offset, uint8_t data) { logerror("'%s' (%04X): unmapped_rf_w @ $%04x = $%02x\n", tag(), m_pc, offset + 0x80, data); } uint8_t tms7000_pf_r(offs_t offset); void tms7000_pf_w(offs_t offset, uint8_t data); diff --git a/src/devices/cpu/tms9900/tms9995.h b/src/devices/cpu/tms9900/tms9995.h index 76e0ab7ec1c..dc540ac95b5 100644 --- a/src/devices/cpu/tms9900/tms9995.h +++ b/src/devices/cpu/tms9900/tms9995.h @@ -54,8 +54,8 @@ public: auto holda_cb() { return m_holda_line.bind(); } // For debugger access - uint8_t debug_read_onchip_memory(offs_t addr) { return m_onchip_memory[addr & 0xff]; }; - void debug_write_onchip_memory(offs_t addr, uint8_t data) { m_onchip_memory[addr & 0xff] = data; }; + uint8_t debug_read_onchip_memory(offs_t addr) { return m_onchip_memory[addr & 0xff]; } + void debug_write_onchip_memory(offs_t addr, uint8_t data) { m_onchip_memory[addr & 0xff] = data; } bool is_onchip(offs_t addrb) { return (((addrb & 0xff00)==0xf000 && (addrb < 0xf0fc)) || ((addrb & 0xfffc)==0xfffc)) && !m_mp9537; } void set_overflow_interrupt( int enable ) { m_check_overflow = (enable!=0); } diff --git a/src/devices/cpu/v30mz/v30mz.h b/src/devices/cpu/v30mz/v30mz.h index 770da50d954..f194fba269c 100644 --- a/src/devices/cpu/v30mz/v30mz.h +++ b/src/devices/cpu/v30mz/v30mz.h @@ -50,7 +50,7 @@ protected: // device_disasm_interface overrides virtual std::unique_ptr create_disassembler() override; - virtual int get_mode() const override { return 1; }; + virtual int get_mode() const override { return 1; } void interrupt(int int_num); diff --git a/src/devices/imagedev/floppy.h b/src/devices/imagedev/floppy.h index 9aaf9c6020e..2c23c48d470 100644 --- a/src/devices/imagedev/floppy.h +++ b/src/devices/imagedev/floppy.h @@ -118,7 +118,7 @@ public: bool ready_r(); void set_ready(bool state); double get_pos(); - virtual void tfsel_w(int state) { }; // 35SEL line for Apple Sony drives + virtual void tfsel_w(int state) { } // 35SEL line for Apple Sony drives virtual bool wpt_r(); // Mac sony drives using this for various reporting int dskchg_r() { return dskchg; } @@ -159,7 +159,7 @@ protected: floppy_image_device *m_fid; const fs::manager_t *m_manager; - fs_enum(floppy_image_device *fid) : fs::manager_t::floppy_enumerator(), m_fid(fid) {}; + fs_enum(floppy_image_device *fid) : fs::manager_t::floppy_enumerator(), m_fid(fid) {} virtual void add(floppy_format_type type, u32 image_size, const char *name, const char *description) override; virtual void add_raw(const char *name, u32 key, const char *description) override; diff --git a/src/devices/machine/ataflash.h b/src/devices/machine/ataflash.h index dad05081ff6..e52c78ee27a 100644 --- a/src/devices/machine/ataflash.h +++ b/src/devices/machine/ataflash.h @@ -27,7 +27,7 @@ protected: virtual void device_reset() override; virtual attotime seek_time() override; - uint8_t calculate_status() override { return ata_hle_device::calculate_status(); }; + uint8_t calculate_status() override { return ata_hle_device::calculate_status(); } private: uint8_t m_cis[512]; diff --git a/src/devices/machine/atmel_arm_aic.h b/src/devices/machine/atmel_arm_aic.h index cc0388d21f3..72659841f3a 100644 --- a/src/devices/machine/atmel_arm_aic.h +++ b/src/devices/machine/atmel_arm_aic.h @@ -46,35 +46,35 @@ private: devcb_write_line m_irq_out; void check_irqs(); - void set_lines() { m_irq_out((m_core_status & ~m_debug & 2) ? ASSERT_LINE : CLEAR_LINE); }; // TODO FIQ + void set_lines() { m_irq_out((m_core_status & ~m_debug & 2) ? ASSERT_LINE : CLEAR_LINE); } // TODO FIQ - void push_level(int lvl) { m_level_stack[++m_lvlidx] = lvl; }; - void pop_level() { if (m_lvlidx) --m_lvlidx; }; - int get_level() { return m_level_stack[m_lvlidx]; }; + void push_level(int lvl) { m_level_stack[++m_lvlidx] = lvl; } + void pop_level() { if (m_lvlidx) --m_lvlidx; } + int get_level() { return m_level_stack[m_lvlidx]; } uint32_t irq_vector_r(); uint32_t firq_vector_r(); - uint32_t aic_isr_r() { return m_status; }; - uint32_t aic_cisr_r() { return m_core_status; }; - uint32_t aic_ipr_r() { return m_irqs_pending; }; - uint32_t aic_imr_r() { return m_irqs_enabled; }; - uint32_t aic_ffsr_r() { return m_fast_irqs; }; + uint32_t aic_isr_r() { return m_status; } + uint32_t aic_cisr_r() { return m_core_status; } + uint32_t aic_ipr_r() { return m_irqs_pending; } + uint32_t aic_imr_r() { return m_irqs_enabled; } + uint32_t aic_ffsr_r() { return m_fast_irqs; } // can't use ram() and share() in device submaps - uint32_t aic_smr_r(offs_t offset) { return m_aic_smr[offset]; }; - uint32_t aic_svr_r(offs_t offset) { return m_aic_svr[offset]; }; - void aic_smr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_aic_smr[offset]); }; - void aic_svr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_aic_svr[offset]); }; - void aic_spu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_spurious_vector); }; - void aic_dcr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_debug); check_irqs(); }; - void aic_ffer_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_fast_irqs |= data & mem_mask; check_irqs(); }; - void aic_ffdr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_fast_irqs &= ~(data & mem_mask) | 1; check_irqs(); }; + uint32_t aic_smr_r(offs_t offset) { return m_aic_smr[offset]; } + uint32_t aic_svr_r(offs_t offset) { return m_aic_svr[offset]; } + void aic_smr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_aic_smr[offset]); } + void aic_svr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_aic_svr[offset]); } + void aic_spu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_spurious_vector); } + void aic_dcr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { COMBINE_DATA(&m_debug); check_irqs(); } + void aic_ffer_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_fast_irqs |= data & mem_mask; check_irqs(); } + void aic_ffdr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_fast_irqs &= ~(data & mem_mask) | 1; check_irqs(); } - void aic_iecr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_enabled |= data & mem_mask; check_irqs(); }; - void aic_idcr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_enabled &= ~(data & mem_mask); check_irqs(); }; - void aic_iccr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_pending &= ~(data & mem_mask); check_irqs(); }; - void aic_iscr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_pending |= data & mem_mask; check_irqs(); }; - void aic_eoicr_w(uint32_t data) { m_status = 0; pop_level(); check_irqs(); }; + void aic_iecr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_enabled |= data & mem_mask; check_irqs(); } + void aic_idcr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_enabled &= ~(data & mem_mask); check_irqs(); } + void aic_iccr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_pending &= ~(data & mem_mask); check_irqs(); } + void aic_iscr_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { m_irqs_pending |= data & mem_mask; check_irqs(); } + void aic_eoicr_w(uint32_t data) { m_status = 0; pop_level(); check_irqs(); } }; #endif diff --git a/src/devices/machine/generalplus_gpl16250soc_video.h b/src/devices/machine/generalplus_gpl16250soc_video.h index 068e26b5f77..328525b7359 100644 --- a/src/devices/machine/generalplus_gpl16250soc_video.h +++ b/src/devices/machine/generalplus_gpl16250soc_video.h @@ -134,7 +134,7 @@ public: uint16_t video_7051_r(); uint16_t video_70e0_prng_r(); - auto write_video_irq_callback() { return m_video_irq_cb.bind(); }; + auto write_video_irq_callback() { return m_video_irq_cb.bind(); } virtual void device_add_mconfig(machine_config& config) override; diff --git a/src/devices/machine/gt64xxx.h b/src/devices/machine/gt64xxx.h index 8f5bd7db079..0126dac306f 100644 --- a/src/devices/machine/gt64xxx.h +++ b/src/devices/machine/gt64xxx.h @@ -29,9 +29,9 @@ public: void set_autoconfig(int autoconfig) { m_autoconfig = autoconfig; } void set_irq_num(int irq_num) { m_irq_num = irq_num; } virtual void config_map(address_map &map) override; - void set_simm_size(int index, int size) { m_simm_size[index] = size; }; - void set_simm0_size(int size) { m_simm_size[0] = size; }; - void set_simm1_size(int size) { m_simm_size[1] = size; }; + void set_simm_size(int index, int size) { m_simm_size[index] = size; } + void set_simm0_size(int size) { m_simm_size[0] = size; } + void set_simm1_size(int size) { m_simm_size[1] = size; } DECLARE_WRITE_LINE_MEMBER(pci_stall); diff --git a/src/devices/machine/ncr5390.h b/src/devices/machine/ncr5390.h index f16ffee69cc..98a4cb40701 100644 --- a/src/devices/machine/ncr5390.h +++ b/src/devices/machine/ncr5390.h @@ -245,8 +245,8 @@ public: virtual uint8_t status_r() override; - uint8_t conf2_r() { return config2; }; - void conf2_w(uint8_t data) { config2 = data; }; + uint8_t conf2_r() { return config2; } + void conf2_w(uint8_t data) { config2 = data; } virtual uint8_t read(offs_t offset) override; virtual void write(offs_t offset, uint8_t data) override; @@ -296,9 +296,9 @@ public: virtual void map(address_map &map) override; - uint8_t conf3_r() { return config3; }; - void conf3_w(uint8_t data) { config3 = data; }; - void fifo_align_w(uint8_t data) { fifo_align = data; }; + uint8_t conf3_r() { return config3; } + void conf3_w(uint8_t data) { config3 = data; } + void fifo_align_w(uint8_t data) { fifo_align = data; } virtual uint8_t read(offs_t offset) override; virtual void write(offs_t offset, uint8_t data) override; diff --git a/src/devices/machine/pci-ide.h b/src/devices/machine/pci-ide.h index aae418fb9e0..af3d7ae0a4d 100644 --- a/src/devices/machine/pci-ide.h +++ b/src/devices/machine/pci-ide.h @@ -33,10 +33,10 @@ public: auto irq_handler() { return m_irq_handler.bind(); } // This will set the top 12 bits for address decoding in legacy mode. Needed for seattle driver. - void set_legacy_top(int val) { m_legacy_top = val & 0xfff; }; + void set_legacy_top(int val) { m_legacy_top = val & 0xfff; } // Sets the default Programming Interface (PIF) register - void set_pif(int val) { m_pif = val & 0xff; }; + void set_pif(int val) { m_pif = val & 0xff; } protected: virtual void device_start() override; diff --git a/src/devices/machine/ram.h b/src/devices/machine/ram.h index 34bf7949db3..8b17b3eadc5 100644 --- a/src/devices/machine/ram.h +++ b/src/devices/machine/ram.h @@ -42,7 +42,7 @@ public: u32 size() const { return m_size; } u32 mask() const { return m_size - 1; } u8 *pointer() { return &m_pointer[0]; } - char const *default_size_string() const { return m_default_size; }; + char const *default_size_string() const { return m_default_size; } u32 default_size() const; extra_option_vector const &extra_options() const; diff --git a/src/devices/machine/smc91c9x.h b/src/devices/machine/smc91c9x.h index 219f6dde0b6..2942e77572a 100644 --- a/src/devices/machine/smc91c9x.h +++ b/src/devices/machine/smc91c9x.h @@ -25,7 +25,7 @@ public: u16 read(offs_t offset, u16 mem_mask = ~0); void write(offs_t offset, u16 data, u16 mem_mask = ~0); - void set_link_connected(bool connected) { m_link_unconnected = !connected; }; + void set_link_connected(bool connected) { m_link_unconnected = !connected; } protected: enum class dev_type { @@ -273,29 +273,29 @@ private: // FIFO for allocated (queued) transmit packets u8 m_queued_tx[FIFO_SIZE]; int m_queued_tx_h, m_queued_tx_t; - void reset_queued_tx() { m_queued_tx_t = m_queued_tx_h = 0; }; - void push_queued_tx(const u8 &data) { m_queued_tx[m_queued_tx_h++] = data; m_queued_tx_h &= FIFO_SIZE - 1; }; - u8 pop_queued_tx() { u8 val = m_queued_tx[m_queued_tx_t++]; m_queued_tx_t &= FIFO_SIZE - 1; return val; }; - bool empty_queued_tx() const { return m_queued_tx_h == m_queued_tx_t; }; - u8 curr_queued_tx() const { return m_queued_tx[m_queued_tx_t]; }; + void reset_queued_tx() { m_queued_tx_t = m_queued_tx_h = 0; } + void push_queued_tx(const u8 &data) { m_queued_tx[m_queued_tx_h++] = data; m_queued_tx_h &= FIFO_SIZE - 1; } + u8 pop_queued_tx() { u8 val = m_queued_tx[m_queued_tx_t++]; m_queued_tx_t &= FIFO_SIZE - 1; return val; } + bool empty_queued_tx() const { return m_queued_tx_h == m_queued_tx_t; } + u8 curr_queued_tx() const { return m_queued_tx[m_queued_tx_t]; } // FIFO for completed transmit packets u8 m_completed_tx[FIFO_SIZE]; int m_completed_tx_h, m_completed_tx_t; - void reset_completed_tx() { m_completed_tx_t = m_completed_tx_h = 0; }; - void push_completed_tx(const u8 &data) { m_completed_tx[m_completed_tx_h++] = data; m_completed_tx_h &= FIFO_SIZE - 1; }; - u8 pop_completed_tx() { u8 val = m_completed_tx[m_completed_tx_t++]; m_completed_tx_t &= FIFO_SIZE - 1; return val; }; - bool empty_completed_tx() const { return m_completed_tx_h == m_completed_tx_t; }; - u8 curr_completed_tx() const { return m_completed_tx[m_completed_tx_t]; }; + void reset_completed_tx() { m_completed_tx_t = m_completed_tx_h = 0; } + void push_completed_tx(const u8 &data) { m_completed_tx[m_completed_tx_h++] = data; m_completed_tx_h &= FIFO_SIZE - 1; } + u8 pop_completed_tx() { u8 val = m_completed_tx[m_completed_tx_t++]; m_completed_tx_t &= FIFO_SIZE - 1; return val; } + bool empty_completed_tx() const { return m_completed_tx_h == m_completed_tx_t; } + u8 curr_completed_tx() const { return m_completed_tx[m_completed_tx_t]; } // FIFO for completed receive packets u8 m_completed_rx[FIFO_SIZE]; int m_completed_rx_h, m_completed_rx_t; - void reset_completed_rx() { m_completed_rx_t = m_completed_rx_h = 0; }; - void push_completed_rx(const u8 &data) { m_completed_rx[m_completed_rx_h++] = data; m_completed_rx_h &= FIFO_SIZE - 1; }; - u8 pop_completed_rx() { u8 val = m_completed_rx[m_completed_rx_t++]; m_completed_rx_t &= FIFO_SIZE - 1; return val; }; - bool empty_completed_rx() const { return m_completed_rx_h == m_completed_rx_t; }; - u8 curr_completed_rx() const { return m_completed_rx[m_completed_rx_t]; }; + void reset_completed_rx() { m_completed_rx_t = m_completed_rx_h = 0; } + void push_completed_rx(const u8 &data) { m_completed_rx[m_completed_rx_h++] = data; m_completed_rx_h &= FIFO_SIZE - 1; } + u8 pop_completed_rx() { u8 val = m_completed_rx[m_completed_rx_t++]; m_completed_rx_t &= FIFO_SIZE - 1; return val; } + bool empty_completed_rx() const { return m_completed_rx_h == m_completed_rx_t; } + u8 curr_completed_rx() const { return m_completed_rx[m_completed_rx_t]; } }; diff --git a/src/devices/machine/spg110_video.h b/src/devices/machine/spg110_video.h index 4e26b83ffec..6f8e0db0b5c 100644 --- a/src/devices/machine/spg110_video.h +++ b/src/devices/machine/spg110_video.h @@ -85,7 +85,7 @@ public: void tmap0_regs_w(offs_t offset, uint16_t data); void tmap1_regs_w(offs_t offset, uint16_t data); - auto write_video_irq_callback() { return m_video_irq_cb.bind(); }; + auto write_video_irq_callback() { return m_video_irq_cb.bind(); } protected: virtual void device_start() override; diff --git a/src/devices/machine/spg2xx.h b/src/devices/machine/spg2xx.h index 68d42675360..6b6bfd0d560 100644 --- a/src/devices/machine/spg2xx.h +++ b/src/devices/machine/spg2xx.h @@ -140,7 +140,7 @@ protected: template uint16_t adc_r() { return m_adc_in[Line](); } void eepromx_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_i2c_w(offset, data, mem_mask); } - uint8_t eepromx_r() { return m_i2c_r(); }; + uint8_t eepromx_r() { return m_i2c_r(); } void uart_tx_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0) { m_uart_tx(offset, data, mem_mask); } DECLARE_WRITE_LINE_MEMBER(spi_tx_w) { m_spi_tx(state); } diff --git a/src/devices/machine/spg2xx_io.h b/src/devices/machine/spg2xx_io.h index c04752eea96..c674ae72e6b 100644 --- a/src/devices/machine/spg2xx_io.h +++ b/src/devices/machine/spg2xx_io.h @@ -41,15 +41,15 @@ public: virtual uint16_t io_extended_r(offs_t offset); virtual void io_extended_w(offs_t offset, uint16_t data); - auto pal_read_callback() { return m_pal_read_cb.bind(); }; + auto pal_read_callback() { return m_pal_read_cb.bind(); } - auto write_timer_irq_callback() { return m_timer_irq_cb.bind(); }; - auto write_uart_adc_irq_callback() { return m_uart_adc_irq_cb.bind(); }; - auto write_external_irq_callback() { return m_external_irq_cb.bind(); }; - auto write_ffrq_tmr1_irq_callback() { return m_ffreq_tmr1_irq_cb.bind(); }; - auto write_ffrq_tmr2_irq_callback() { return m_ffreq_tmr2_irq_cb.bind(); }; + auto write_timer_irq_callback() { return m_timer_irq_cb.bind(); } + auto write_uart_adc_irq_callback() { return m_uart_adc_irq_cb.bind(); } + auto write_external_irq_callback() { return m_external_irq_cb.bind(); } + auto write_ffrq_tmr1_irq_callback() { return m_ffreq_tmr1_irq_cb.bind(); } + auto write_ffrq_tmr2_irq_callback() { return m_ffreq_tmr2_irq_cb.bind(); } - auto write_fiq_vector_callback() { return m_fiq_vector_w.bind(); }; + auto write_fiq_vector_callback() { return m_fiq_vector_w.bind(); } template uint16_t adc_r() { return m_adc_in[Line](); } diff --git a/src/devices/machine/spg2xx_video.h b/src/devices/machine/spg2xx_video.h index fe21cd39984..f4d3e5e93b6 100644 --- a/src/devices/machine/spg2xx_video.h +++ b/src/devices/machine/spg2xx_video.h @@ -30,9 +30,9 @@ public: uint16_t video_r(offs_t offset); void video_w(offs_t offset, uint16_t data); - auto sprlimit_read_callback() { return m_sprlimit_read_cb.bind(); }; + auto sprlimit_read_callback() { return m_sprlimit_read_cb.bind(); } - auto write_video_irq_callback() { return m_video_irq_cb.bind(); }; + auto write_video_irq_callback() { return m_video_irq_cb.bind(); } protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index f7c2334e477..b8840e712a2 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -351,7 +351,7 @@ protected: bool write_one_bit(const attotime &limit); virtual u8 get_drive_busy() const { return 0; } - virtual void clr_drive_busy() { }; + virtual void clr_drive_busy() { } }; class upd765a_device : public upd765_family_device { @@ -419,8 +419,8 @@ protected: virtual void execute_command(int cmd) override; virtual void command_end(floppy_info &fi, bool data_completion) override; virtual void index_callback(floppy_image_device *floppy, int state) override; - virtual u8 get_drive_busy() const override { return drive_busy; }; - virtual void clr_drive_busy() override { drive_busy = 0; }; + virtual u8 get_drive_busy() const override { return drive_busy; } + virtual void clr_drive_busy() override { drive_busy = 0; } void motor_control(int fid, bool start_motor); diff --git a/src/devices/machine/vrc4373.h b/src/devices/machine/vrc4373.h index 7d47d572940..7717a979e23 100644 --- a/src/devices/machine/vrc4373.h +++ b/src/devices/machine/vrc4373.h @@ -28,8 +28,8 @@ public: auto irq_cb() { return m_irq_cb.bind(); } template void set_cpu_tag(T &&tag) { m_cpu.set_tag(std::forward(tag)); } - void set_ram_size(int size) { m_ram_size = size; }; - void set_simm0_size(int size) { m_simm0_size = size; }; + void set_ram_size(int size) { m_ram_size = size; } + void set_simm0_size(int size) { m_simm0_size = size; } virtual void config_map(address_map &map) override; diff --git a/src/devices/machine/vrc5074.h b/src/devices/machine/vrc5074.h index 02bafd8d73d..749068b1ff8 100644 --- a/src/devices/machine/vrc5074.h +++ b/src/devices/machine/vrc5074.h @@ -31,7 +31,7 @@ public: virtual void device_post_load() override; template void set_cpu_tag(T &&tag) { m_cpu.set_tag(std::forward(tag)); } - void set_sdram_size(int index, int size) { m_sdram_size[index] = size; }; + void set_sdram_size(int index, int size) { m_sdram_size[index] = size; } void set_map(int id, const address_map_constructor &map, device_t *device); diff --git a/src/devices/sound/dac76.h b/src/devices/sound/dac76.h index 74f51690082..7f3cd1a52fd 100644 --- a/src/devices/sound/dac76.h +++ b/src/devices/sound/dac76.h @@ -37,18 +37,18 @@ public: dac76_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // chord - DECLARE_WRITE_LINE_MEMBER(b1_w) { m_chord &= ~(1 << 2); m_chord |= (state << 2); }; - DECLARE_WRITE_LINE_MEMBER(b2_w) { m_chord &= ~(1 << 1); m_chord |= (state << 1); }; - DECLARE_WRITE_LINE_MEMBER(b3_w) { m_chord &= ~(1 << 0); m_chord |= (state << 0); }; + DECLARE_WRITE_LINE_MEMBER(b1_w) { m_chord &= ~(1 << 2); m_chord |= (state << 2); } + DECLARE_WRITE_LINE_MEMBER(b2_w) { m_chord &= ~(1 << 1); m_chord |= (state << 1); } + DECLARE_WRITE_LINE_MEMBER(b3_w) { m_chord &= ~(1 << 0); m_chord |= (state << 0); } // step - DECLARE_WRITE_LINE_MEMBER(b4_w) { m_step &= ~(1 << 3); m_step |= (state << 3); }; - DECLARE_WRITE_LINE_MEMBER(b5_w) { m_step &= ~(1 << 2); m_step |= (state << 2); }; - DECLARE_WRITE_LINE_MEMBER(b6_w) { m_step &= ~(1 << 1); m_step |= (state << 1); }; - DECLARE_WRITE_LINE_MEMBER(b7_w) { m_step &= ~(1 << 0); m_step |= (state << 0); }; + DECLARE_WRITE_LINE_MEMBER(b4_w) { m_step &= ~(1 << 3); m_step |= (state << 3); } + DECLARE_WRITE_LINE_MEMBER(b5_w) { m_step &= ~(1 << 2); m_step |= (state << 2); } + DECLARE_WRITE_LINE_MEMBER(b6_w) { m_step &= ~(1 << 1); m_step |= (state << 1); } + DECLARE_WRITE_LINE_MEMBER(b7_w) { m_step &= ~(1 << 0); m_step |= (state << 0); } // sign bit - DECLARE_WRITE_LINE_MEMBER(sb_w) { m_sb = bool(state); }; + DECLARE_WRITE_LINE_MEMBER(sb_w) { m_sb = bool(state); } void update() { m_stream->update(); } diff --git a/src/devices/sound/discrete.h b/src/devices/sound/discrete.h index 20d445959fa..7929353dbce 100644 --- a/src/devices/sound/discrete.h +++ b/src/devices/sound/discrete.h @@ -4292,7 +4292,7 @@ public: set_intf(intf); } discrete_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); - virtual ~discrete_sound_device() { }; + virtual ~discrete_sound_device() { } /* --------------------------------- */ @@ -4344,7 +4344,7 @@ public: virtual void stop() { } virtual void save_state(); - virtual int max_output() { return 1; }; + virtual int max_output() { return 1; } inline bool interface(discrete_step_interface *&intf) const { intf = m_step_intf; return (intf != nullptr); } inline bool interface(discrete_input_interface *&intf) const { intf = m_input_intf; return (intf != nullptr); } diff --git a/src/devices/sound/es5506.h b/src/devices/sound/es5506.h index 4e45617c8b7..73f5c0a3c8f 100644 --- a/src/devices/sound/es5506.h +++ b/src/devices/sound/es5506.h @@ -114,7 +114,7 @@ protected: void generate_ulaw(es550x_voice *voice, s32 *dest); void generate_pcm(es550x_voice *voice, s32 *dest); inline void generate_irq(es550x_voice *voice, int v); - virtual void generate_samples(std::vector &outputs) {}; + virtual void generate_samples(std::vector &outputs) {} inline void update_index(es550x_voice *voice) { m_voice_index = voice->index; } virtual inline u16 read_sample(es550x_voice *voice, offs_t addr) { return 0; } diff --git a/src/devices/sound/gb.h b/src/devices/sound/gb.h index fee26bd8a74..dfd0e7e7a20 100644 --- a/src/devices/sound/gb.h +++ b/src/devices/sound/gb.h @@ -155,7 +155,7 @@ protected: void tick_envelope(struct SOUND &snd); void update_state(); bool dac_enabled(struct SOUND &snd); - virtual void corrupt_wave_ram() { }; + virtual void corrupt_wave_ram() { } uint64_t noise_period_cycles(); TIMER_CALLBACK_MEMBER(timer_callback); }; diff --git a/src/devices/sound/upd7759.h b/src/devices/sound/upd7759.h index 0084ac8c774..5508e8d92bb 100644 --- a/src/devices/sound/upd7759.h +++ b/src/devices/sound/upd7759.h @@ -26,7 +26,7 @@ public: DECLARE_WRITE_LINE_MEMBER( start_w ); DECLARE_READ_LINE_MEMBER( busy_r ); virtual void port_w(u8 data); - void set_start_delay(uint32_t data) { m_start_delay = data; }; + void set_start_delay(uint32_t data) { m_start_delay = data; } protected: virtual void internal_start_w(int state) = 0; diff --git a/src/devices/sound/ymz770.h b/src/devices/sound/ymz770.h index 6c87cef8de4..c8850b2e2bc 100644 --- a/src/devices/sound/ymz770.h +++ b/src/devices/sound/ymz770.h @@ -36,10 +36,10 @@ protected: virtual void sound_stream_update(sound_stream &stream, std::vector const &inputs, std::vector &outputs) override; virtual void internal_reg_write(uint8_t reg, uint8_t data); - virtual uint32_t get_phrase_offs(int phrase) { return m_rom[(4 * phrase) + 1] << 16 | m_rom[(4 * phrase) + 2] << 8 | m_rom[(4 * phrase) + 3]; }; - virtual uint32_t get_seq_offs(int sqn) { return m_rom[(4 * sqn) + 1 + 0x400] << 16 | m_rom[(4 * sqn) + 2 + 0x400] << 8 | m_rom[(4 * sqn) + 3 + 0x400]; }; + virtual uint32_t get_phrase_offs(int phrase) { return m_rom[(4 * phrase) + 1] << 16 | m_rom[(4 * phrase) + 2] << 8 | m_rom[(4 * phrase) + 3]; } + virtual uint32_t get_seq_offs(int sqn) { return m_rom[(4 * sqn) + 1 + 0x400] << 16 | m_rom[(4 * sqn) + 2 + 0x400] << 8 | m_rom[(4 * sqn) + 3 + 0x400]; } virtual void sequencer(); - uint8_t get_rom_byte(uint32_t offset) { return m_rom[offset % m_rom.bytes()]; }; // need optimise or its good as is ? + uint8_t get_rom_byte(uint32_t offset) { return m_rom[offset % m_rom.bytes()]; } // need optimise or its good as is ? ymz770_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t sclock); @@ -117,9 +117,9 @@ public: protected: virtual void internal_reg_write(uint8_t reg, uint8_t data) override; - virtual uint32_t get_phrase_offs(int phrase) override { int ph = phrase * 4; return ((m_rom[ph] & 0x0f) << 24 | m_rom[ph + 1] << 16 | m_rom[ph + 2] << 8 | m_rom[ph + 3]) * 2; }; - virtual uint32_t get_seq_offs(int sqn) override { int sq = sqn * 4 + 0x2000; return ((m_rom[sq] & 0x0f) << 24 | m_rom[sq + 1] << 16 | m_rom[sq + 2] << 8 | m_rom[sq + 3]) * 2; }; - uint32_t get_sqc_offs(int sqc) { int sq = sqc * 4 + 0x6000; return ((m_rom[sq] & 0x0f) << 24 | m_rom[sq + 1] << 16 | m_rom[sq + 2] << 8 | m_rom[sq + 3]) * 2; }; + virtual uint32_t get_phrase_offs(int phrase) override { int ph = phrase * 4; return ((m_rom[ph] & 0x0f) << 24 | m_rom[ph + 1] << 16 | m_rom[ph + 2] << 8 | m_rom[ph + 3]) * 2; } + virtual uint32_t get_seq_offs(int sqn) override { int sq = sqn * 4 + 0x2000; return ((m_rom[sq] & 0x0f) << 24 | m_rom[sq + 1] << 16 | m_rom[sq + 2] << 8 | m_rom[sq + 3]) * 2; } + uint32_t get_sqc_offs(int sqc) { int sq = sqc * 4 + 0x6000; return ((m_rom[sq] & 0x0f) << 24 | m_rom[sq + 1] << 16 | m_rom[sq + 2] << 8 | m_rom[sq + 3]) * 2; } virtual void sequencer() override; private: diff --git a/src/devices/video/315_5124.h b/src/devices/video/315_5124.h index 075d9836838..eaa78b0ac03 100644 --- a/src/devices/video/315_5124.h +++ b/src/devices/video/315_5124.h @@ -76,8 +76,8 @@ public: void hcount_latch(); bool hcount_latched() { return m_hcounter_latched; } - bitmap_rgb32 &get_bitmap() { return m_tmpbitmap; }; - bitmap_ind8 &get_y1_bitmap() { return m_y1_bitmap; }; + bitmap_rgb32 &get_bitmap() { return m_tmpbitmap; } + bitmap_ind8 &get_y1_bitmap() { return m_y1_bitmap; } /* update the screen */ u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); diff --git a/src/devices/video/315_5313.h b/src/devices/video/315_5313.h index 565f5d06f09..23bd51f3f33 100644 --- a/src/devices/video/315_5313.h +++ b/src/devices/video/315_5313.h @@ -73,8 +73,8 @@ public: TIMER_CALLBACK_MEMBER(irq4_on_timer_callback); void vdp_handle_eof(); void device_reset_old(); - void vdp_clear_irq6_pending() { m_irq6_pending = 0; }; - void vdp_clear_irq4_pending() { m_irq4_pending = 0; }; + void vdp_clear_irq6_pending() { m_irq6_pending = 0; } + void vdp_clear_irq4_pending() { m_irq4_pending = 0; } // set some VDP variables at start (shall be moved to a device interface?) void set_scanline_counter(int scanline) { m_scanline_counter = scanline; } diff --git a/src/devices/video/fixfreq.h b/src/devices/video/fixfreq.h index b32992fbf8d..f0f279a2832 100644 --- a/src/devices/video/fixfreq.h +++ b/src/devices/video/fixfreq.h @@ -38,7 +38,7 @@ struct fixedfreq_monitor_desc {} uint32_t monitor_clock() const noexcept { return m_monitor_clock; } - double clock_period() const noexcept { return 1.0 / (double) m_monitor_clock; }; + double clock_period() const noexcept { return 1.0 / (double) m_monitor_clock; } int minh() const noexcept { return (m_hbackporch - m_hsync) * m_hscale; } int maxh() const noexcept { return (m_hbackporch - m_hsync + m_hvisible) * m_hscale - 1; } diff --git a/src/devices/video/imagetek_i4100.h b/src/devices/video/imagetek_i4100.h index 9457cbce040..8b72600c328 100644 --- a/src/devices/video/imagetek_i4100.h +++ b/src/devices/video/imagetek_i4100.h @@ -232,7 +232,7 @@ public: // needed by Blazing Tornado / Grand Striker 2 for mixing with PSAC // (it's unknown how the chip enables external sync) - u32 get_background_pen() { return m_palette->pen(m_background_color); }; + u32 get_background_pen() { return m_palette->pen(m_background_color); } void v2_map(address_map &map); }; diff --git a/src/devices/video/ims_cvc.h b/src/devices/video/ims_cvc.h index b196272c059..0772ef150de 100644 --- a/src/devices/video/ims_cvc.h +++ b/src/devices/video/ims_cvc.h @@ -21,7 +21,7 @@ public: virtual void map(address_map &map) = 0; virtual u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, rectangle const &cliprect) = 0; - virtual void set_swapped(bool swapped) { m_swap = swapped ? 3 : 0; }; + virtual void set_swapped(bool swapped) { m_swap = swapped ? 3 : 0; } protected: ims_cvc_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock); @@ -222,7 +222,7 @@ class g364_device : public g332_device public: g364_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock); - virtual void set_swapped(bool swapped) override { m_swap = swapped ? 7 : 0; }; + virtual void set_swapped(bool swapped) override { m_swap = swapped ? 7 : 0; } }; DECLARE_DEVICE_TYPE(G300, g300_device) diff --git a/src/devices/video/topcat.h b/src/devices/video/topcat.h index b96ef3a3fc0..ca08f16b9d4 100644 --- a/src/devices/video/topcat.h +++ b/src/devices/video/topcat.h @@ -9,7 +9,7 @@ class topcat_device : public device_t { public: topcat_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - bool has_changed() { bool ret = m_changed; m_changed = false; return ret; }; + bool has_changed() { bool ret = m_changed; m_changed = false; return ret; } void set_fb_width(int _pixels) { m_fb_width = _pixels; } void set_fb_height(int _pixels) { m_fb_height = _pixels; } void set_planemask(int _mask) { m_plane_mask = _mask; }