ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3821 from mathieui/gcadapter-no-device 

Fix a hang with the GC Adapter
This commit is contained in:
Mat M 2016-05-13 21:36:51 -04:00
parent e319ac0561 8f0cbefbe5
commit e5bafeb40a
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/Core/Core/HW/SI_DeviceGCAdapter.cpp
View File

@ -8,6 +8,7 @@
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#include "Core/NetPlayProto.h"
#include "Core/HW/GCPad.h"
#include "Core/HW/SI_DeviceGCAdapter.h"
#include "InputCommon/GCAdapter.h"
@ -33,6 +34,27 @@ GCPadStatus CSIDevice_GCAdapter::GetPadStatus()
return PadStatus;
}
int CSIDevice_GCAdapter::RunBuffer(u8* buffer, int length)
{
if (!NetPlay::IsNetPlayRunning())
{
// The previous check is a hack to prevent a netplay desync due to
// SI devices being different and returning different values on
// RunBuffer(); the corresponding code in GCAdapter.cpp has the same
// check.
// This returns an error value if there is no controller plugged
// into this port on the hardware gc adapter, exposing it to the game.
if (!GCAdapter::DeviceConnected(ISIDevice::m_iDeviceNumber))
{
TSIDevices device = SI_NONE;
memcpy(buffer, &device, sizeof(device));
return 4;
}
}
return CSIDevice_GCController::RunBuffer(buffer, length);
}
void CSIDevice_GCController::Rumble(u8 numPad, ControlState strength)
{
SIDevices device = SConfig::GetInstance().m_SIDevice[numPad];

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

@ -14,4 +14,5 @@ public:
CSIDevice_GCAdapter(SIDevices device, int _iDeviceNumber);
GCPadStatus GetPadStatus() override;
int RunBuffer(u8* buffer, int length) override;
};

6
Source/Core/InputCommon/GCAdapter.cpp
View File

@ -12,6 +12,7 @@
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
#include "Core/NetPlayProto.h"
#include "Core/HW/SI.h"
#include "Core/HW/SystemTimers.h"
@ -417,8 +418,11 @@ void Input(int chan, GCPadStatus* pad)
pad->triggerLeft = controller_payload_copy[1 + (9 * chan) + 7];
pad->triggerRight = controller_payload_copy[1 + (9 * chan) + 8];
}
else
else if (!NetPlay::IsNetPlayRunning())
{
// This is a hack to prevent a netplay desync due to SI devices
// being different and returning different values.
// The corresponding code in DeviceGCAdapter has the same check
pad->button = PAD_ERR_STATUS;
}
}