summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vic20
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-05 20:32:27 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-05 21:20:53 +0100
commit1c4865d66ff88a6891ebdde4580c3d61ee46ffa2 (patch)
tree268936fc8389b1a2adb8bfc3fa3006f12a4ccc95 /src/devices/bus/vic20
parente8516832e941e39fa1db11211249afa9f015e7bb (diff)
override part 1 (nw)
Diffstat (limited to 'src/devices/bus/vic20')
-rw-r--r--src/devices/bus/vic20/4cga.h6
-rw-r--r--src/devices/bus/vic20/exp.h30
-rw-r--r--src/devices/bus/vic20/fe3.h12
-rw-r--r--src/devices/bus/vic20/megacart.h16
-rw-r--r--src/devices/bus/vic20/std.h4
-rw-r--r--src/devices/bus/vic20/vic1010.h10
-rw-r--r--src/devices/bus/vic20/vic1011.h12
-rw-r--r--src/devices/bus/vic20/vic1110.h8
-rw-r--r--src/devices/bus/vic20/vic1111.h6
-rw-r--r--src/devices/bus/vic20/vic1112.h10
-rw-r--r--src/devices/bus/vic20/vic1210.h6
11 files changed, 60 insertions, 60 deletions
diff --git a/src/devices/bus/vic20/4cga.h b/src/devices/bus/vic20/4cga.h
index b852c5e0958..e95e682ae1d 100644
--- a/src/devices/bus/vic20/4cga.h
+++ b/src/devices/bus/vic20/4cga.h
@@ -31,7 +31,7 @@ public:
c64_4cga_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual ioport_constructor device_input_ports() const;
+ virtual ioport_constructor device_input_ports() const override;
DECLARE_WRITE_LINE_MEMBER(write_joy3_0) { if (state) m_joy3 |= 1; else m_joy3 &= ~1; update_output(); }
DECLARE_WRITE_LINE_MEMBER(write_joy3_1) { if (state) m_joy3 |= 2; else m_joy3 &= ~2; update_output(); }
@@ -45,10 +45,10 @@ public:
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start() override;
// device_pet_user_port_interface overrides
- virtual DECLARE_WRITE_LINE_MEMBER( input_l );
+ virtual DECLARE_WRITE_LINE_MEMBER( input_l ) override;
private:
void update_output();
diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h
index c613977d2e8..ddcffa82569 100644
--- a/src/devices/bus/vic20/exp.h
+++ b/src/devices/bus/vic20/exp.h
@@ -105,27 +105,27 @@ public:
protected:
// device-level overrides
- virtual void device_config_complete() { update_names(); }
- virtual void device_start();
- virtual void device_reset();
+ virtual void device_config_complete() override { update_names(); }
+ virtual void device_start() override;
+ virtual void device_reset() override;
// image-level overrides
- virtual bool call_load();
- virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry);
+ virtual bool call_load() override;
+ virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
- virtual iodevice_t image_type() const { return IO_CARTSLOT; }
+ virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
- virtual bool is_readable() const { return 1; }
- virtual bool is_writeable() const { return 0; }
- virtual bool is_creatable() const { return 0; }
- virtual bool must_be_loaded() const { return 0; }
- virtual bool is_reset_on_load() const { return 1; }
- virtual const char *image_interface() const { return "vic1001_cart"; }
- virtual const char *file_extensions() const { return "20,40,60,70,a0,b0,crt"; }
- virtual const option_guide *create_option_guide() const { return nullptr; }
+ virtual bool is_readable() const override { return 1; }
+ virtual bool is_writeable() const override { return 0; }
+ virtual bool is_creatable() const override { return 0; }
+ virtual bool must_be_loaded() const override { return 0; }
+ virtual bool is_reset_on_load() const override { return 1; }
+ virtual const char *image_interface() const override { return "vic1001_cart"; }
+ virtual const char *file_extensions() const override { return "20,40,60,70,a0,b0,crt"; }
+ virtual const option_guide *create_option_guide() const override { return nullptr; }
// slot interface overrides
- virtual void get_default_card_software(std::string &result);
+ virtual void get_default_card_software(std::string &result) override;
devcb_write_line m_write_irq;
devcb_write_line m_write_nmi;
diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h
index f42ae0e2f94..93669f5ace3 100644
--- a/src/devices/bus/vic20/fe3.h
+++ b/src/devices/bus/vic20/fe3.h
@@ -31,17 +31,17 @@ public:
vic20_final_expansion_3_t(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual const rom_entry *device_rom_region() const;
- virtual machine_config_constructor device_mconfig_additions() const;
+ virtual const rom_entry *device_rom_region() const override;
+ virtual machine_config_constructor device_mconfig_additions() const override;
protected:
// device-level overrides
- virtual void device_start();
- virtual void device_reset();
+ virtual void device_start() override;
+ virtual void device_reset() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
enum
diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h
index 5e9f82b10bf..678ddac1cff 100644
--- a/src/devices/bus/vic20/megacart.h
+++ b/src/devices/bus/vic20/megacart.h
@@ -31,21 +31,21 @@ public:
vic20_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual machine_config_constructor device_mconfig_additions() const;
+ virtual machine_config_constructor device_mconfig_additions() const override;
protected:
// device-level overrides
- virtual void device_start();
- virtual void device_reset();
+ virtual void device_start() override;
+ virtual void device_reset() override;
// device_nvram_interface overrides
- virtual void nvram_default() { }
- virtual void nvram_read(emu_file &file) { file.read(m_nvram, m_nvram.bytes()); }
- virtual void nvram_write(emu_file &file) { file.write(m_nvram, m_nvram.bytes()); }
+ virtual void nvram_default() override { }
+ virtual void nvram_read(emu_file &file) override { file.read(m_nvram, m_nvram.bytes()); }
+ virtual void nvram_write(emu_file &file) override { file.write(m_nvram, m_nvram.bytes()); }
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
int m_nvram_en;
diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h
index e7a70d338e5..0ea4cdec1ab 100644
--- a/src/devices/bus/vic20/std.h
+++ b/src/devices/bus/vic20/std.h
@@ -31,10 +31,10 @@ public:
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
};
diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h
index 56f194635b8..a481ba9cb08 100644
--- a/src/devices/bus/vic20/vic1010.h
+++ b/src/devices/bus/vic20/vic1010.h
@@ -38,16 +38,16 @@ public:
vic1010_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual machine_config_constructor device_mconfig_additions() const;
+ virtual machine_config_constructor device_mconfig_additions() const override;
protected:
// device-level overrides
- virtual void device_start();
- virtual void device_reset();
+ virtual void device_start() override;
+ virtual void device_reset() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
required_device<vic20_expansion_slot_device> m_slot1;
diff --git a/src/devices/bus/vic20/vic1011.h b/src/devices/bus/vic20/vic1011.h
index 9ec16e5fd2a..0e5b104b0e3 100644
--- a/src/devices/bus/vic20/vic1011.h
+++ b/src/devices/bus/vic20/vic1011.h
@@ -30,19 +30,19 @@ public:
vic1011_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual machine_config_constructor device_mconfig_additions() const;
+ virtual machine_config_constructor device_mconfig_additions() const override;
// device_pet_user_port_interface overrides
- virtual DECLARE_WRITE_LINE_MEMBER( input_d );
- virtual DECLARE_WRITE_LINE_MEMBER( input_e );
- virtual DECLARE_WRITE_LINE_MEMBER( input_j );
- virtual DECLARE_WRITE_LINE_MEMBER( input_m );
+ virtual DECLARE_WRITE_LINE_MEMBER( input_d ) override;
+ virtual DECLARE_WRITE_LINE_MEMBER( input_e ) override;
+ virtual DECLARE_WRITE_LINE_MEMBER( input_j ) override;
+ virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override;
DECLARE_WRITE_LINE_MEMBER( output_rxd );
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start() override;
private:
required_device<rs232_port_device> m_rs232;
diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h
index 4b6aecebd5a..21a4660d282 100644
--- a/src/devices/bus/vic20/vic1110.h
+++ b/src/devices/bus/vic20/vic1110.h
@@ -30,15 +30,15 @@ public:
vic1110_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual ioport_constructor device_input_ports() const;
+ virtual ioport_constructor device_input_ports() const override;
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
optional_shared_ptr<UINT8> m_ram;
diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h
index e20dc4a8e2d..83783da6878 100644
--- a/src/devices/bus/vic20/vic1111.h
+++ b/src/devices/bus/vic20/vic1111.h
@@ -31,11 +31,11 @@ public:
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
optional_shared_ptr<UINT8> m_ram;
diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h
index 6149866c020..fce5971c533 100644
--- a/src/devices/bus/vic20/vic1112.h
+++ b/src/devices/bus/vic20/vic1112.h
@@ -35,7 +35,7 @@ public:
vic1112_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// optional information overrides
- virtual machine_config_constructor device_mconfig_additions() const;
+ virtual machine_config_constructor device_mconfig_additions() const override;
// not really public
DECLARE_WRITE_LINE_MEMBER( via0_irq_w );
@@ -45,12 +45,12 @@ public:
protected:
// device-level overrides
- virtual void device_start();
- virtual void device_reset();
+ virtual void device_start() override;
+ virtual void device_reset() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
required_device<via6522_device> m_via0;
diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h
index 904336dd6c0..90de25cddae 100644
--- a/src/devices/bus/vic20/vic1210.h
+++ b/src/devices/bus/vic20/vic1210.h
@@ -32,11 +32,11 @@ public:
protected:
// device-level overrides
- virtual void device_start();
+ virtual void device_start() override;
// device_vic20_expansion_card_interface overrides
- virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
- virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3);
+ virtual UINT8 vic20_cd_r(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
+ virtual void vic20_cd_w(address_space &space, offs_t offset, UINT8 data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override;
private:
optional_shared_ptr<UINT8> m_ram;