Merge 22526f587c into 25a90c634d

* Fix SDL2 build on MacOS

* Fixing compilation error

core/input_hw/input.c

@@ -480,4 +480,4 @@ void input_end_frame(unsigned int cycles)
       }
     }
   }
-}
+}

gx/gui/menu.c

@@ -48,6 +48,7 @@
 #ifdef HW_RVL
 #include <ogc/usbmouse.h>
 #include "wiidrc.h"
+#include "retrousb.h"
 #endif
 
 #include <ogc/lwp_threads.h>
@@ -124,6 +125,7 @@
 #include "ctrl_nunchuk_png.h"
 #include "ctrl_wiimote_png.h"
 #include "ctrl_wiiu_png.h"
+#include "ctrl_retrousb_png.h"
 #endif
 
 /* Generic images */
@@ -2471,7 +2473,7 @@ static void ctrlmenu(void)
 
   /* Player Configuration device items */
 #ifdef HW_RVL
-  gui_item items_device[6] =
+  gui_item items_device[7] =
   {
     {NULL,ctrl_option_off_png ,"Input\nDevice","Select Input Controller",534,244,24,24},
     {NULL,ctrl_gamecube_png   ,"Input\nDevice","Select Input Controller",530,246,36,24},
@@ -2479,6 +2481,7 @@ static void ctrlmenu(void)
     {NULL,ctrl_nunchuk_png    ,"Input\nDevice","Select Input Controller",532,242,32,32},
     {NULL,ctrl_classic_png    ,"Input\nDevice","Select Input Controller",526,242,40,32},
     {NULL,ctrl_wiiu_png       ,"Input\nDevice","Select Input Controller",526,246,40,24},
+    {NULL,ctrl_retrousb_png   ,"Input\nDevice","Select Input Controller",526,246,40,24},
   };
 #else
   gui_item items_device[2] =
@@ -2518,6 +2521,7 @@ static void ctrlmenu(void)
   {
     items_device[5].texture = gxTextureOpenPNG(items_device[5].data,0);
   }
+  items_device[6].texture = gxTextureOpenPNG(items_device[6].data, 0);
 #endif
 
   /* restore current menu elements */
@@ -3060,11 +3064,21 @@ static void ctrlmenu(void)
             /* support for only one gamepad */
             if (!WiiDRC_Inited() || !WiiDRC_Connected() || (config.input[player].port >= 1))
             {
-              /* no input controller left */
-              config.input[player].device = -1;
-              config.input[player].port = player%4;
+              /* test RetroUSB */
+              config.input[player].device = 5;
+              config.input[player].port = 0;
             }
           }
+
+          if (config.input[player].device == 5)
+          {
+              if (!RetroUSB_OK() || config.input[player].port >= 1)
+              {
+                  /* no input controller left */
+                  config.input[player].device = -1;
+                  config.input[player].port = player % 4;
+              }
+          }
 #endif
 
           /* update menu items */
@@ -3230,6 +3244,7 @@ static void ctrlmenu(void)
   {
     gxTextureClose(&items_device[5].texture);
   }
+  gxTextureClose(&items_device[6].texture);
 #endif
 }
 

gx/gx_input.c

@@ -46,6 +46,7 @@
 #ifdef HW_RVL
 #include <ogc/usbmouse.h>
 #include "wiidrc.h"
+#include "retrousb.h"
 #endif
 
 /* Analog sticks sensitivity */
@@ -79,12 +80,13 @@
 #define PAD_RIGHT 3
 
 /* default directions mapping  */
