diff options
Diffstat (limited to 'src/devices/bus/vidbrain')
-rw-r--r-- | src/devices/bus/vidbrain/exp.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/exp.h | 52 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/money_minder.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/money_minder.h | 4 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/std.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/std.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/timeshare.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/vidbrain/timeshare.h | 4 |
8 files changed, 37 insertions, 43 deletions
diff --git a/src/devices/bus/vidbrain/exp.cpp b/src/devices/bus/vidbrain/exp.cpp index c490c0605b2..808907678cc 100644 --- a/src/devices/bus/vidbrain/exp.cpp +++ b/src/devices/bus/vidbrain/exp.cpp @@ -153,13 +153,13 @@ std::string videobrain_expansion_slot_device::get_default_card_software(get_defa // bo_r - cartridge data read //------------------------------------------------- -uint8_t videobrain_expansion_slot_device::bo_r(address_space &space, offs_t offset, int cs1, int cs2) +uint8_t videobrain_expansion_slot_device::bo_r(offs_t offset, int cs1, int cs2) { uint8_t data = 0; if (m_cart != nullptr) { - data = m_cart->videobrain_bo_r(space, offset, cs1, cs2); + data = m_cart->videobrain_bo_r(offset, cs1, cs2); } return data; @@ -170,11 +170,11 @@ uint8_t videobrain_expansion_slot_device::bo_r(address_space &space, offs_t offs // bo_w - cartridge data write //------------------------------------------------- -void videobrain_expansion_slot_device::bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) +void videobrain_expansion_slot_device::bo_w(offs_t offset, uint8_t data, int cs1, int cs2) { if (m_cart != nullptr) { - m_cart->videobrain_bo_w(space, offset, data, cs1, cs2); + m_cart->videobrain_bo_w(offset, data, cs1, cs2); } } diff --git a/src/devices/bus/vidbrain/exp.h b/src/devices/bus/vidbrain/exp.h index fdb4b6a6ac7..e841df6c32c 100644 --- a/src/devices/bus/vidbrain/exp.h +++ b/src/devices/bus/vidbrain/exp.h @@ -49,21 +49,6 @@ #define VIDEOBRAIN_EXPANSION_SLOT_TAG "exp" - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_VIDEOBRAIN_EXPANSION_SLOT_ADD(_tag, _slot_intf, _def_slot) \ - MCFG_DEVICE_ADD(_tag, VIDEOBRAIN_EXPANSION_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) - - -#define MCFG_VIDEOBRAIN_EXPANSION_SLOT_EXTRES_CALLBACK(_write) \ - downcast<videobrain_expansion_slot_device &>(*device).set_extres_wr_callback(DEVCB_##_write); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -88,8 +73,8 @@ protected: virtual uint8_t* videobrain_ram_pointer(running_machine &machine, size_t size); // runtime - virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) { return 0; } - virtual void videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) { } + virtual uint8_t videobrain_bo_r(offs_t offset, int cs1, int cs2) { return 0; } + virtual void videobrain_bo_w(offs_t offset, uint8_t data, int cs1, int cs2) { } virtual void videobrain_extres_w() { } videobrain_expansion_slot_device *m_slot; @@ -110,20 +95,29 @@ class videobrain_expansion_slot_device : public device_t, { public: // construction/destruction - videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - - template <class Object> devcb_base &set_extres_wr_callback(Object &&cb) { return m_write_extres.set_callback(std::forward<Object>(cb)); } + template <typename T> + videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, char const* dflt) + : videobrain_expansion_slot_device(mconfig, tag, owner, 0) + { + option_reset(); + opts(*this); + set_default_option(dflt); + set_fixed(false); + } + videobrain_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); + + auto extres_wr_callback() { return m_write_extres.bind(); } // computer interface - uint8_t bo_r(address_space &space, offs_t offset, int cs1, int cs2); - void bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2); - - DECLARE_READ8_MEMBER( cs1_r ) { return bo_r(space, offset + 0x1000, 0, 1); } - DECLARE_WRITE8_MEMBER( cs1_w ) { bo_w(space, offset + 0x1000, data, 0, 1); } - DECLARE_READ8_MEMBER( cs2_r ) { return bo_r(space, offset + 0x1800, 1, 0); } - DECLARE_WRITE8_MEMBER( cs2_w ) { bo_w(space, offset + 0x1800, data, 1, 0); } - DECLARE_READ8_MEMBER( unmap_r ) { return bo_r(space, offset + 0x3000, 1, 0); } - DECLARE_WRITE8_MEMBER( unmap_w ) { bo_w(space, offset + 0x3000, data, 1, 0); } + uint8_t bo_r(offs_t offset, int cs1, int cs2); + void bo_w(offs_t offset, uint8_t data, int cs1, int cs2); + + uint8_t cs1_r(offs_t offset) { return bo_r(offset + 0x1000, 0, 1); } + void cs1_w(offs_t offset, uint8_t data) { bo_w(offset + 0x1000, data, 0, 1); } + uint8_t cs2_r(offs_t offset) { return bo_r(offset + 0x1800, 1, 0); } + void cs2_w(offs_t offset, uint8_t data) { bo_w(offset + 0x1800, data, 1, 0); } + uint8_t unmap_r(offs_t offset) { return bo_r(offset + 0x3000, 1, 0); } + void unmap_w(offs_t offset, uint8_t data) { bo_w(offset + 0x3000, data, 1, 0); } // cartridge interface DECLARE_WRITE_LINE_MEMBER( extres_w ) { m_write_extres(state); } diff --git a/src/devices/bus/vidbrain/money_minder.cpp b/src/devices/bus/vidbrain/money_minder.cpp index 81220a499b6..b0f4826ca5d 100644 --- a/src/devices/bus/vidbrain/money_minder.cpp +++ b/src/devices/bus/vidbrain/money_minder.cpp @@ -47,7 +47,7 @@ void videobrain_money_minder_cartridge_device::device_start() // videobrain_cd_r - cartridge data read //------------------------------------------------- -uint8_t videobrain_money_minder_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) +uint8_t videobrain_money_minder_cartridge_device::videobrain_bo_r(offs_t offset, int cs1, int cs2) { uint8_t data = 0; @@ -68,7 +68,7 @@ uint8_t videobrain_money_minder_cartridge_device::videobrain_bo_r(address_space // videobrain_bo_w - cartridge data write //------------------------------------------------- -void videobrain_money_minder_cartridge_device::videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) +void videobrain_money_minder_cartridge_device::videobrain_bo_w(offs_t offset, uint8_t data, int cs1, int cs2) { if (offset >= 0x3800) { diff --git a/src/devices/bus/vidbrain/money_minder.h b/src/devices/bus/vidbrain/money_minder.h index 20ead06960e..23f219c4962 100644 --- a/src/devices/bus/vidbrain/money_minder.h +++ b/src/devices/bus/vidbrain/money_minder.h @@ -33,8 +33,8 @@ protected: virtual void device_start() override; // device_videobrain_expansion_card_interface overrides - virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override; - virtual void videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) override; + virtual uint8_t videobrain_bo_r(offs_t offset, int cs1, int cs2) override; + virtual void videobrain_bo_w(offs_t offset, uint8_t data, int cs1, int cs2) override; }; diff --git a/src/devices/bus/vidbrain/std.cpp b/src/devices/bus/vidbrain/std.cpp index 82a6fc2761e..55b5c3ce22d 100644 --- a/src/devices/bus/vidbrain/std.cpp +++ b/src/devices/bus/vidbrain/std.cpp @@ -47,7 +47,7 @@ void videobrain_standard_cartridge_device::device_start() // videobrain_bo_r - cartridge data read //------------------------------------------------- -uint8_t videobrain_standard_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) +uint8_t videobrain_standard_cartridge_device::videobrain_bo_r(offs_t offset, int cs1, int cs2) { uint8_t data = 0; diff --git a/src/devices/bus/vidbrain/std.h b/src/devices/bus/vidbrain/std.h index 2dbbde3231f..7939501909f 100644 --- a/src/devices/bus/vidbrain/std.h +++ b/src/devices/bus/vidbrain/std.h @@ -33,7 +33,7 @@ protected: virtual void device_start() override; // device_videobrain_expansion_card_interface overrides - virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override; + virtual uint8_t videobrain_bo_r(offs_t offset, int cs1, int cs2) override; }; diff --git a/src/devices/bus/vidbrain/timeshare.cpp b/src/devices/bus/vidbrain/timeshare.cpp index f4997a55ddc..709f16f5c74 100644 --- a/src/devices/bus/vidbrain/timeshare.cpp +++ b/src/devices/bus/vidbrain/timeshare.cpp @@ -47,7 +47,7 @@ void videobrain_timeshare_cartridge_device::device_start() // videobrain_bo_r - cartridge data read //------------------------------------------------- -uint8_t videobrain_timeshare_cartridge_device::videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) +uint8_t videobrain_timeshare_cartridge_device::videobrain_bo_r(offs_t offset, int cs1, int cs2) { uint8_t data = 0; @@ -67,7 +67,7 @@ uint8_t videobrain_timeshare_cartridge_device::videobrain_bo_r(address_space &sp // videobrain_bo_w - cartridge data write //------------------------------------------------- -void videobrain_timeshare_cartridge_device::videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) +void videobrain_timeshare_cartridge_device::videobrain_bo_w(offs_t offset, uint8_t data, int cs1, int cs2) { if (!cs2) { diff --git a/src/devices/bus/vidbrain/timeshare.h b/src/devices/bus/vidbrain/timeshare.h index 971c5674320..7885772149d 100644 --- a/src/devices/bus/vidbrain/timeshare.h +++ b/src/devices/bus/vidbrain/timeshare.h @@ -33,8 +33,8 @@ protected: virtual void device_start() override; // device_videobrain_expansion_card_interface overrides - virtual uint8_t videobrain_bo_r(address_space &space, offs_t offset, int cs1, int cs2) override; - virtual void videobrain_bo_w(address_space &space, offs_t offset, uint8_t data, int cs1, int cs2) override; + virtual uint8_t videobrain_bo_r(offs_t offset, int cs1, int cs2) override; + virtual void videobrain_bo_w(offs_t offset, uint8_t data, int cs1, int cs2) override; }; |