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

SerialInterface: Fixed the Init for different MAXPADS values, I think 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1975 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-01-21 17:54:03 +00:00
parent cf8b3b2264
commit cd76970d8f
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Core/Core/Src/HW/SI.cpp
View File

@ -246,28 +246,25 @@ void DoState(PointerWrap &p)
// ¯¯¯¯¯¯¯¯¯¯ // ¯¯¯¯¯¯¯¯¯¯
void Init() void Init()
{ {
// TODO: allow dynamic attaching/detaching of plugins
// maybe this code should be in the pad plugin loader at all?
for (int i = 0; i < NUMBER_OF_CHANNELS; i++) for (int i = 0; i < NUMBER_OF_CHANNELS; i++)
{ {
g_Channel[i].m_Out.Hex = 0; g_Channel[i].m_Out.Hex = 0;
g_Channel[i].m_InHi.Hex = 0; g_Channel[i].m_InHi.Hex = 0;
g_Channel[i].m_InLo.Hex = 0; g_Channel[i].m_InLo.Hex = 0;
// First attach a dummy device to all channels // Check the maxpads limit
g_Channel[i].m_pDevice = new CSIDevice_Dummy(i); int j = i; if(i >= MAXPADS) j = MAXPADS - 1;
}
// TODO: allow dynamic attaching/detaching of plugins // Get pad
// maybe this code should be in the pad plugin loader at all? Common::PluginPAD* pad = CPluginManager::GetInstance().GetPAD(j);
for (int i = 0; i < MAXPADS; i++)
{
// Get pad status
Common::PluginPAD* pad = CPluginManager::GetInstance().GetPAD(i);
// Check if this pad is attached for the current plugin // Check if this pad is attached for the current plugin
if (pad != NULL && (pad->PAD_GetAttachedPads() & (1 << i))) if (pad != NULL && (pad->PAD_GetAttachedPads() & (1 << i)))
g_Channel[i].m_pDevice = new CSIDevice_GCController(i); g_Channel[i].m_pDevice = new CSIDevice_GCController(i);
//else else
// g_Channel[i].m_pDevice = new CSIDevice_Dummy(i); g_Channel[i].m_pDevice = new CSIDevice_Dummy(i);
} }
g_Poll.Hex = 0; g_Poll.Hex = 0;