diff options
author | 2019-03-25 23:13:40 +0100 | |
---|---|---|
committer | 2019-03-25 23:13:40 +0100 | |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/machine/bankdev.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/machine/bankdev.cpp')
-rw-r--r-- | src/devices/machine/bankdev.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/devices/machine/bankdev.cpp b/src/devices/machine/bankdev.cpp index e8e141ff7e6..8c10286ccfa 100644 --- a/src/devices/machine/bankdev.cpp +++ b/src/devices/machine/bankdev.cpp @@ -6,7 +6,7 @@ // device type definition DEFINE_DEVICE_TYPE(ADDRESS_MAP_BANK, address_map_bank_device, "address_map_bank", "Address Map Bank") -address_map_bank_device::address_map_bank_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +address_map_bank_device::address_map_bank_device( const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock ) : device_t(mconfig, ADDRESS_MAP_BANK, tag, owner, clock), device_memory_interface(mconfig, *this), m_endianness(ENDIANNESS_NATIVE), @@ -46,42 +46,42 @@ void address_map_bank_device::amap64(address_map &map) map(0x00000000, 0xffffffff).rw(FUNC(address_map_bank_device::read64), FUNC(address_map_bank_device::write64)); } -void address_map_bank_device::write8(offs_t offset, u8 data) +WRITE8_MEMBER(address_map_bank_device::write8) { m_program->write_byte(m_offset + offset, data); } -void address_map_bank_device::write16(offs_t offset, u16 data, u16 mem_mask) +WRITE16_MEMBER(address_map_bank_device::write16) { m_program->write_word(m_offset + (offset << (m_shift+1)), data, mem_mask); } -void address_map_bank_device::write32(offs_t offset, u32 data, u32 mem_mask) +WRITE32_MEMBER(address_map_bank_device::write32) { m_program->write_dword(m_offset + (offset << (m_shift+2)), data, mem_mask); } -void address_map_bank_device::write64(offs_t offset, u64 data, u64 mem_mask) +WRITE64_MEMBER(address_map_bank_device::write64) { m_program->write_qword(m_offset + (offset << (m_shift+3)), data, mem_mask); } -u8 address_map_bank_device::read8(offs_t offset) +READ8_MEMBER(address_map_bank_device::read8) { return m_program->read_byte(m_offset + offset); } -u16 address_map_bank_device::read16(offs_t offset, u16 mem_mask) +READ16_MEMBER(address_map_bank_device::read16) { return m_program->read_word(m_offset + (offset << (m_shift+1)), mem_mask); } -u32 address_map_bank_device::read32(offs_t offset, u32 mem_mask) +READ32_MEMBER(address_map_bank_device::read32) { return m_program->read_dword(m_offset + (offset << (m_shift+2)), mem_mask); } -u64 address_map_bank_device::read64(offs_t offset, u64 mem_mask) +READ64_MEMBER(address_map_bank_device::read64) { return m_program->read_qword(m_offset + (offset << (m_shift+3)), mem_mask); } |