Previous 199869 Revisions Next

r17641 Tuesday 4th September, 2012 at 17:56:05 UTC by Curt Coder
(MESS) c65: Added missing SID interface. (nw)\n(MESS) c64: Used SID8580 for the 64C models. (nw)
[src/emu/sound]sid6581.c
[src/mess/drivers]c64.c c65.c
[src/mess/includes]c64.h

trunk/src/emu/sound/sid6581.c
r17640r17641
3333{
3434   _SID6581 *sid = get_sid(device);
3535   const sid6581_interface *iface = (const sid6581_interface*) device->static_config();
36
36   assert(iface);
37   
3738   // resolve callbacks
3839   sid->in_potx_func.resolve(iface->in_potx_cb, *device);
3940   sid->in_poty_func.resolve(iface->in_poty_cb, *device);
trunk/src/mess/includes/c64.h
r17640r17641
6767   required_device<cpu_device> m_maincpu;
6868   required_device<pls100_device> m_pla;
6969   required_device<mos6566_device> m_vic;
70   required_device<device_t> m_sid;
70   required_device<sid6581_device> m_sid;
7171   required_device<mos6526_device> m_cia1;
7272   required_device<mos6526_device> m_cia2;
7373   optional_device<cbm_iec_device> m_iec;
trunk/src/mess/drivers/c65.c
r17640r17641
203203   return c64_paddle_read(sid, 1);
204204}
205205
206static MOS6581_INTERFACE( c65_sound_interface )
206static MOS6581_INTERFACE( sidr_intf )
207207{
208208   DEVCB_DRIVER_MEMBER(c65_state, sid_potx_r),
209209   DEVCB_DRIVER_MEMBER(c65_state, sid_poty_r)
210210};
211211
212static MOS6581_INTERFACE( sidl_intf )
213{
214   DEVCB_NULL,
215   DEVCB_NULL
216};
212217
218
213219static CBM_IEC_INTERFACE( cbm_iec_intf )
214220{
215221   DEVCB_NULL,
r17640r17641
321327   /* sound hardware */
322328   MCFG_SPEAKER_STANDARD_STEREO("lspeaker", "rspeaker")
323329   MCFG_SOUND_ADD("sid_r", SID8580, 985248)
324   MCFG_SOUND_CONFIG(c65_sound_interface)
330   MCFG_SOUND_CONFIG(sidr_intf)
325331   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
326332   MCFG_SOUND_ADD("sid_l", SID8580, 985248)
327333   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
334   MCFG_SOUND_CONFIG(sidl_intf)
328335
329336   /* quickload */
330337   MCFG_QUICKLOAD_ADD("quickload", cbm_c65, "p00,prg", CBM_QUICKLOAD_DELAY_SECONDS)
r17640r17641
355362
356363   /* sound hardware */
357364   MCFG_SOUND_REPLACE("sid_r", SID8580, 1022727)
358   MCFG_SOUND_CONFIG(c65_sound_interface)
365   MCFG_SOUND_CONFIG(sidr_intf)
359366   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "rspeaker", 0.50)
360367   MCFG_SOUND_REPLACE("sid_l", SID8580, 1022727)
368   MCFG_SOUND_CONFIG(sidl_intf)
361369   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.50)
362370
363371   /* cia */
trunk/src/mess/drivers/c64.c
r17640r17641
10921092//-------------------------------------------------
10931093
10941094static MACHINE_CONFIG_DERIVED_CLASS( ntsc_c, ntsc, c64c_state )
1095   MCFG_SOUND_REPLACE(MOS6851_TAG, SID8580, VIC6567_CLOCK)
1096   MCFG_SOUND_CONFIG(sid_intf)
1097   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
10951098MACHINE_CONFIG_END
10961099
10971100
r17640r17641
11661169//-------------------------------------------------
11671170
11681171static MACHINE_CONFIG_DERIVED_CLASS( pal_c, pal, c64c_state )
1172   MCFG_SOUND_REPLACE(MOS6851_TAG, SID8580, VIC6569_CLOCK)
1173   MCFG_SOUND_CONFIG(sid_intf)
1174   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
11691175MACHINE_CONFIG_END
11701176
11711177
r17640r17641
11861192
11871193   // sound hardware
11881194   MCFG_SPEAKER_STANDARD_MONO("mono")
1189   MCFG_SOUND_ADD(MOS6851_TAG, SID6581, VIC6569_CLOCK)
1195   MCFG_SOUND_ADD(MOS6851_TAG, SID8580, VIC6569_CLOCK)
11901196   MCFG_SOUND_CONFIG(sid_intf)
11911197   MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
11921198   MCFG_SOUND_ADD("dac", DAC, 0)

Previous 199869 Revisions Next

© 1997-2024 The MAME Team