From 50d52fd0c9337311253e3c2d7f2698775adc60ef Mon Sep 17 00:00:00 2001 From: crediar Date: Sat, 19 Jul 2025 00:23:40 +0200 Subject: [PATCH] Fixed a bug that always connected the Triforce Baseboard by default --- Source/Core/Core/HW/DVD/DVDInterface.cpp | 2 +- Source/Core/Core/HW/EXI/EXI.cpp | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Source/Core/Core/HW/DVD/DVDInterface.cpp b/Source/Core/Core/HW/DVD/DVDInterface.cpp index 2ffe2855e2..d82f544773 100644 --- a/Source/Core/Core/HW/DVD/DVDInterface.cpp +++ b/Source/Core/Core/HW/DVD/DVDInterface.cpp @@ -292,7 +292,7 @@ void DVDInterface::Init() { AMMediaboard::Init(); - // The Trifoce IPL expects the cover to be closed + // The Triforce IPL expects the cover to be closed m_DICVR.Hex = 0; } } diff --git a/Source/Core/Core/HW/EXI/EXI.cpp b/Source/Core/Core/HW/EXI/EXI.cpp index d676dc4845..6f56e8cc76 100644 --- a/Source/Core/Core/HW/EXI/EXI.cpp +++ b/Source/Core/Core/HW/EXI/EXI.cpp @@ -67,15 +67,8 @@ void ExpansionInterfaceManager::AddMemoryCard(Slot slot) } void ExpansionInterfaceManager::AddSP1Device() -{ - EXIDeviceType sp1_device = EXIDeviceType::Baseboard; - auto& system = Core::System::GetInstance(); - if (system.IsTriforce()) - { - sp1_device = Config::Get(Config::MAIN_SERIAL_PORT_1); - } - - m_channels[0]->AddDevice(sp1_device, SlotToEXIDevice(Slot::SP1)); +{ + m_channels[0]->AddDevice( Config::Get(Config::MAIN_SERIAL_PORT_1), SlotToEXIDevice(Slot::SP1) ); } u8 SlotToEXIChannel(Slot slot)