summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/3dom2.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/3dom2.cpp')
-rw-r--r--src/mame/machine/3dom2.cpp46
1 files changed, 23 insertions, 23 deletions
diff --git a/src/mame/machine/3dom2.cpp b/src/mame/machine/3dom2.cpp
index e90a307dd67..9c2b49c4ff6 100644
--- a/src/mame/machine/3dom2.cpp
+++ b/src/mame/machine/3dom2.cpp
@@ -338,7 +338,7 @@ void m2_bda_device::device_timer(emu_timer &timer, device_timer_id id, int param
// cpu_id_r - read from CPU ID register
//-------------------------------------------------
-READ32_MEMBER( m2_bda_device::cpu_id_r )
+uint32_t m2_bda_device::cpu_id_r(address_space &space)
{
uint32_t data = 0;
@@ -359,7 +359,7 @@ READ32_MEMBER( m2_bda_device::cpu_id_r )
// cpu_id_w - Write to CPU ID register
//-------------------------------------------------
-WRITE32_MEMBER( m2_bda_device::cpu_id_w )
+void m2_bda_device::cpu_id_w(address_space &space, uint32_t data)
{
// TODO: How should this work?
logerror("%s: CPUID: %x\n", machine().describe_context(), data);
@@ -469,17 +469,17 @@ void m2_bda_device::configure_ppc_address_map(address_space &space)
space.install_ram(TE_TRAM_BASE, TE_TRAM_BASE + TE_TRAM_MASK, m_te->tram_ptr());
// Install BDA sub-devices
- space.install_readwrite_handler(POWERBUS_BASE, POWERBUS_BASE + DEVICE_MASK,read32_delegate(*m_powerbus, FUNC(m2_powerbus_device::read)), write32_delegate(*m_powerbus, FUNC(m2_powerbus_device::write)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(MEMCTL_BASE, MEMCTL_BASE + DEVICE_MASK, read32_delegate(*m_memctl, FUNC(m2_memctl_device::read)), write32_delegate(*m_memctl, FUNC(m2_memctl_device::write)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(VDU_BASE, VDU_BASE + DEVICE_MASK, read32_delegate(*m_vdu, FUNC(m2_vdu_device::read)), write32_delegate(*m_vdu, FUNC(m2_vdu_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(POWERBUS_BASE, POWERBUS_BASE + DEVICE_MASK,read32sm_delegate(*m_powerbus, FUNC(m2_powerbus_device::read)), write32sm_delegate(*m_powerbus, FUNC(m2_powerbus_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(MEMCTL_BASE, MEMCTL_BASE + DEVICE_MASK, read32s_delegate(*m_memctl, FUNC(m2_memctl_device::read)), write32s_delegate(*m_memctl, FUNC(m2_memctl_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(VDU_BASE, VDU_BASE + DEVICE_MASK, read32s_delegate(*m_vdu, FUNC(m2_vdu_device::read)), write32s_delegate(*m_vdu, FUNC(m2_vdu_device::write)), 0xffffffffffffffffULL);
space.install_readwrite_handler(TE_BASE, TE_BASE + DEVICE_MASK, read32sm_delegate(*m_te, FUNC(m2_te_device::read)), write32sm_delegate(*m_te, FUNC(m2_te_device::write)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(DSP_BASE, DSP_BASE + DEVICE_MASK, read32_delegate(*m_dspp, FUNC(dspp_device::read)), write32_delegate(*m_dspp, FUNC(dspp_device::write)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(CTRLPORT_BASE, CTRLPORT_BASE + DEVICE_MASK,read32_delegate(*m_ctrlport, FUNC(m2_ctrlport_device::read)), write32_delegate(*m_ctrlport, FUNC(m2_ctrlport_device::write)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(MPEG_BASE, MPEG_BASE + DEVICE_MASK, read32_delegate(*m_mpeg, FUNC(m2_mpeg_device::read)), write32_delegate(*m_mpeg, FUNC(m2_mpeg_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(DSP_BASE, DSP_BASE + DEVICE_MASK, read32_delegate(*m_dspp, FUNC(dspp_device::read)), write32_delegate(*m_dspp, FUNC(dspp_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(CTRLPORT_BASE, CTRLPORT_BASE + DEVICE_MASK,read32sm_delegate(*m_ctrlport, FUNC(m2_ctrlport_device::read)), write32sm_delegate(*m_ctrlport, FUNC(m2_ctrlport_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(MPEG_BASE, MPEG_BASE + DEVICE_MASK, read32sm_delegate(*m_mpeg, FUNC(m2_mpeg_device::read)), write32sm_delegate(*m_mpeg, FUNC(m2_mpeg_device::write)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(CPUID_BASE, CPUID_BASE + DEVICE_MASK, read32_delegate(*this, FUNC(m2_bda_device::cpu_id_r)), write32_delegate(*this, FUNC(m2_bda_device::cpu_id_w)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(CPUID_BASE, CPUID_BASE + DEVICE_MASK, read32mo_delegate(*this, FUNC(m2_bda_device::cpu_id_r)), write32mo_delegate(*this, FUNC(m2_bda_device::cpu_id_w)), 0xffffffffffffffffULL);
- space.install_readwrite_handler(SLOT4_BASE, SLOT4_BASE + SLOT_MASK, read32_delegate(*m_cde, FUNC(m2_cde_device::read)), write32_delegate(*m_cde, FUNC(m2_cde_device::write)), 0xffffffffffffffffULL);
+ space.install_readwrite_handler(SLOT4_BASE, SLOT4_BASE + SLOT_MASK, read32_delegate(*m_cde, FUNC(m2_cde_device::read)), write32_delegate(*m_cde, FUNC(m2_cde_device::write)), 0xffffffffffffffffULL);
}
@@ -541,7 +541,7 @@ void m2_powerbus_device::device_reset()
// read -
//-------------------------------------------------
-READ32_MEMBER( m2_powerbus_device::read )
+uint32_t m2_powerbus_device::read(offs_t offset)
{
const uint32_t byte_offs = offset << 2;
uint32_t data = 0;
@@ -570,7 +570,7 @@ READ32_MEMBER( m2_powerbus_device::read )
// write -
//-------------------------------------------------
-WRITE32_MEMBER( m2_powerbus_device::write )
+void m2_powerbus_device::write(offs_t offset, uint32_t data)
{
uint32_t byte_offs = offset << 2;
@@ -682,7 +682,7 @@ void m2_memctl_device::device_reset()
// read -
//-------------------------------------------------
-READ32_MEMBER( m2_memctl_device::read )
+uint32_t m2_memctl_device::read(offs_t offset, uint32_t mem_mask)
{
uint32_t byte_offs = offset << 2;
uint32_t data = 0;
@@ -745,7 +745,7 @@ READ32_MEMBER( m2_memctl_device::read )
// write -
//-------------------------------------------------
-WRITE32_MEMBER( m2_memctl_device::write )
+void m2_memctl_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t byte_offs = offset << 2;
@@ -895,7 +895,7 @@ void m2_vdu_device::device_timer(emu_timer &timer, device_timer_id id, int param
// read -
//-------------------------------------------------
-READ32_MEMBER( m2_vdu_device::read )
+uint32_t m2_vdu_device::read(offs_t offset, uint32_t mem_mask)
{
uint32_t byte_offs = offset << 2;
uint32_t data = 0;
@@ -939,7 +939,7 @@ READ32_MEMBER( m2_vdu_device::read )
// write -
//-------------------------------------------------
-WRITE32_MEMBER( m2_vdu_device::write )
+void m2_vdu_device::write(offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t byte_offs = offset << 2;
m2_reg_wmode wmode = byte_offs & 0x400 ? REG_CLEAR : REG_WRITE;
@@ -1441,7 +1441,7 @@ void m2_ctrlport_device::device_reset()
// read -
//-------------------------------------------------
-READ32_MEMBER( m2_ctrlport_device::read )
+uint32_t m2_ctrlport_device::read(offs_t offset)
{
//const uint32_t byte_offs = offset << 2;
uint32_t data = machine().rand();
@@ -1460,7 +1460,7 @@ READ32_MEMBER( m2_ctrlport_device::read )
// write -
//-------------------------------------------------
-WRITE32_MEMBER( m2_ctrlport_device::write )
+void m2_ctrlport_device::write(offs_t offset, uint32_t data)
{
//uint32_t byte_offs = offset << 2;
@@ -1627,7 +1627,7 @@ void m2_cde_device::update_interrupts()
// read -
//-------------------------------------------------
-READ32_MEMBER( m2_cde_device::read )
+uint32_t m2_cde_device::read(address_space &space, offs_t offset, uint32_t mem_mask)
{
const uint32_t byte_offs = offset << 2;
uint32_t data = 0;
@@ -1730,7 +1730,7 @@ READ32_MEMBER( m2_cde_device::read )
// write -
//-------------------------------------------------
-WRITE32_MEMBER( m2_cde_device::write )
+void m2_cde_device::write(address_space &space, offs_t offset, uint32_t data, uint32_t mem_mask)
{
uint32_t byte_offs = offset << 2;
uint32_t dmach = byte_offs & 0x20 ? 1 : 0;
@@ -1889,7 +1889,7 @@ WRITE32_MEMBER( m2_cde_device::write )
// sdbg_in -
//-------------------------------------------------
-WRITE32_MEMBER( m2_cde_device::sdbg_in )
+void m2_cde_device::sdbg_in(uint32_t data)
{
m_sdbg_in = data;
set_interrupt(CDE_SDBG_RD_DONE);
@@ -2062,7 +2062,7 @@ void m2_mpeg_device::device_reset()
// read
//-------------------------------------------------
-READ32_MEMBER( m2_mpeg_device::read )
+uint32_t m2_mpeg_device::read(offs_t offset)
{
logerror("%s: MPEG READ: %08X\n", machine().describe_context(), offset);
return 0;
@@ -2072,7 +2072,7 @@ READ32_MEMBER( m2_mpeg_device::read )
// write
//-------------------------------------------------
-WRITE32_MEMBER( m2_mpeg_device::write )
+void m2_mpeg_device::write(offs_t offset, uint32_t data)
{
logerror("%s: MPEG WRITE: %08X %08X\n", machine().describe_context(), offset, data);
}