summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/slapshot.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/slapshot.cpp')
-rw-r--r--src/mame/drivers/slapshot.cpp39
1 files changed, 9 insertions, 30 deletions
diff --git a/src/mame/drivers/slapshot.cpp b/src/mame/drivers/slapshot.cpp
index 56ab5b95a07..9d8baa66ded 100644
--- a/src/mame/drivers/slapshot.cpp
+++ b/src/mame/drivers/slapshot.cpp
@@ -135,7 +135,6 @@ Region byte at offset 0x031:
#include "emu.h"
#include "includes/slapshot.h"
-#include "audio/taitosnd.h"
#include "cpu/m68000/m68000.h"
#include "cpu/z80/z80.h"
@@ -187,7 +186,7 @@ READ16_MEMBER(slapshot_state::service_input_r)
}
}
-WRITE8_MEMBER(slapshot_state::coin_control_w)
+void slapshot_state::coin_control_w(u8 data)
{
machine().bookkeeping().coin_lockout_w(0, ~data & 0x01);
machine().bookkeeping().coin_lockout_w(1, ~data & 0x02);
@@ -199,33 +198,11 @@ WRITE8_MEMBER(slapshot_state::coin_control_w)
SOUND
*****************************************************/
-WRITE8_MEMBER(slapshot_state::sound_bankswitch_w)
+void slapshot_state::sound_bankswitch_w(u8 data)
{
membank("z80bank")->set_entry(data & 3);
}
-WRITE16_MEMBER(slapshot_state::msb_sound_w)
-{
- if (offset == 0)
- m_tc0140syt->master_port_w(space, 0, (data >> 8) & 0xff);
- else if (offset == 1)
- m_tc0140syt->master_comm_w(space, 0, (data >> 8) & 0xff);
-
-#ifdef MAME_DEBUG
- if (data & 0xff)
- popmessage("taito_msb_sound_w to low byte: %04x",data);
-#endif
-}
-
-READ16_MEMBER(slapshot_state::msb_sound_r)
-{
- if (offset == 1)
- return ((m_tc0140syt->master_comm_r(space, 0) & 0xff) << 8);
- else
- return 0;
-}
-
-
/***********************************************************
MEMORY STRUCTURES
***********************************************************/
@@ -243,7 +220,8 @@ void slapshot_state::slapshot_map(address_map &map)
map(0xb00000, 0xb0001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0xff00); /* priority chip */
map(0xc00000, 0xc0000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w));
map(0xc00020, 0xc0002f).r(FUNC(slapshot_state::service_input_r)); /* service mirror */
- map(0xd00000, 0xd00003).rw(FUNC(slapshot_state::msb_sound_r), FUNC(slapshot_state::msb_sound_w));
+ map(0xd00000, 0xd00000).w(m_tc0140syt, FUNC(tc0140syt_device::master_port_w));
+ map(0xd00002, 0xd00002).rw(m_tc0140syt, FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w));
}
void slapshot_state::opwolf3_map(address_map &map)
@@ -259,7 +237,8 @@ void slapshot_state::opwolf3_map(address_map &map)
map(0xb00000, 0xb0001f).w(m_tc0360pri, FUNC(tc0360pri_device::write)).umask16(0xff00); /* priority chip */
map(0xc00000, 0xc0000f).rw(m_tc0640fio, FUNC(tc0640fio_device::halfword_byteswap_r), FUNC(tc0640fio_device::halfword_byteswap_w));
map(0xc00020, 0xc0002f).r(FUNC(slapshot_state::service_input_r)); /* service mirror */
- map(0xd00000, 0xd00003).rw(FUNC(slapshot_state::msb_sound_r), FUNC(slapshot_state::msb_sound_w));
+ map(0xd00000, 0xd00000).w(m_tc0140syt, FUNC(tc0140syt_device::master_port_w));
+ map(0xd00002, 0xd00002).rw(m_tc0140syt, FUNC(tc0140syt_device::master_comm_r), FUNC(tc0140syt_device::master_comm_w));
map(0xe00000, 0xe0000f).rw("adc", FUNC(adc0808_device::data_r), FUNC(adc0808_device::address_offset_start_w)).umask16(0xff00);
// map(0xe80000, 0xe80001) // gun recoil here?
}
@@ -412,7 +391,7 @@ static const gfx_layout tilelayout =
128*8 /* every sprite takes 128 consecutive bytes */
};
-static const gfx_layout slapshot_charlayout =
+static const gfx_layout charlayout =
{
16,16, /* 16*16 characters */
RGN_FRAC(1,1),
@@ -424,8 +403,8 @@ static const gfx_layout slapshot_charlayout =
};
static GFXDECODE_START( gfx_slapshot )
- GFXDECODE_ENTRY( "gfx2", 0x0, tilelayout, 0, 256 ) /* sprite parts */
- GFXDECODE_ENTRY( "gfx1", 0x0, slapshot_charlayout, 4096, 256 ) /* sprites & playfield */
+ GFXDECODE_ENTRY( "gfx2", 0x0, tilelayout, 0, 256 ) /* sprite parts */
+ GFXDECODE_ENTRY( "gfx1", 0x0, charlayout, 4096, 256 ) /* sprites & playfield */
GFXDECODE_END