summaryrefslogtreecommitdiffstatshomepage
path: root/src/emu
diff options
context:
space:
mode:
author Wilbert Pol <wilbert@jdg.info>2008-12-20 20:00:25 +0000
committer Wilbert Pol <wilbert@jdg.info>2008-12-20 20:00:25 +0000
commit0b6b3886cce5f1e9d1fa98e7b51211209c20dae7 (patch)
treefb392b084d96eff27c618dce6af350244dc4f78c /src/emu
parentac26377859c4aff3afd60176b27ee8ed334ee0ac (diff)
Added running_machine parameter to the callback in the sid interface.
Diffstat (limited to 'src/emu')
-rw-r--r--src/emu/sound/sid.c6
-rw-r--r--src/emu/sound/sid.h4
-rw-r--r--src/emu/sound/sid6581.c4
-rw-r--r--src/emu/sound/sid6581.h2
4 files changed, 8 insertions, 8 deletions
diff --git a/src/emu/sound/sid.c b/src/emu/sound/sid.c
index 452700276cb..9732bd6cbf7 100644
--- a/src/emu/sound/sid.c
+++ b/src/emu/sound/sid.c
@@ -323,7 +323,7 @@ void sid6581_port_w (SID6581 *This, int offset, int data)
}
}
-int sid6581_port_r (SID6581 *This, int offset)
+int sid6581_port_r (running_machine *machine, SID6581 *This, int offset)
{
int data;
/* SIDPLAY reads last written at a sid address value */
@@ -337,13 +337,13 @@ int sid6581_port_r (SID6581 *This, int offset)
break;
case 0x19: /* paddle 1 */
if (This->ad_read != NULL)
- data=This->ad_read (0);
+ data=This->ad_read (machine, 0);
else
data=0;
break;
case 0x1a: /* paddle 2 */
if (This->ad_read != NULL)
- data=This->ad_read (1);
+ data=This->ad_read (machine, 1);
else
data=0;
break;
diff --git a/src/emu/sound/sid.h b/src/emu/sound/sid.h
index 9e5233edfe5..4e86024b3c1 100644
--- a/src/emu/sound/sid.h
+++ b/src/emu/sound/sid.h
@@ -18,7 +18,7 @@ typedef struct _SID6581
const device_config *device;
sound_stream *mixer_channel; // mame stream/ mixer channel
- int (*ad_read) (int which);
+ int (*ad_read) (running_machine *machine, int which);
SIDTYPE type;
UINT32 clock;
@@ -59,7 +59,7 @@ void sid6581_init (SID6581 *This);
int sidEmuReset(SID6581 *This);
-int sid6581_port_r (SID6581 *This, int offset);
+int sid6581_port_r (running_machine *machine, SID6581 *This, int offset);
void sid6581_port_w (SID6581 *This, int offset, int data);
void sid_set_type(SID6581 *This, SIDTYPE type);
diff --git a/src/emu/sound/sid6581.c b/src/emu/sound/sid6581.c
index c83c9f2ccb1..ec5d534bd27 100644
--- a/src/emu/sound/sid6581.c
+++ b/src/emu/sound/sid6581.c
@@ -75,12 +75,12 @@ static SND_START( sid8580 )
READ8_HANDLER ( sid6581_0_port_r )
{
- return sid6581_port_r(get_sid(0), offset);
+ return sid6581_port_r(space->machine, get_sid(0), offset);
}
READ8_HANDLER ( sid6581_1_port_r )
{
- return sid6581_port_r(get_sid(1), offset);
+ return sid6581_port_r(space->machine, get_sid(1), offset);
}
WRITE8_HANDLER ( sid6581_0_port_w )
diff --git a/src/emu/sound/sid6581.h b/src/emu/sound/sid6581.h
index ac484574687..5093222674f 100644
--- a/src/emu/sound/sid6581.h
+++ b/src/emu/sound/sid6581.h
@@ -23,7 +23,7 @@ typedef enum
typedef struct _sid6581_interface sid6581_interface;
struct _sid6581_interface
{
- int (*ad_read)(int channel);
+ int (*ad_read)(running_machine *machine, int channel);
} ;