-static u32 wpad_dirmap[4][4] =
+static u32 wpad_dirmap[5][4] =
 {
   {WPAD_BUTTON_RIGHT, WPAD_BUTTON_LEFT, WPAD_BUTTON_UP, WPAD_BUTTON_DOWN},                                  /* WIIMOTE */
   {WPAD_BUTTON_UP, WPAD_BUTTON_DOWN, WPAD_BUTTON_LEFT, WPAD_BUTTON_RIGHT},                                  /* WIIMOTE + NUNCHUK */
   {WPAD_CLASSIC_BUTTON_UP, WPAD_CLASSIC_BUTTON_DOWN, WPAD_CLASSIC_BUTTON_LEFT, WPAD_CLASSIC_BUTTON_RIGHT},  /* CLASSIC */
-  {WIIDRC_BUTTON_UP, WIIDRC_BUTTON_DOWN, WIIDRC_BUTTON_LEFT, WIIDRC_BUTTON_RIGHT}                           /* WIIU GAMEPAD */
+  {WIIDRC_BUTTON_UP, WIIDRC_BUTTON_DOWN, WIIDRC_BUTTON_LEFT, WIIDRC_BUTTON_RIGHT},                           /* WIIU GAMEPAD */
+  {PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT, PAD_BUTTON_RIGHT}
 };
 
 #define WPAD_BUTTONS_HELD (WPAD_BUTTON_UP | WPAD_BUTTON_DOWN | WPAD_BUTTON_LEFT | WPAD_BUTTON_RIGHT | \
@@ -615,6 +617,7 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
 {
   char msg[64];
   u32 p = 255;
+  bool isRetroUSB = false;
 
   /* Disable background PAD scanning */
   inputs_disabled = 1;
@@ -624,12 +627,14 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
   {
     WPAD_Probe(chan, &p);
   }
-  else
+  else if (WiiDRC_Inited() && WiiDRC_Connected())
   {
-    if (WiiDRC_Inited() && WiiDRC_Connected())
-    {
       p = exp;
-    }
+  }
+  else if (RetroUSB_OK())
+  {
+      p = exp;
+      isRetroUSB = true;
   }
   
   /* Device not detected */
@@ -638,7 +643,7 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
     if (exp == WPAD_EXP_NONE) sprintf(msg, "WIIMOTE #%d is not connected !", chan+1);
     else if (exp == WPAD_EXP_NUNCHUK) sprintf(msg, "NUNCHUK #%d is not connected !", chan+1);
     else if (exp == WPAD_EXP_CLASSIC) sprintf(msg, "CLASSIC #%d is not connected !", chan+1);
-    else sprintf(msg, "WIIU GAMEPAD is not connected !");
+    else sprintf(msg, "WIIU GAMEPAD or RETROUSB is not connected !");
     GUI_WaitPrompt("Error",msg);
 
     /* re-enable background PAD scanning and exit */
@@ -661,6 +666,14 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
           WPAD_ScanPads();
         }
       }
+      else if (isRetroUSB)
+      {
+          while (RetroUSB_ButtonsHeld())
+          {
+              VIDEO_WaitVSync();
+              RetroUSB_ScanPads();
+          }
+      }
       else
       {
         while (WiiDRC_ButtonsHeld())
@@ -672,7 +685,7 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
 
       /* configurable button */
       sprintf(msg,"Press key for %s\n(HOME to return)",keyname[first_key]);
-      GUI_MsgBoxUpdate(0,msg);
+      GUI_MsgBoxUpdate(0, msg);
 
       /* wait for user input */
       p = 0;
@@ -684,6 +697,11 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
           WPAD_ScanPads();
           p = WPAD_ButtonsDown(chan);
         }
