From cd85730b9824d9010b557de62289442cab5caf63 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 18 May 2023 15:36:43 -0400 Subject: Fix validation errors from 24371e7a4af8a28e843218f3c887bc60360acc5b --- src/devices/machine/cr511b.cpp | 1 + src/mame/amiga/amiga.cpp | 7 +------ src/mame/shared/megacdcd.h | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/devices/machine/cr511b.cpp b/src/devices/machine/cr511b.cpp index 9eb07578de0..350fd45f6b5 100644 --- a/src/devices/machine/cr511b.cpp +++ b/src/devices/machine/cr511b.cpp @@ -29,6 +29,7 @@ void cr511b_device::device_add_mconfig(machine_config &config) CDDA(config, m_cdda); m_cdda->add_route(0, ":lspeaker", 1.0); m_cdda->add_route(1, ":rspeaker", 1.0); + m_cdda->set_cdrom_tag("cdrom"); } diff --git a/src/mame/amiga/amiga.cpp b/src/mame/amiga/amiga.cpp index 7fcccce6390..cdb7bb2c374 100644 --- a/src/mame/amiga/amiga.cpp +++ b/src/mame/amiga/amiga.cpp @@ -573,7 +573,7 @@ public: cd32_state(const machine_config &mconfig, device_type type, const char *tag) : amiga_state(mconfig, type, tag) , m_player_ports(*this, {"p1_cd32_buttons", "p2_cd32_buttons"}) - , m_cdda(*this, "cdda") + , m_cdda(*this, "akiko:cdda") { } DECLARE_WRITE_LINE_MEMBER( akiko_int_w ); @@ -2239,14 +2239,9 @@ void cd32_state::cd32(machine_config &config) MCFG_VIDEO_START_OVERRIDE(amiga_state, amiga_aga) - CDDA(config, m_cdda); - m_cdda->add_route(0, "lspeaker", 0.50); - m_cdda->add_route(1, "rspeaker", 0.50); - m_cia_0->pa_wr_callback().set(FUNC(cd32_state::akiko_cia_0_port_a_write)); m_cia_0->sp_wr_callback().set_nop(); - CDROM(config, "cdrom").set_interface("cdrom"); SOFTWARE_LIST(config, "cd32_list").set_original("cd32"); SOFTWARE_LIST(config, "cd_list").set_original("cdtv"); } diff --git a/src/mame/shared/megacdcd.h b/src/mame/shared/megacdcd.h index ba6d6049947..1fcc9cac199 100644 --- a/src/mame/shared/megacdcd.h +++ b/src/mame/shared/megacdcd.h @@ -22,7 +22,7 @@ public: template void set_cdc_do_dma_callback(T &&... args) { m_segacd_dma_callback.set(std::forward(args)...); } - template void set_cdrom_tag(T &&tag) { m_cdrom.set_tag(std::forward(tag)); } + template void set_cdrom_tag(T &&tag) { m_cdrom.set_tag(std::forward(tag)); subdevice("cdda")->set_cdrom_tag(std::forward(tag)); } template void set_68k_tag(T &&tag) { m_68k.set_tag(std::forward(tag)); } -- cgit v1.2.3