summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/bublbobl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/bublbobl.cpp')
-rw-r--r--src/mame/machine/bublbobl.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/src/mame/machine/bublbobl.cpp b/src/mame/machine/bublbobl.cpp
index 8a55e1538de..2af8ab904bd 100644
--- a/src/mame/machine/bublbobl.cpp
+++ b/src/mame/machine/bublbobl.cpp
@@ -113,12 +113,12 @@ void bublbobl_state::tokio_videoctrl_w(uint8_t data)
flip_screen_set(data & 0x80);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_nmitrigger_w)
+void bublbobl_state::bublbobl_nmitrigger_w(uint8_t data)
{
m_subcpu->pulse_input_line(INPUT_LINE_NMI, attotime::zero);
}
-READ8_MEMBER(bublbobl_state::tokiob_mcu_r)
+uint8_t bublbobl_state::tokiob_mcu_r()
{
/* This return value is literally set by a resistor on the bootleg tokio pcb;
the MCU footprint is unpopulated but for a resistor tying what would be the
@@ -139,13 +139,13 @@ void bublbobl_state::device_timer(emu_timer &timer, device_timer_id id, int para
}
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_soundcpu_reset_w)
+void bublbobl_state::bublbobl_soundcpu_reset_w(uint8_t data)
{
//logerror("soundcpu_reset_w called with data of %d\n", data);
common_sreset(data ? ASSERT_LINE : CLEAR_LINE);
}
-READ8_MEMBER(bublbobl_state::common_sound_semaphores_r)
+uint8_t bublbobl_state::common_sound_semaphores_r()
{
uint8_t ret = 0xfc;
ret |= m_main_to_sound->pending_r() ? 0x2 : 0x0;
@@ -161,54 +161,54 @@ Bubble Bobble MCU
***************************************************************************/
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr1_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr1_r()
{
return m_ddr1;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr1_w)
+void bublbobl_state::bublbobl_mcu_ddr1_w(uint8_t data)
{
m_ddr1 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr2_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr2_r()
{
return m_ddr2;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr2_w)
+void bublbobl_state::bublbobl_mcu_ddr2_w(uint8_t data)
{
m_ddr2 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr3_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr3_r()
{
return m_ddr3;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr3_w)
+void bublbobl_state::bublbobl_mcu_ddr3_w(uint8_t data)
{
m_ddr3 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_r)
+uint8_t bublbobl_state::bublbobl_mcu_ddr4_r()
{
return m_ddr4;
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_ddr4_w)
+void bublbobl_state::bublbobl_mcu_ddr4_w(uint8_t data)
{
m_ddr4 = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port1_r)
+uint8_t bublbobl_state::bublbobl_mcu_port1_r()
{
//logerror("%04x: 6801U4 port 1 read\n", m_mcu->pc());
m_port1_in = ioport("IN0")->read();
return (m_port1_out & m_ddr1) | (m_port1_in & ~m_ddr1);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w)
+void bublbobl_state::bublbobl_mcu_port1_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 1 write %02x\n", m_mcu->pc(), data);
@@ -231,13 +231,13 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port1_w)
m_port1_out = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port2_r)
+uint8_t bublbobl_state::bublbobl_mcu_port2_r()
{
//logerror("%04x: 6801U4 port 2 read\n", m_mcu->pc());
return (m_port2_out & m_ddr2) | (m_port2_in & ~m_ddr2);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port2_w)
+void bublbobl_state::bublbobl_mcu_port2_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 2 write %02x\n", m_mcu->pc(), data);
static const char *const portnames[] = { "DSW0", "DSW1", "IN1", "IN2" };
@@ -271,25 +271,25 @@ WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port2_w)
m_port2_out = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port3_r)
+uint8_t bublbobl_state::bublbobl_mcu_port3_r()
{
//logerror("%04x: 6801U4 port 3 read\n", m_mcu->pc());
return (m_port3_out & m_ddr3) | (m_port3_in & ~m_ddr3);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port3_w)
+void bublbobl_state::bublbobl_mcu_port3_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 3 write %02x\n", m_mcu->pc(), data);
m_port3_out = data;
}
-READ8_MEMBER(bublbobl_state::bublbobl_mcu_port4_r)
+uint8_t bublbobl_state::bublbobl_mcu_port4_r()
{
//logerror("%04x: 6801U4 port 4 read\n", m_mcu->pc());
return (m_port4_out & m_ddr4) | (m_port4_in & ~m_ddr4);
}
-WRITE8_MEMBER(bublbobl_state::bublbobl_mcu_port4_w)
+void bublbobl_state::bublbobl_mcu_port4_w(uint8_t data)
{
//logerror("%04x: 6801U4 port 4 write %02x\n", m_mcu->pc(), data);
@@ -307,7 +307,7 @@ in boblbobl, so they don't matter. All checks are patched out in sboblbob.
***************************************************************************/
-READ8_MEMBER(bublbobl_state::boblbobl_ic43_a_r)
+uint8_t bublbobl_state::boblbobl_ic43_a_r(offs_t offset)
{
// if (offset >= 2)
// logerror("%04x: ic43_a_r (offs %d) res = %02x\n", m_mcu->pc(), offset, res);
@@ -318,7 +318,7 @@ READ8_MEMBER(bublbobl_state::boblbobl_ic43_a_r)
return machine().rand() & 0xff;
}
-WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_a_w)
+void bublbobl_state::boblbobl_ic43_a_w(offs_t offset, uint8_t data)
{
int res = 0;
@@ -356,7 +356,7 @@ WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_a_w)
m_ic43_a = res;
}
-WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_b_w)
+void bublbobl_state::boblbobl_ic43_b_w(offs_t offset, uint8_t data)
{
static const int xorval[4] = { 4, 1, 8, 2 };
@@ -364,7 +364,7 @@ WRITE8_MEMBER(bublbobl_state::boblbobl_ic43_b_w)
m_ic43_b = (data >> 4) ^ xorval[offset];
}
-READ8_MEMBER(bublbobl_state::boblbobl_ic43_b_r)
+uint8_t bublbobl_state::boblbobl_ic43_b_r(offs_t offset)
{
// logerror("%04x: ic43_b_r (offs %d)\n", m_mcu->pc(), offset);
if (offset == 0)