devices/*: Removed extra semicolons after function bodies in headers. (#9275)

This commit is contained in:
0kmg 2022-02-06 13:59:38 -09:00 committed by GitHub
parent 22e7beb2fc
commit ae373baa24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
97 changed files with 300 additions and 300 deletions

View File

@ -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

View File

@ -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; }

View File

@ -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;

View File

@ -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;

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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; }

View File

@ -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);

View File

@ -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); }

View File

@ -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:

View File

@ -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);

View File

@ -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); }

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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;

View File

@ -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

View File

@ -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);

View File

@ -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);

View File

@ -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);

View File

@ -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) { }

View File

@ -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); }

View File

@ -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<i8255_device> m_ppi;
required_device<acia6850_device> m_acia;

View File

@ -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;

View File

@ -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;

View File

@ -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; }

View File

@ -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;

View File

@ -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(); }

View File

@ -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:

View File

@ -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;

View File

@ -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;

View File

@ -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<centronics_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<centronics_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<centronics_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<centronics_device> m_centronics;

View File

@ -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(); }

View File

@ -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<spectrum_expansion_slot_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<centronics_device> m_centronics;

View File

@ -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

View File

@ -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:

View File

@ -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<centronics_device> m_centronics;
required_ioport m_conf;

View File

@ -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); }

View File

@ -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); }

View File

@ -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:

View File

@ -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);

View File

@ -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:

View File

@ -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;

View File

@ -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 );

View File

@ -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;

View File

@ -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) { }

View File

@ -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 );

View File

@ -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;
};

View File

@ -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

View File

@ -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);

View File

@ -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<address_map_bank_device> m_io;
};

View File

@ -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<address_map_bank_device> m_mem;
required_device<address_map_bank_device> m_io;

View File

@ -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

View File

@ -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 &params) override;
private:

View File

@ -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

View File

@ -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;

View File

@ -135,9 +135,9 @@ protected:
virtual std::unique_ptr<util::disasm_interface> 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 <typename... T> void set_tas_write_callback(T &&... args) { m_tas_write_callback.set(std::forward<T>(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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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<util::disasm_interface> 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

View File

@ -48,7 +48,7 @@ protected:
// device_disasm_interface overrides
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
virtual bool is_6809() override { return false; };
virtual bool is_6809() override { return false; }
private:
typedef m6809_base_device super;

View File

@ -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

View File

@ -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;

View File

@ -53,7 +53,7 @@ protected:
// device_disasm_interface overrides
virtual std::unique_ptr<util::disasm_interface> 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); }

View File

@ -71,7 +71,7 @@ protected:
// device_disasm_interface overrides
virtual std::unique_ptr<util::disasm_interface> 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;

View File

@ -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();

View File

@ -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;

View File

@ -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;

View File

@ -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);

View File

@ -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); }

View File

@ -50,7 +50,7 @@ protected:
// device_disasm_interface overrides
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
virtual int get_mode() const override { return 1; };
virtual int get_mode() const override { return 1; }
void interrupt(int int_num);

View File

@ -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;

View File

@ -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];

View File

@ -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

View File

@ -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;

View File

@ -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);

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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]; }
};

View File

@ -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;

View File

@ -140,7 +140,7 @@ protected:
template <size_t Line> 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); }

View File

@ -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 <size_t Line> uint16_t adc_r() { return m_adc_in[Line](); }

View File

@ -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;

View File

@ -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);

View File

@ -28,8 +28,8 @@ public:
auto irq_cb() { return m_irq_cb.bind(); }
template <typename T> void set_cpu_tag(T &&tag) { m_cpu.set_tag(std::forward<T>(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;

View File

@ -31,7 +31,7 @@ public:
virtual void device_post_load() override;
template <typename T> void set_cpu_tag(T &&tag) { m_cpu.set_tag(std::forward<T>(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);

View File

@ -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(); }

View File

@ -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); }

View File

@ -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<write_stream_view> &outputs) {};
virtual void generate_samples(std::vector<write_stream_view> &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; }

View File

@ -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);
};

View File

@ -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;

View File

@ -36,10 +36,10 @@ protected:
virtual void sound_stream_update(sound_stream &stream, std::vector<read_stream_view> const &inputs, std::vector<write_stream_view> &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:

View File

@ -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);

View File

@ -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; }

View File

@ -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; }

View File

@ -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);
};

View File

@ -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)

View File

@ -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; }