diff options
author | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-21 19:57:43 +0200 |
---|---|---|
committer | Ivan Vangelista <mesgnet@yahoo.it> | 2020-05-21 19:57:43 +0200 |
commit | 889e65792ed3eb0e90c1c6cf266b6f4a08b9a26b (patch) | |
tree | 65d69f004e494e2fa57526066e022886416d07e6 /src/devices/bus/nubus | |
parent | 6b8cb09ee7cfdbc6415aebe4670b44e5b5756a2a (diff) |
last batch of changes to make the https://github.com/mamedev/mame/tree/devcb-no-space branch build. (nw)
Diffstat (limited to 'src/devices/bus/nubus')
-rw-r--r-- | src/devices/bus/nubus/nubus_asntmc3b.cpp | 12 | ||||
-rw-r--r-- | src/devices/bus/nubus/nubus_asntmc3b.h | 4 |
2 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 2da81f791db..a96dbcfc655 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.cpp +++ b/src/devices/bus/nubus/nubus_asntmc3b.cpp @@ -145,12 +145,12 @@ WRITE32_MEMBER( nubus_mac8390_device::en_w ) if (mem_mask == 0xff000000) { // printf("%02x to 8390 @ %x\n", data>>24, 0xf-offset); - m_dp83902->dp8390_w(space, 0xf-offset, data>>24); + m_dp83902->dp8390_w(0xf-offset, data>>24); } else if (mem_mask == 0xffff0000) { m_dp83902->dp8390_cs(1); - m_dp83902->dp8390_w(space, 0xf-offset, data>>16); + m_dp83902->dp8390_w(0xf-offset, data>>16); m_dp83902->dp8390_cs(0); } else @@ -163,12 +163,12 @@ READ32_MEMBER( nubus_mac8390_device::en_r ) { if (mem_mask == 0xff000000) { - return (m_dp83902->dp8390_r(space, 0xf-offset)<<24); + return (m_dp83902->dp8390_r(0xf-offset)<<24); } else if (mem_mask == 0xffff0000) { m_dp83902->dp8390_cs(1); - return (m_dp83902->dp8390_r(space, 0xf-offset)<<16); + return (m_dp83902->dp8390_r(0xf-offset)<<16); m_dp83902->dp8390_cs(0); } else @@ -191,13 +191,13 @@ WRITE_LINE_MEMBER( nubus_mac8390_device::dp_irq_w ) } } -READ8_MEMBER( nubus_mac8390_device::dp_mem_read ) +uint8_t nubus_mac8390_device::dp_mem_read(offs_t offset) { // printf("MC3NB: 8390 read RAM @ %x = %02x\n", offset, m_ram[offset]); return m_ram[offset]; } -WRITE8_MEMBER( nubus_mac8390_device::dp_mem_write ) +void nubus_mac8390_device::dp_mem_write(offs_t offset, uint8_t data) { // printf("MC3NB: 8390 wrote %02x to RAM @ %x\n", data, offset); m_ram[offset] = data; diff --git a/src/devices/bus/nubus/nubus_asntmc3b.h b/src/devices/bus/nubus/nubus_asntmc3b.h index 7b1ee196a13..177cf30900b 100644 --- a/src/devices/bus/nubus/nubus_asntmc3b.h +++ b/src/devices/bus/nubus/nubus_asntmc3b.h @@ -39,8 +39,8 @@ protected: private: void dp_irq_w(int state); - DECLARE_READ8_MEMBER(dp_mem_read); - DECLARE_WRITE8_MEMBER(dp_mem_write); + uint8_t dp_mem_read(offs_t offset); + void dp_mem_write(offs_t offset, uint8_t data); uint8_t m_ram[0x20000]; uint8_t m_prom[16]; |