+        else if (isRetroUSB)
+        {
+            RetroUSB_ScanPads();
+            p = RetroUSB_ButtonsHeld();
+        }
         else
         {
           WiiDRC_ScanPads();
@@ -742,17 +760,30 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
         /* WiiU GamePad Controller */
         default:
         {
-          if (p & WIIDRC_BUTTON_A) p = WIIDRC_BUTTON_A;
-          else if (p & WIIDRC_BUTTON_B) p = WIIDRC_BUTTON_B;
-          else if (p & WIIDRC_BUTTON_X) p = WIIDRC_BUTTON_X;
-          else if (p & WIIDRC_BUTTON_Y) p = WIIDRC_BUTTON_Y;
-          else if (p & WIIDRC_BUTTON_ZL) p = WIIDRC_BUTTON_ZL;
-          else if (p & WIIDRC_BUTTON_ZR) p = WIIDRC_BUTTON_ZR;
-          else if (p & WIIDRC_BUTTON_PLUS) p = WIIDRC_BUTTON_PLUS;
-          else if (p & WIIDRC_BUTTON_MINUS) p = WIIDRC_BUTTON_MINUS;
-          else if (p & WIIDRC_BUTTON_L) p = WIIDRC_BUTTON_L;
-          else if (p & WIIDRC_BUTTON_R) p = WIIDRC_BUTTON_R;
-          else first_key = MAX_KEYS;
+          if (isRetroUSB) {
+              if (p & PAD_BUTTON_A) p = PAD_BUTTON_A;
+              else if (p & PAD_BUTTON_B) p = PAD_BUTTON_B;
+              else if (p & PAD_BUTTON_X) p = PAD_BUTTON_X;
+              else if (p & PAD_BUTTON_Y) p = PAD_BUTTON_Y;
+              else if (p & PAD_TRIGGER_Z) p = PAD_TRIGGER_Z;
+              else if (p & PAD_BUTTON_START) p = PAD_BUTTON_START;
+              else if (p & PAD_TRIGGER_L) p = PAD_TRIGGER_L;
+              else if (p & PAD_TRIGGER_R) p = PAD_TRIGGER_R;
+              else first_key = MAX_KEYS;
+          }
+          else {
+              if (p & WIIDRC_BUTTON_A) p = WIIDRC_BUTTON_A;
+              else if (p & WIIDRC_BUTTON_B) p = WIIDRC_BUTTON_B;
+              else if (p & WIIDRC_BUTTON_X) p = WIIDRC_BUTTON_X;
+              else if (p & WIIDRC_BUTTON_Y) p = WIIDRC_BUTTON_Y;
+              else if (p & WIIDRC_BUTTON_ZL) p = WIIDRC_BUTTON_ZL;
+              else if (p & WIIDRC_BUTTON_ZR) p = WIIDRC_BUTTON_ZR;
+              else if (p & WIIDRC_BUTTON_PLUS) p = WIIDRC_BUTTON_PLUS;
+              else if (p & WIIDRC_BUTTON_MINUS) p = WIIDRC_BUTTON_MINUS;
+              else if (p & WIIDRC_BUTTON_L) p = WIIDRC_BUTTON_L;
+              else if (p & WIIDRC_BUTTON_R) p = WIIDRC_BUTTON_R;
+              else first_key = MAX_KEYS;
+          }
           break;
         }
       }
@@ -762,6 +793,14 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
       {
         config.wpad_keymap[4*exp + chan][first_key] = p;
       }
+
+      if (isRetroUSB)
+      {
+          while (RetroUSB_ButtonsHeld())
+          {
+              VIDEO_WaitVSync();
+          }
+      }
     }
   }
   while (first_key++ < last_key);
@@ -775,6 +814,14 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
       WPAD_ScanPads();
     }
   }
+  else if (isRetroUSB)
+  {
+      while (RetroUSB_ButtonsHeld())
+      {
+          VIDEO_WaitVSync();
+          RetroUSB_ScanPads();
+      }
+  }
   else
   {
     while (WiiDRC_ButtonsHeld())
@@ -784,49 +831,55 @@ static void wpad_config(u8 exp, int chan, int first_key, int last_key)
     }
   }
 
-  /* Configurable menu key */
-  GUI_MsgBoxUpdate(0,"Press key(s) for MENU");
-
-  /* reset key combo */
-  config.wpad_keymap[4*exp + chan][KEY_MENU] = 0;
-
-  /* wait for user input */
-  p = 0;
-  while (!p)
+  if (!isRetroUSB)
   {
-    VIDEO_WaitVSync();
-    if (exp <= WPAD_EXP_CLASSIC)
-    {
-      WPAD_ScanPads();
-      p = WPAD_ButtonsHeld(chan);
-    }
-    else
-    {
-      WiiDRC_ScanPads();
-      p = WiiDRC_ButtonsHeld();
-    }
-  }
+      /* Configurable menu key */
+      GUI_MsgBoxUpdate(0, "Press key(s) for MENU");
 
