diff options
Diffstat (limited to 'src/devices/cpu/psx/psx.h')
-rw-r--r-- | src/devices/cpu/psx/psx.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index f1fc9315852..f2ce1ed59d3 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -128,39 +128,38 @@ public: auto cd_write() { return m_cd_write_handler.bind(); } // public interfaces - DECLARE_WRITE32_MEMBER( berr_w ); - DECLARE_READ32_MEMBER( berr_r ); + void berr_w(uint32_t data); + uint32_t berr_r(); uint32_t exp_base(); - DECLARE_WRITE32_MEMBER( exp_base_w ); - DECLARE_READ32_MEMBER( exp_base_r ); + void exp_base_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t exp_base_r(); - DECLARE_WRITE32_MEMBER( exp_config_w ); - DECLARE_READ32_MEMBER( exp_config_r ); + void exp_config_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t exp_config_r(); - DECLARE_WRITE32_MEMBER( ram_config_w ); - DECLARE_READ32_MEMBER( ram_config_r ); + void ram_config_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t ram_config_r(); - DECLARE_WRITE32_MEMBER( rom_config_w ); - DECLARE_READ32_MEMBER( rom_config_r ); + void rom_config_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t rom_config_r(); - DECLARE_WRITE32_MEMBER( biu_w ); - DECLARE_READ32_MEMBER( biu_r ); + void biu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t biu_r(); - DECLARE_WRITE32_MEMBER( gpu_w ); - DECLARE_READ32_MEMBER( gpu_r ); + void gpu_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t gpu_r(offs_t offset, uint32_t mem_mask = ~0); - DECLARE_WRITE16_MEMBER( spu_w ); - DECLARE_READ16_MEMBER( spu_r ); + void spu_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); + uint16_t spu_r(offs_t offset, uint16_t mem_mask = ~0); - DECLARE_WRITE8_MEMBER( cd_w ); - DECLARE_READ8_MEMBER( cd_r ); + void cd_w(offs_t offset, uint8_t data, uint8_t mem_mask = ~0); + uint8_t cd_r(offs_t offset, uint8_t mem_mask = ~0); - DECLARE_WRITE32_MEMBER( com_delay_w ); - DECLARE_READ32_MEMBER( com_delay_r ); + void com_delay_w(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + uint32_t com_delay_r(offs_t offset, uint32_t mem_mask = ~0); - static psxcpu_device *getcpu( device_t &device, const char *cputag ) { return downcast<psxcpu_device *>( device.subdevice( cputag ) ); } void set_disable_rom_berr(bool mode); void psxcpu_internal_map(address_map &map); @@ -208,7 +207,8 @@ protected: // address spaces const address_space_config m_program_config; address_space *m_program; - memory_access_cache<2, 0, ENDIANNESS_LITTLE> *m_cache; + memory_access<32, 2, 0, ENDIANNESS_LITTLE>::cache m_instruction; + memory_access<32, 2, 0, ENDIANNESS_LITTLE>::specific m_data; // other internal states int m_icount; @@ -309,7 +309,7 @@ protected: devcb_read8 m_cd_read_handler; devcb_write8 m_cd_write_handler; required_device<ram_device> m_ram; - memory_region *m_rom; + required_memory_region m_rom; bool m_disable_rom_berr; private: |