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

sp0256: Remove MCFG_ (nw)

Browse Source
This commit is contained in:
Nigel Barnes 2018-07-10 22:32:21 +01:00
parent 92da85d7d2
commit 0417252c14
13 changed files with 64 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/devices/bus/bbc/userport/beebspch.cpp
View File

@ -16,12 +16,6 @@
#include "speaker.h"
//**************************************************************************
// MACROS/CONSTANTS
//**************************************************************************
#define SP0256_TAG "sp0256"
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
@ -33,7 +27,7 @@ ROM_START(beebspch)
ROM_LOAD("watford_speech.rom", 0x0000, 0x2000, CRC(731642a8) SHA1(1bd31345af6043f394bc9d8e65180c93b2356905))
ROM_RELOAD(0x2000, 0x2000)
ROM_REGION(0x10000, SP0256_TAG, 0)
ROM_REGION(0x10000, "sp0256", 0)
ROM_LOAD("sp0256a-al2.bin", 0x1000, 0x0800, CRC(b504ac15) SHA1(e60fcb5fa16ff3f3b69d36c7a6e955744d3feafc))
ROM_END
@ -50,13 +44,14 @@ const tiny_rom_entry *bbc_beebspch_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(bbc_beebspch_device::device_add_mconfig)
void bbc_beebspch_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD(SP0256_TAG, SP0256, 14_MHz_XTAL / 4) // TODO: Crystal unknown
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, bbc_beebspch_device, cb1_w))
MCFG_SP0256_STANDBY_CB(WRITELINE(*this, bbc_beebspch_device, cb2_w))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
SP0256(config, m_nsp, 3120000); // TODO: generated by a LS269
m_nsp->data_request_callback().set(FUNC(bbc_beebspch_device::cb1_w));
m_nsp->standby_callback().set(FUNC(bbc_beebspch_device::cb2_w));
m_nsp->add_route(ALL_OUTPUTS, "mono", 1.0);
}
//**************************************************************************
@ -71,7 +66,7 @@ bbc_beebspch_device::bbc_beebspch_device(const machine_config &mconfig, const ch
: device_t(mconfig, BBC_BEEBSPCH, tag, owner, clock)
, device_bbc_userport_interface(mconfig, *this)
, m_rom(*this, "rom")
, m_nsp(*this, SP0256_TAG)
, m_nsp(*this, "sp0256")
{
}

22
src/devices/bus/c64/currah_speech.cpp
View File

@ -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")
{
}

22
src/devices/bus/cpc/cpc_ssa1.cpp
View File

@ -117,10 +117,10 @@ const tiny_rom_entry *cpc_dkspeech_device::device_rom_region() const
// device machine config
MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig)
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("sp0256",SP0256,XTAL(3'120'000))
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, cpc_ssa1_device, lrq_cb))
MCFG_SP0256_STANDBY_CB(WRITELINE(*this, cpc_ssa1_device, sby_cb))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
SP0256(config, m_sp0256_device, XTAL(3'120'000));
m_sp0256_device->data_request_callback().set(FUNC(cpc_ssa1_device::lrq_cb));
m_sp0256_device->standby_callback().set(FUNC(cpc_ssa1_device::sby_cb));
m_sp0256_device->add_route(ALL_OUTPUTS, "mono", 1.00);
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
@ -128,15 +128,14 @@ MACHINE_CONFIG_START(cpc_ssa1_device::device_add_mconfig)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig)
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("sp0256",SP0256,XTAL(4'000'000)) // uses the CPC's clock from pin 50 of the expansion port
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, cpc_dkspeech_device, lrq_cb))
MCFG_SP0256_STANDBY_CB(WRITELINE(*this, cpc_dkspeech_device, sby_cb))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
SP0256(config, m_sp0256_device, XTAL(4'000'000)); // uses the CPC's clock from pin 50 of the expansion port
m_sp0256_device->data_request_callback().set(FUNC(cpc_dkspeech_device::lrq_cb));
m_sp0256_device->standby_callback().set(FUNC(cpc_dkspeech_device::sby_cb));
m_sp0256_device->add_route(ALL_OUTPUTS, "mono", 1.00);
// pass-through
MCFG_DEVICE_ADD("exp", CPC_EXPANSION_SLOT, 0)
@ -144,7 +143,6 @@ MACHINE_CONFIG_START(cpc_dkspeech_device::device_add_mconfig)
MCFG_CPC_EXPANSION_SLOT_OUT_IRQ_CB(WRITELINE("^", cpc_expansion_slot_device, irq_w))
MCFG_CPC_EXPANSION_SLOT_OUT_NMI_CB(WRITELINE("^", cpc_expansion_slot_device, nmi_w))
MCFG_CPC_EXPANSION_SLOT_OUT_ROMDIS_CB(WRITELINE("^", cpc_expansion_slot_device, romdis_w)) // ROMDIS
MACHINE_CONFIG_END
@ -180,8 +178,6 @@ void cpc_ssa1_device::device_start()
m_rom = memregion("sp0256")->base();
// m_sp0256_device = subdevice("sp0256");
space.install_readwrite_handler(0xfaee,0xfaee,read8_delegate(FUNC(cpc_ssa1_device::ssa1_r),this),write8_delegate(FUNC(cpc_ssa1_device::ssa1_w),this));
space.install_readwrite_handler(0xfbee,0xfbee,read8_delegate(FUNC(cpc_ssa1_device::ssa1_r),this),write8_delegate(FUNC(cpc_ssa1_device::ssa1_w),this));
}
@ -194,8 +190,6 @@ void cpc_dkspeech_device::device_start()
m_rom = memregion("sp0256")->base();
// m_sp0256_device = subdevice("sp0256");
space.install_readwrite_handler(0xfbfe,0xfbfe,read8_delegate(FUNC(cpc_dkspeech_device::dkspeech_r),this),write8_delegate(FUNC(cpc_dkspeech_device::dkspeech_w),this));
}

