Pass handle to input driver to joypad driver's init function

input/drivers/android_input.c

@@ -438,7 +438,7 @@ static void *android_input_init(void)
       return NULL;
 
    android->pads_connected = 0;
-   android->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   android->joypad = input_joypad_init_driver(settings->input.joypad_driver, android);
 
    frontend_android_get_version_sdk(&sdk);
 

input/drivers/cocoa_input.c

@@ -238,7 +238,7 @@ static void *cocoa_input_init(void)
     
    input_keymaps_init_keyboard_lut(rarch_key_map_apple_hid);
 
-   apple->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   apple->joypad = input_joypad_init_driver(settings->input.joypad_driver, apple);
     
    return apple;
 }

input/drivers/ctr_input.c

@@ -74,7 +74,7 @@ static void* ctr_input_initialize(void)
    if (!ctr)
       return NULL;
 
-   ctr->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   ctr->joypad = input_joypad_init_driver(settings->input.joypad_driver, ctr);
 
    return ctr;
 }

input/drivers/dinput.c

@@ -165,7 +165,7 @@ static void *dinput_init(void)
    }
 
    input_keymaps_init_keyboard_lut(rarch_key_map_dinput);
-   di->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   di->joypad = input_joypad_init_driver(settings->input.joypad_driver, di);
 
    return di;
 }
@@ -576,7 +576,7 @@ bool dinput_handle_message(void *dinput, UINT message, WPARAM wParam, LPARAM lPa
       {
          if (di->joypad)
             di->joypad->destroy();
-         di->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+         di->joypad = input_joypad_init_driver(settings->input.joypad_driver, di);
          break;
       }
       case WM_MOUSEWHEEL:

input/drivers/gx_input.c

@@ -75,7 +75,7 @@ static void *gx_input_init(void)
    if (!gx)
       return NULL;
 
-   gx->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   gx->joypad = input_joypad_init_driver(settings->input.joypad_driver, gx);
 
    return gx;
 }

input/drivers/linuxraw_input.c

@@ -116,7 +116,8 @@ static void *linuxraw_input_init(void)
 
    atexit(linuxraw_reset_kbmd);
 
