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

... 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2514 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-03-02 04:18:02 +00:00
parent e65ba57814
commit 5586c964bb
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/Src/HW/SI_Device.cpp
View File

@ -93,11 +93,7 @@ ISIDevice* SIDevice_Create(TSIDevices _SIDevice, int _iDeviceNumber)
case SI_GBA:
return new CSIDevice_GBA(_iDeviceNumber);
break;
default:
return NULL;
break;
}
return NULL;
}

4
Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
View File

@ -126,8 +126,8 @@ CSIDevice_GCController::GetData(u32& _Hi, u32& _Low)
_Hi = (u32)((u8)PadStatus.stickY);
_Hi |= (u32)((u8)PadStatus.stickX << 8);
_Hi |= (u32)((u16)PadStatus.button << 16); // The highest 3bits should always be 0
_Hi |= 0x00800000; // This bit is always on
_Hi |= (u32)((u16)PadStatus.button << 16); // Dunno were/if we should set any of the top 3bits...
_Hi |= 0x00800000; // F|RES: means that the pad must be "combined" with the origin to math the "final" OSPad-Struct
//_Hi |= 0x20000000; // ?
_Low = (u8)PadStatus.triggerRight;