diff options
Diffstat (limited to 'src/mame/audio/segasnd.cpp')
-rw-r--r-- | src/mame/audio/segasnd.cpp | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/src/mame/audio/segasnd.cpp b/src/mame/audio/segasnd.cpp index c74b2d2aefb..fd29e227f9d 100644 --- a/src/mame/audio/segasnd.cpp +++ b/src/mame/audio/segasnd.cpp @@ -87,12 +87,12 @@ speech_sound_device::speech_sound_device(const machine_config &mconfig, const ch void speech_sound_device::device_start() { - m_speech = machine().root_device().memregion("speech")->base(); + m_speech = machine().root_device().memregion("speech")->base(); - save_item(NAME(m_latch)); - save_item(NAME(m_t0)); - save_item(NAME(m_p2)); - save_item(NAME(m_drq)); + save_item(NAME(m_latch)); + save_item(NAME(m_t0)); + save_item(NAME(m_p2)); + save_item(NAME(m_drq)); } @@ -222,19 +222,19 @@ void segag80snd_common::speech_portmap(address_map &map) MACHINE_CONFIG_START(segag80snd_common::sega_speech_board) /* CPU for the speech board */ - MCFG_CPU_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ - MCFG_CPU_PROGRAM_MAP(speech_map) - MCFG_CPU_IO_MAP(speech_portmap) - MCFG_MCS48_PORT_P1_IN_CB(DEVREAD8("segaspeech", speech_sound_device, p1_r)) - MCFG_MCS48_PORT_P1_OUT_CB(DEVWRITE8("segaspeech", speech_sound_device, p1_w)) - MCFG_MCS48_PORT_P2_OUT_CB(DEVWRITE8("segaspeech", speech_sound_device, p2_w)) - MCFG_MCS48_PORT_T0_IN_CB(DEVREADLINE("segaspeech", speech_sound_device, t0_r)) - MCFG_MCS48_PORT_T1_IN_CB(DEVREADLINE("segaspeech", speech_sound_device, t1_r)) + MCFG_DEVICE_ADD("audiocpu", I8035, SPEECH_MASTER_CLOCK) /* divide by 15 in CPU */ + MCFG_DEVICE_PROGRAM_MAP(speech_map) + MCFG_DEVICE_IO_MAP(speech_portmap) + MCFG_MCS48_PORT_P1_IN_CB(READ8("segaspeech", speech_sound_device, p1_r)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8("segaspeech", speech_sound_device, p1_w)) + MCFG_MCS48_PORT_P2_OUT_CB(WRITE8("segaspeech", speech_sound_device, p2_w)) + MCFG_MCS48_PORT_T0_IN_CB(READLINE("segaspeech", speech_sound_device, t0_r)) + MCFG_MCS48_PORT_T1_IN_CB(READLINE("segaspeech", speech_sound_device, t1_r)) /* sound hardware */ - MCFG_SOUND_ADD("segaspeech", SEGASPEECH, 0) - MCFG_SOUND_ADD("speech", SP0250, SPEECH_MASTER_CLOCK) - MCFG_SP0250_DRQ_CALLBACK(DEVWRITELINE("segaspeech", speech_sound_device, drq_w)) + MCFG_DEVICE_ADD("segaspeech", SEGASPEECH, 0) + MCFG_DEVICE_ADD("speech", SP0250, SPEECH_MASTER_CLOCK) + MCFG_SP0250_DRQ_CALLBACK(WRITELINE("segaspeech", speech_sound_device, drq_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "speaker", 1.0) MACHINE_CONFIG_END @@ -866,13 +866,13 @@ void usb_sound_device::usb_portmap(address_map &map) MACHINE_CONFIG_START(usb_sound_device::device_add_mconfig) /* CPU for the usb board */ - MCFG_CPU_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ - MCFG_CPU_PROGRAM_MAP(usb_map) - MCFG_CPU_IO_MAP(usb_portmap) - MCFG_MCS48_PORT_P1_IN_CB(READ8(usb_sound_device, p1_r)) - MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(usb_sound_device, p1_w)) - MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(usb_sound_device, p2_w)) - MCFG_MCS48_PORT_T1_IN_CB(READLINE(usb_sound_device, t1_r)) + MCFG_DEVICE_ADD("ourcpu", I8035, USB_MASTER_CLOCK) /* divide by 15 in CPU */ + MCFG_DEVICE_PROGRAM_MAP(usb_map) + MCFG_DEVICE_IO_MAP(usb_portmap) + MCFG_MCS48_PORT_P1_IN_CB(READ8(*this, usb_sound_device, p1_r)) + MCFG_MCS48_PORT_P1_OUT_CB(WRITE8(*this, usb_sound_device, p1_w)) + MCFG_MCS48_PORT_P2_OUT_CB(WRITE8(*this, usb_sound_device, p2_w)) + MCFG_MCS48_PORT_T1_IN_CB(READLINE(*this, usb_sound_device, t1_r)) MCFG_TIMER_DRIVER_ADD_PERIODIC("usb_timer", usb_sound_device, increment_t1_clock_timer_cb, attotime::from_hz(USB_2MHZ_CLOCK / 256)) MACHINE_CONFIG_END @@ -894,6 +894,6 @@ MACHINE_CONFIG_START(usb_rom_sound_device::device_add_mconfig) usb_sound_device::device_add_mconfig(config); /* CPU for the usb board */ - MCFG_CPU_MODIFY("ourcpu") - MCFG_CPU_PROGRAM_MAP(usb_map_rom) + MCFG_DEVICE_MODIFY("ourcpu") + MCFG_DEVICE_PROGRAM_MAP(usb_map_rom) MACHINE_CONFIG_END |