summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/c64/currah_speech.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/c64/currah_speech.cpp')
-rw-r--r--src/devices/bus/c64/currah_speech.cpp22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/devices/bus/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 6973f8bd2de..5e97ee9b645 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -72,15 +72,6 @@ Notes:
#include "speaker.h"
-
-//**************************************************************************
-// MACROS/CONSTANTS
-//**************************************************************************
-
-#define SP0256_TAG "sp0256"
-
-
-
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
@@ -93,7 +84,7 @@ DEFINE_DEVICE_TYPE(C64_CURRAH_SPEECH, c64_currah_speech_cartridge_device, "c64_c
//-------------------------------------------------
ROM_START( c64_currah_speech )
- ROM_REGION( 0x10000, SP0256_TAG, 0 )
+ ROM_REGION( 0x10000, "sp0256", 0 )
ROM_LOAD( "sp0256a-al2", 0x1000, 0x0800, CRC(b504ac15) SHA1(e60fcb5fa16ff3f3b69d36c7a6e955744d3feafc) )
ROM_END
@@ -112,11 +103,12 @@ const tiny_rom_entry *c64_currah_speech_cartridge_device::device_rom_region() co
// device_add_mconfig - add device configuration
//-------------------------------------------------
-MACHINE_CONFIG_START(c64_currah_speech_cartridge_device::device_add_mconfig)
+void c64_currah_speech_cartridge_device::device_add_mconfig(machine_config &config)
+{
SPEAKER(config, "mono").front_center();
- MCFG_DEVICE_ADD(SP0256_TAG, SP0256, 4000000) // ???
- MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
-MACHINE_CONFIG_END
+ SP0256(config, m_nsp, 4000000); // ???
+ m_nsp->add_route(ALL_OUTPUTS, "mono", 1.00);
+}
@@ -149,7 +141,7 @@ void c64_currah_speech_cartridge_device::set_osc1(int voice, int intonation)
c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, C64_CURRAH_SPEECH, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
- m_nsp(*this, SP0256_TAG)
+ m_nsp(*this, "sp0256")
{
}