Keep HID pads from clobbering gamepad/wiimotes

== DETAILS

Trying to do weird pad math just wasn't working so I bit the bullet and just
let it allocate all 16 pads in the slot list, then just mark 0-4 as
connected so that the slot allocator would start at 5.

I can see it detect the pad, but no idea if it works. Out of time for
today.

input/common/hid/device_wiiu_gca.c

@@ -40,14 +40,12 @@ typedef struct gca_pad_data
    uint8_t data[9];      // pad data
    uint32_t slot;        // slot this pad occupies
    uint32_t buttons;     // digital button state
-   char *name;           // name of the pad
 } gca_pad_t;
 
 
 static void update_pad_state(wiiu_gca_instance_t *instance);
 static joypad_connection_t *register_pad(wiiu_gca_instance_t *instance, int port);
 static void unregister_pad(wiiu_gca_instance_t *instance, int port);
-static void set_pad_name_for_port(gca_pad_t *pad, int port);
 
 extern pad_connection_interface_t wiiu_gca_pad_connection;
 
@@ -91,10 +89,17 @@ static void wiiu_gca_handle_packet(void *data, uint8_t *buffer, size_t size)
 {
    wiiu_gca_instance_t *instance = (wiiu_gca_instance_t *)data;
    if(!instance || !instance->online)
+   {
+      RARCH_WARN("[gca]: instance null or not ready yet.\n");
       return;
+   }
 
    if(size > sizeof(instance->device_state))
+   {
+      RARCH_WARN("[gca]: packet size %d is too big for buffer of size %d\n",
+         size, sizeof(instance->device_state));
       return;
+   }
 
    memcpy(instance->device_state, buffer, size);
    update_pad_state(instance);
@@ -141,29 +146,6 @@ static void update_pad_state(wiiu_gca_instance_t *instance)
    }
 }
 
