summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/electron/cart/click.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/electron/cart/click.cpp')
-rw-r--r--src/devices/bus/electron/cart/click.cpp17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/devices/bus/electron/cart/click.cpp b/src/devices/bus/electron/cart/click.cpp
index a4a0bfd5af2..c8366a90ed4 100644
--- a/src/devices/bus/electron/cart/click.cpp
+++ b/src/devices/bus/electron/cart/click.cpp
@@ -27,7 +27,7 @@ void electron_click_device::device_add_mconfig(machine_config &config)
{
/* rtc */
MC146818(config, m_rtc, 32.768_kHz_XTAL);
- m_rtc->irq().set(FUNC(electron_click_device::irq_w));
+ m_rtc->irq().set(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::irq_w));
}
//-------------------------------------------------
@@ -88,7 +88,7 @@ void electron_click_device::device_reset()
// read - cartridge data read
//-------------------------------------------------
-uint8_t electron_click_device::read(address_space &space, offs_t offset, int infc, int infd, int romqa)
+uint8_t electron_click_device::read(address_space &space, offs_t offset, int infc, int infd, int romqa, int oe, int oe2)
{
uint8_t data = 0xff;
@@ -105,8 +105,7 @@ uint8_t electron_click_device::read(address_space &space, offs_t offset, int inf
break;
}
}
-
- if (!infc && !infd)
+ else if (oe)
{
offs_t rom_page_offset = (m_page_register & 0x03) * 0x2000;
offs_t ram_page_offset = ((m_page_register & 0x0c) >> 2) * 0x2000;
@@ -128,7 +127,7 @@ uint8_t electron_click_device::read(address_space &space, offs_t offset, int inf
// write - cartridge data write
//-------------------------------------------------
-void electron_click_device::write(address_space &space, offs_t offset, uint8_t data, int infc, int infd, int romqa)
+void electron_click_device::write(address_space &space, offs_t offset, uint8_t data, int infc, int infd, int romqa, int oe, int oe2)
{
if (infc)
{
@@ -143,8 +142,7 @@ void electron_click_device::write(address_space &space, offs_t offset, uint8_t d
break;
}
}
-
- if (!infc && !infd)
+ else if (oe)
{
offs_t ram_page_offset = ((m_page_register & 0x0c) >> 2) * 0x2000;
@@ -166,8 +164,3 @@ INPUT_CHANGED_MEMBER(electron_click_device::click_button)
m_slot->irq_w(CLEAR_LINE);
}
}
-
-WRITE_LINE_MEMBER(electron_click_device::irq_w)
-{
- m_slot->irq_w(state);
-}