We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch 3: WaveBird differences

0003-Handle-GameCube-WaveBird-controller-differences.patch (text/plain), 3.06 KB, created by Zack Middleton (zturtleman) on 2019-06-19 08:00:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zack Middleton (zturtleman)

Created: 2019-06-19 08:00:39 UTC

Size: 3.06 KB

patch

obsolete

>From aa54d65bb5eb3419704221c7675f5a74bb5d9a10 Mon Sep 17 00:00:00 2001
>From: Zack Middleton <zack@cloemail.com>
>Date: Wed, 19 Jun 2019 02:21:19 -0500
>Subject: [PATCH 3/3] Handle GameCube WaveBird controller differences
>
>Make wireless GameCube controllers use unknown power level instead of
>wired and don't allow rumble (it doesn't have hardware for it).
>---
> src/joystick/hidapi/SDL_hidapi_gamecube.c | 14 +++++++++++---
> 1 file changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/src/joystick/hidapi/SDL_hidapi_gamecube.c b/src/joystick/hidapi/SDL_hidapi_gamecube.c
>index d5f513233..d44c55d40 100644
>--- a/src/joystick/hidapi/SDL_hidapi_gamecube.c
>+++ b/src/joystick/hidapi/SDL_hidapi_gamecube.c
>@@ -37,6 +37,7 @@
> 
> typedef struct {
>     SDL_JoystickID joysticks[4];
>+    Uint8 wireless[4];
>     Uint8 rumbleAllowed[4];
>     Uint8 rumble[5];
>     Uint32 rumbleExpiration[4];
>@@ -100,8 +101,10 @@ HIDAPI_DriverGameCube_InitDriver(SDL_HIDAPI_DriverData *context, Uint16 vendor_i
>         /* Go through all 4 slots */
>         curSlot = packet + 1;
>         for (i = 0; i < 4; i += 1, curSlot += 9) {
>+            ctx->wireless[i] = (curSlot[0] & 0x20) != 0;
>+
>             /* Only allow rumble if the adapter's second USB cable is connected */
>-            ctx->rumbleAllowed[i] = (curSlot[0] & 0x04) != 0;
>+            ctx->rumbleAllowed[i] = (curSlot[0] & 0x04) != 0 && !ctx->wireless[i];
> 
>             if (curSlot[0] & 0x30) { /* 0x10 - Wired, 0x20 - Wireless */
>                 if (ctx->joysticks[i] == -1) {
>@@ -172,8 +175,10 @@ HIDAPI_DriverGameCube_UpdateDriver(SDL_HIDAPI_DriverData *context, int *num_joys
>         /* Go through all 4 slots */
>         curSlot = packet + 1;
>         for (i = 0; i < 4; i += 1, curSlot += 9) {
>+            ctx->wireless[i] = (curSlot[0] & 0x20) != 0;
>+
>             /* Only allow rumble if the adapter's second USB cable is connected */
>-            ctx->rumbleAllowed[i] = (curSlot[0] & 0x04) != 0;
>+            ctx->rumbleAllowed[i] = (curSlot[0] & 0x04) != 0 && !ctx->wireless[i];
> 
>             if (curSlot[0] & 0x30) { /* 0x10 - Wired, 0x20 - Wireless */
>                 if (ctx->joysticks[i] == -1) {
>@@ -316,7 +321,7 @@ HIDAPI_DriverGameCube_OpenJoystick(SDL_HIDAPI_DriverData *context, SDL_Joystick
>         if (instance == ctx->joysticks[i]) {
>             joystick->nbuttons = 12;
>             joystick->naxes = 6;
>-            joystick->epowerlevel = SDL_JOYSTICK_POWER_WIRED;
>+            joystick->epowerlevel = ctx->wireless[i] ? SDL_JOYSTICK_POWER_UNKNOWN : SDL_JOYSTICK_POWER_WIRED;
>             joystick->player_index = i;
>             return SDL_TRUE;
>         }
>@@ -332,6 +337,9 @@ HIDAPI_DriverGameCube_Rumble(SDL_HIDAPI_DriverData *context, SDL_Joystick *joyst
>     Uint8 i, val;
>     for (i = 0; i < 4; i += 1) {
>         if (instance == ctx->joysticks[i]) {
>+            if (ctx->wireless[i]) {
>+                return SDL_SetError("Ninteno GameCube WaveBird controllers do not support rumble");
>+            }
>             if (!ctx->rumbleAllowed[i]) {
>                 return SDL_SetError("Second USB cable for WUP-028 not connected");
>             }
>-- 
>2.11.0
>

Actions: View | Diff

Attachments on bug 4676: 3833 | 3834 | 3835

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.