summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-08 19:21:46 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-08 19:21:46 +0100
commitae55e9ffcba46faa090121ee56c4f8f0f7a69133 (patch)
tree025052500a3321a50c9808792adde0b09fd2a340
parent56ec560c881af787396032015b5194e14cd1148f (diff)
fix compile (nw)
-rw-r--r--src/devices/bus/m5/rom.h14
-rw-r--r--src/devices/bus/m5/slot.h30
-rw-r--r--src/mame/drivers/m5.cpp16
-rw-r--r--src/mame/includes/m5.h8
4 files changed, 37 insertions, 31 deletions
diff --git a/src/devices/bus/m5/rom.h b/src/devices/bus/m5/rom.h
index 8bf62a90fa8..dedd7555f1c 100644
--- a/src/devices/bus/m5/rom.h
+++ b/src/devices/bus/m5/rom.h
@@ -17,11 +17,11 @@ public:
m5_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_start() {}
- virtual void device_reset() {}
+ virtual void device_start() override {}
+ virtual void device_reset() override {}
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_rom);
+ virtual DECLARE_READ8_MEMBER(read_rom) override;
};
// ======================> m5_ram_device
@@ -33,12 +33,12 @@ public:
m5_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, UINT32 clock);
// device-level overrides
- virtual void device_start() {}
- virtual void device_reset() {}
+ virtual void device_start() override {}
+ virtual void device_reset() override {}
// reading and writing
- virtual DECLARE_READ8_MEMBER(read_ram);
- virtual DECLARE_WRITE8_MEMBER(write_ram);
+ virtual DECLARE_READ8_MEMBER(read_ram) override;
+ virtual DECLARE_WRITE8_MEMBER(write_ram) override;
};
diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h
index 8010f9f5b26..4f9c7e8fb41 100644
--- a/src/devices/bus/m5/slot.h
+++ b/src/devices/bus/m5/slot.h
@@ -64,30 +64,30 @@ public:
virtual ~m5_cart_slot_device();
// device-level overrides
- virtual void device_start();
- virtual void device_config_complete();
+ virtual void device_start() override;
+ virtual void device_config_complete() override;
// image-level overrides
- virtual bool call_load();
- virtual void call_unload() {}
- virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry);
+ virtual bool call_load() override;
+ virtual void call_unload() override {}
+ virtual bool call_softlist_load(software_list_device &swlist, const char *swname, const rom_entry *start_entry) override;
int get_type() { return m_type; }
void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); }
- virtual iodevice_t image_type() const { 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 option_guide *create_option_guide() const { return NULL; }
- virtual const char *image_interface() const { return "m5_cart"; }
- virtual const char *file_extensions() const { return "bin,rom"; }
+ virtual iodevice_t image_type() const override { return IO_CARTSLOT; }
+ virtual bool is_readable() const override { return 1; }
+ virtual bool is_writeable() const override { return 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 option_guide *create_option_guide() const override { return NULL; }
+ virtual const char *image_interface() const override { return "m5_cart"; }
+ virtual const char *file_extensions() const override { return "bin,rom"; }
// slot interface overrides
- virtual void get_default_card_software(std::string &result);
+ virtual std::string get_default_card_software() override;
// reading and writing
virtual DECLARE_READ8_MEMBER(read_rom);
diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp
index f9487075fb9..6c48e8786d0 100644
--- a/src/mame/drivers/m5.cpp
+++ b/src/mame/drivers/m5.cpp
@@ -1268,17 +1268,20 @@ void m5_state::machine_reset()
std::string region_tag;
//is ram/rom cart plugged in?
- if (m_cart1->exists())
+ if (m_cart1->exists())
+ {
if (m_cart1->get_type() > 0)
m_cart_ram=m_cart1;
else
m_cart=m_cart1;
- if (m_cart2->exists())
+ }
+ if (m_cart2->exists())
+ {
if (m_cart2->get_type() > 0)
m_cart_ram=m_cart2;
else
m_cart=m_cart2;
-
+ }
// no cart inserted - there is nothing to do - not allowed in original Sord m5
if (m_cart_ram == NULL && m_cart == NULL)
{
@@ -1375,17 +1378,20 @@ void brno_state::machine_reset()
program.unmap_write(0x0000, 0x5fff);
//is ram/rom cart plugged in?
- if (m_cart1->exists())
+ if (m_cart1->exists())
+ {
if (m_cart1->get_type() > 0)
m_cart_ram=m_cart1;
else
m_cart=m_cart1;
+ }
if (m_cart2->exists())
+ {
if (m_cart2->get_type() > 0)
m_cart_ram=m_cart2;
else
m_cart=m_cart2;
-
+ }
if (m_cart)
{
diff --git a/src/mame/includes/m5.h b/src/mame/includes/m5.h
index b338985cd2c..9b5d82b0c00 100644
--- a/src/mame/includes/m5.h
+++ b/src/mame/includes/m5.h
@@ -58,8 +58,8 @@ public:
required_ioport m_reset;
optional_ioport m_DIPS;
- virtual void machine_start();
- virtual void machine_reset();
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
DECLARE_READ8_MEMBER( sts_r );
DECLARE_WRITE8_MEMBER( com_w );
@@ -150,8 +150,8 @@ public:
// DECLARE_DEVICE_IMAGE_LOAD_MEMBER(m5_cart);
- virtual void machine_start();
- virtual void machine_reset();
+ virtual void machine_start() override;
+ virtual void machine_reset() override;
UINT8 m_rambank; // bank #
UINT8 m_ramcpu; //where Ramdisk bank is mapped