summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2012-09-12 09:55:17 +0000
committerGravatarGravatar Miodrag Milanovic <mmicko@gmail.com>2012-09-12 09:55:17 +0000
commitfab5a8559d17ee613c26d00cfea78971ac9142fe (patch)
tree7767d3434274d89c93afb70444d4c059e68e111a /src
parent8fa9cb845e7236a7413968ba33d31734b8f2092b (diff)
use SOUND_START/RESET instead of MACHINE_START/RESET (no whatsnew)
Diffstat (limited to 'src')
-rw-r--r--src/mame/audio/cinemat.c94
-rw-r--r--src/mame/drivers/cinemat.c2
-rw-r--r--src/mame/includes/cinemat.h5
3 files changed, 47 insertions, 54 deletions
diff --git a/src/mame/audio/cinemat.c b/src/mame/audio/cinemat.c
index 8ee58921a55..9c0122a9888 100644
--- a/src/mame/audio/cinemat.c
+++ b/src/mame/audio/cinemat.c
@@ -71,7 +71,7 @@ WRITE8_MEMBER(cinemat_state::cinemat_sound_control_w)
*
*************************************/
-static MACHINE_START( generic )
+static SOUND_START( generic )
{
cinemat_state *state = machine.driver_data<cinemat_state>();
/* register for save states */
@@ -91,8 +91,6 @@ static MACHINE_START( generic )
static void generic_init(running_machine &machine, void (*callback)(running_machine &,UINT8, UINT8))
{
cinemat_state *state = machine.driver_data<cinemat_state>();
- /* call the standard init */
- MACHINE_RESET_CALL(cinemat);
/* set the sound handler */
state->m_sound_handler = callback;
@@ -181,14 +179,14 @@ static void spacewar_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bi
}
}
-static MACHINE_RESET( spacewar )
+static SOUND_RESET( spacewar )
{
generic_init(machine, spacewar_sound_w);
}
MACHINE_CONFIG_FRAGMENT( spacewar_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(spacewar)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(spacewar)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -236,14 +234,14 @@ static void barrier_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bit
samples->start(2, 2);
}
-static MACHINE_RESET( barrier )
+static SOUND_RESET( barrier )
{
generic_init(machine, barrier_sound_w);
}
MACHINE_CONFIG_FRAGMENT( barrier_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(barrier)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(barrier)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -297,14 +295,14 @@ static void speedfrk_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bi
set_led_status(machine, 0, ~sound_val & 0x02);
}
-static MACHINE_RESET( speedfrk )
+static SOUND_RESET( speedfrk )
{
generic_init(machine, speedfrk_sound_w);
}
MACHINE_CONFIG_FRAGMENT( speedfrk_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(speedfrk)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(speedfrk)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -373,14 +371,14 @@ static void starhawk_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bi
samples->stop(3);
}
-static MACHINE_RESET( starhawk )
+static SOUND_RESET( starhawk )
{
generic_init(machine, starhawk_sound_w);
}
MACHINE_CONFIG_FRAGMENT( starhawk_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(starhawk)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(starhawk)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -443,14 +441,14 @@ static void sundance_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bi
samples->start(5, 5);
}
-static MACHINE_RESET( sundance )
+static SOUND_RESET( sundance )
{
generic_init(machine, sundance_sound_w);
}
MACHINE_CONFIG_FRAGMENT( sundance_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(sundance)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(sundance)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -533,14 +531,14 @@ static void tailg_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bits_
}
}
-static MACHINE_RESET( tailg )
+static SOUND_RESET( tailg )
{
generic_init(machine, tailg_sound_w);
}
MACHINE_CONFIG_FRAGMENT( tailg_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(tailg)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(tailg)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -602,14 +600,14 @@ static void warrior_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bit
samples->start(4, 4);
}
-static MACHINE_RESET( warrior )
+static SOUND_RESET( warrior )
{
generic_init(machine, warrior_sound_w);
}
MACHINE_CONFIG_FRAGMENT( warrior_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(warrior)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(warrior)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -698,14 +696,14 @@ static void armora_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bits
samples->stop(6);
}
-static MACHINE_RESET( armora )
+static SOUND_RESET( armora )
{
generic_init(machine, armora_sound_w);
}
MACHINE_CONFIG_FRAGMENT( armora_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(armora)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(armora)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -791,14 +789,14 @@ static void ripoff_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bits
samples->start(4, 4);
}
-static MACHINE_RESET( ripoff )
+static SOUND_RESET( ripoff )
{
generic_init(machine, ripoff_sound_w);
}
MACHINE_CONFIG_FRAGMENT( ripoff_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(ripoff)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(ripoff)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -905,14 +903,14 @@ static void starcas_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bit
samples->start(7, 7);
}
-static MACHINE_RESET( starcas )
+static SOUND_RESET( starcas )
{
generic_init(machine, starcas_sound_w);
}
MACHINE_CONFIG_FRAGMENT( starcas_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(starcas)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(starcas)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1041,14 +1039,14 @@ static void solarq_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bits
}
}
-static MACHINE_RESET( solarq )
+static SOUND_RESET( solarq )
{
generic_init(machine, solarq_sound_w);
}
MACHINE_CONFIG_FRAGMENT( solarq_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(solarq)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(solarq)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1177,14 +1175,14 @@ static void boxingb_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bit
samples->start(11, 11);
}
-static MACHINE_RESET( boxingb )
+static SOUND_RESET( boxingb )
{
generic_init(machine, boxingb_sound_w);
}
MACHINE_CONFIG_FRAGMENT( boxingb_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(boxingb)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(boxingb)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1291,14 +1289,14 @@ static void wotw_sound_w(running_machine &machine, UINT8 sound_val, UINT8 bits_c
samples->start(7, 7);
}
-static MACHINE_RESET( wotw )
+static SOUND_RESET( wotw )
{
generic_init(machine, wotw_sound_w);
}
MACHINE_CONFIG_FRAGMENT( wotw_sound )
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(wotw)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(wotw)
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1404,7 +1402,7 @@ static Z80CTC_INTERFACE( demon_z80ctc_interface )
};
-static MACHINE_RESET( demon_sound )
+static SOUND_RESET( demon_sound )
{
cinemat_state *state = machine.driver_data<cinemat_state>();
/* generic init */
@@ -1456,8 +1454,8 @@ MACHINE_CONFIG_FRAGMENT( demon_sound )
MCFG_Z80CTC_ADD("ctc", 3579545 /* same as "audiocpu" */, demon_z80ctc_interface)
- MCFG_MACHINE_START(generic)
- MCFG_MACHINE_RESET(demon_sound)
+ MCFG_SOUND_START(generic)
+ MCFG_SOUND_RESET(demon_sound)
/* sound hardware */
MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -1489,10 +1487,10 @@ WRITE8_MEMBER(cinemat_state::qb3_sound_w)
}
-static MACHINE_RESET( qb3_sound )
+static SOUND_RESET( qb3_sound )
{
cinemat_state *state = machine.driver_data<cinemat_state>();
- MACHINE_RESET_CALL(demon_sound);
+ SOUND_RESET_CALL(demon_sound);
machine.device("maincpu")->memory().space(AS_IO)->install_write_handler(0x04, 0x04, write8_delegate(FUNC(cinemat_state::qb3_sound_w),state));
/* this patch prevents the sound ROM from eating itself when command $0A is sent */
@@ -1502,5 +1500,5 @@ static MACHINE_RESET( qb3_sound )
MACHINE_CONFIG_DERIVED( qb3_sound, demon_sound )
- MCFG_MACHINE_RESET(qb3_sound)
+ MCFG_SOUND_RESET(qb3_sound)
MACHINE_CONFIG_END
diff --git a/src/mame/drivers/cinemat.c b/src/mame/drivers/cinemat.c
index f7512f9ebee..d8644565b49 100644
--- a/src/mame/drivers/cinemat.c
+++ b/src/mame/drivers/cinemat.c
@@ -58,7 +58,7 @@ static MACHINE_START( cinemat )
}
-MACHINE_RESET( cinemat )
+static MACHINE_RESET( cinemat )
{
cinemat_state *state = machine.driver_data<cinemat_state>();
/* reset the coin states */
diff --git a/src/mame/includes/cinemat.h b/src/mame/includes/cinemat.h
index eac7c51d7cf..89418fa52cf 100644
--- a/src/mame/includes/cinemat.h
+++ b/src/mame/includes/cinemat.h
@@ -60,11 +60,6 @@ public:
};
-/*----------- defined in drivers/cinemat.c -----------*/
-
-MACHINE_RESET( cinemat );
-
-
/*----------- defined in audio/cinemat.c -----------*/