diff options
Diffstat (limited to 'src/mame/includes/cps3.h')
-rw-r--r-- | src/mame/includes/cps3.h | 46 |
1 files changed, 21 insertions, 25 deletions
diff --git a/src/mame/includes/cps3.h b/src/mame/includes/cps3.h index 19d603c9e5c..09941fb47a1 100644 --- a/src/mame/includes/cps3.h +++ b/src/mame/includes/cps3.h @@ -40,11 +40,10 @@ public: , m_tilemap30_regs_base(*this, "tmap30_regs") , m_tilemap40_regs_base(*this, "tmap40_regs") , m_tilemap50_regs_base(*this, "tmap50_regs") - , m_ss_ram(*this, "ss_ram") - , m_fullscreenzoom(*this, "fullscreenzoom") - , m_0xc0000000_ram(*this, "0xc0000000_ram") + , m_ppu_crtc_zoom(*this, "ppu_crtc_zoom") + , m_sh2cache_ram(*this, "sh2cache_ram") , m_decrypted_gamerom(*this, "decrypted_gamerom") - , m_0xc0000000_ram_decrypted(*this, "0xc0000000_ram_decrypted") + , m_sh2cache_ram_decrypted(*this, "sh2cache_ram_decrypted") , m_user4_region(*this, "user4") , m_user5_region(*this, "user5") { @@ -95,11 +94,10 @@ protected: required_shared_ptr<u32> m_tilemap30_regs_base; required_shared_ptr<u32> m_tilemap40_regs_base; required_shared_ptr<u32> m_tilemap50_regs_base; - required_shared_ptr<u32> m_ss_ram; - required_shared_ptr<u32> m_fullscreenzoom; - required_shared_ptr<u32> m_0xc0000000_ram; + required_shared_ptr<u32> m_ppu_crtc_zoom; + required_shared_ptr<u32> m_sh2cache_ram; required_shared_ptr<u32> m_decrypted_gamerom; - required_shared_ptr<u32> m_0xc0000000_ram_decrypted; + required_shared_ptr<u32> m_sh2cache_ram_decrypted; optional_memory_region m_user4_region; optional_memory_region m_user5_region; @@ -108,9 +106,11 @@ private: u32 m_cram_gfxflash_bank; std::unique_ptr<u32[]> m_char_ram; std::unique_ptr<u32[]> m_eeprom; - u32 m_ss_pal_base; - u32 m_unk_vidregs[0x20/4]; - u32 m_ss_bank_base; + std::unique_ptr<u8[]> m_ss_ram; + u32 m_ppu_gscroll[0x20/4]; + s16 m_ss_hscroll; + s16 m_ss_vscroll; + u8 m_ss_pal_base; u32 m_screenwidth; std::unique_ptr<u32[]> m_mame_colours; bitmap_rgb32 m_renderbuffer_bitmap; @@ -135,9 +135,10 @@ private: u16 m_lastb2; u8* m_user5; - DECLARE_READ32_MEMBER(ssram_r); - DECLARE_WRITE32_MEMBER(ssram_w); - DECLARE_WRITE32_MEMBER(_0xc0000000_ram_w); + DECLARE_READ8_MEMBER(ssram_r); + DECLARE_WRITE8_MEMBER(ssram_w); + DECLARE_WRITE8_MEMBER(ssregs_w); + DECLARE_WRITE32_MEMBER(sh2cache_ram_w); DECLARE_WRITE32_MEMBER(cram_bank_w); DECLARE_READ32_MEMBER(cram_data_r); DECLARE_WRITE32_MEMBER(cram_data_w); @@ -148,26 +149,21 @@ private: DECLARE_WRITE32_MEMBER(flash1_w); DECLARE_WRITE32_MEMBER(flash2_w); DECLARE_WRITE32_MEMBER(cram_gfxflash_bank_w); - DECLARE_READ32_MEMBER(vbl_r); - DECLARE_READ32_MEMBER(unk_io_r); - DECLARE_READ32_MEMBER(_40C0000_r); - DECLARE_READ32_MEMBER(_40C0004_r); + DECLARE_READ16_MEMBER(gpu_status_r); + DECLARE_READ16_MEMBER(dev_dipsw_r); DECLARE_READ32_MEMBER(eeprom_r); DECLARE_WRITE32_MEMBER(eeprom_w); - DECLARE_WRITE32_MEMBER(ss_bank_base_w); - DECLARE_WRITE32_MEMBER(ss_pal_base_w); DECLARE_WRITE32_MEMBER(palettedma_w); DECLARE_WRITE32_MEMBER(characterdma_w); - DECLARE_WRITE32_MEMBER(irq10_ack_w); - DECLARE_WRITE32_MEMBER(irq12_ack_w); - DECLARE_WRITE32_MEMBER(unk_vidregs_w); + DECLARE_WRITE32_MEMBER(ppu_gscroll_w); DECLARE_READ16_MEMBER(colourram_r); DECLARE_WRITE16_MEMBER(colourram_w); + DECLARE_WRITE16_MEMBER(outport_w); SH2_DMA_KLUDGE_CB(dma_callback); void draw_fg_layer(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); - INTERRUPT_GEN_MEMBER(vbl_interrupt); - INTERRUPT_GEN_MEMBER(other_interrupt); + WRITE_LINE_MEMBER(vbl_interrupt); + INTERRUPT_GEN_MEMBER(irq10_periodic); u16 rotate_left(u16 value, int n); u16 rotxor(u16 val, u16 xorval); u32 cps3_mask(u32 address, u32 key1, u32 key2); |