-/**
- * This is kind of cheating because it's taking advantage of the fact that
- * we know what the pad handle data format is. It'd be nice if the pad
- * interface had a set_name function so this wouldn't be required.
- */
-static void set_pad_name_for_port(gca_pad_t *pad, int port)
-{
-   char buf[45];
-
-   if(port >= 4)
-      return;
-
-   snprintf(buf, 32, "Nintendo Gamecube Controller [GCA Port %d]", port);
-   if(pad->name)
-   {
-      free(pad->name);
-      pad->name = NULL;
-   }
-
-   pad->name = strdup(buf);
-}
-
-
 static joypad_connection_t *register_pad(wiiu_gca_instance_t *instance, int port) {
    int slot;
    joypad_connection_t *result;
@@ -185,7 +167,6 @@ static joypad_connection_t *register_pad(wiiu_gca_instance_t *instance, int port
    result = &(hid_instance.pad_list[slot]);
    result->iface = &wiiu_gca_pad_connection;
    result->data = result->iface->init(instance, slot, hid_instance.os_driver);
-   set_pad_name_for_port(result->data, port);
    result->connected = true;
    input_pad_connect(slot, hid_instance.pad_driver);
 
@@ -243,12 +224,6 @@ static void wiiu_gca_pad_deinit(void *data)
 
   if(pad)
   {
-    if(pad->name)
-    {
-      free(pad->name);
-      pad->name = NULL;
-    }
-
     free(pad);
   }
 }
@@ -338,7 +313,7 @@ const char *wiiu_gca_get_name(void *data)
 {
   gca_pad_t *pad = (gca_pad_t *)data;
 
-  return pad->name;
+  return "GameCube Controller";
 }
 
 pad_connection_interface_t wiiu_gca_pad_connection = {

input/input_autodetect_builtin.c

@@ -612,6 +612,7 @@ const char* const input_builtin_autoconfs[] =
    DECL_AUTOCONF_DEVICE(PAD_NAME_NUNCHUK, "wiiu", WIIUINPUT_NUNCHUK_DEFAULT_BINDS),
    DECL_AUTOCONF_DEVICE(PAD_NAME_CLASSIC, "wiiu", WIIUINPUT_CLASSIC_CONTROLLER_DEFAULT_BINDS),
    DECL_AUTOCONF_DEVICE(PAD_NAME_HID, "wiiu", WIIUINPUT_GAMEPAD_DEFAULT_BINDS),
+   DECL_AUTOCONF_DEVICE("GameCube Controller", "wiiu", WIIUINPUT_GAMEPAD_DEFAULT_BINDS),
 #endif
 #ifdef __CELLOS_LV2__
    DECL_AUTOCONF_DEVICE("SixAxis Controller", "ps3", PS3INPUT_DEFAULT_BINDS),

wiiu/input/hidpad_driver.c

@@ -29,23 +29,17 @@ static const char *hidpad_name(unsigned pad);
 
 static bool ready = false;
 
-static unsigned to_slot(unsigned pad)
-{
-   return pad - (WIIU_WIIMOTE_CHANNELS+1);
-}
-
 static bool init_hid_driver(void)
 {
-   unsigned connections_size        = MAX_USERS - (WIIU_WIIMOTE_CHANNELS+1);
-
    memset(&hid_instance, 0, sizeof(hid_instance));
 
-   return hid_init(&hid_instance, &wiiu_hid, &hidpad_driver, connections_size);
+   return hid_init(&hid_instance, &wiiu_hid, &hidpad_driver, MAX_USERS);
 }
 
 static bool hidpad_init(void *data)
 {
    (void *)data;
+   int i;
 
    if(!init_hid_driver())
    {
@@ -53,6 +47,14 @@ static bool hidpad_init(void *data)
       return false;
    }
 
+/*   hid_instance.pad_list[0].connected = true; */
+
+   for(i = 0; i < (WIIU_WIIMOTE_CHANNELS+1); i++)
+   {
+      hid_instance.pad_list[i].connected = true;
+   }
+
+
    hidpad_poll();
    ready = true;
 
@@ -77,7 +79,7 @@ static bool hidpad_button(unsigned pad, uint16_t button)
       return false;
 
 #if 0
-   return hid_driver->button(hid_data, to_slot(pad), button);
+   return hid_driver->button(hid_data, pad, button);
 #else
    return false;
 #endif
@@ -89,7 +91,7 @@ static void hidpad_get_buttons(unsigned pad, retro_bits_t *state)
     BIT256_CLEAR_ALL_PTR(state);
 
 #if 0
-  hid_driver->get_buttons(hid_data, to_slot(pad), state);
+  hid_driver->get_buttons(hid_data, pad, state);
 #endif
   BIT256_CLEAR_ALL_PTR(state);
 }
@@ -100,7 +102,7 @@ static int16_t hidpad_axis(unsigned pad, uint32_t axis)
    return 0;
 
 #if 0
-   return hid_driver->axis(hid_data, to_slot(pad), axis);
+   return hid_driver->axis(hid_data, pad, axis);
 #else
    return 0;
 #endif
@@ -120,7 +122,7 @@ static const char *hidpad_name(unsigned pad)
 #if 1
    return PAD_NAME_HID;
 #else
-   return hid_driver->name(hid_data, to_slot(pad));
+   return hid_driver->name(hid_data, pad);
 #endif
 }
 

wiiu/input/wiiu_hid.c

@@ -328,16 +328,12 @@ static void synchronized_process_adapters(wiiu_hid_t *hid)
    {
      switch(adapter->state)
      {
-       case ADAPTER_STATE_DONE:
-          break;
        case ADAPTER_STATE_NEW:
           adapter->state = try_init_driver(adapter);
           break;
        case ADAPTER_STATE_READY:
        case ADAPTER_STATE_READING:
-#if 0
-          adapter->driver->poll();
-#endif
+       case ADAPTER_STATE_DONE:
           break;
        default:
           RARCH_ERR("[hid]: Invalid adapter state: %d\n", adapter->state);