summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nubus/nubus_asntmc3b.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nubus/nubus_asntmc3b.cpp')
-rw-r--r--src/devices/bus/nubus/nubus_asntmc3b.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/nubus/nubus_asntmc3b.cpp b/src/devices/bus/nubus/nubus_asntmc3b.cpp
index f68328ef45f..c3692ad441c 100644
--- a/src/devices/bus/nubus/nubus_asntmc3b.cpp
+++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp
@@ -111,10 +111,10 @@ void nubus_mac8390_device::device_start()
// TODO: move 24-bit mirroring down into nubus.c
uint32_t ofs_24bit = slotno()<<20;
- nubus().install_device(slotspace+0xd0000, slotspace+0xdffff, read8_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_r)), write8_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_w)));
- nubus().install_device(slotspace+0xe0000, slotspace+0xe003f, read32_delegate(*this, FUNC(nubus_mac8390_device::en_r)), write32_delegate(*this, FUNC(nubus_mac8390_device::en_w)));
- nubus().install_device(slotspace+0xd0000+ofs_24bit, slotspace+0xdffff+ofs_24bit, read8_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_r)), write8_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_w)));
- nubus().install_device(slotspace+0xe0000+ofs_24bit, slotspace+0xe003f+ofs_24bit, read32_delegate(*this, FUNC(nubus_mac8390_device::en_r)), write32_delegate(*this, FUNC(nubus_mac8390_device::en_w)));
+ nubus().install_device(slotspace+0xd0000, slotspace+0xdffff, read8sm_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_r)), write8sm_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_w)));
+ nubus().install_device(slotspace+0xe0000, slotspace+0xe003f, read32s_delegate(*this, FUNC(nubus_mac8390_device::en_r)), write32s_delegate(*this, FUNC(nubus_mac8390_device::en_w)));
+ nubus().install_device(slotspace+0xd0000+ofs_24bit, slotspace+0xdffff+ofs_24bit, read8sm_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_r)), write8sm_delegate(*this, FUNC(nubus_mac8390_device::asntm3b_ram_w)));
+ nubus().install_device(slotspace+0xe0000+ofs_24bit, slotspace+0xe003f+ofs_24bit, read32s_delegate(*this, FUNC(nubus_mac8390_device::en_r)), write32s_delegate(*this, FUNC(nubus_mac8390_device::en_w)));
}
//-------------------------------------------------
@@ -127,19 +127,19 @@ void nubus_mac8390_device::device_reset()
memcpy(m_prom, m_dp83902->get_mac(), 6);
}
-WRITE8_MEMBER( nubus_mac8390_device::asntm3b_ram_w )
+void nubus_mac8390_device::asntm3b_ram_w(offs_t offset, uint8_t data)
{
// printf("MC3NB: CPU wrote %02x to RAM @ %x\n", data, offset);
m_ram[offset] = data;
}
-READ8_MEMBER( nubus_mac8390_device::asntm3b_ram_r )
+uint8_t nubus_mac8390_device::asntm3b_ram_r(offs_t offset)
{
// printf("MC3NB: CPU read %02x @ RAM %x\n", m_ram[offset], offset);
return m_ram[offset];
}
-WRITE32_MEMBER( nubus_mac8390_device::en_w )
+void nubus_mac8390_device::en_w(offs_t offset, uint32_t data, uint32_t mem_mask)
{
if (mem_mask == 0xff000000)
{
@@ -156,7 +156,7 @@ WRITE32_MEMBER( nubus_mac8390_device::en_w )
}
}
-READ32_MEMBER( nubus_mac8390_device::en_r )
+uint32_t nubus_mac8390_device::en_r(offs_t offset, uint32_t mem_mask)
{
if (mem_mask == 0xff000000)
{