diff options
Diffstat (limited to 'src/mame/drivers/taitopjc.cpp')
-rw-r--r-- | src/mame/drivers/taitopjc.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/mame/drivers/taitopjc.cpp b/src/mame/drivers/taitopjc.cpp index c1d5586d5b9..8044e565339 100644 --- a/src/mame/drivers/taitopjc.cpp +++ b/src/mame/drivers/taitopjc.cpp @@ -126,22 +126,22 @@ private: required_memory_region m_polyrom; required_device<gfxdecode_device> m_gfxdecode; - DECLARE_READ64_MEMBER(video_r); - DECLARE_WRITE64_MEMBER(video_w); - DECLARE_READ64_MEMBER(ppc_common_r); - DECLARE_WRITE64_MEMBER(ppc_common_w); - DECLARE_READ64_MEMBER(dsp_r); - DECLARE_WRITE64_MEMBER(dsp_w); - DECLARE_READ8_MEMBER(tlcs_common_r); - DECLARE_WRITE8_MEMBER(tlcs_common_w); - DECLARE_READ8_MEMBER(tlcs_sound_r); - DECLARE_WRITE8_MEMBER(tlcs_sound_w); - DECLARE_WRITE16_MEMBER(tlcs_unk_w); - DECLARE_READ16_MEMBER(tms_dspshare_r); - DECLARE_WRITE16_MEMBER(tms_dspshare_w); - DECLARE_READ16_MEMBER(dsp_rom_r); - DECLARE_WRITE16_MEMBER(dsp_roml_w); - DECLARE_WRITE16_MEMBER(dsp_romh_w); + uint64_t video_r(offs_t offset, uint64_t mem_mask = ~0); + void video_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t ppc_common_r(offs_t offset, uint64_t mem_mask = ~0); + void ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint64_t dsp_r(offs_t offset, uint64_t mem_mask = ~0); + void dsp_w(offs_t offset, uint64_t data, uint64_t mem_mask = ~0); + uint8_t tlcs_common_r(offs_t offset); + void tlcs_common_w(offs_t offset, uint8_t data); + uint8_t tlcs_sound_r(offs_t offset); + void tlcs_sound_w(offs_t offset, uint8_t data); + void tlcs_unk_w(offs_t offset, uint16_t data); + uint16_t tms_dspshare_r(offs_t offset); + void tms_dspshare_w(offs_t offset, uint16_t data); + uint16_t dsp_rom_r(); + void dsp_roml_w(uint16_t data); + void dsp_romh_w(uint16_t data); virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update_taitopjc(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); @@ -310,7 +310,7 @@ void taitopjc_state::videochip_w(offs_t address, uint32_t data) } } -READ64_MEMBER(taitopjc_state::video_r) +uint64_t taitopjc_state::video_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -325,7 +325,7 @@ READ64_MEMBER(taitopjc_state::video_r) return r; } -WRITE64_MEMBER(taitopjc_state::video_w) +void taitopjc_state::video_w(offs_t offset, uint64_t data, uint64_t mem_mask) { if (offset == 0) { @@ -344,7 +344,7 @@ WRITE64_MEMBER(taitopjc_state::video_w) } } -READ64_MEMBER(taitopjc_state::ppc_common_r) +uint64_t taitopjc_state::ppc_common_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; uint32_t address; @@ -365,7 +365,7 @@ READ64_MEMBER(taitopjc_state::ppc_common_r) return r; } -WRITE64_MEMBER(taitopjc_state::ppc_common_w) +void taitopjc_state::ppc_common_w(offs_t offset, uint64_t data, uint64_t mem_mask) { uint32_t address = offset * 2; @@ -394,7 +394,7 @@ WRITE64_MEMBER(taitopjc_state::ppc_common_w) } } -READ64_MEMBER(taitopjc_state::dsp_r) +uint64_t taitopjc_state::dsp_r(offs_t offset, uint64_t mem_mask) { uint64_t r = 0; @@ -485,7 +485,7 @@ void taitopjc_state::print_display_list() } } -WRITE64_MEMBER(taitopjc_state::dsp_w) +void taitopjc_state::dsp_w(offs_t offset, uint64_t data, uint64_t mem_mask) { //logerror("dsp_w: %08X, %08X%08X, %08X%08X at %08X\n", offset, (uint32_t)(data >> 32), (uint32_t)(data), (uint32_t)(mem_mask >> 32), (uint32_t)(mem_mask), m_maincpu->pc()); @@ -544,7 +544,7 @@ void taitopjc_state::ppc603e_mem(address_map &map) -READ8_MEMBER(taitopjc_state::tlcs_common_r) +uint8_t taitopjc_state::tlcs_common_r(offs_t offset) { if (offset & 1) { @@ -556,7 +556,7 @@ READ8_MEMBER(taitopjc_state::tlcs_common_r) } } -WRITE8_MEMBER(taitopjc_state::tlcs_common_w) +void taitopjc_state::tlcs_common_w(offs_t offset, uint8_t data) { if (offset & 1) { @@ -590,7 +590,7 @@ WRITE8_MEMBER(taitopjc_state::tlcs_common_w) } } -READ8_MEMBER(taitopjc_state::tlcs_sound_r) +uint8_t taitopjc_state::tlcs_sound_r(offs_t offset) { if (offset == 0x17) { @@ -600,12 +600,12 @@ READ8_MEMBER(taitopjc_state::tlcs_sound_r) return 0; } -WRITE8_MEMBER(taitopjc_state::tlcs_sound_w) +void taitopjc_state::tlcs_sound_w(offs_t offset, uint8_t data) { // printf("tlcs_sound_w: %08X, %02X\n", offset, data); } -WRITE16_MEMBER(taitopjc_state::tlcs_unk_w) +void taitopjc_state::tlcs_unk_w(offs_t offset, uint16_t data) { if (offset == 0xc/2) { @@ -648,12 +648,12 @@ void taitopjc_state::mn10200_map(address_map &map) -READ16_MEMBER(taitopjc_state::tms_dspshare_r) +uint16_t taitopjc_state::tms_dspshare_r(offs_t offset) { return m_dsp_ram[offset]; } -WRITE16_MEMBER(taitopjc_state::tms_dspshare_w) +void taitopjc_state::tms_dspshare_w(offs_t offset, uint16_t data) { if (offset == 0xffc) { @@ -662,7 +662,7 @@ WRITE16_MEMBER(taitopjc_state::tms_dspshare_w) m_dsp_ram[offset] = data; } -READ16_MEMBER(taitopjc_state::dsp_rom_r) +uint16_t taitopjc_state::dsp_rom_r() { assert(m_dsp_rom_address < 0x800000); @@ -671,13 +671,13 @@ READ16_MEMBER(taitopjc_state::dsp_rom_r) return data; } -WRITE16_MEMBER(taitopjc_state::dsp_roml_w) +void taitopjc_state::dsp_roml_w(uint16_t data) { m_dsp_rom_address &= 0xffff0000; m_dsp_rom_address |= data; } -WRITE16_MEMBER(taitopjc_state::dsp_romh_w) +void taitopjc_state::dsp_romh_w(uint16_t data) { m_dsp_rom_address &= 0xffff; m_dsp_rom_address |= (uint32_t)(data) << 16; |