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.cpp21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/devices/bus/electron/cart/click.cpp b/src/devices/bus/electron/cart/click.cpp
index bdeebeba79b..a4a0bfd5af2 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(DEVICE_SELF_OWNER, FUNC(electron_cartslot_device::irq_w));
+ m_rtc->irq().set(FUNC(electron_click_device::irq_w));
}
//-------------------------------------------------
@@ -88,7 +88,7 @@ void electron_click_device::device_reset()
// read - cartridge data read
//-------------------------------------------------
-uint8_t electron_click_device::read(offs_t offset, int infc, int infd, int romqa, int oe, int oe2)
+uint8_t electron_click_device::read(address_space &space, offs_t offset, int infc, int infd, int romqa)
{
uint8_t data = 0xff;
@@ -98,14 +98,15 @@ uint8_t electron_click_device::read(offs_t offset, int infc, int infd, int romqa
{
case 0xf8:
case 0xf9:
- data = m_rtc->read(offset & 0x01);
+ data = m_rtc->read(space, offset & 0x01);
break;
case 0xfc:
data = m_page_register;
break;
}
}
- else if (oe)
+
+ if (!infc && !infd)
{
offs_t rom_page_offset = (m_page_register & 0x03) * 0x2000;
offs_t ram_page_offset = ((m_page_register & 0x0c) >> 2) * 0x2000;
@@ -127,7 +128,7 @@ uint8_t electron_click_device::read(offs_t offset, int infc, int infd, int romqa
// write - cartridge data write
//-------------------------------------------------
-void electron_click_device::write(offs_t offset, uint8_t data, int infc, int infd, int romqa, int oe, int oe2)
+void electron_click_device::write(address_space &space, offs_t offset, uint8_t data, int infc, int infd, int romqa)
{
if (infc)
{
@@ -135,14 +136,15 @@ void electron_click_device::write(offs_t offset, uint8_t data, int infc, int inf
{
case 0xf8:
case 0xf9:
- m_rtc->write(offset & 0x01, data);
+ m_rtc->write(space, offset & 0x01, data);
break;
case 0xfc:
m_page_register = data;
break;
}
}
- else if (oe)
+
+ if (!infc && !infd)
{
offs_t ram_page_offset = ((m_page_register & 0x0c) >> 2) * 0x2000;
@@ -164,3 +166,8 @@ 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);
+}