Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 00:39:36 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(MESS) c65: Added missing SID interface. (nw)\n(MESS) c64: Used SID8580 for the 64C models. (nw)

Browse Source
This commit is contained in:
Curt Coder 2012-09-04 17:56:05 +00:00
parent b56467bbb6
commit 05054328f2
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,8 @@ static void sid_start(device_t *device, SIDTYPE sidtype)
{
_SID6581 *sid = get_sid(device);
const sid6581_interface *iface = (const sid6581_interface*) device->static_config();
assert(iface);
// resolve callbacks
sid->in_potx_func.resolve(iface->in_potx_cb, *device);
sid->in_poty_func.resolve(iface->in_poty_cb, *device);

8
src/mess/drivers/c64.c
View File

@ -1092,6 +1092,9 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED_CLASS( ntsc_c, ntsc, c64c_state )
MCFG_SOUND_REPLACE(MOS6851_TAG, SID8580, VIC6567_CLOCK)
MCFG_SOUND_CONFIG(sid_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@ -1166,6 +1169,9 @@ MACHINE_CONFIG_END
//-------------------------------------------------
static MACHINE_CONFIG_DERIVED_CLASS( pal_c, pal, c64c_state )
MCFG_SOUND_REPLACE(MOS6851_TAG, SID8580, VIC6569_CLOCK)
MCFG_SOUND_CONFIG(sid_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
@ -1186,7 +1192,7 @@ static MACHINE_CONFIG_START( pal_gs, c64gs_state )
// sound hardware
MCFG_SPEAKER_STANDARD_MONO("mono")
MCFG_SOUND_ADD(MOS6851_TAG, SID6581, VIC6569_CLOCK)
MCFG_SOUND_ADD(MOS6851_TAG, SID8580, VIC6569_CLOCK)
MCFG_SOUND_CONFIG(sid_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MCFG_SOUND_ADD("dac", DAC, 0)

14
src/mess/drivers/c65.c
View File

@ -203,12 +203,18 @@ READ8_MEMBER( c65_state::sid_poty_r )
return c64_paddle_read(sid, 1);
}
static MOS6581_INTERFACE( c65_sound_interface )
static MOS6581_INTERFACE( sidr_intf )
{
DEVCB_DRIVER_MEMBER(c65_state, sid_potx_r),
DEVCB_DRIVER_MEMBER(c65_state, sid_poty_r)
};
static MOS6581_INTERFACE( sidl_intf )
{
DEVCB_NULL,
DEVCB_NULL
};
static CBM_IEC_INTERFACE( cbm_iec_intf )
{
@ -321,10 +327,11 @@ static MACHINE_CONFIG_START( c65, c65_state )
/* sound hardware */
MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
MCFG_SOUND_ADD("sid_r", SID8580, 985248)
MCFG_SOUND_CONFIG(c65_sound_interface)
MCFG_SOUND_CONFIG(sidr_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_SOUND_ADD("sid_l", SID8580, 985248)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
MCFG_SOUND_CONFIG(sidl_intf)
/* quickload */
MCFG_QUICKLOAD_ADD("quickload", cbm_c65, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
@ -355,9 +362,10 @@ static MACHINE_CONFIG_DERIVED( c65pal, c65 )
/* sound hardware */
MCFG_SOUND_REPLACE("sid_r", SID8580, 1022727)
MCFG_SOUND_CONFIG(c65_sound_interface)
MCFG_SOUND_CONFIG(sidr_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
MCFG_SOUND_REPLACE("sid_l", SID8580, 1022727)
MCFG_SOUND_CONFIG(sidl_intf)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
/* cia */

2
src/mess/includes/c64.h
View File

@ -67,7 +67,7 @@ public:
required_device<cpu_device> m_maincpu;
required_device<pls100_device> m_pla;
required_device<mos6566_device> m_vic;
required_device<device_t> m_sid;
required_device<sid6581_device> m_sid;
required_device<mos6526_device> m_cia1;
required_device<mos6526_device> m_cia2;
optional_device<cbm_iec_device> m_iec;