-  /* register keys until none are pressed anymore */
-  while (p)
+      /* reset key combo */
+      config.wpad_keymap[4 * exp + chan][KEY_MENU] = 0;
+
+      /* wait for user input */
+      p = 0;
+      while (!p)
+      {
+          VIDEO_WaitVSync();
+          if (exp <= WPAD_EXP_CLASSIC)
+          {
+              WPAD_ScanPads();
+              p = WPAD_ButtonsHeld(chan);
+          }
+          else
+          {
+              WiiDRC_ScanPads();
+              p = WiiDRC_ButtonsHeld();
+          }
+      }
+
+      /* register keys until none are pressed anymore */
+      while (p)
+      {
+          /* update key combo */
+          config.wpad_keymap[4 * exp + chan][KEY_MENU] |= p;
+
+          /* update WPAD status */
+          VIDEO_WaitVSync();
+          if (exp <= WPAD_EXP_CLASSIC)
+          {
+              WPAD_ScanPads();
+              p = WPAD_ButtonsHeld(chan);
+          }
+          else
+          {
+              WiiDRC_ScanPads();
+              p = WiiDRC_ButtonsHeld();
+          }
+      }
+  }
+  else
   {
-    /* update key combo */
-    config.wpad_keymap[4*exp + chan][KEY_MENU] |= p;
-
-    /* update WPAD status */
-    VIDEO_WaitVSync();
-    if (exp <= WPAD_EXP_CLASSIC)
-    {
-      WPAD_ScanPads();
-      p = WPAD_ButtonsHeld(chan);
-    }
-    else
-    {
-      WiiDRC_ScanPads();
-      p = WiiDRC_ButtonsHeld();
-    }
+      config.wpad_keymap[4 * exp + chan][KEY_MENU] = 0xFFFF;
   }
-
   /* re-enable background WPAD scanning and exit */
   inputs_disabled = 0;
 }
@@ -846,34 +899,41 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
   /* WiiU GamePad Controller support */
   if (exp > WPAD_EXP_CLASSIC)
   {
-    WiiDRC_ScanPads();
-    if (WiiDRC_ShutdownRequested())
-    {
-      Shutdown = ConfigRequested = 1;
-      reload = 0;
-      return;
-    }
-
-    p = WiiDRC_ButtonsHeld();
-
-    /* Default fast-forward key combo */
-    if (WiiDRC_ButtonsDown() & WIIDRC_BUTTON_HOME)
-    {
-      if (p & WIIDRC_BUTTON_MINUS)
+      if (RetroUSB_OK())
       {
-        audioSync ^= AUDIO_WAIT;
-        videoSync = (audioSync && config.vsync && (gc_pal != vdp_pal)) ? VIDEO_WAIT : 0;
-        return;
+          p = RetroUSB_ButtonsHeld();
       }
-    }
+      else
+      {
+          WiiDRC_ScanPads();
+          if (WiiDRC_ShutdownRequested())
+          {
+              Shutdown = ConfigRequested = 1;
+              reload = 0;
+              return;
+          }
 
-    /* Left Analog Stick */
-    x = (WiiDRC_lStickX() * 128) / 75;
-    y = (WiiDRC_lStickY() * 128) / 75;
-    if (x > 127) x = 127;
-    else if (x < -128) x = -128;
-    if (y > 127) y = 127;
-    else if (y < -128) y = -128;
+          p = WiiDRC_ButtonsHeld();
+
+          /* Default fast-forward key combo */
+          if (WiiDRC_ButtonsDown() & WIIDRC_BUTTON_HOME)
+          {
+              if (p & WIIDRC_BUTTON_MINUS)
+              {
+                  audioSync ^= AUDIO_WAIT;
+                  videoSync = (audioSync && config.vsync && (gc_pal != vdp_pal)) ? VIDEO_WAIT : 0;
+                  return;
+              }
+          }
+
+          /* Left Analog Stick */
+          x = (WiiDRC_lStickX() * 128) / 75;
+          y = (WiiDRC_lStickY() * 128) / 75;
+          if (x > 127) x = 127;
+          else if (x < -128) x = -128;
+          if (y > 127) y = 127;
+          else if (y < -128) y = -128;
+      }
   }
   else if (exp != WPAD_EXP_NONE)
   {
@@ -933,7 +993,7 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
       input.analog[i][1] = y ? (127 - y) : 128;
 
       /* Right Stick analog position [0-255] */
-      if (exp >= WPAD_EXP_CLASSIC)
+      if (exp >= WPAD_EXP_CLASSIC && !RetroUSB_OK())
       {
         if (exp > WPAD_EXP_CLASSIC)
         {
@@ -1060,7 +1120,7 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
           input.analog[i][1] = 512;
         }
       }
-      else
+      else if(!RetroUSB_OK())
       {
         /* Left analog stick */
         input.analog[i][0] += x / ANALOG_SENSITIVITY;
@@ -1114,7 +1174,7 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
           input.analog[i][1] = (int)((ir.sy - 384) * 2 / 3 / ANALOG_SENSITIVITY);
         }
       }
