summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/nes/sunsoft.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/nes/sunsoft.cpp')
-rw-r--r--src/devices/bus/nes/sunsoft.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/devices/bus/nes/sunsoft.cpp b/src/devices/bus/nes/sunsoft.cpp
index be90e36e535..f62fa24e67d 100644
--- a/src/devices/bus/nes/sunsoft.cpp
+++ b/src/devices/bus/nes/sunsoft.cpp
@@ -209,7 +209,7 @@ void nes_sunsoft_fme7_device::pcb_reset()
-------------------------------------------------*/
-void nes_sunsoft_1_device::write_m(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_1_device::write_m)
{
LOG_MMC(("Sunsoft 1 write_m, offset: %04x, data: %02x\n", offset, data));
@@ -235,7 +235,7 @@ void nes_sunsoft_1_device::write_m(offs_t offset, uint8_t data)
// there are two 'variants' depending on hardwired or mapper ctrl mirroring
-void nes_sunsoft_2_device::write_h(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_2_device::write_h)
{
uint8_t helper = (data & 0x07) | ((data & 0x80) ? 0x08 : 0x00);
LOG_MMC(("Sunsoft 2 write_h, offset: %04x, data: %02x\n", offset, data));
@@ -282,7 +282,7 @@ void nes_sunsoft_3_device::device_timer(emu_timer &timer, device_timer_id id, in
}
}
-void nes_sunsoft_3_device::write_h(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_3_device::write_h)
{
LOG_MMC(("Sunsoft 3 write_h, offset %04x, data: %02x\n", offset, data));
@@ -384,7 +384,7 @@ void nes_sunsoft_4_device::sun4_mirror( int mirror, int mirr0, int mirr1 )
}
}
-void nes_sunsoft_4_device::sun4_write(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_4_device::sun4_write)
{
LOG_MMC(("Sunsoft 4 write_h, offset %04x, data: %02x\n", offset, data));
@@ -424,7 +424,7 @@ void nes_sunsoft_4_device::sun4_write(offs_t offset, uint8_t data)
}
}
-void nes_sunsoft_4_device::write_m(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_4_device::write_m)
{
LOG_MMC(("Sunsoft 4 write_m, offset: %04x, data: %02x\n", offset, data));
@@ -434,7 +434,7 @@ void nes_sunsoft_4_device::write_m(offs_t offset, uint8_t data)
m_prgram[offset & (m_prgram.size() - 1)] = data;
}
-uint8_t nes_sunsoft_4_device::read_m(offs_t offset)
+READ8_MEMBER(nes_sunsoft_4_device::read_m)
{
LOG_MMC(("Sunsoft 4 read_m, offset: %04x\n", offset));
@@ -443,7 +443,7 @@ uint8_t nes_sunsoft_4_device::read_m(offs_t offset)
if (!m_prgram.empty() && m_wram_enable)
return m_prgram[offset & (m_prgram.size() - 1)];
- return get_open_bus(); // open bus
+ return m_open_bus; // open bus
}
/*-------------------------------------------------
@@ -475,7 +475,7 @@ void nes_sunsoft_fme7_device::device_timer(emu_timer &timer, device_timer_id id,
}
}
-void nes_sunsoft_fme7_device::fme7_write(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_fme7_device::fme7_write)
{
LOG_MMC(("fme7_write, offset %04x, data: %02x\n", offset, data));
@@ -533,7 +533,7 @@ void nes_sunsoft_fme7_device::fme7_write(offs_t offset, uint8_t data)
}
}
-void nes_sunsoft_fme7_device::write_m(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_fme7_device::write_m)
{
uint8_t bank = m_wram_bank & 0x3f;
LOG_MMC(("Sunsoft FME7 write_m, offset: %04x, data: %02x\n", offset, data));
@@ -549,7 +549,7 @@ void nes_sunsoft_fme7_device::write_m(offs_t offset, uint8_t data)
}
}
-uint8_t nes_sunsoft_fme7_device::read_m(offs_t offset)
+READ8_MEMBER(nes_sunsoft_fme7_device::read_m)
{
uint8_t bank = m_wram_bank & 0x3f;
LOG_MMC(("Sunsoft FME7 read_m, offset: %04x\n", offset));
@@ -564,7 +564,7 @@ uint8_t nes_sunsoft_fme7_device::read_m(offs_t offset)
return m_prgram[((bank * 0x2000) + offset) & (m_prgram.size() - 1)];
}
- return get_open_bus(); // open bus
+ return m_open_bus; // open bus
}
@@ -578,20 +578,20 @@ uint8_t nes_sunsoft_fme7_device::read_m(offs_t offset)
-------------------------------------------------*/
-void nes_sunsoft_5_device::write_h(offs_t offset, uint8_t data)
+WRITE8_MEMBER(nes_sunsoft_5_device::write_h)
{
LOG_MMC(("sunsoft 5 write_h, offset %04x, data: %02x\n", offset, data));
switch (offset & 0x6000)
{
case 0x4000:
- m_ym2149->address_w(data & 0x0f);
+ m_ym2149->address_w(space, 0, data & 0x0f);
break;
case 0x6000:
- m_ym2149->data_w(data);
+ m_ym2149->data_w(space, 0, data);
break;
default:
- fme7_write(offset, data);
+ fme7_write(space, offset, data, mem_mask);
break;
}
}