-   linuxraw->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   linuxraw->joypad = input_joypad_init_driver(
+         settings->input.joypad_driver, linuxraw);
    input_keymaps_init_keyboard_lut(rarch_key_map_linux);
 
    /* We need to disable use of stdin command interface if 

input/drivers/ps3_input.c

@@ -161,7 +161,7 @@ static void* ps3_input_init(void)
    if (!ps3)
       return NULL;
 
-   ps3->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   ps3->joypad = input_joypad_init_driver(settings->input.joypad_driver, ps3);
 
    if (ps3->joypad)
       ps3->joypad->init();

input/drivers/psp_input.c

@@ -87,7 +87,8 @@ static void* psp_input_initialize(void)
    if (!psp)
       return NULL;
    
-   psp->joypad = input_joypad_init_driver(settings->input.joypad_driver);   
+   psp->joypad = input_joypad_init_driver(
+         settings->input.joypad_driver, psp);
 
    return psp;
 }

input/drivers/qnx_input.c

@@ -646,7 +646,7 @@ static void *qnx_input_init(void)
    }
 
    qnx->joypad = input_joypad_init_driver(
-         settings->input.joypad_driver);
+         settings->input.joypad_driver, qnx);
 
    for (i = 0; i < MAX_PADS; ++i)
    {

input/drivers/sdl_input.c

@@ -46,7 +46,7 @@ static void *sdl_input_init(void)
    if (!sdl)
       return NULL;
 
-   sdl->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   sdl->joypad = input_joypad_init_driver(settings->input.joypad_driver, sdl);
 
    RARCH_LOG("[SDL]: Input driver initialized.\n");
    return sdl;

input/drivers/udev_input.c

@@ -816,7 +816,7 @@ static void *udev_input_init(void)
    if (!udev->num_devices)
       RARCH_WARN("[udev]: Couldn't open any keyboard, mouse or touchpad. Are permissions set correctly for /dev/input/event*?\n");
 
-   udev->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   udev->joypad = input_joypad_init_driver(settings->input.joypad_driver, udev);
    input_keymaps_init_keyboard_lut(rarch_key_map_linux);
 
    disable_terminal_input();

input/drivers/x11_input.c

@@ -64,7 +64,7 @@ static void *x_input_init(void)
    x11->display = (Display*)driver->video_display;
    x11->win     = (Window)driver->video_window;
 
-   x11->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   x11->joypad = input_joypad_init_driver(settings->input.joypad_driver, x11);
    input_keymaps_init_keyboard_lut(rarch_key_map_x11);
 
    return x11;

input/drivers/xdk_xinput_input.c

@@ -80,7 +80,7 @@ static void *xdk_input_init(void)
    if (!xdk)
       return NULL;
 
-   xdk->joypad = input_joypad_init_driver(settings->input.joypad_driver);
+   xdk->joypad = input_joypad_init_driver(settings->input.joypad_driver, xdk);
 
    return xdk;
 }

input/drivers_joypad/android_joypad.c

@@ -22,12 +22,14 @@ static const char *android_joypad_name(unsigned pad)
    return settings ? settings->input.device_names[pad] : NULL;
 }
 
-static bool android_joypad_init(void)
+static bool android_joypad_init(void *data)
 {
    unsigned autoconf_pad;
    settings_t *settings       = config_get_ptr();
    autoconfig_params_t params = {{0}};
 
+   (void)data;
+
    for (autoconf_pad = 0; autoconf_pad < MAX_USERS; autoconf_pad++)
    {
       strlcpy(settings->input.device_names[autoconf_pad],

input/drivers_joypad/ctr_joypad.c

@@ -51,10 +51,12 @@ static void ctr_joypad_autodetect_add(unsigned autoconf_pad)
    input_config_autoconfigure_joypad(&params);
 }
 
-static bool ctr_joypad_init(void)
+static bool ctr_joypad_init(void *data)
 {
    ctr_joypad_autodetect_add(0);
 
+   (void)data;
+
    return true;
 }
 

input/drivers_joypad/dinput_joypad.c

@@ -240,10 +240,12 @@ enum_iteration_done:
    return DIENUM_CONTINUE; 
 }
 
-static bool dinput_joypad_init(void)
+static bool dinput_joypad_init(void *data)
 {
    unsigned i;
 
+   (void)data;
+
    if (!dinput_init_context())
       return false;
    

input/drivers_joypad/gx_joypad.c

@@ -558,13 +558,15 @@ static void gx_joypad_poll(void)
       *lifecycle_state |= (1ULL << RARCH_MENU_TOGGLE);
 }
 
-static bool gx_joypad_init(void)
+static bool gx_joypad_init(void *data)
 {
    SYS_SetResetCallback(reset_cb);
 #ifdef HW_RVL
    SYS_SetPowerCallback(power_callback);
 #endif
 
+   (void)data;
+
    PAD_Init();
 #ifdef HW_RVL
    WPADInit();

input/drivers_joypad/hid_joypad.c

@@ -21,12 +21,14 @@
 
 static const hid_driver_t *generic_hid;
 
-static bool hid_joypad_init(void)
+static bool hid_joypad_init(void *data)
 {
    generic_hid = input_hid_init_first();
    if (!generic_hid)
        return false;
 
+   (void)data;
+
    return true;
 }
 

input/drivers_joypad/linuxraw_joypad.c

@@ -217,7 +217,7 @@ static void linuxraw_joypad_setup_notify(void)
    inotify_add_watch(g_notify, "/dev/input", IN_DELETE | IN_CREATE | IN_ATTRIB);
 }
 
-static bool linuxraw_joypad_init(void)
+static bool linuxraw_joypad_init(void *data)
 {
    unsigned i;
    settings_t *settings = config_get_ptr();
@@ -226,6 +226,8 @@ static bool linuxraw_joypad_init(void)
    if (g_epoll < 0)
       return false;
 
+   (void)data;
+
    for (i = 0; i < MAX_USERS; i++)
    {
       char path[PATH_MAX_LENGTH];

input/drivers_joypad/null_joypad.c

@@ -25,8 +25,9 @@ static const char *null_joypad_name(unsigned pad)
    return "null";
 }
 
-static bool null_joypad_init(void)
+static bool null_joypad_init(void *data)
 {
+   (void)data;
    return true;
 }