summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/bebox.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/bebox.cpp')
-rw-r--r--src/mame/machine/bebox.cpp70
1 files changed, 35 insertions, 35 deletions
diff --git a/src/mame/machine/bebox.cpp b/src/mame/machine/bebox.cpp
index e8bb4eecf71..ea64354a1f4 100644
--- a/src/mame/machine/bebox.cpp
+++ b/src/mame/machine/bebox.cpp
@@ -128,22 +128,22 @@ static void bebox_mbreg32_w(uint32_t *target, uint64_t data, uint64_t mem_mask)
}
-READ64_MEMBER(bebox_state::bebox_cpu0_imask_r )
+uint64_t bebox_state::bebox_cpu0_imask_r()
{
return ((uint64_t) m_cpu_imask[0]) << 32;
}
-READ64_MEMBER(bebox_state::bebox_cpu1_imask_r )
+uint64_t bebox_state::bebox_cpu1_imask_r()
{
return ((uint64_t) m_cpu_imask[1]) << 32;
}
-READ64_MEMBER(bebox_state::bebox_interrupt_sources_r )
+uint64_t bebox_state::bebox_interrupt_sources_r()
{
return ((uint64_t) m_interrupts) << 32;
}
-WRITE64_MEMBER(bebox_state::bebox_cpu0_imask_w )
+void bebox_state::bebox_cpu0_imask_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
uint32_t old_imask = m_cpu_imask[0];
@@ -160,7 +160,7 @@ WRITE64_MEMBER(bebox_state::bebox_cpu0_imask_w )
}
}
-WRITE64_MEMBER(bebox_state::bebox_cpu1_imask_w )
+void bebox_state::bebox_cpu1_imask_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
uint32_t old_imask = m_cpu_imask[1];
@@ -177,7 +177,7 @@ WRITE64_MEMBER(bebox_state::bebox_cpu1_imask_w )
}
}
-READ64_MEMBER(bebox_state::bebox_crossproc_interrupts_r )
+uint64_t bebox_state::bebox_crossproc_interrupts_r(address_space &space)
{
uint32_t result;
result = m_crossproc_interrupts;
@@ -191,7 +191,7 @@ READ64_MEMBER(bebox_state::bebox_crossproc_interrupts_r )
return ((uint64_t) result) << 32;
}
-WRITE64_MEMBER(bebox_state::bebox_crossproc_interrupts_w )
+void bebox_state::bebox_crossproc_interrupts_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
static const struct
{
@@ -234,7 +234,7 @@ WRITE64_MEMBER(bebox_state::bebox_crossproc_interrupts_w )
}
}
-WRITE64_MEMBER(bebox_state::bebox_processor_resets_w )
+void bebox_state::bebox_processor_resets_w(uint64_t data)
{
uint8_t b = (uint8_t) (data >> 56);
@@ -345,7 +345,7 @@ WRITE_LINE_MEMBER( bebox_state::fdc_interrupt )
*
*************************************/
-READ64_MEMBER(bebox_state::bebox_interrupt_ack_r )
+uint64_t bebox_state::bebox_interrupt_ack_r()
{
uint32_t result;
result = m_pic8259[0]->acknowledge();
@@ -389,50 +389,50 @@ WRITE_LINE_MEMBER(bebox_state::bebox_ide_interrupt)
*
*************************************/
/*
-static READ64_MEMBER(bebox_state::bebox_video_r )
+uint64_t bebox_state::bebox_video_r(offs_t offset, uint64_t mem_mask)
{
uint64_t result = 0;
mem_mask = FLIPENDIAN_INT64(mem_mask);
if (ACCESSING_BITS_0_7)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 0, mem_mask >> 0) << 0;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 0, mem_mask >> 0) << 0;
if (ACCESSING_BITS_8_15)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 1, mem_mask >> 8) << 8;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 1, mem_mask >> 8) << 8;
if (ACCESSING_BITS_16_23)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 2, mem_mask >> 16) << 16;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 2, mem_mask >> 16) << 16;
if (ACCESSING_BITS_24_31)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 3, mem_mask >> 24) << 24;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 3, mem_mask >> 24) << 24;
if (ACCESSING_BITS_32_39)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 4, mem_mask >> 32) << 32;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 4, mem_mask >> 32) << 32;
if (ACCESSING_BITS_40_47)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 5, mem_mask >> 40) << 40;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 5, mem_mask >> 40) << 40;
if (ACCESSING_BITS_48_55)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 6, mem_mask >> 48) << 48;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 6, mem_mask >> 48) << 48;
if (ACCESSING_BITS_56_63)
- result |= (uint64_t)vga_mem_linear_r(space, offset * 8 + 7, mem_mask >> 56) << 56;
+ result |= (uint64_t)vga_mem_linear_r(offset * 8 + 7, mem_mask >> 56) << 56;
return FLIPENDIAN_INT64(result);
}
-static WRITE64_MEMBER(bebox_state::bebox_video_w )
+void bebox_state::bebox_video_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
data = FLIPENDIAN_INT64(data);
mem_mask = FLIPENDIAN_INT64(mem_mask);
if (ACCESSING_BITS_0_7)
- vga_mem_linear_w(space, offset * 8 + 0, data >> 0 , mem_mask >> 0);
+ vga_mem_linear_w(offset * 8 + 0, data >> 0 , mem_mask >> 0);
if (ACCESSING_BITS_8_15)
- vga_mem_linear_w(space, offset * 8 + 1, data >> 8 , mem_mask >> 8);
+ vga_mem_linear_w(offset * 8 + 1, data >> 8 , mem_mask >> 8);
if (ACCESSING_BITS_16_23)
- vga_mem_linear_w(space, offset * 8 + 2, data >> 16, mem_mask >> 16);
+ vga_mem_linear_w(offset * 8 + 2, data >> 16, mem_mask >> 16);
if (ACCESSING_BITS_24_31)
- vga_mem_linear_w(space, offset * 8 + 3, data >> 24, mem_mask >> 24);
+ vga_mem_linear_w(offset * 8 + 3, data >> 24, mem_mask >> 24);
if (ACCESSING_BITS_32_39)
- vga_mem_linear_w(space, offset * 8 + 4, data >> 32, mem_mask >> 32);
+ vga_mem_linear_w(offset * 8 + 4, data >> 32, mem_mask >> 32);
if (ACCESSING_BITS_40_47)
- vga_mem_linear_w(space, offset * 8 + 5, data >> 40, mem_mask >> 40);
+ vga_mem_linear_w(offset * 8 + 5, data >> 40, mem_mask >> 40);
if (ACCESSING_BITS_48_55)
- vga_mem_linear_w(space, offset * 8 + 6, data >> 48, mem_mask >> 48);
+ vga_mem_linear_w(offset * 8 + 6, data >> 48, mem_mask >> 48);
if (ACCESSING_BITS_56_63)
- vga_mem_linear_w(space, offset * 8 + 7, data >> 56, mem_mask >> 56);
+ vga_mem_linear_w(offset * 8 + 7, data >> 56, mem_mask >> 56);
}
*/
/*************************************
@@ -442,7 +442,7 @@ static WRITE64_MEMBER(bebox_state::bebox_video_w )
*************************************/
-READ8_MEMBER(bebox_state::bebox_page_r)
+uint8_t bebox_state::bebox_page_r(offs_t offset)
{
uint8_t data = m_at_pages[offset % 0x10];
@@ -465,7 +465,7 @@ READ8_MEMBER(bebox_state::bebox_page_r)
}
-WRITE8_MEMBER(bebox_state::bebox_page_w)
+void bebox_state::bebox_page_w(offs_t offset, uint8_t data)
{
m_at_pages[offset % 0x10] = data;
@@ -491,7 +491,7 @@ WRITE8_MEMBER(bebox_state::bebox_page_w)
}
-WRITE8_MEMBER(bebox_state::bebox_80000480_w)
+void bebox_state::bebox_80000480_w(offs_t offset, uint8_t data)
{
switch(offset % 8)
{
@@ -515,7 +515,7 @@ WRITE8_MEMBER(bebox_state::bebox_80000480_w)
}
-READ8_MEMBER(bebox_state::bebox_80000480_r)
+uint8_t bebox_state::bebox_80000480_r()
{
fatalerror("NYI\n");
}
@@ -580,14 +580,14 @@ WRITE_LINE_MEMBER(bebox_state::bebox_timer0_w)
*
*************************************/
-READ8_MEMBER(bebox_state::bebox_flash_r)
+uint8_t bebox_state::bebox_flash_r(offs_t offset)
{
offset = (offset & ~7) | (7 - (offset & 7));
return m_flash->read(offset);
}
-WRITE8_MEMBER(bebox_state::bebox_flash_w)
+void bebox_state::bebox_flash_w(offs_t offset, uint8_t data)
{
offset = (offset & ~7) | (7 - (offset & 7));
m_flash->write(offset, data);
@@ -600,7 +600,7 @@ WRITE8_MEMBER(bebox_state::bebox_flash_w)
*************************************/
-READ64_MEMBER(bebox_state::scsi53c810_r )
+uint64_t bebox_state::scsi53c810_r(offs_t offset, uint64_t mem_mask)
{
int reg = offset*8;
uint64_t r = 0;
@@ -633,7 +633,7 @@ READ64_MEMBER(bebox_state::scsi53c810_r )
}
-WRITE64_MEMBER(bebox_state::scsi53c810_w )
+void bebox_state::scsi53c810_w(offs_t offset, uint64_t data, uint64_t mem_mask)
{
int reg = offset*8;
if (!ACCESSING_BITS_56_63) {