Yaya48/dolphin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HW/GBPlayer: Fix GBA cart detection in GBI.

Browse Source
This commit is contained in:
Jordan Woyak committed 2026-04-04 12:30:11 -05:00
1 parent c4e99cef61
commit 415f8c1f8a
1 file changed
+5 -5
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/HW/HSP/HSP_DeviceGBPlayer.cpp
+5 -5
View File
@@ -42,7 +42,7 @@ enum class GBPRegister : u8
constexpr u16 IRQ_ASSERTED = 0x8000; constexpr u16 IRQ_ASSERTED = 0x8000;
constexpr u8 CONTROL_CART_DETECTED = 0x01; constexpr u8 CONTROL_CART_IS_GB = 0x01;
constexpr u8 CONTROL_CART_INSERTED = 0x02; constexpr u8 CONTROL_CART_INSERTED = 0x02;
constexpr u8 CONTROL_3V = 0x04; constexpr u8 CONTROL_3V = 0x04;
constexpr u8 CONTROL_5V = 0x08; constexpr u8 CONTROL_5V = 0x08;
@@ -412,14 +412,14 @@ void CHSPDevice_GBPlayer::Read(u32 address, std::span<u8, TRANSFER_SIZE> data)
if (m_gbp->IsLoaded()) if (m_gbp->IsLoaded())
{ {
m_control |= CONTROL_CART_INSERTED; m_control |= CONTROL_CART_INSERTED;
if ((m_control & CONTROL_3V) && (m_gbp->IsGBA() || (m_control & CONTROL_5V))) if (m_gbp->IsGBA())
m_control |= CONTROL_CART_DETECTED; m_control &= ~CONTROL_CART_IS_GB;
else else
m_control &= ~CONTROL_CART_DETECTED; m_control |= CONTROL_CART_IS_GB;
} }
else else
{ {
m_control &= ~(CONTROL_CART_DETECTED | CONTROL_CART_INSERTED); m_control &= ~(CONTROL_CART_IS_GB | CONTROL_CART_INSERTED);
} }
std::ranges::fill(data, m_control); std::ranges::fill(data, m_control);