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 #1692 from skidau/GC-Adapter-netplay 

Fixed the Y button (typo) on the GC adapter.
This commit is contained in:
skidau 2014-12-13 19:40:44 +11:00
parent f3064bf160 6fb89e3b77
commit 00b05bb18c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/HW/SI_GCAdapter.cpp
View File

@ -209,8 +209,7 @@ void Input(int chan, GCPadStatus* pad)
if (s_controller_payload_size != sizeof(controller_payload_copy) || controller_payload_copy[0] != LIBUSB_DT_HID) if (s_controller_payload_size != sizeof(controller_payload_copy) || controller_payload_copy[0] != LIBUSB_DT_HID)
{ {
ERROR_LOG(SERIALINTERFACE, "error reading payload (size: %d)", s_controller_payload_size); ERROR_LOG(SERIALINTERFACE, "error reading payload (size: %d, type: %02x)", s_controller_payload_size, controller_payload_copy[0]);
Shutdown();
} }
else else
{ {
@ -228,7 +227,7 @@ void Input(int chan, GCPadStatus* pad)
if (b1 & (1 << 0)) pad->button |= PAD_BUTTON_A; if (b1 & (1 << 0)) pad->button |= PAD_BUTTON_A;
if (b1 & (1 << 1)) pad->button |= PAD_BUTTON_B; if (b1 & (1 << 1)) pad->button |= PAD_BUTTON_B;
if (b1 & (1 << 2)) pad->button |= PAD_BUTTON_X; if (b1 & (1 << 2)) pad->button |= PAD_BUTTON_X;
if (b1 & (1 << 2)) pad->button |= PAD_BUTTON_Y; if (b1 & (1 << 3)) pad->button |= PAD_BUTTON_Y;
if (b1 & (1 << 4)) pad->button |= PAD_BUTTON_LEFT; if (b1 & (1 << 4)) pad->button |= PAD_BUTTON_LEFT;
if (b1 & (1 << 5)) pad->button |= PAD_BUTTON_RIGHT; if (b1 & (1 << 5)) pad->button |= PAD_BUTTON_RIGHT;

2
Source/Core/Core/HW/SI_GCAdapter.h
View File

@ -14,7 +14,7 @@ namespace SI_GCAdapter
void Init(); void Init();
void Shutdown(); void Shutdown();
void Input(int chan, GCPadStatus* pad); void Input(int chan, GCPadStatus* pad);
void Output(int chan, u8 rumble); void Output(int chan, u8 rumble_command);
SIDevices GetDeviceType(int channel); SIDevices GetDeviceType(int channel);
void RefreshConnectedDevices(); void RefreshConnectedDevices();
bool IsDetected(); bool IsDetected();