From 6fb89e3b779ab152bdc02291e075b64952c6c489 Mon Sep 17 00:00:00 2001 From: skidau Date: Sat, 13 Dec 2014 16:14:18 +1100 Subject: [PATCH] Fixed the Y button (typo) on the GC adapter. --- Source/Core/Core/HW/SI_GCAdapter.cpp | 5 ++--- Source/Core/Core/HW/SI_GCAdapter.h | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/Core/HW/SI_GCAdapter.cpp b/Source/Core/Core/HW/SI_GCAdapter.cpp index 66ac409bb2..269219ac7f 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.cpp +++ b/Source/Core/Core/HW/SI_GCAdapter.cpp @@ -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) { - ERROR_LOG(SERIALINTERFACE, "error reading payload (size: %d)", s_controller_payload_size); - Shutdown(); + ERROR_LOG(SERIALINTERFACE, "error reading payload (size: %d, type: %02x)", s_controller_payload_size, controller_payload_copy[0]); } else { @@ -228,7 +227,7 @@ void Input(int chan, GCPadStatus* pad) if (b1 & (1 << 0)) pad->button |= PAD_BUTTON_A; 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_Y; + if (b1 & (1 << 3)) pad->button |= PAD_BUTTON_Y; if (b1 & (1 << 4)) pad->button |= PAD_BUTTON_LEFT; if (b1 & (1 << 5)) pad->button |= PAD_BUTTON_RIGHT; diff --git a/Source/Core/Core/HW/SI_GCAdapter.h b/Source/Core/Core/HW/SI_GCAdapter.h index 11560aa95d..b47afdaec2 100644 --- a/Source/Core/Core/HW/SI_GCAdapter.h +++ b/Source/Core/Core/HW/SI_GCAdapter.h @@ -14,7 +14,7 @@ namespace SI_GCAdapter void Init(); void Shutdown(); void Input(int chan, GCPadStatus* pad); -void Output(int chan, u8 rumble); +void Output(int chan, u8 rumble_command); SIDevices GetDeviceType(int channel); void RefreshConnectedDevices(); bool IsDetected();