summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/tapatune.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/tapatune.cpp')
-rw-r--r--src/mame/drivers/tapatune.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/mame/drivers/tapatune.cpp b/src/mame/drivers/tapatune.cpp
index 97af2505ce2..e98f02f8b83 100644
--- a/src/mame/drivers/tapatune.cpp
+++ b/src/mame/drivers/tapatune.cpp
@@ -94,23 +94,23 @@ private:
DECLARE_WRITE_LINE_MEMBER(crtc_vsync);
- DECLARE_WRITE16_MEMBER(palette_w);
- DECLARE_READ16_MEMBER(read_from_z80);
- DECLARE_WRITE16_MEMBER(write_to_z80);
-
- DECLARE_READ8_MEMBER(sound_irq_clear);
- DECLARE_WRITE8_MEMBER(controls_mux);
- DECLARE_READ8_MEMBER(controls_r);
- DECLARE_WRITE8_MEMBER(write_index_to_68k);
- DECLARE_WRITE8_MEMBER(write_data_to_68k);
- DECLARE_READ8_MEMBER(read_index_from_68k);
- DECLARE_READ8_MEMBER(read_data_from_68k);
- DECLARE_WRITE8_MEMBER(lamps_w);
- DECLARE_READ8_MEMBER(status_r);
- DECLARE_WRITE8_MEMBER(bsmt_data_lo_w);
- DECLARE_WRITE8_MEMBER(bsmt_data_hi_w);
- DECLARE_WRITE8_MEMBER(bsmt_reg_w);
- DECLARE_READ8_MEMBER(special_r);
+ void palette_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
+ uint16_t read_from_z80();
+ void write_to_z80(uint16_t data);
+
+ uint8_t sound_irq_clear();
+ void controls_mux(uint8_t data);
+ uint8_t controls_r();
+ void write_index_to_68k(uint8_t data);
+ void write_data_to_68k(uint8_t data);
+ uint8_t read_index_from_68k();
+ uint8_t read_data_from_68k();
+ void lamps_w(uint8_t data);
+ uint8_t status_r();
+ void bsmt_data_lo_w(uint8_t data);
+ void bsmt_data_hi_w(uint8_t data);
+ void bsmt_reg_w(uint8_t data);
+ uint8_t special_r();
MC6845_BEGIN_UPDATE(crtc_begin_update);
MC6845_UPDATE_ROW(crtc_update_row);
@@ -194,7 +194,7 @@ MC6845_UPDATE_ROW( tapatune_state::crtc_update_row )
}
-WRITE16_MEMBER(tapatune_state::palette_w)
+void tapatune_state::palette_w(offs_t offset, uint16_t data, uint16_t mem_mask)
{
//logerror("Palette write: offset = %02x, data = %04x, mask = %04x\n", offset, data, mem_mask );
switch(offset)
@@ -223,14 +223,14 @@ WRITE_LINE_MEMBER(tapatune_state::crtc_vsync)
*
*************************************/
-READ16_MEMBER(tapatune_state::read_from_z80)
+uint16_t tapatune_state::read_from_z80()
{
m_z80_data_available = 0;
return ((uint16_t)m_z80_to_68k_data << 8) | (m_z80_to_68k_index);
}
-WRITE16_MEMBER(tapatune_state::write_to_z80)
+void tapatune_state::write_to_z80(uint16_t data)
{
m_68k_to_z80_index = data & 0xff;
m_68k_to_z80_data = (data >> 8) & 0xff;
@@ -249,13 +249,13 @@ WRITE16_MEMBER(tapatune_state::write_to_z80)
*
*************************************/
-WRITE8_MEMBER(tapatune_state::write_index_to_68k)
+void tapatune_state::write_index_to_68k(uint8_t data)
{
m_z80_to_68k_index = data;
}
-WRITE8_MEMBER(tapatune_state::write_data_to_68k)
+void tapatune_state::write_data_to_68k(uint8_t data)
{
// todo, use callback as this will hook up elsewhere on non-video games
if (m_videocpu)
@@ -267,13 +267,13 @@ WRITE8_MEMBER(tapatune_state::write_data_to_68k)
}
-READ8_MEMBER(tapatune_state::read_index_from_68k)
+uint8_t tapatune_state::read_index_from_68k()
{
return m_68k_to_z80_index;
}
-READ8_MEMBER(tapatune_state::read_data_from_68k)
+uint8_t tapatune_state::read_data_from_68k()
{
m_68k_data_available = 0;
@@ -333,14 +333,14 @@ void tapatune_state::maincpu_io_map(address_map &map)
*
*************************************/
-READ8_MEMBER(tapatune_state::sound_irq_clear)
+uint8_t tapatune_state::sound_irq_clear()
{
m_maincpu->set_input_line(0, CLEAR_LINE);
return 0;
}
-WRITE8_MEMBER(tapatune_state::controls_mux)
+void tapatune_state::controls_mux(uint8_t data)
{
/*
Input multiplexer select and outputs:
@@ -360,7 +360,7 @@ WRITE8_MEMBER(tapatune_state::controls_mux)
}
-READ8_MEMBER(tapatune_state::controls_r)
+uint8_t tapatune_state::controls_r()
{
switch (m_controls_mux & 0xf)
{
@@ -373,7 +373,7 @@ READ8_MEMBER(tapatune_state::controls_r)
}
-READ8_MEMBER(tapatune_state::special_r)
+uint8_t tapatune_state::special_r()
{
// Not sure if this is actually correct
if (m_z80_data_available)
@@ -383,7 +383,7 @@ READ8_MEMBER(tapatune_state::special_r)
}
-WRITE8_MEMBER(tapatune_state::lamps_w)
+void tapatune_state::lamps_w(uint8_t data)
{
/*
Button Lamps:
@@ -407,19 +407,19 @@ WRITE8_MEMBER(tapatune_state::lamps_w)
*
*************************************/
-READ8_MEMBER(tapatune_state::status_r)
+uint8_t tapatune_state::status_r()
{
return !m_bsmt->read_status() << 7;
}
-WRITE8_MEMBER(tapatune_state::bsmt_data_lo_w)
+void tapatune_state::bsmt_data_lo_w(uint8_t data)
{
m_bsmt_data_l = data;
}
-WRITE8_MEMBER(tapatune_state::bsmt_data_hi_w)
+void tapatune_state::bsmt_data_hi_w(uint8_t data)
{
m_bsmt_data_h = data;
@@ -431,7 +431,7 @@ WRITE8_MEMBER(tapatune_state::bsmt_data_hi_w)
}
-WRITE8_MEMBER(tapatune_state::bsmt_reg_w)
+void tapatune_state::bsmt_reg_w(uint8_t data)
{
m_bsmt->write_reg(data);
m_bsmt->write_data((m_bsmt_data_h << 8) | m_bsmt_data_l);