summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2013-04-13 16:24:25 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2013-04-13 16:24:25 +0000
commit6b009f2c49044507e9814b0316bcf5eb2a6b0e29 (patch)
treef9a6d32f82dee81a92b8b30070c034bfd66fbdd0 /src
parent4b5654ad600ff6ecd2c368971ea32e64f5eab5ea (diff)
renamed and done some "konami*" chips (nw)
Diffstat (limited to 'src')
-rw-r--r--src/mame/drivers/fastlane.c32
-rw-r--r--src/mame/drivers/hcastle.c33
-rw-r--r--src/mame/drivers/twin16.c38
-rw-r--r--src/mame/drivers/wecleman.c51
-rw-r--r--src/mame/includes/fastlane.h6
-rw-r--r--src/mame/includes/hcastle.h3
-rw-r--r--src/mame/includes/twin16.h3
-rw-r--r--src/mame/includes/wecleman.h12
8 files changed, 92 insertions, 86 deletions
diff --git a/src/mame/drivers/fastlane.c b/src/mame/drivers/fastlane.c
index b7b17e3cbd4..6643a28ef4c 100644
--- a/src/mame/drivers/fastlane.c
+++ b/src/mame/drivers/fastlane.c
@@ -46,7 +46,7 @@ WRITE8_MEMBER(fastlane_state::fastlane_bankswitch_w)
membank("bank1")->set_entry((data & 0x0c) >> 2);
/* bit 4: bank # for the 007232 (chip 2) */
- k007232_set_bank(m_konami2, 0 + ((data & 0x10) >> 4), 2 + ((data & 0x10) >> 4));
+ k007232_set_bank(m_k007232_2, 0 + ((data & 0x10) >> 4), 2 + ((data & 0x10) >> 4));
/* other bits seems to be unused */
}
@@ -56,26 +56,22 @@ WRITE8_MEMBER(fastlane_state::fastlane_bankswitch_w)
READ8_MEMBER(fastlane_state::fastlane_k1_k007232_r)
{
- device_t *device = machine().device("konami1");
- return k007232_r(device, space, offset ^ 1);
+ return k007232_r(m_k007232_1, space, offset ^ 1);
}
WRITE8_MEMBER(fastlane_state::fastlane_k1_k007232_w)
{
- device_t *device = machine().device("konami1");
- k007232_w(device, space, offset ^ 1, data);
+ k007232_w(m_k007232_1, space, offset ^ 1, data);
}
READ8_MEMBER(fastlane_state::fastlane_k2_k007232_r)
{
- device_t *device = machine().device("konami2");
- return k007232_r(device, space, offset ^ 1);
+ return k007232_r(m_k007232_2, space, offset ^ 1);
}
WRITE8_MEMBER(fastlane_state::fastlane_k2_k007232_w)
{
- device_t *device = machine().device("konami2");
- k007232_w(device, space, offset ^ 1, data);
+ k007232_w(m_k007232_2, space, offset ^ 1, data);
}
static ADDRESS_MAP_START( fastlane_map, AS_PROGRAM, 8, fastlane_state )
AM_RANGE(0x0000, 0x005f) AM_RAM_WRITE(k007121_registers_w) AM_SHARE("k007121_regs") /* 007121 registers */
@@ -181,14 +177,14 @@ GFXDECODE_END
WRITE8_MEMBER(fastlane_state::volume_callback0)
{
- k007232_set_volume(machine().device("konami1"), 0, (data >> 4) * 0x11, 0);
- k007232_set_volume(machine().device("konami1"), 1, 0, (data & 0x0f) * 0x11);
+ k007232_set_volume(m_k007232_1, 0, (data >> 4) * 0x11, 0);
+ k007232_set_volume(m_k007232_1, 1, 0, (data & 0x0f) * 0x11);
}
WRITE8_MEMBER(fastlane_state::volume_callback1)
{
- k007232_set_volume(m_konami2, 0, (data >> 4) * 0x11, 0);
- k007232_set_volume(m_konami2, 1, 0, (data & 0x0f) * 0x11);
+ k007232_set_volume(m_k007232_2, 0, (data >> 4) * 0x11, 0);
+ k007232_set_volume(m_k007232_2, 1, 0, (data & 0x0f) * 0x11);
}
static const k007232_interface k007232_interface_1 =
@@ -206,8 +202,6 @@ void fastlane_state::machine_start()
UINT8 *ROM = memregion("maincpu")->base();
membank("bank1")->configure_entries(0, 4, &ROM[0x10000], 0x4000);
-
- m_konami2 = machine().device("konami2");
}
static MACHINE_CONFIG_START( fastlane, fastlane_state )
@@ -234,12 +228,12 @@ static MACHINE_CONFIG_START( fastlane, fastlane_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("konami1", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232_1", K007232, XTAL_3_579545MHz)
MCFG_SOUND_CONFIG(k007232_interface_1)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
- MCFG_SOUND_ADD("konami2", K007232, XTAL_3_579545MHz)
+ MCFG_SOUND_ADD("k007232_2", K007232, XTAL_3_579545MHz)
MCFG_SOUND_CONFIG(k007232_interface_2)
MCFG_SOUND_ROUTE(0, "mono", 0.50)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -263,10 +257,10 @@ ROM_START( fastlane )
ROM_REGION( 0x0100, "proms", 0 )
ROM_LOAD( "752e03.6h", 0x0000, 0x0100, CRC(44300aeb) SHA1(580c6e88cbb3b6d8156ea0b9103834f199ec2747) )
- ROM_REGION( 0x20000, "konami1", 0 ) /* 007232 data */
+ ROM_REGION( 0x20000, "k007232_1", 0 ) /* 007232 data */
ROM_LOAD( "752e06.4c", 0x00000, 0x20000, CRC(85d691ed) SHA1(7f8d05562a68c75672141fc80ce7e7acb80588b9) ) /* chip 1 */
- ROM_REGION( 0x80000, "konami2", 0 ) /* 007232 data */
+ ROM_REGION( 0x80000, "k007232_2", 0 ) /* 007232 data */
ROM_LOAD( "752e05.12b", 0x00000, 0x80000, CRC(119e9cbf) SHA1(21e3def9ab10b210632df11b6df4699140c473db) ) /* chip 2 */
ROM_END
diff --git a/src/mame/drivers/hcastle.c b/src/mame/drivers/hcastle.c
index 6796d97ac44..bc0c3b4a024 100644
--- a/src/mame/drivers/hcastle.c
+++ b/src/mame/drivers/hcastle.c
@@ -65,22 +65,21 @@ ADDRESS_MAP_END
WRITE8_MEMBER(hcastle_state::sound_bank_w)
{
- device_t *device = machine().device("konami1");
int bank_A=(data&0x3);
int bank_B=((data>>2)&0x3);
- k007232_set_bank(device, bank_A, bank_B );
+ k007232_set_bank(m_k007232, bank_A, bank_B );
}
static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, hcastle_state )
AM_RANGE(0x0000, 0x7fff) AM_ROM
AM_RANGE(0x8000, 0x87ff) AM_RAM
- AM_RANGE(0x9800, 0x987f) AM_DEVREADWRITE("konami2", k051649_device, k051649_waveform_r, k051649_waveform_w)
- AM_RANGE(0x9880, 0x9889) AM_DEVWRITE("konami2", k051649_device, k051649_frequency_w)
- AM_RANGE(0x988a, 0x988e) AM_DEVWRITE("konami2", k051649_device, k051649_volume_w)
- AM_RANGE(0x988f, 0x988f) AM_DEVWRITE("konami2", k051649_device, k051649_keyonoff_w)
- AM_RANGE(0x98e0, 0x98ff) AM_DEVREADWRITE("konami2", k051649_device, k051649_test_r, k051649_test_w)
+ AM_RANGE(0x9800, 0x987f) AM_DEVREADWRITE("k051649", k051649_device, k051649_waveform_r, k051649_waveform_w)
+ AM_RANGE(0x9880, 0x9889) AM_DEVWRITE("k051649", k051649_device, k051649_frequency_w)
+ AM_RANGE(0x988a, 0x988e) AM_DEVWRITE("k051649", k051649_device, k051649_volume_w)
+ AM_RANGE(0x988f, 0x988f) AM_DEVWRITE("k051649", k051649_device, k051649_keyonoff_w)
+ AM_RANGE(0x98e0, 0x98ff) AM_DEVREADWRITE("k051649", k051649_device, k051649_test_r, k051649_test_w)
AM_RANGE(0xa000, 0xa001) AM_DEVREADWRITE_LEGACY("ymsnd", ym3812_r, ym3812_w)
- AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("konami1", k007232_r, k007232_w)
+ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("k007232", k007232_r, k007232_w)
AM_RANGE(0xc000, 0xc000) AM_WRITE(sound_bank_w) /* 7232 bankswitch */
AM_RANGE(0xd000, 0xd000) AM_READ(soundlatch_byte_r)
ADDRESS_MAP_END
@@ -163,8 +162,8 @@ WRITE_LINE_MEMBER(hcastle_state::irqhandler)
WRITE8_MEMBER(hcastle_state::volume_callback)
{
- k007232_set_volume(machine().device("konami1"), 0, (data >> 4) * 0x11, 0);
- k007232_set_volume(machine().device("konami1"), 1, 0, (data & 0x0f) * 0x11);
+ k007232_set_volume(m_k007232, 0, (data >> 4) * 0x11, 0);
+ k007232_set_volume(m_k007232, 1, 0, (data & 0x0f) * 0x11);
}
static const k007232_interface k007232_config =
@@ -231,7 +230,7 @@ static MACHINE_CONFIG_START( hcastle, hcastle_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("konami1", K007232, 3579545)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
MCFG_SOUND_CONFIG(k007232_config)
MCFG_SOUND_ROUTE(0, "mono", 0.44)
MCFG_SOUND_ROUTE(1, "mono", 0.50)
@@ -240,7 +239,7 @@ static MACHINE_CONFIG_START( hcastle, hcastle_state )
MCFG_SOUND_CONFIG(ym3812_config)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.70)
- MCFG_K051649_ADD("konami2", 3579545/2)
+ MCFG_K051649_ADD("k051649", 3579545/2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.45)
MACHINE_CONFIG_END
@@ -269,7 +268,7 @@ ROM_START( hcastle )
ROM_LOAD( "768c10.i3", 0x0300, 0x0100, CRC(b32071b7) SHA1(09a699a3f20c155eae1e63429f03ed91abc54784) ) /* 007121 #1 char lookup table (same) */
ROM_LOAD( "768b12.d20", 0x0400, 0x0100, CRC(362544b8) SHA1(744c8d2ccfa980fc9a7354b4d241c569b3c1fffe) ) /* priority encoder (not used) */
- ROM_REGION( 0x80000, "konami1", 0 ) /* 512k for the samples */
+ ROM_REGION( 0x80000, "k007232", 0 ) /* 512k for the samples */
ROM_LOAD( "768c07.e17", 0x00000, 0x80000, CRC(01f9889c) SHA1(01252d2ce7b14cfbe39ac8d7a5bd7417f1c2fc22) )
ROM_END
@@ -296,7 +295,7 @@ ROM_START( hcastlek )
ROM_LOAD( "768c10.i3", 0x0300, 0x0100, CRC(b32071b7) SHA1(09a699a3f20c155eae1e63429f03ed91abc54784) ) /* 007121 #1 char lookup table (same) */
ROM_LOAD( "768b12.d20", 0x0400, 0x0100, CRC(362544b8) SHA1(744c8d2ccfa980fc9a7354b4d241c569b3c1fffe) ) /* priority encoder (not used) */
- ROM_REGION( 0x80000, "konami1", 0 ) /* 512k for the samples */
+ ROM_REGION( 0x80000, "k007232", 0 ) /* 512k for the samples */
ROM_LOAD( "768c07.e17", 0x00000, 0x80000, CRC(01f9889c) SHA1(01252d2ce7b14cfbe39ac8d7a5bd7417f1c2fc22) )
ROM_END
@@ -323,7 +322,7 @@ ROM_START( hcastlee )
ROM_LOAD( "768c10.i3", 0x0300, 0x0100, CRC(b32071b7) SHA1(09a699a3f20c155eae1e63429f03ed91abc54784) ) /* 007121 #1 char lookup table (same) */
ROM_LOAD( "768b12.d20", 0x0400, 0x0100, CRC(362544b8) SHA1(744c8d2ccfa980fc9a7354b4d241c569b3c1fffe) ) /* priority encoder (not used) */
- ROM_REGION( 0x80000, "konami1", 0 ) /* 512k for the samples */
+ ROM_REGION( 0x80000, "k007232", 0 ) /* 512k for the samples */
ROM_LOAD( "768c07.e17", 0x00000, 0x80000, CRC(01f9889c) SHA1(01252d2ce7b14cfbe39ac8d7a5bd7417f1c2fc22) )
ROM_END
@@ -350,7 +349,7 @@ ROM_START( akumajou )
ROM_LOAD( "768c10.i3", 0x0300, 0x0100, CRC(b32071b7) SHA1(09a699a3f20c155eae1e63429f03ed91abc54784) ) /* 007121 #1 char lookup table (same) */
ROM_LOAD( "768b12.d20", 0x0400, 0x0100, CRC(362544b8) SHA1(744c8d2ccfa980fc9a7354b4d241c569b3c1fffe) ) /* priority encoder (not used) */
- ROM_REGION( 0x80000, "konami1", 0 ) /* 512k for the samples */
+ ROM_REGION( 0x80000, "k007232", 0 ) /* 512k for the samples */
ROM_LOAD( "768c07.e17", 0x00000, 0x80000, CRC(01f9889c) SHA1(01252d2ce7b14cfbe39ac8d7a5bd7417f1c2fc22) )
ROM_END
@@ -377,7 +376,7 @@ ROM_START( akumajoun )
ROM_LOAD( "768c10.i3", 0x0300, 0x0100, CRC(b32071b7) SHA1(09a699a3f20c155eae1e63429f03ed91abc54784) ) /* 007121 #1 char lookup table (same) */
ROM_LOAD( "768b12.d20", 0x0400, 0x0100, CRC(362544b8) SHA1(744c8d2ccfa980fc9a7354b4d241c569b3c1fffe) ) /* priority encoder (not used) */
- ROM_REGION( 0x80000, "konami1", 0 ) /* 512k for the samples */
+ ROM_REGION( 0x80000, "k007232", 0 ) /* 512k for the samples */
ROM_LOAD( "768c07.e17", 0x00000, 0x80000, CRC(01f9889c) SHA1(01252d2ce7b14cfbe39ac8d7a5bd7417f1c2fc22) )
ROM_END
diff --git a/src/mame/drivers/twin16.c b/src/mame/drivers/twin16.c
index 47182cd25e5..24dd9a4a37d 100644
--- a/src/mame/drivers/twin16.c
+++ b/src/mame/drivers/twin16.c
@@ -224,7 +224,7 @@ static ADDRESS_MAP_START( sound_map, AS_PROGRAM, 8, twin16_state )
AM_RANGE(0x8000, 0x8fff) AM_RAM
AM_RANGE(0x9000, 0x9000) AM_WRITE(twin16_upd_reset_w)
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r)
- AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("konami", k007232_r, k007232_w)
+ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("k007232", k007232_r, k007232_w)
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write)
AM_RANGE(0xd000, 0xd000) AM_DEVWRITE_LEGACY("upd", upd7759_port_w)
AM_RANGE(0xe000, 0xe000) AM_WRITE(twin16_upd_start_w)
@@ -670,8 +670,8 @@ GFXDECODE_END
WRITE8_MEMBER(twin16_state::volume_callback)
{
- 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(m_k007232,0,(data >> 4) * 0x11,0);
+ k007232_set_volume(m_k007232,1,0,(data & 0x0f) * 0x11);
}
static const k007232_interface k007232_config =
@@ -754,7 +754,7 @@ static MACHINE_CONFIG_START( twin16, twin16_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.12) // estimated with gradius2 OST
MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
@@ -808,7 +808,7 @@ static MACHINE_CONFIG_START( fround, twin16_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.12)
MCFG_SOUND_ROUTE(0, "rspeaker", 0.12)
@@ -862,7 +862,7 @@ ROM_START( devilw )
ROM_LOAD16_BYTE( "687_l11.10r", 0x00000, 0x10000, CRC(399deee8) SHA1(dcc65e95f28ae4e9b671e70ce0bd5ba0fe178506) )
ROM_LOAD16_BYTE( "687_l10.8r", 0x00001, 0x10000, CRC(117c91ee) SHA1(dcf8efb25fc73cff916b66b7bcfd3c1fb2556a53) )
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "687_i01.5a", 0x00000, 0x20000, CRC(d4992dfb) SHA1(c65bef07b6adb9ab6328d679595450945dbf6a88) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -898,7 +898,7 @@ ROM_START( majuu )
ROM_LOAD16_BYTE( "687_l11.10r", 0x00000, 0x10000, CRC(399deee8) SHA1(dcc65e95f28ae4e9b671e70ce0bd5ba0fe178506) )
ROM_LOAD16_BYTE( "687_l10.8r", 0x00001, 0x10000, CRC(117c91ee) SHA1(dcf8efb25fc73cff916b66b7bcfd3c1fb2556a53) )
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "687_i01.5a", 0x00000, 0x20000, CRC(d4992dfb) SHA1(c65bef07b6adb9ab6328d679595450945dbf6a88) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -934,7 +934,7 @@ ROM_START( darkadv )
ROM_LOAD16_BYTE( "687_l11.10r", 0x00000, 0x10000, CRC(399deee8) SHA1(dcc65e95f28ae4e9b671e70ce0bd5ba0fe178506) )
ROM_LOAD16_BYTE( "687_l10.8r", 0x00001, 0x10000, CRC(117c91ee) SHA1(dcf8efb25fc73cff916b66b7bcfd3c1fb2556a53) )
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "687_i01.5a", 0x00000, 0x20000, CRC(d4992dfb) SHA1(c65bef07b6adb9ab6328d679595450945dbf6a88) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -968,7 +968,7 @@ ROM_START( vulcan )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "785_f01.5a", 0x00000, 0x20000, CRC(a0d8d69e) SHA1(2994e5740b7c099d55fb162a363a26ef1995c756) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1002,7 +1002,7 @@ ROM_START( vulcana )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "785_f01.5a", 0x00000, 0x20000, CRC(a0d8d69e) SHA1(2994e5740b7c099d55fb162a363a26ef1995c756) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1036,7 +1036,7 @@ ROM_START( vulcanb )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "785_f01.5a", 0x00000, 0x20000, CRC(a0d8d69e) SHA1(2994e5740b7c099d55fb162a363a26ef1995c756) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1075,7 +1075,7 @@ ROM_START( gradius2 )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "785_f01.5a", 0x00000, 0x20000, CRC(a0d8d69e) SHA1(2994e5740b7c099d55fb162a363a26ef1995c756) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1109,7 +1109,7 @@ ROM_START( gradius2a )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "785_f01.5a", 0x00000, 0x20000, CRC(a0d8d69e) SHA1(2994e5740b7c099d55fb162a363a26ef1995c756) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1143,7 +1143,7 @@ ROM_START( gradius2b )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "785_f01.5a", 0x00000, 0x20000, CRC(a0d8d69e) SHA1(2994e5740b7c099d55fb162a363a26ef1995c756) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1167,7 +1167,7 @@ ROM_START( fround )
ROM_LOAD16_WORD("870c16.p15", 0x100000, 0x80000, CRC(41df6a1b) SHA1(32e0fdeb53628d18adde851e4496dd01ac6ec68f) )
ROM_LOAD16_WORD("870c15.p13", 0x180000, 0x80000, CRC(8c9281df) SHA1(5e3d80be414db108d5363d0ea1b74021ba942c33) )
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "870_c01.5a", 0x00000, 0x20000, CRC(6af96546) SHA1(63b49b28c0f2ef8f52bc4c5955ad6a633dd553cf) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1191,7 +1191,7 @@ ROM_START( froundl )
ROM_LOAD16_WORD("870c16.p15", 0x100000, 0x80000, CRC(41df6a1b) SHA1(32e0fdeb53628d18adde851e4496dd01ac6ec68f) )
ROM_LOAD16_WORD("870c15.p13", 0x180000, 0x80000, CRC(8c9281df) SHA1(5e3d80be414db108d5363d0ea1b74021ba942c33) )
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "870_c01.5a", 0x00000, 0x20000, CRC(6af96546) SHA1(63b49b28c0f2ef8f52bc4c5955ad6a633dd553cf) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1221,7 +1221,7 @@ ROM_START( hpuncher )
ROM_LOAD16_WORD("870c15.p13", 0x100000, 0x80000, CRC(8c9281df) SHA1(5e3d80be414db108d5363d0ea1b74021ba942c33) )
ROM_LOAD16_WORD("870c16.p15", 0x180000, 0x80000, CRC(41df6a1b) SHA1(32e0fdeb53628d18adde851e4496dd01ac6ec68f) )
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD( "870_c01.5a", 0x00000, 0x20000, CRC(6af96546) SHA1(63b49b28c0f2ef8f52bc4c5955ad6a633dd553cf) )
ROM_REGION( 0x20000, "upd", 0 ) // samples
@@ -1253,7 +1253,7 @@ ROM_START( miaj )
ROM_REGION( 0x20000, "gfx3", ROMREGION_ERASE00 ) // tile data; mapped at 0x80000 on CPUB
- ROM_REGION( 0x20000, "konami", 0 ) // samples
+ ROM_REGION( 0x20000, "k007232", 0 ) // samples
ROM_LOAD("808_d01.5a", 0x00000, 0x20000, CRC(fd4d37c0) SHA1(ef91c6e7bb57c27a9a51729fffd1bfe3e806fb61) )
ROM_REGION( 0x20000, "upd", ROMREGION_ERASE00 ) // samples
@@ -1285,7 +1285,7 @@ ROM_START( cuebrickj )
ROM_LOAD16_BYTE( "903_e11.10r", 0x00000, 0x10000, CRC(5c41faf8) SHA1(f9eee6a7b92d3b3aa4320747da6390310522a2cf) )
ROM_LOAD16_BYTE( "903_e10.8r", 0x00001, 0x10000, CRC(417576d4) SHA1(e84762743e3a1117b6ef7ea0b304877e4a719f75) )
- ROM_REGION( 0x20000, "konami", ROMREGION_ERASE00 ) // samples
+ ROM_REGION( 0x20000, "k007232", ROMREGION_ERASE00 ) // samples
// unpopulated
ROM_REGION( 0x20000, "upd", ROMREGION_ERASE00 ) // samples
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index 30306fe01cb..2c1936407a6 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -617,8 +617,7 @@ WRITE8_MEMBER(wecleman_state::multiply_w)
WRITE8_MEMBER(wecleman_state::wecleman_K00723216_bank_w)
{
- device_t *device = machine().device("konami");
- k007232_set_bank(device, 0, ~data&1 ); //* (wecleman062gre)
+ k007232_set_bank(m_k007232, 0, ~data&1 ); //* (wecleman062gre)
}
static ADDRESS_MAP_START( wecleman_sound_map, AS_PROGRAM, 8, wecleman_state )
@@ -629,7 +628,7 @@ static ADDRESS_MAP_START( wecleman_sound_map, AS_PROGRAM, 8, wecleman_state )
AM_RANGE(0x9000, 0x9001) AM_WRITE(multiply_w) // Protection
AM_RANGE(0x9006, 0x9006) AM_WRITENOP // ?
AM_RANGE(0xa000, 0xa000) AM_READ(soundlatch_byte_r) // From main CPU
- AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("konami", k007232_r, k007232_w) // K007232 (Reading offset 5/b triggers the sample)
+ AM_RANGE(0xb000, 0xb00d) AM_DEVREADWRITE_LEGACY("k007232", k007232_r, k007232_w) // K007232 (Reading offset 5/b triggers the sample)
AM_RANGE(0xc000, 0xc001) AM_DEVREADWRITE("ymsnd", ym2151_device, read, write)
AM_RANGE(0xf000, 0xf000) AM_WRITE(wecleman_K00723216_bank_w) // Samples banking
ADDRESS_MAP_END
@@ -651,13 +650,13 @@ WRITE16_MEMBER(wecleman_state::hotchase_soundlatch_w)
WRITE8_MEMBER(wecleman_state::hotchase_sound_control_w)
{
- device_t *sound[3];
+ k007232_device *sound[3];
// int reg[8];
- sound[0] = machine().device("konami1");
- sound[1] = machine().device("konami2");
- sound[2] = machine().device("konami3");
+ sound[0] = m_k007232_1;
+ sound[1] = m_k007232_2;
+ sound[2] = m_k007232_3;
// reg[offset] = data;
@@ -706,38 +705,32 @@ WRITE8_MEMBER(wecleman_state::hotchase_sound_control_w)
even and odd register are mapped swapped */
READ8_MEMBER(wecleman_state::hotchase_1_k007232_r)
{
- device_t *device = machine().device("konami1");
- return k007232_r(device, space, offset ^ 1);
+ return k007232_r(m_k007232_1, space, offset ^ 1);
}
WRITE8_MEMBER(wecleman_state::hotchase_1_k007232_w)
{
- device_t *device = machine().device("konami1");
- k007232_w(device, space, offset ^ 1, data);
+ k007232_w(m_k007232_1, space, offset ^ 1, data);
}
READ8_MEMBER(wecleman_state::hotchase_2_k007232_r)
{
- device_t *device = machine().device("konami2");
- return k007232_r(device, space, offset ^ 1);
+ return k007232_r(m_k007232_2, space, offset ^ 1);
}
WRITE8_MEMBER(wecleman_state::hotchase_2_k007232_w)
{
- device_t *device = machine().device("konami2");
- k007232_w(device, space, offset ^ 1, data);
+ k007232_w(m_k007232_2, space, offset ^ 1, data);
}
READ8_MEMBER(wecleman_state::hotchase_3_k007232_r)
{
- device_t *device = machine().device("konami3");
- return k007232_r(device, space, offset ^ 1);
+ return k007232_r(m_k007232_3, space, offset ^ 1);
}
WRITE8_MEMBER(wecleman_state::hotchase_3_k007232_w)
{
- device_t *device = machine().device("konami3");
- k007232_w(device, space, offset ^ 1, data);
+ k007232_w(m_k007232_3, space, offset ^ 1, data);
}
static ADDRESS_MAP_START( hotchase_sound_map, AS_PROGRAM, 8, wecleman_state )
@@ -1047,7 +1040,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(wecleman_state::hotchase_scanline)
MACHINE_RESET_MEMBER(wecleman_state,wecleman)
{
- k007232_set_bank( machine().device("konami"), 0, 1 );
+ k007232_set_bank( m_k007232, 0, 1 );
}
static MACHINE_CONFIG_START( wecleman, wecleman_state )
@@ -1089,7 +1082,7 @@ static MACHINE_CONFIG_START( wecleman, wecleman_state )
MCFG_SOUND_ROUTE(0, "mono", 0.85)
MCFG_SOUND_ROUTE(1, "mono", 0.85)
- MCFG_SOUND_ADD("konami", K007232, 3579545)
+ MCFG_SOUND_ADD("k007232", K007232, 3579545)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
@@ -1171,15 +1164,15 @@ static MACHINE_CONFIG_START( hotchase, wecleman_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
- MCFG_SOUND_ADD("konami1", K007232, 3579545)
+ MCFG_SOUND_ADD("k007232_1", K007232, 3579545)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MCFG_SOUND_ADD("konami2", K007232, 3579545)
+ MCFG_SOUND_ADD("k007232_2", K007232, 3579545)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
- MCFG_SOUND_ADD("konami3", K007232, 3579545)
+ MCFG_SOUND_ADD("k007232_3", K007232, 3579545)
MCFG_SOUND_ROUTE(0, "mono", 0.20)
MCFG_SOUND_ROUTE(1, "mono", 0.20)
MACHINE_CONFIG_END
@@ -1230,7 +1223,7 @@ ROM_START( wecleman )
ROM_LOAD( "602a04.11e", 0x000000, 0x08000, CRC(ade9f359) SHA1(58db6be6217ed697827015e50e99e58602042a4c) )
ROM_LOAD( "602a05.13e", 0x008000, 0x04000, CRC(f22b7f2b) SHA1(857389c57552c4e2237cb599f4c68c381430475e) ) // may also exist as 32KB with one half empty
- ROM_REGION( 0x40000, "konami", 0 ) /* Samples (Channel A 0x20000=Channel B) */
+ ROM_REGION( 0x40000, "k007232", 0 ) /* Samples (Channel A 0x20000=Channel B) */
ROM_LOAD( "602a03.10a", 0x00000, 0x20000, CRC(31392b01) SHA1(0424747bc2015c9c93afd20e6a23083c0dcc4fb7) )
ROM_LOAD( "602a02.8a", 0x20000, 0x20000, CRC(e2be10ae) SHA1(109c31bf7252c83a062d259143cd8299681db778) )
@@ -1280,7 +1273,7 @@ ROM_START( wecleman2 )
ROM_LOAD( "602a04.11e", 0x000000, 0x08000, CRC(ade9f359) SHA1(58db6be6217ed697827015e50e99e58602042a4c) )
ROM_LOAD( "602a05.13e", 0x008000, 0x04000, CRC(f22b7f2b) SHA1(857389c57552c4e2237cb599f4c68c381430475e) ) // may also exist as 32KB with one half empty
- ROM_REGION( 0x40000, "konami", 0 ) /* Samples (Channel A 0x20000=Channel B) */
+ ROM_REGION( 0x40000, "k007232", 0 ) /* Samples (Channel A 0x20000=Channel B) */
ROM_LOAD( "602a03.10a", 0x00000, 0x20000, CRC(31392b01) SHA1(0424747bc2015c9c93afd20e6a23083c0dcc4fb7) )
ROM_LOAD( "602a02.8a", 0x20000, 0x20000, CRC(e2be10ae) SHA1(109c31bf7252c83a062d259143cd8299681db778) )
@@ -1397,13 +1390,13 @@ ROM_START( hotchase )
ROM_REGION( 0x20000, "gfx4", 0 ) /* road */
ROM_LOAD( "763e15", 0x000000, 0x020000, CRC(7110aa43) SHA1(639dc002cc1580f0530bb5bb17f574e2258d5954) )
- ROM_REGION( 0x40000, "konami1", 0 ) /* Samples, 2 banks */
+ ROM_REGION( 0x40000, "k007232_1", 0 ) /* Samples, 2 banks */
ROM_LOAD( "763e11", 0x000000, 0x040000, CRC(9d99a5a7) SHA1(96e37bbb259e0a91d124c26b6b1a9b70de2e19a4) )
- ROM_REGION( 0x40000, "konami2", 0 ) /* Samples, 2 banks */
+ ROM_REGION( 0x40000, "k007232_2", 0 ) /* Samples, 2 banks */
ROM_LOAD( "763e10", 0x000000, 0x040000, CRC(ca409210) SHA1(703d7619c4bd33d2ff5fad127d98c82906fede33) )
- ROM_REGION( 0x100000, "konami3", 0 ) /* Samples, 4 banks for each ROM */
+ ROM_REGION( 0x100000, "k007232_3", 0 ) /* Samples, 4 banks for each ROM */
ROM_LOAD( "763e08", 0x000000, 0x080000, CRC(054a9a63) SHA1(45d7926c9e7af47c041ba9b733e334bccd730a6d) )
ROM_LOAD( "763e09", 0x080000, 0x080000, CRC(c39857db) SHA1(64b135a9ccf9e1dd50789cdd5c6bc03da8decfd0) )
diff --git a/src/mame/includes/fastlane.h b/src/mame/includes/fastlane.h
index 34443e2703b..c64e5db5f98 100644
--- a/src/mame/includes/fastlane.h
+++ b/src/mame/includes/fastlane.h
@@ -3,6 +3,7 @@
Fast Lane
*************************************************************************/
+#include "sound/k007232.h"
class fastlane_state : public driver_device
{
@@ -15,6 +16,8 @@ public:
m_videoram1(*this, "videoram1"),
m_videoram2(*this, "videoram2"),
m_spriteram(*this, "spriteram"),
+ m_k007232_1(*this, "k007232_1"),
+ m_k007232_2(*this, "k007232_2"),
m_k007121(*this, "k007121") { }
required_device<cpu_device> m_maincpu;
@@ -33,7 +36,8 @@ public:
rectangle m_clip1;
/* devices */
- device_t *m_konami2;
+ required_device<k007232_device> m_k007232_1;
+ required_device<k007232_device> m_k007232_2;
required_device<k007121_device> m_k007121;
DECLARE_WRITE8_MEMBER(k007121_registers_w);
diff --git a/src/mame/includes/hcastle.h b/src/mame/includes/hcastle.h
index 18dcbdb09dd..6e801e065dd 100644
--- a/src/mame/includes/hcastle.h
+++ b/src/mame/includes/hcastle.h
@@ -5,6 +5,7 @@
*************************************************************************/
#include "video/bufsprite.h"
+#include "sound/k007232.h"
class hcastle_state : public driver_device
{
@@ -19,6 +20,7 @@ public:
m_audiocpu(*this, "audiocpu"),
m_k007121_1(*this, "k007121_1"),
m_k007121_2(*this, "k007121_2"),
+ m_k007232(*this, "k007232"),
m_maincpu(*this, "maincpu") { }
required_device<buffered_spriteram8_device> m_spriteram;
@@ -41,6 +43,7 @@ public:
required_device<cpu_device> m_audiocpu;
required_device<k007121_device> m_k007121_1;
required_device<k007121_device> m_k007121_2;
+ optional_device<k007232_device> m_k007232;
DECLARE_WRITE8_MEMBER(hcastle_bankswitch_w);
DECLARE_WRITE8_MEMBER(hcastle_soundirq_w);
diff --git a/src/mame/includes/twin16.h b/src/mame/includes/twin16.h
index d03dc3ead80..b7df998a069 100644
--- a/src/mame/includes/twin16.h
+++ b/src/mame/includes/twin16.h
@@ -1,5 +1,6 @@
#include "video/bufsprite.h"
#include "sound/upd7759.h"
+#include "sound/k007232.h"
class twin16_state : public driver_device
{
@@ -14,6 +15,7 @@ public:
m_maincpu(*this, "maincpu"),
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub"),
+ m_k007232(*this, "k007232"),
m_upd7759(*this, "upd") { }
required_device<buffered_spriteram16_device> m_spriteram;
@@ -81,5 +83,6 @@ public:
required_device<cpu_device> m_maincpu;
required_device<cpu_device> m_audiocpu;
optional_device<cpu_device> m_subcpu;
+ required_device<k007232_device> m_k007232;
required_device<upd7759_device> m_upd7759;
};
diff --git a/src/mame/includes/wecleman.h b/src/mame/includes/wecleman.h
index 1d830f10d6e..b2431a18ec6 100644
--- a/src/mame/includes/wecleman.h
+++ b/src/mame/includes/wecleman.h
@@ -1,3 +1,5 @@
+#include "sound/k007232.h"
+
class wecleman_state : public driver_device
{
public:
@@ -14,7 +16,11 @@ public:
m_audiocpu(*this, "audiocpu"),
m_subcpu(*this, "sub"),
m_k051316_1(*this, "k051316_1"),
- m_k051316_2(*this, "k051316_2") { }
+ m_k051316_2(*this, "k051316_2"),
+ m_k007232(*this, "k007232"),
+ m_k007232_1(*this, "k007232_1"),
+ m_k007232_2(*this, "k007232_2"),
+ m_k007232_3(*this, "k007232_3") { }
optional_shared_ptr<UINT16> m_videostatus;
optional_shared_ptr<UINT16> m_protection_ram;
@@ -94,6 +100,10 @@ public:
required_device<cpu_device> m_subcpu;
optional_device<k051316_device> m_k051316_1;
optional_device<k051316_device> m_k051316_2;
+ optional_device<k007232_device> m_k007232;
+ optional_device<k007232_device> m_k007232_1;
+ optional_device<k007232_device> m_k007232_2;
+ optional_device<k007232_device> m_k007232_3;
};
/*----------- defined in video/wecleman.c -----------*/