9
src/devices/bus/einstein/userport/speech.cpp
View File

@ -37,11 +37,12 @@ const tiny_rom_entry *einstein_speech_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(einstein_speech_device::device_add_mconfig)
void einstein_speech_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("sp0256", SP0256, 3120000) // ???
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
MACHINE_CONFIG_END
SP0256(config, m_sp0256, 3120000); // ???
m_sp0256->add_route(ALL_OUTPUTS, "mono", 1.00);
}
//**************************************************************************

4
src/devices/bus/intv/voice.cpp
View File

@ -72,9 +72,9 @@ void intv_voice_device::late_subslot_setup()
MACHINE_CONFIG_START(intv_voice_device::device_add_mconfig)
SPEAKER(config, "mono_voice").front_center();
MCFG_DEVICE_ADD("sp0256_speech", SP0256, 3120000)
SP0256(config, m_speech, 3120000);
/* The Intellivoice uses a speaker with its own volume control so the relative volumes to use are subjective */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono_voice", 1.00)
m_speech->add_route(ALL_OUTPUTS, "mono_voice", 1.00);
MCFG_INTV_CARTRIDGE_ADD("subslot", intv_cart, nullptr)
MACHINE_CONFIG_END

6
src/devices/bus/odyssey2/voice.cpp
View File

@ -46,10 +46,10 @@ void o2_voice_device::device_start()
MACHINE_CONFIG_START(o2_voice_device::device_add_mconfig)
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("sp0256_speech", SP0256, 3120000)
MCFG_SP0256_DATA_REQUEST_CB(WRITELINE(*this, o2_voice_device, lrq_callback))
SP0256(config, m_speech, 3120000);
m_speech->data_request_callback().set(FUNC(o2_voice_device::lrq_callback));
// The Voice uses a speaker with its own volume control so the relative volumes to use are subjective, these sound good
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
m_speech->add_route(ALL_OUTPUTS, "mono", 1.00);
MCFG_O2_CARTRIDGE_ADD("subslot", o2_cart, nullptr)
MACHINE_CONFIG_END

23
src/devices/bus/spectrum/uspeech.cpp
View File

