summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/vic10/exp.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/vic10/exp.h')
-rw-r--r--src/devices/bus/vic10/exp.h32
1 files changed, 12 insertions, 20 deletions
diff --git a/src/devices/bus/vic10/exp.h b/src/devices/bus/vic10/exp.h
index c2b1f52ec70..58b6d555718 100644
--- a/src/devices/bus/vic10/exp.h
+++ b/src/devices/bus/vic10/exp.h
@@ -36,8 +36,7 @@
#pragma once
-#include "softlist_dev.h"
-#include "formats/cbm_crt.h"
+#include "imagedev/cartrom.h"
//**************************************************************************
@@ -50,7 +49,7 @@ class device_vic10_expansion_card_interface;
class vic10_expansion_slot_device : public device_t,
public device_single_card_slot_interface<device_vic10_expansion_card_interface>,
- public device_image_interface
+ public device_cartrom_image_interface
{
public:
// construction/destruction
@@ -73,34 +72,27 @@ public:
// computer interface
uint8_t cd_r(offs_t offset, uint8_t data, int lorom, int uprom, int exram);
void cd_w(offs_t offset, uint8_t data, int lorom, int uprom, int exram);
- DECLARE_READ_LINE_MEMBER( p0_r );
- DECLARE_WRITE_LINE_MEMBER( p0_w );
+ int p0_r();
+ void p0_w(int state);
// cartridge interface
- DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); }
- DECLARE_WRITE_LINE_MEMBER( res_w ) { m_write_res(state); }
- DECLARE_WRITE_LINE_MEMBER( cnt_w ) { m_write_cnt(state); }
- DECLARE_WRITE_LINE_MEMBER( sp_w ) { m_write_sp(state); }
+ void irq_w(int state) { m_write_irq(state); }
+ void res_w(int state) { m_write_res(state); }
+ void cnt_w(int state) { m_write_cnt(state); }
+ void sp_w(int state) { m_write_sp(state); }
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 true; }
virtual bool is_reset_on_load() const noexcept override { return true; }
virtual const char *image_interface() const noexcept override { return "vic10_cart"; }
virtual const char *file_extensions() const noexcept override { return "80,e0"; }
- // slot interface overrides
+ // device_slot_interface implementation
virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override;
devcb_write_line m_write_irq;