diff options
Diffstat (limited to 'src/mame/machine')
-rw-r--r-- | src/mame/machine/konppc.cpp | 12 | ||||
-rw-r--r-- | src/mame/machine/konppc.h | 2 | ||||
-rw-r--r-- | src/mame/machine/n64.cpp | 1 | ||||
-rw-r--r-- | src/mame/machine/xbox.cpp | 1 |
4 files changed, 9 insertions, 7 deletions
diff --git a/src/mame/machine/konppc.cpp b/src/mame/machine/konppc.cpp index d7525801d10..c372c29e856 100644 --- a/src/mame/machine/konppc.cpp +++ b/src/mame/machine/konppc.cpp @@ -436,7 +436,7 @@ void konppc_device::nwk_fifo_0_w(offs_t offset, uint32_t data, uint32_t mem_mask } else { - m_voodoo[0]->voodoo_w(offset ^ 0x80000, data, mem_mask); + m_voodoo[0]->write(offset ^ 0x80000, data, mem_mask); } } @@ -453,7 +453,7 @@ void konppc_device::nwk_fifo_1_w(offs_t offset, uint32_t data, uint32_t mem_mask } else { - m_voodoo[1]->voodoo_w(offset ^ 0x80000, data, mem_mask); + m_voodoo[1]->write(offset ^ 0x80000, data, mem_mask); } } @@ -465,7 +465,7 @@ uint32_t konppc_device::nwk_voodoo_0_r(offs_t offset) } else { - return m_voodoo[0]->voodoo_r(offset); + return m_voodoo[0]->read(offset); } } @@ -477,7 +477,7 @@ uint32_t konppc_device::nwk_voodoo_1_r(offs_t offset) } else { - return m_voodoo[1]->voodoo_r(offset); + return m_voodoo[1]->read(offset); } } @@ -494,7 +494,7 @@ void konppc_device::nwk_voodoo_0_w(offs_t offset, uint32_t data, uint32_t mem_ma } else { - m_voodoo[0]->voodoo_w(offset, data, mem_mask); + m_voodoo[0]->write(offset, data, mem_mask); } } @@ -511,6 +511,6 @@ void konppc_device::nwk_voodoo_1_w(offs_t offset, uint32_t data, uint32_t mem_ma } else { - m_voodoo[1]->voodoo_w(offset, data, mem_mask); + m_voodoo[1]->write(offset, data, mem_mask); } } diff --git a/src/mame/machine/konppc.h b/src/mame/machine/konppc.h index c397a02bbd1..41b6e49ad9a 100644 --- a/src/mame/machine/konppc.h +++ b/src/mame/machine/konppc.h @@ -73,7 +73,7 @@ private: // device finders optional_device_array<adsp21062_device, 2> m_dsp; optional_device_array<k033906_device, 2> m_k033906; - optional_device_array<voodoo_device, 2> m_voodoo; + optional_device_array<generic_voodoo_device, 2> m_voodoo; // internal state uint32_t dsp_comm_ppc[MAX_CG_BOARDS][2]; diff --git a/src/mame/machine/n64.cpp b/src/mame/machine/n64.cpp index 35459505d3b..f157cb104ed 100644 --- a/src/mame/machine/n64.cpp +++ b/src/mame/machine/n64.cpp @@ -4,6 +4,7 @@ #include "emu.h" #include "debugger.h" +#include "screen.h" #include "cpu/mips/mips3.h" #include "cpu/mips/mips3com.h" #include "includes/n64.h" diff --git a/src/mame/machine/xbox.cpp b/src/mame/machine/xbox.cpp index 74af8e4eb71..9618cb2f36a 100644 --- a/src/mame/machine/xbox.cpp +++ b/src/mame/machine/xbox.cpp @@ -13,6 +13,7 @@ #include "debugger.h" #include "romload.h" +#include "screen.h" #include <functional> |