summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/i8155.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/i8155.cpp')
-rw-r--r--src/devices/machine/i8155.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/devices/machine/i8155.cpp b/src/devices/machine/i8155.cpp
index 779874a244d..b5027368633 100644
--- a/src/devices/machine/i8155.cpp
+++ b/src/devices/machine/i8155.cpp
@@ -406,7 +406,7 @@ void i8155_device::device_timer(emu_timer &timer, device_timer_id id, int param,
// io_r - register read
//-------------------------------------------------
-READ8_MEMBER( i8155_device::io_r )
+uint8_t i8155_device::io_r(offs_t offset)
{
uint8_t data = 0;
@@ -539,7 +539,7 @@ void i8155_device::register_w(int offset, uint8_t data)
// io_w - register write
//-------------------------------------------------
-WRITE8_MEMBER( i8155_device::io_w )
+void i8155_device::io_w(offs_t offset, uint8_t data)
{
register_w(offset, data);
}
@@ -549,7 +549,7 @@ WRITE8_MEMBER( i8155_device::io_w )
// memory_r - internal RAM read
//-------------------------------------------------
-READ8_MEMBER( i8155_device::memory_r )
+uint8_t i8155_device::memory_r(offs_t offset)
{
return m_ram[offset & 0xff];
}
@@ -559,7 +559,7 @@ READ8_MEMBER( i8155_device::memory_r )
// memory_w - internal RAM write
//-------------------------------------------------
-WRITE8_MEMBER( i8155_device::memory_w )
+void i8155_device::memory_w(offs_t offset, uint8_t data)
{
m_ram[offset & 0xff] = data;
}
@@ -569,7 +569,7 @@ WRITE8_MEMBER( i8155_device::memory_w )
// ale_w - address latch write
//-------------------------------------------------
-WRITE8_MEMBER( i8155_device::ale_w )
+void i8155_device::ale_w(offs_t offset, uint8_t data)
{
// I/O / memory select
m_io_m = BIT(offset, 0);
@@ -580,21 +580,21 @@ WRITE8_MEMBER( i8155_device::ale_w )
//-------------------------------------------------
-// read - memory or I/O read
+// data_r - memory or I/O read
//-------------------------------------------------
-READ8_MEMBER( i8155_device::read )
+uint8_t i8155_device::data_r()
{
uint8_t data = 0;
switch (m_io_m)
{
case MEMORY:
- data = memory_r(space, m_ad);
+ data = memory_r(m_ad);
break;
case IO:
- data = io_r(space, m_ad);
+ data = io_r(m_ad);
break;
}
@@ -603,19 +603,19 @@ READ8_MEMBER( i8155_device::read )
//-------------------------------------------------
-// write - memory or I/O write
+// data_w - memory or I/O write
//-------------------------------------------------
-WRITE8_MEMBER( i8155_device::write )
+void i8155_device::data_w(uint8_t data)
{
switch (m_io_m)
{
case MEMORY:
- memory_w(space, m_ad, data);
+ memory_w(m_ad, data);
break;
case IO:
- io_w(space, m_ad, data);
+ io_w(m_ad, data);
break;
}
}