@ -11,14 +11,6 @@
#include "speaker.h"
//**************************************************************************
// MACROS/CONSTANTS
//**************************************************************************
#define SP0256_TAG "sp0256"
//**************************************************************************
// DEVICE DEFINITIONS
//**************************************************************************
@ -34,7 +26,7 @@ ROM_START( uspeech )
ROM_REGION(0x0800, "rom", 0)
ROM_LOAD("currah.rom", 0x0000, 0x0800, CRC(ce7cf52e) SHA1(90dbba5afbf07949df9cbdcb0a8ec0b106340422))
ROM_REGION(0x10000, SP0256_TAG, 0)
ROM_REGION(0x10000, "sp0256", 0)
ROM_LOAD( "sp0256a-al2.bin", 0x1000, 0x0800, CRC(b504ac15) SHA1(e60fcb5fa16ff3f3b69d36c7a6e955744d3feafc) )
ROM_END
@ -53,11 +45,12 @@ const tiny_rom_entry *spectrum_uspeech_device::device_rom_region() const
// device_add_mconfig - add device configuration
//-------------------------------------------------
MACHINE_CONFIG_START(spectrum_uspeech_device::device_add_mconfig)
void spectrum_uspeech_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD(SP0256_TAG, SP0256, XTAL(14'000'000) / 4)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
SP0256(config, m_nsp, 14_MHz_XTAL / 4);
m_nsp->add_route(ALL_OUTPUTS, "mono", 1.0);
}
//**************************************************************************
@ -71,7 +64,7 @@ MACHINE_CONFIG_END
spectrum_uspeech_device::spectrum_uspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
device_t(mconfig, SPECTRUM_USPEECH, tag, owner, clock),
device_spectrum_expansion_interface(mconfig, *this),
m_nsp(*this, SP0256_TAG),
m_nsp(*this, "sp0256"),
m_rom(*this, "rom")
{
}
@ -143,7 +136,7 @@ WRITE8_MEMBER(spectrum_uspeech_device::mreq_w)
m_nsp->set_clock(3500000); // CK / 4 ??
break;
case 0x3001:
case 0x3001:
// intonation high
m_nsp->set_clock(3800000); // TODO: the exact frequency is unknown
break;

10
src/devices/sound/sp0256.h
View File

