Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-27 16:21:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Device-ized the SID code

Browse Source
This commit is contained in:
Nathan Woods 2009-02-20 12:55:53 +00:00
parent a427b077af
commit f79b04bf0f
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/emu/sound/sid6581.c
View File

@ -12,12 +12,11 @@
static SID6581 *get_sid(int indx)
static SID6581 *get_sid(const device_config *device)
{
return NULL;
// sound_type type = sndnum_to_sndti(indx, NULL);
// assert((type == SOUND_SID6581) || (type == SOUND_SID8580));
// return (SID6581 *) sndti_token(space->machine, type, indx);
assert(device != NULL);
assert((sound_get_type(device) == SOUND_SID6581) || (sound_get_type(device) == SOUND_SID8580));
return (SID6581 *) device->token;
}
@ -70,24 +69,15 @@ static DEVICE_START( sid8580 )
READ8_HANDLER ( sid6581_0_port_r )
READ8_DEVICE_HANDLER ( sid6581_r )
{
return sid6581_port_r(space->machine, get_sid(0), offset);
return sid6581_port_r(device->machine, get_sid(device), offset);
}
READ8_HANDLER ( sid6581_1_port_r )
{
return sid6581_port_r(space->machine, get_sid(1), offset);
}
WRITE8_HANDLER ( sid6581_0_port_w )
WRITE8_DEVICE_HANDLER ( sid6581_w )
{
sid6581_port_w(get_sid(0), offset, data);
}
WRITE8_HANDLER ( sid6581_1_port_w )
{
sid6581_port_w(get_sid(1), offset, data);
sid6581_port_w(get_sid(device), offset, data);
}

6
src/emu/sound/sid6581.h
View File

@ -27,10 +27,8 @@ struct _sid6581_interface
} ;
READ8_HANDLER ( sid6581_0_port_r );
READ8_HANDLER ( sid6581_1_port_r );
WRITE8_HANDLER ( sid6581_0_port_w );
WRITE8_HANDLER ( sid6581_1_port_w );
READ8_DEVICE_HANDLER ( sid6581_r );
WRITE8_DEVICE_HANDLER ( sid6581_w );
DEVICE_GET_INFO( sid6581 );
DEVICE_GET_INFO( sid8580 );