diff options
author | Nigel Barnes <Pernod70@users.noreply.github.com> | 2019-01-23 02:06:55 +0000 |
---|---|---|
committer | Nigel Barnes <Pernod70@users.noreply.github.com> | 2019-01-23 02:10:10 +0000 |
commit | 89c09536ac56b428bca78ef915b975352b2c80ba (patch) | |
tree | c9f0bed9845d010ddfb56f00d9a5f0f4692b66a1 /src/devices/bus/electron/exp.cpp | |
parent | 709559b75416bef2ff72a28b263cd6cac7727118 (diff) |
electron: Amended cartridge slot interface to include OE and OE2 lines to specify ROM13.
- Added Slogger Plus 2 Expansion, Acorn Tube Interface and P.R.E.S. Advanced Plus 5 cartridge devices.
- Use derived 16Mhz clock on expansion bus and cartridge slots.
- Removed MCFG and added devcb3 in expansion and cartridge devices.
Diffstat (limited to 'src/devices/bus/electron/exp.cpp')
-rw-r--r-- | src/devices/bus/electron/exp.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp index 9d78af460a9..afa58d9c40a 100644 --- a/src/devices/bus/electron/exp.cpp +++ b/src/devices/bus/electron/exp.cpp @@ -32,15 +32,6 @@ device_electron_expansion_interface::device_electron_expansion_interface(const m } -//------------------------------------------------- -// ~device_electron_expansion_interface - destructor -//------------------------------------------------- - -device_electron_expansion_interface::~device_electron_expansion_interface() -{ -} - - //************************************************************************** // LIVE DEVICE //************************************************************************** @@ -60,15 +51,6 @@ electron_expansion_slot_device::electron_expansion_slot_device(const machine_con //------------------------------------------------- -// expansion_slot_device - destructor -//------------------------------------------------- - -electron_expansion_slot_device::~electron_expansion_slot_device() -{ -} - - -//------------------------------------------------- // device_start - device-specific startup //------------------------------------------------- @@ -93,11 +75,13 @@ void electron_expansion_slot_device::device_reset() // expbus_r - expansion data read //------------------------------------------------- -uint8_t electron_expansion_slot_device::expbus_r(address_space &space, offs_t offset, uint8_t data) +uint8_t electron_expansion_slot_device::expbus_r(address_space &space, offs_t offset) { + uint8_t data = 0xff; + if (m_card != nullptr) { - data = m_card->expbus_r(space, offset, data); + data = m_card->expbus_r(space, offset); } return data; @@ -126,6 +110,7 @@ void electron_expansion_slot_device::expbus_w(address_space &space, offs_t offse //#include "fbprint.h" //#include "jafamode7.h" #include "plus1.h" +#include "plus2.h" #include "plus3.h" #include "pwrjoy.h" #include "rombox.h" @@ -140,6 +125,7 @@ void electron_expansion_devices(device_slot_interface &device) //device.option_add("fbprint", ELECTRON_FBPRINT); //device.option_add("jafamode7", ELECTRON_JAFAMODE7); device.option_add("plus1", ELECTRON_PLUS1); + device.option_add("plus2", ELECTRON_PLUS2); device.option_add("plus3", ELECTRON_PLUS3); device.option_add("pwrjoy", ELECTRON_PWRJOY); device.option_add("rombox", ELECTRON_ROMBOX); |