@ -35,12 +35,6 @@
#pragma once
#define MCFG_SP0256_DATA_REQUEST_CB(_devcb) \
downcast<sp0256_device &>(*device).set_data_request_callback(DEVCB_##_devcb);
#define MCFG_SP0256_STANDBY_CB(_devcb) \
downcast<sp0256_device &>(*device).set_standby_callback(DEVCB_##_devcb);
class sp0256_device : public device_t,
public device_sound_interface
@ -48,8 +42,8 @@ class sp0256_device : public device_t,
public:
sp0256_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
template <class Object> devcb_base &set_data_request_callback(Object &&cb) { return m_drq_cb.set_callback(std::forward<Object>(cb)); }
template <class Object> devcb_base &set_standby_callback(Object &&cb) { return m_sby_cb.set_callback(std::forward<Object>(cb)); }
auto data_request_callback() { return m_drq_cb.bind(); }
auto standby_callback() { return m_sby_cb.bind(); }
DECLARE_WRITE8_MEMBER(ald_w);
DECLARE_READ_LINE_MEMBER(lrq_r);

10
src/mame/drivers/holeland.cpp
View File

@ -306,19 +306,19 @@ MACHINE_CONFIG_START(holeland_state::holeland)
/* sound hardware */
SPEAKER(config, "mono").front_center();
MCFG_DEVICE_ADD("ay1", AY8910, 20000000/32) /* verified on PCB */
MCFG_DEVICE_ADD("ay1", AY8910, 20000000 / 32) /* verified on PCB */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("IN0"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("IN1"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("ay2", AY8910, 20000000/16) /* verified on PCB */
MCFG_DEVICE_ADD("ay2", AY8910, 20000000 / 16) /* verified on PCB */
MCFG_AY8910_PORT_A_READ_CB(IOPORT("DSW1"))
MCFG_AY8910_PORT_B_READ_CB(IOPORT("DSW2"))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD("speech", SP0256, 3355700) /* measured 298ns on PCB */
MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE("maincpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
sp0256_device &speech(SP0256(config, "speech", 3355700)); /* measured 298ns on PCB */
speech.data_request_callback().set_inputline("maincpu", INPUT_LINE_NMI);
speech.add_route(ALL_OUTPUTS, "mono", 1.0);
MACHINE_CONFIG_END
/*

4
src/mame/drivers/idsa.cpp
View File

@ -348,8 +348,8 @@ MACHINE_CONFIG_START(idsa_state::idsa)
genpin_audio(config);
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
MCFG_DEVICE_ADD("speech", SP0256, 3120000) // unknown variant
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 1.5)
SP0256(config, m_speech, 3120000); // unknown variant
m_speech->add_route(ALL_OUTPUTS, "lspeaker", 1.5);
MCFG_DEVICE_ADD("aysnd1", AY8910, 2000000) // 2Mhz according to pinmame, schematic omits the clock line
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "lspeaker", 0.75)

6
src/mame/drivers/intv.cpp
View File

@ -519,15 +519,15 @@ MACHINE_CONFIG_END
MACHINE_CONFIG_START(intv_state::intvecs)
intv(config);
MCFG_DEVICE_MODIFY( "maincpu" )
MCFG_DEVICE_MODIFY("maincpu")
MCFG_DEVICE_PROGRAM_MAP(intvecs_mem)
MCFG_DEVICE_REMOVE("cartslot")
MCFG_DEVICE_ADD("ecs", INTV_ROM_ECS, 0)
MCFG_DEVICE_ADD("speech", SP0256, 3120000)
sp0256_device &speech(SP0256(config, "speech", 3120000));
/* The Intellivoice uses a speaker with its own volume control so the relative volumes to use are subjective */
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.00)
speech.add_route(ALL_OUTPUTS, "mono", 1.00);
/* cassette */
//MCFG_CASSETTE_ADD( "cassette" )

6
src/mame/drivers/jupace.cpp
View File

@ -779,11 +779,11 @@ MACHINE_CONFIG_START(ace_state::ace)
WAVE(config, "wave", "cassette").add_route(ALL_OUTPUTS, "mono", 0.25);
SPEAKER_SOUND(config, "speaker").add_route(ALL_OUTPUTS, "mono", 1.00);
MCFG_DEVICE_ADD(AY8910_TAG, AY8910, XTAL(6'500'000)/2)
MCFG_DEVICE_ADD(AY8910_TAG, AY8910, XTAL(6'500'000) / 2)
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
MCFG_DEVICE_ADD(SP0256AL2_TAG, SP0256, XTAL(3'000'000))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.25)
SP0256(config, m_sp0256, XTAL(3'000'000));
m_sp0256->add_route(ALL_OUTPUTS, "mono", 0.25);
// devices
MCFG_CASSETTE_ADD("cassette")

14
src/mame/drivers/sauro.cpp
View File

@ -512,24 +512,24 @@ MACHINE_CONFIG_START(sauro_state::sauro)
MCFG_ADDRESSABLE_LATCH_Q5_OUT_CB(WRITELINE(*this, sauro_state, sauro_palette_bank0_w))
MCFG_ADDRESSABLE_LATCH_Q6_OUT_CB(WRITELINE(*this, sauro_state, sauro_palette_bank1_w))
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(20'000'000)/5) /* verified on pcb */
MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(20'000'000) / 5) /* verified on pcb */
MCFG_DEVICE_PROGRAM_MAP(sauro_sound_map)
MCFG_DEVICE_PERIODIC_INT_DRIVER(sauro_state, irq0_line_hold, 8*60) // ?
MCFG_DEVICE_PERIODIC_INT_DRIVER(sauro_state, irq0_line_hold, 8 * 60) // ?
MCFG_DEVICE_ADD("gfxdecode", GFXDECODE, "palette", gfx_sauro)
MCFG_VIDEO_START_OVERRIDE(sauro_state,sauro)
MCFG_VIDEO_START_OVERRIDE(sauro_state, sauro)
MCFG_SCREEN_MODIFY("screen")
MCFG_SCREEN_UPDATE_DRIVER(sauro_state, screen_update_sauro)
MCFG_GENERIC_LATCH_8_ADD("soundlatch")
MCFG_DEVICE_MODIFY("ymsnd")
MCFG_DEVICE_CLOCK(XTAL(20'000'000)/5) /* verified on pcb */
MCFG_DEVICE_CLOCK(XTAL(20'000'000) / 5) /* verified on pcb */
MCFG_DEVICE_ADD("speech", SP0256, XTAL(20'000'000)/5) /* verified on pcb */
MCFG_SP0256_DATA_REQUEST_CB(INPUTLINE("audiocpu", INPUT_LINE_NMI))
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
SP0256(config, m_sp0256, XTAL(20'000'000) / 5); /* verified on pcb */
m_sp0256->data_request_callback().set_inputline("audiocpu", INPUT_LINE_NMI);
m_sp0256->add_route(ALL_OUTPUTS, "mono", 1.0);
MACHINE_CONFIG_END
MACHINE_CONFIG_START(sauro_state::saurob)