diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/electron/exp.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/electron/exp.cpp')
-rw-r--r-- | src/devices/bus/electron/exp.cpp | 30 |
1 files changed, 22 insertions, 8 deletions
diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp index d2cd0abc824..9d78af460a9 100644 --- a/src/devices/bus/electron/exp.cpp +++ b/src/devices/bus/electron/exp.cpp @@ -32,6 +32,15 @@ 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 //************************************************************************** @@ -51,6 +60,15 @@ 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 //------------------------------------------------- @@ -75,13 +93,11 @@ void electron_expansion_slot_device::device_reset() // expbus_r - expansion data read //------------------------------------------------- -uint8_t electron_expansion_slot_device::expbus_r(offs_t offset) +uint8_t electron_expansion_slot_device::expbus_r(address_space &space, offs_t offset, uint8_t data) { - uint8_t data = 0xff; - if (m_card != nullptr) { - data = m_card->expbus_r(offset); + data = m_card->expbus_r(space, offset, data); } return data; @@ -91,11 +107,11 @@ uint8_t electron_expansion_slot_device::expbus_r(offs_t offset) // expbus_w - expansion data write //------------------------------------------------- -void electron_expansion_slot_device::expbus_w(offs_t offset, uint8_t data) +void electron_expansion_slot_device::expbus_w(address_space &space, offs_t offset, uint8_t data) { if (m_card != nullptr) { - m_card->expbus_w(offset, data); + m_card->expbus_w(space, offset, data); } } @@ -110,7 +126,6 @@ void electron_expansion_slot_device::expbus_w(offs_t offset, uint8_t data) //#include "fbprint.h" //#include "jafamode7.h" #include "plus1.h" -#include "plus2.h" #include "plus3.h" #include "pwrjoy.h" #include "rombox.h" @@ -125,7 +140,6 @@ 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); |