summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbm2/exp.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/cbm2/exp.h')
-rw-r--r--src/devices/bus/cbm2/exp.h23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h
index b9f967137ca..83eac3589bf 100644
--- a/src/devices/bus/cbm2/exp.h
+++ b/src/devices/bus/cbm2/exp.h
@@ -29,7 +29,7 @@
#pragma once
-#include "softlist_dev.h"
+#include "imagedev/cartrom.h"
@@ -43,7 +43,7 @@ class device_cbm2_expansion_card_interface;
class cbm2_expansion_slot_device : public device_t,
public device_single_card_slot_interface<device_cbm2_expansion_card_interface>,
- public device_image_interface
+ public device_cartrom_image_interface
{
public:
// construction/destruction
@@ -66,24 +66,17 @@ public:
int phi2() { return clock(); }
protected:
- // device-level overrides
+ // device_t implementation
virtual void device_start() override;
- // image-level overrides
- virtual image_init_result call_load() override;
- virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); }
+ // device_image_interface implementation
+ virtual std::pair<std::error_condition, std::string> call_load() override;
- virtual iodevice_t image_type() const noexcept override { return IO_CARTSLOT; }
-
- virtual bool is_readable() const noexcept override { return true; }
- virtual bool is_writeable() const noexcept override { return false; }
- virtual bool is_creatable() const noexcept override { return false; }
- virtual bool must_be_loaded() const noexcept override { return false; }
virtual bool is_reset_on_load() const noexcept override { return true; }
virtual const char *image_interface() const noexcept override { return "cbm2_cart"; }
virtual const char *file_extensions() const noexcept override { return "20,40,60"; }
- // slot interface overrides
+ // device_slot_interface implementation
virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override;
device_cbm2_expansion_card_interface *m_card;
@@ -100,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);