-      else
+      else if(!RetroUSB_OK())
       {
         /* Left analog stick position (-127;+127) -> (-255;+255) */
         input.analog[i][0] = (x / ANALOG_SENSITIVITY) * 2;
@@ -1156,7 +1216,7 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
           input.analog[0][1] = 0x1fc + ((ir.y + config.caly) * (0x2f7 - 0x1fc + 1)) / 480;
         }
       }
-      else
+      else if(!RetroUSB_OK())
       {
         /* Left analog stick */
         input.analog[0][0] += x / ANALOG_SENSITIVITY;
@@ -1193,7 +1253,7 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
           input.analog[0][1] = ((ir.y + config.caly) * 250) / 480;
         }
       }
-      else
+      else if(!RetroUSB_OK())
       {
         /* Left analog stick */
         input.analog[0][0] += x / ANALOG_SENSITIVITY;
@@ -1226,7 +1286,7 @@ static void wpad_update(s8 chan, u8 i, u32 exp)
           input.analog[0][1] = ((ir.y + config.caly) * 255) / 480;
         }
       }
-      else
+      else if(!RetroUSB_OK())
       {
         /* Left analog stick */
         input.analog[0][0] += x / ANALOG_SENSITIVITY;
@@ -1305,6 +1365,7 @@ void gx_input_Init(void)
   WPAD_SetDataFormat(WPAD_CHAN_ALL,WPAD_FMT_BTNS_ACC_IR);
   WPAD_SetVRes(WPAD_CHAN_ALL,640,480);
   WiiDRC_Init();
+  RetroUSB_OK();
 #endif
 }
 
@@ -1379,6 +1440,14 @@ int gx_input_FindDevices(void)
           }
           break;
         }
+
+        case 5: /* RetroUSB */
+        {
+            if (RetroUSB_OK())
+            {
+                found++;
+            }
+        }
  #endif
 
         default:
@@ -1461,6 +1530,17 @@ void gx_input_SetDefault(void)
     config.wpad_keymap[4*3][KEY_BUTTONZ] = WIIDRC_BUTTON_X;
     config.wpad_keymap[4*3][KEY_MODE]    = WIIDRC_BUTTON_MINUS;
     config.wpad_keymap[4*3][KEY_MENU]    = WIIDRC_BUTTON_HOME;
+
+    /* RetroUSB */
+    config.wpad_keymap[4 * 3 + 1][KEY_BUTTONA] = PAD_BUTTON_Y;
+    config.wpad_keymap[4 * 3 + 1][KEY_BUTTONB] = PAD_BUTTON_B;
+    config.wpad_keymap[4 * 3 + 1][KEY_BUTTONC] = PAD_BUTTON_A;
+    config.wpad_keymap[4 * 3 + 1][KEY_START] = PAD_BUTTON_START;
+    config.wpad_keymap[4 * 3 + 1][KEY_BUTTONX] = PAD_TRIGGER_L;
+    config.wpad_keymap[4 * 3 + 1][KEY_BUTTONY] = PAD_TRIGGER_R;
+    config.wpad_keymap[4 * 3 + 1][KEY_BUTTONZ] = PAD_BUTTON_X;
+    config.wpad_keymap[4 * 3 + 1][KEY_MODE] = PAD_TRIGGER_Z;
+    config.wpad_keymap[4 * 3 + 1][KEY_MENU] = 0;
   }
 #endif
 
@@ -1473,16 +1553,21 @@ void gx_input_SetDefault(void)
   }
 
 #ifdef HW_RVL
+
+  i = 0;
   /* autodetect connected WiiU Gamepad Controller */
   if (WiiDRC_Inited() && WiiDRC_Connected())
   {
-    config.input[0].device = 4;
-    config.input[0].port = 0;
-    i = 1;
+    config.input[i].device = 4;
+    config.input[i].port = 0;
+    i++;
   }
