Permalink
Browse files

[Wii] fixed Wii U Pro Controller detection using libogc

  • Loading branch information...
ekeeke committed Aug 10, 2018
1 parent 7af5a0c commit 3ec4b627e84acebbda865dc1b447b1eb7cf1b3a8
Showing with 9 additions and 7 deletions.
  1. +3 −2 gx/gui/menu.c
  2. +1 −1 gx/gui/menu.h
  3. +4 −3 gx/gx_input.c
  4. +1 −1 gx/gx_input.h
View
@@ -3,7 +3,7 @@
*
* Genesis Plus GX menu
*
* Copyright Eke-Eke (2009-2017)
* Copyright Eke-Eke (2009-2018)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:
@@ -2859,7 +2859,8 @@ static void ctrlmenu(void)
if (exp == WPAD_EXP_CLASSIC)
{
WPADData *data = WPAD_Data(config.input[player].port);
exp = data->exp.classic.rjs.max.x;
if (data->exp.classic.type == 2)
exp = 255;
}
/* try next port if no wimote available */
View
@@ -3,7 +3,7 @@
*
* Genesis Plus GX menus
*
* Copyright Eke-Eke (2009-2017)
* Copyright Eke-Eke (2009-2018)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:
View
@@ -3,7 +3,7 @@
*
* Genesis Plus GX input support
*
* Copyright Eke-Eke (2007-2017)
* Copyright Eke-Eke (2007-2018)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:
@@ -1284,7 +1284,7 @@ int gx_input_FindDevices(void)
if (wpad == WPAD_EXP_CLASSIC)
{
WPADData *data = WPAD_Data(config.input[player].port);
if (data->exp.classic.rjs.max.x != 255)
if (data->exp.classic.type != 2)
{
found++;
}
@@ -1453,11 +1453,12 @@ void gx_input_SetDefault(void)
{
/* make sure this is not a Wii U Pro Controller */
WPADData *data = WPAD_Data(config.input[j].port);
if (data->exp.classic.rjs.max.x != 255)
if (data->exp.classic.type != 2)
{
/* Wiimote is available */
config.input[i].device = 1;
config.input[i].port = j;
break;
}
}
}
View
@@ -3,7 +3,7 @@
*
* Genesis Plus GX input support
*
* Copyright Eke-Eke (2007-2017)
* Copyright Eke-Eke (2007-2018)
*
* Redistribution and use of this code or any derivative works are permitted
* provided that the following conditions are met:

0 comments on commit 3ec4b62

Please sign in to comment.