diff options
Diffstat (limited to 'src/mame/drivers/naomi.cpp')
-rw-r--r-- | src/mame/drivers/naomi.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/drivers/naomi.cpp b/src/mame/drivers/naomi.cpp index 2ef4a928e45..e17f3276694 100644 --- a/src/mame/drivers/naomi.cpp +++ b/src/mame/drivers/naomi.cpp @@ -1643,7 +1643,7 @@ Premier Eleven #define CPU_CLOCK (200000000) -READ16_MEMBER(naomi_state::naomi_g2bus_r ) +uint16_t naomi_state::naomi_g2bus_r(offs_t offset) { // G2 bus is 16bit wide, "floating bus" value is 16 most significant address bits u32 address = 0x01000000 + offset * 2; @@ -1655,7 +1655,7 @@ READ16_MEMBER(naomi_state::naomi_g2bus_r ) */ -READ64_MEMBER(naomi_state::eeprom_93c46a_r ) +uint64_t naomi_state::eeprom_93c46a_r() { int res; // bit 0 - EEPROM type: 0 - 93C46, 1 - X76F100 TODO @@ -1665,7 +1665,7 @@ READ64_MEMBER(naomi_state::eeprom_93c46a_r ) return res; } -WRITE64_MEMBER(naomi_state::eeprom_93c46a_w ) +void naomi_state::eeprom_93c46a_w(uint64_t data) { /* bit 4 is data */ /* bit 2 is clock */ @@ -1784,7 +1784,7 @@ void naomi_state::naomi_map(address_map &map) */ // example hookup for accessing both PVRs, to be extended to everything else. -WRITE32_MEMBER(naomi2_state::both_pvr2_ta_w) +void naomi2_state::both_pvr2_ta_w(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask) { space.write_dword(0x005f8000|offset*4,data,mem_mask); space.write_dword(0x025f8000|offset*4,data,mem_mask); @@ -1860,13 +1860,13 @@ void naomi_state::naomi_port(address_map &map) * Atomiswave address map, almost identical to Dreamcast */ -READ64_MEMBER(atomiswave_state::aw_flash_r) +uint64_t atomiswave_state::aw_flash_r(offs_t offset) { return (uint64_t)m_awflash->read(offset*8) | (uint64_t)m_awflash->read((offset*8)+1)<<8 | (uint64_t)m_awflash->read((offset*8)+2)<<16 | (uint64_t)m_awflash->read((offset*8)+3)<<24 | (uint64_t)m_awflash->read((offset*8)+4)<<32 | (uint64_t)m_awflash->read((offset*8)+5)<<40 | (uint64_t)m_awflash->read((offset*8)+6)<<48 | (uint64_t)m_awflash->read((offset*8)+7)<<56; } -WRITE64_MEMBER(atomiswave_state::aw_flash_w) +void atomiswave_state::aw_flash_w(offs_t offset, uint64_t data, uint64_t mem_mask) { int i; uint32_t addr = offset * 8; @@ -1908,7 +1908,7 @@ inline int atomiswave_state::decode_reg32_64(uint32_t offset, uint64_t mem_mask, return reg; } -READ64_MEMBER(atomiswave_state::aw_modem_r ) +uint64_t atomiswave_state::aw_modem_r(offs_t offset, uint64_t mem_mask) { int reg; uint64_t shift; @@ -1934,7 +1934,7 @@ READ64_MEMBER(atomiswave_state::aw_modem_r ) return 0; } -WRITE64_MEMBER(atomiswave_state::aw_modem_w ) +void atomiswave_state::aw_modem_w(offs_t offset, uint64_t data, uint64_t mem_mask) { int reg; uint64_t shift; @@ -10741,7 +10741,7 @@ void atomiswave_state::init_atomiswave() m_maincpu->sh2drc_add_fastram(0x00000000, 0x0000ffff, true, ROM); } -READ64_MEMBER(atomiswave_state::xtrmhnt2_hack_r) +uint64_t atomiswave_state::xtrmhnt2_hack_r() { // disable ALL.Net board check if (m_maincpu->pc() == 0xc03cb30) @@ -10759,7 +10759,7 @@ READ64_MEMBER(atomiswave_state::xtrmhnt2_hack_r) void atomiswave_state::init_xtrmhnt2() { init_atomiswave(); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000000, 0x100011f, read64_delegate(*this, FUNC(atomiswave_state::xtrmhnt2_hack_r))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x1000000, 0x100011f, read64smo_delegate(*this, FUNC(atomiswave_state::xtrmhnt2_hack_r))); } ROM_START( fotns ) |