-  else
+  /* autodetect RetroUSB */
+  if (RetroUSB_OK())
   {
-    i = 0;
+      config.input[i].device = 5;
+      config.input[i].port = 0;
+      i++;
   }
 
   /* autodetect connected Wii Controllers */

gx/retrousb.c

@@ -0,0 +1,188 @@
+#ifdef HW_RVL
+#include <gccore.h>
+#include <string.h>
+
+#define RETROUSB_VID 61440
+#define RETROUSB_PID 8	
+
+#define POLL_THREAD_STACKSIZE		(1024 * 4)
+#define POLL_THREAD_PRIO			65
+
+static bool setup = false;
+static bool replugRequired = false;
+static s32 deviceId = 0;
+static u8 endpoint = 0;
+static u8 bMaxPacketSize = 0;
+static u32 jpRetroUSB;
+static char testChars[65];
+static bool pollThreadRunning = false;
+static lwp_t pollThread = LWP_THREAD_NULL;
+static u8 pollStack[POLL_THREAD_STACKSIZE] ATTRIBUTE_ALIGN(8);
+u8 RetroUSB_Counter = 0;
+
+static bool isRetroUSBGamepad(usb_device_entry dev)
+{
+	return dev.vid == RETROUSB_VID && dev.pid == RETROUSB_PID;
+}
+
+static u8 getEndpoint(usb_devdesc devdesc)
+{
+	if (devdesc.configurations == NULL || devdesc.configurations->interfaces == NULL ||
+		devdesc.configurations->interfaces->endpoints == NULL)
+	{
+		return -1;
+	}
+	return devdesc.configurations->interfaces->endpoints->bEndpointAddress;
+}
+
+static int removal_cb(int result, void* usrdata)
+{
+	s32 fd = (s32)usrdata;
+	if (fd == deviceId)
+	{
+		deviceId = 0;
+	}
+	return 1;
+}
+
+static void open()
+{
+	if (deviceId != 0)
+	{
+		return;
+	}
+
+	usb_device_entry dev_entry[8];
+	u8 dev_count;
+	if (USB_GetDeviceList(dev_entry, 8, USB_CLASS_HID, &dev_count) < 0)
+	{
+		return;
+	}
+
+	for (int i = 0; i < dev_count; ++i)
+	{
+		if (!isRetroUSBGamepad(dev_entry[i]))
+		{
+			continue;
+		}
+		s32 fd;
+		if (USB_OpenDevice(dev_entry[i].device_id, dev_entry[i].vid, dev_entry[i].pid, &fd) < 0)
+		{
+			continue;
+		}
+
+		usb_devdesc devdesc;
+		if (USB_GetDescriptors(fd, &devdesc) < 0)
+		{
+			// You have to replug the controller!
+			replugRequired = true;
+			USB_CloseDevice(&fd);
+			break;
+		}
+
+		deviceId = fd;
+		replugRequired = false;
+		endpoint = getEndpoint(devdesc);
+		bMaxPacketSize = devdesc.bMaxPacketSize0;
+		USB_DeviceRemovalNotifyAsync(fd, &removal_cb, (void*)fd);
+		break;
+	}
+
+	setup = true;
+}
+
+u32 RetroUSB_ScanPads(void)
+{
+	return jpRetroUSB;
+}
+
+static void *scanThreadFunc(void *arg)
+{
+	RetroUSB_Counter = 100;
+	while (1)
+	{
+		if (deviceId == 0 || replugRequired)
+		{
+			continue;
+		}
+
+		uint8_t ATTRIBUTE_ALIGN(32) buf[4];
+		s32 res = USB_ReadIntrMsg(deviceId, endpoint, sizeof(buf), buf);
+		if (res < 0)
+		{
+			continue;
+		}
+
+		u32 jp = 0;
+		jp |= (buf[2] & 0x80) ? PAD_BUTTON_UP : 0;
+		jp |= (buf[2] & 0x40) ? PAD_BUTTON_DOWN : 0;
+		jp |= (buf[2] & 0x20) ? PAD_BUTTON_LEFT : 0;
+		jp |= (buf[2] & 0x10) ? PAD_BUTTON_RIGHT : 0;
+
+		jp |= ((buf[2] & 0x08)) ? PAD_BUTTON_A : 0;
+		jp |= ((buf[2] & 0x04)) ? PAD_BUTTON_B : 0;
+		jp |= ((buf[3] & 0x04)) ? PAD_BUTTON_X : 0;
+		jp |= ((buf[2] & 0x02)) ? PAD_BUTTON_Y : 0;
+
+		jp |= ((buf[3] & 0x02)) ? PAD_TRIGGER_L : 0;
+		jp |= ((buf[3] & 0x08)) ? PAD_TRIGGER_R : 0;
+
+		jp |= ((buf[2] & 0x01)) ? PAD_BUTTON_START : 0;
+		jp |= ((buf[3] & 0x01)) ? PAD_TRIGGER_Z : 0;
+
+		/*int i;
+		for (i = 0; i < res; i++) {
+			testChars[i * 3] = "0123456789ABCDEF"[(buf[i] & 0xF0) >> 4];
+			testChars[i * 3 + 1] = "0123456789ABCDEF"[buf[i] & 0xF];
+			testChars[i * 3 + 2] = ' ';
+		}
+
+		counter++;
+		testChars[i * 3] = "0123456789ABCDEF"[(counter & 0xF0) >> 4];
+		testChars[i * 3 + 1] = "0123456789ABCDEF"[counter & 0xF];
+		testChars[i * 3 + 2] = '\0';*/
+
+		RetroUSB_Counter++;
+
+		jpRetroUSB = jp;
+	}
+
+	return 0;
+}
+
+u32 RetroUSB_ButtonsHeld()
+{
+	if (!setup)
+	{
+		open();
+	}
+	if (!pollThreadRunning)
+	{
+		memset(pollStack, 0, POLL_THREAD_STACKSIZE);
+
+		s32 res = LWP_CreateThread(&pollThread, scanThreadFunc, NULL,
+			pollStack, POLL_THREAD_STACKSIZE,
+			POLL_THREAD_PRIO);
+		if (!res)
+		{
+			pollThreadRunning = true;
+		}
+	}
+	if (deviceId == 0)
+	{
+		return 0;
+	}
+	return jpRetroUSB;
+}
+
+char* RetroUSB_TestChars() {
+	return testChars;
+}
+
+bool RetroUSB_OK()
+{
+	open();
+	return !replugRequired && deviceId;
+}
+
+#endif

