The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Build fix

Browse Source
This commit is contained in:
Pokechu22 2023-09-03 16:01:01 -07:00
parent 798c9826cc
commit 612ed106cd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/Core/HW/WII_IPC.cpp
View File

@ -290,10 +290,10 @@ void WiiIPC::Shutdown()
{ {
} }
static u32 ReadGPIOIn(Core::System& system) u32 WiiIPC::ReadGPIOIn()
{ {
Common::Flags<GPIO> gpio_in; Common::Flags<GPIO> gpio_in;
gpio_in[GPIO::SLOT_IN] = system.GetDVDInterface().IsDiscInside(); gpio_in[GPIO::SLOT_IN] = m_system.GetDVDInterface().IsDiscInside();
gpio_in[GPIO::AVE_SCL] = i2c_state.GetSCL(); gpio_in[GPIO::AVE_SCL] = i2c_state.GetSCL();
gpio_in[GPIO::AVE_SDA] = i2c_state.GetSDA(); gpio_in[GPIO::AVE_SDA] = i2c_state.GetSDA();
return gpio_in.m_hex; return gpio_in.m_hex;
@ -306,7 +306,7 @@ u32 WiiIPC::GetGPIOOut()
// In practice this means that (at least for the AVE I²C pins) a 1 is output when the pin is an // In practice this means that (at least for the AVE I²C pins) a 1 is output when the pin is an
// input. (RVLoader depends on this.) // input. (RVLoader depends on this.)
// https://github.com/Aurelio92/RVLoader/blob/75732f248019f589deb1109bba7b5323a8afaadf/source/i2c.c#L101-L109 // https://github.com/Aurelio92/RVLoader/blob/75732f248019f589deb1109bba7b5323a8afaadf/source/i2c.c#L101-L109
return (m_gpio_out.m_hex | ~(m_gpio_dir.m_hex)) & (ReadGPIOIn(m_system) | m_gpio_dir.m_hex); return (m_gpio_out.m_hex | ~(m_gpio_dir.m_hex)) & (ReadGPIOIn() | m_gpio_dir.m_hex);
} }
void WiiIPC::GPIOOutChanged(u32 old_value_hex) void WiiIPC::GPIOOutChanged(u32 old_value_hex)
@ -389,7 +389,8 @@ void WiiIPC::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
wii_ipc.GPIOOutChanged(old_out); wii_ipc.GPIOOutChanged(old_out);
})); }));
mmio->Register(base | GPIOB_IN, MMIO::ComplexRead<u32>([](Core::System& system, u32) { mmio->Register(base | GPIOB_IN, MMIO::ComplexRead<u32>([](Core::System& system, u32) {
return ReadGPIOIn(system); auto& wii_ipc = system.GetWiiIPC();
return wii_ipc.ReadGPIOIn();
}), }),
MMIO::Nop<u32>()); MMIO::Nop<u32>());
// Starlet GPIO registers, not normally accessible by PPC (but they can be depending on how // Starlet GPIO registers, not normally accessible by PPC (but they can be depending on how
@ -420,7 +421,8 @@ void WiiIPC::RegisterMMIO(MMIO::Mapping* mmio, u32 base)
wii_ipc.GPIOOutChanged(old_out); wii_ipc.GPIOOutChanged(old_out);
})); }));
mmio->Register(base | GPIO_IN, MMIO::ComplexRead<u32>([](Core::System& system, u32) { mmio->Register(base | GPIO_IN, MMIO::ComplexRead<u32>([](Core::System& system, u32) {
return ReadGPIOIn(system); auto& wii_ipc = system.GetWiiIPC();
return wii_ipc.ReadGPIOIn();
}), }),
MMIO::Nop<u32>()); MMIO::Nop<u32>());

1
Source/Core/Core/HW/WII_IPC.h
View File

@ -140,6 +140,7 @@ private:
static void UpdateInterruptsCallback(Core::System& system, u64 userdata, s64 cycles_late); static void UpdateInterruptsCallback(Core::System& system, u64 userdata, s64 cycles_late);
void UpdateInterrupts(); void UpdateInterrupts();
u32 ReadGPIOIn();
u32 GetGPIOOut(); u32 GetGPIOOut();
void GPIOOutChanged(u32 old_value_hex); void GPIOOutChanged(u32 old_value_hex);