summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Aaron Giles <aaron@aarongiles.com>2009-02-17 06:08:25 +0000
committer Aaron Giles <aaron@aarongiles.com>2009-02-17 06:08:25 +0000
commit0ca5402b1e96c1ea4a15da6d93c734f0297f6909 (patch)
treea688be60391f1e5c80736639923d1630e1d47441
parent500f6def5aa04ca10075566070a73b440345c735 (diff)
Fix a few regressions due to the audio devic-ification.
-rw-r--r--src/mame/audio/cage.c2
-rw-r--r--src/mame/audio/dcs.c2
-rw-r--r--src/mame/drivers/88games.c8
-rw-r--r--src/mame/drivers/arkanoid.c3
-rw-r--r--src/mame/drivers/circusc.c4
-rw-r--r--src/mame/drivers/coinmstr.c6
-rw-r--r--src/mame/drivers/dcheese.c2
7 files changed, 15 insertions, 12 deletions
diff --git a/src/mame/audio/cage.c b/src/mame/audio/cage.c
index 7c0a51b23c3..20cab9accbb 100644
--- a/src/mame/audio/cage.c
+++ b/src/mame/audio/cage.c
@@ -177,7 +177,7 @@ void cage_init(running_machine *machine, offs_t speedup)
for (chan = 0; chan < DAC_BUFFER_CHANNELS; chan++)
{
char buffer[10];
- sprintf(buffer, "dac%d", chan);
+ sprintf(buffer, "dac%d", chan + 1);
dmadac[chan] = devtag_get_device(machine, SOUND, buffer);
}
diff --git a/src/mame/audio/dcs.c b/src/mame/audio/dcs.c
index e5dfa79f676..3ac4231e57b 100644
--- a/src/mame/audio/dcs.c
+++ b/src/mame/audio/dcs.c
@@ -1397,7 +1397,7 @@ static WRITE16_HANDLER( denver_w )
for (chan = 0; chan < dcs.channels; chan++)
{
char buffer[10];
- sprintf(buffer, "dac%d", chan);
+ sprintf(buffer, "dac%d", chan + 1);
dcs.dmadac[chan] = devtag_get_device(space->machine, SOUND, buffer);
}
dmadac_enable(&dcs.dmadac[0], dcs.channels, enable);
diff --git a/src/mame/drivers/88games.c b/src/mame/drivers/88games.c
index 6c1407e8cc7..1ffe0762de1 100644
--- a/src/mame/drivers/88games.c
+++ b/src/mame/drivers/88games.c
@@ -107,21 +107,21 @@ static READ8_HANDLER( cheat2_r )
return res;
}
-static char speech_chip[8];
+static UINT8 speech_chip[8];
static WRITE8_HANDLER( speech_control_w )
{
const device_config *upd;
- strcpy(speech_chip, ( data & 4 ) ? "upd2" : "upd1");
+ strcpy((char *)speech_chip, ( data & 4 ) ? "upd2" : "upd1");
- upd = devtag_get_device(space->machine, SOUND, speech_chip);
+ upd = devtag_get_device(space->machine, SOUND, (char *)speech_chip);
upd7759_reset_w( upd, data & 2 );
upd7759_start_w( upd, data & 1 );
}
static WRITE8_HANDLER( speech_msg_w )
{
- upd7759_port_w( devtag_get_device(space->machine, SOUND, speech_chip), 0, data );
+ upd7759_port_w( devtag_get_device(space->machine, SOUND, (char *)speech_chip), 0, data );
}
static ADDRESS_MAP_START( main_map, ADDRESS_SPACE_PROGRAM, 8 )
diff --git a/src/mame/drivers/arkanoid.c b/src/mame/drivers/arkanoid.c
index 008f5995c87..a8ab7df4fd6 100644
--- a/src/mame/drivers/arkanoid.c
+++ b/src/mame/drivers/arkanoid.c
@@ -720,6 +720,9 @@ static INPUT_PORTS_START( tetrsark )
// PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN2 ) // WTF? it does't work
PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(1)
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_BUTTON2 ) PORT_PLAYER(2)
+
+ PORT_START("UNUSED") /* This is read by input_port_4_r in ay8910_interface */
+ PORT_BIT( 0xff, IP_ACTIVE_LOW, IPT_UNUSED )
INPUT_PORTS_END
diff --git a/src/mame/drivers/circusc.c b/src/mame/drivers/circusc.c
index 090ef586dc5..3645a94270e 100644
--- a/src/mame/drivers/circusc.c
+++ b/src/mame/drivers/circusc.c
@@ -138,13 +138,13 @@ static WRITE8_HANDLER(circusc_sound_w)
/* CS5 */
case 3:
- device = devtag_get_device(space->machine, SOUND, "discrete");
+ device = devtag_get_device(space->machine, SOUND, "fltdisc");
discrete_sound_w(device, NODE_03, data);
break;
/* CS6 */
case 4:
- device = devtag_get_device(space->machine, SOUND, "discrete");
+ device = devtag_get_device(space->machine, SOUND, "fltdisc");
discrete_sound_w(device, NODE_05, (offset & 0x20) >> 5);
discrete_sound_w(device, NODE_06, (offset & 0x18) >> 3);
discrete_sound_w(device, NODE_07, (offset & 0x40) >> 6);
diff --git a/src/mame/drivers/coinmstr.c b/src/mame/drivers/coinmstr.c
index 428036e851a..18b283ab80d 100644
--- a/src/mame/drivers/coinmstr.c
+++ b/src/mame/drivers/coinmstr.c
@@ -333,7 +333,7 @@ static INPUT_PORTS_START( quizmstr )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START("IN4")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, DEF_STR( Coin_A ) )
PORT_DIPSETTING( 0x00, DEF_STR( 2C_1C ) )
PORT_DIPSETTING( 0x01, DEF_STR( 1C_1C ) )
@@ -445,7 +445,7 @@ static INPUT_PORTS_START( trailblz )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START("IN4")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
@@ -557,7 +557,7 @@ static INPUT_PORTS_START( supnudg2 )
PORT_DIPSETTING( 0x80, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
- PORT_START("IN4")
+ PORT_START("DSW1")
PORT_DIPNAME( 0x01, 0x01, "4" )
PORT_DIPSETTING( 0x01, DEF_STR( Off ) )
PORT_DIPSETTING( 0x00, DEF_STR( On ) )
diff --git a/src/mame/drivers/dcheese.c b/src/mame/drivers/dcheese.c
index 326e68afdd8..a84cce69bac 100644
--- a/src/mame/drivers/dcheese.c
+++ b/src/mame/drivers/dcheese.c
@@ -182,7 +182,7 @@ static WRITE8_HANDLER( sound_control_w )
/* bit 0x20 = LED */
/* bit 0x40 = BSMT2000 reset */
if ((diff & 0x40) && (data & 0x40))
- devtag_reset(space->machine, SOUND, "bmst");
+ devtag_reset(space->machine, SOUND, "bsmt");
if (data != 0x40 && data != 0x60)
logerror("%04X:sound_control_w = %02X\n", cpu_get_pc(space->cpu), data);
}