gx/retrousb.h

@@ -0,0 +1,13 @@
+#ifndef _RETROUSB_H_
+#define _RETROUSB_H_
+
+#include <gctypes.h>
+
+bool RetroUSB_ScanPads();
+u32 RetroUSB_ButtonsHeld();
+bool RetroUSB_OK();
+char* RetroUSB_TestChars();
+
+extern u8 RetroUSB_Counter;
+
+#endif

sdl/Makefile.sdl2

@@ -41,6 +41,14 @@ ifneq ($(OS),Windows_NT)
 DEFINES += -DHAVE_ALLOCA_H
 endif
 
+ifneq ($(findstring Darwin,$(shell uname -a)),)
+	platform = osx
+endif
+
+ifeq ($(platform), osx)
+	CFLAGS   += -Winvalid-utf8 -Wstrict-prototypes
+endif
+
 SRCDIR    = ../core
 INCLUDES  = -I$(SRCDIR) -I$(SRCDIR)/z80 -I$(SRCDIR)/m68k -I$(SRCDIR)/sound -I$(SRCDIR)/input_hw -I$(SRCDIR)/cart_hw -I$(SRCDIR)/cart_hw/svp -I$(SRCDIR)/cd_hw -I$(SRCDIR)/ntsc -I$(SRCDIR)/tremor -I$(SRCDIR)/../sdl -I$(SRCDIR)/../sdl/sdl2
 LIBS	  = `sdl2-config --libs` -lz -lm

sdl/config.h

@@ -2,7 +2,7 @@
 #ifndef _CONFIG_H_
 #define _CONFIG_H_
 
-#include "shared.h"
+#include "types.h"
 
 /****************************************************************************
  * Config Option