summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-04-13 16:00:35 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-04-13 16:00:35 +0000
commit83c536ffea68b51eb5df8b03a60c9f5aaef78766 (patch)
tree5e86dadc1b107f41a2bd68fff9693ae58487ade8 /src
parent3d158cc97bd17ad86f6b2ca728973c3ca7cafe71 (diff)
missed some (nw)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/flkatck.c14
-rw-r--r--src/mame/includes/combatsc.h6
-rw-r--r--src/mame/includes/contra.h6
-rw-r--r--src/mame/includes/fastlane.h5
-rw-r--r--src/mame/includes/flkatck.h6
-rw-r--r--src/mame/includes/hcastle.h6
-rw-r--r--src/mame/includes/labyrunr.h3
7 files changed, 29 insertions, 17 deletions
diff --git a/src/mame/drivers/flkatck.c b/src/mame/drivers/flkatck.c
index 2002b91164b..71372cba42e 100644
--- a/src/mame/drivers/flkatck.c
+++ b/src/mame/drivers/flkatck.c
@@ -108,7 +108,7 @@ static ADDRESS_MAP_START( flkatck_sound_map, AS_PROGRAM, 8, flkatck_state )
AM_RANGE(0x9004, 0x9004) AM_READNOP /* ??? */
AM_RANGE(0x9006, 0x9006) AM_WRITENOP /* ??? */
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r) /* soundlatch_byte_r */
- AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("konami", k007232_r, k007232_w) /* 007232 registers */
+ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("k007232", k007232_r, k007232_w) /* 007232 registers */
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write) /* YM2151 */
ADDRESS_MAP_END
@@ -179,8 +179,8 @@ GFXDECODE_END
WRITE8_MEMBER(flkatck_state::volume_callback0)
{
- k007232_set_volume(machine().device("konami"), 0, (data >> 4) * 0x11, 0);
- k007232_set_volume(machine().device("konami"), 1, 0, (data & 0x0f) * 0x11);
+ k007232_set_volume(machine().device("k007232"), 0, (data >> 4) * 0x11, 0);
+ k007232_set_volume(machine().device("k007232"), 1, 0, (data & 0x0f) * 0x11);
}
static const k007232_interface k007232_config =
@@ -202,7 +202,7 @@ void flkatck_state::machine_start()
void flkatck_state::machine_reset()
{
- k007232_set_bank(machine().device("konami"), 0, 1);
+ k007232_set_bank(machine().device("k007232"), 0, 1);
m_irq_enabled = 0;
m_multiply_reg[0] = 0;
@@ -244,7 +244,7 @@ static MACHINE_CONFIG_START( flkatck, flkatck_state )
MCFG_SOUND_ROUTE(0, "lspeaker", 1.0)
MCFG_SOUND_ROUTE(1, "rspeaker", 1.0)
- MCFG_SOUND_ADD("konami", K007232, 3579545)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
MCFG_SOUND_CONFIG(k007232_config)
MCFG_SOUND_ROUTE(0, "lspeaker", 0.50)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.50)
@@ -265,7 +265,7 @@ ROM_START( mx5000 )
ROM_REGION( 0x080000, "gfx1", 0 )
ROM_LOAD( "mask4m.5e", 0x000000, 0x080000, CRC(ff1d718b) SHA1(d44fe3ed5a3ba1b3036264e37f9cd3500b706635) ) /* tiles + sprites */
- ROM_REGION( 0x040000, "konami", 0 ) /* 007232 data (chip 1) */
+ ROM_REGION( 0x040000, "k007232", 0 ) /* 007232 data (chip 1) */
ROM_LOAD( "mask2m.11a", 0x000000, 0x040000, CRC(6d1ea61c) SHA1(9e6eb9ac61838df6e1f74e74bb72f3edf1274aed) )
ROM_END
@@ -280,7 +280,7 @@ ROM_START( flkatck )
ROM_REGION( 0x080000, "gfx1", 0 )
ROM_LOAD( "mask4m.5e", 0x000000, 0x080000, CRC(ff1d718b) SHA1(d44fe3ed5a3ba1b3036264e37f9cd3500b706635) ) /* tiles + sprites */
- ROM_REGION( 0x040000, "konami", 0 ) /* 007232 data (chip 1) */
+ ROM_REGION( 0x040000, "k007232", 0 ) /* 007232 data (chip 1) */
ROM_LOAD( "mask2m.11a", 0x000000, 0x040000, CRC(6d1ea61c) SHA1(9e6eb9ac61838df6e1f74e74bb72f3edf1274aed) )
ROM_END
diff --git a/src/mame/includes/combatsc.h b/src/mame/includes/combatsc.h
index 6498c81240e..2dad1b5082b 100644
--- a/src/mame/includes/combatsc.h
+++ b/src/mame/includes/combatsc.h
@@ -12,6 +12,8 @@ public:
: driver_device(mconfig, type, tag),
m_paletteram(*this, "paletteram"),
m_audiocpu(*this, "audiocpu"),
+ m_k007121_1(*this, "k007121_1"),
+ m_k007121_2(*this, "k007121_2"),
m_maincpu(*this, "maincpu"),
m_upd7759(*this, "upd") { }
@@ -44,8 +46,8 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
- device_t *m_k007121_1;
- device_t *m_k007121_2;
+ optional_device<k007121_device> m_k007121_1;
+ optional_device<k007121_device> m_k007121_2;
DECLARE_WRITE8_MEMBER(combatsc_vreg_w);
DECLARE_WRITE8_MEMBER(combatscb_sh_irqtrigger_w);
DECLARE_READ8_MEMBER(combatscb_io_r);
diff --git a/src/mame/includes/contra.h b/src/mame/includes/contra.h
index 69f405546e9..66837ecfab7 100644
--- a/src/mame/includes/contra.h
+++ b/src/mame/includes/contra.h
@@ -18,6 +18,8 @@ public:
m_bg_cram(*this, "bg_cram"),
m_bg_vram(*this, "bg_vram"),
m_audiocpu(*this, "audiocpu"),
+ m_k007121_1(*this, "k007121_1"),
+ m_k007121_2(*this, "k007121_2"),
m_maincpu(*this, "maincpu") { }
/* memory pointers */
@@ -42,8 +44,8 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
- device_t *m_k007121_1;
- device_t *m_k007121_2;
+ required_device<k007121_device> m_k007121_1;
+ required_device<k007121_device> m_k007121_2;
DECLARE_WRITE8_MEMBER(contra_bankswitch_w);
DECLARE_WRITE8_MEMBER(contra_sh_irqtrigger_w);
DECLARE_WRITE8_MEMBER(contra_coin_counter_w);
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index 4ae71db436f..34443e2703b 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -14,7 +14,8 @@ public:
m_paletteram(*this, "paletteram"),
m_videoram1(*this, "videoram1"),
m_videoram2(*this, "videoram2"),
- m_spriteram(*this, "spriteram"){ }
+ m_spriteram(*this, "spriteram"),
+ m_k007121(*this, "k007121") { }
required_device<cpu_device> m_maincpu;
@@ -33,7 +34,7 @@ public:
/* devices */
device_t *m_konami2;
- device_t *m_k007121;
+ required_device<k007121_device> m_k007121;
DECLARE_WRITE8_MEMBER(k007121_registers_w);
DECLARE_WRITE8_MEMBER(fastlane_bankswitch_w);
diff --git a/src/mame/includes/flkatck.h b/src/mame/includes/flkatck.h
index 97242128e92..6cb2f5d079c 100644
--- a/src/mame/includes/flkatck.h
+++ b/src/mame/includes/flkatck.h
@@ -3,6 +3,7 @@
Flak Attack / MX5000
*************************************************************************/
+#include "sound/k007232.h"
class flkatck_state : public driver_device
{
@@ -11,6 +12,8 @@ public:
: driver_device(mconfig, type, tag),
m_k007121_ram(*this, "k007121_ram"),
m_audiocpu(*this, "audiocpu"),
+ m_k007121(*this, "k007121"),
+ m_k007232(*this, "k007232"),
m_maincpu(*this, "maincpu") { }
/* memory pointers */
@@ -27,7 +30,8 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
- device_t *m_k007121;
+ required_device<k007121_device> m_k007121;
+ required_device<k007232_device> m_k007232;
DECLARE_WRITE8_MEMBER(flkatck_bankswitch_w);
DECLARE_READ8_MEMBER(flkatck_ls138_r);
DECLARE_WRITE8_MEMBER(flkatck_ls138_w);
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 98af52633bd..18dcbdb09dd 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -17,6 +17,8 @@ public:
m_pf1_videoram(*this, "pf1_videoram"),
m_pf2_videoram(*this, "pf2_videoram"),
m_audiocpu(*this, "audiocpu"),
+ m_k007121_1(*this, "k007121_1"),
+ m_k007121_2(*this, "k007121_2"),
m_maincpu(*this, "maincpu") { }
required_device<buffered_spriteram8_device> m_spriteram;
@@ -37,8 +39,8 @@ public:
/* devices */
required_device<cpu_device> m_audiocpu;
- device_t *m_k007121_1;
- device_t *m_k007121_2;
+ required_device<k007121_device> m_k007121_1;
+ required_device<k007121_device> m_k007121_2;
DECLARE_WRITE8_MEMBER(hcastle_bankswitch_w);
DECLARE_WRITE8_MEMBER(hcastle_soundirq_w);
diff --git a/src/mame/includes/labyrunr.h b/src/mame/includes/labyrunr.h
index 920091e9a8d..835f127f17b 100644
--- a/src/mame/includes/labyrunr.h
+++ b/src/mame/includes/labyrunr.h
@@ -9,6 +9,7 @@ class labyrunr_state : public driver_device
public:
labyrunr_state(const machine_config &mconfig, device_type type, const char *tag)
: driver_device(mconfig, type, tag),
+ m_k007121(*this, "k007121"),
m_maincpu(*this,"maincpu"),
m_scrollram(*this, "scrollram"),
m_paletteram(*this, "paletteram"),
@@ -17,7 +18,7 @@ public:
m_videoram2(*this, "videoram2"){ }
/* devices */
- device_t *m_k007121;
+ required_device<k007121_device> m_k007121;
required_device<cpu_device> m_maincpu;
/* memory pointers */