diff --git a/input/apple_joypad_wii.c b/input/apple_joypad_wii.c index ad5c05aed9..49b1afe371 100644 --- a/input/apple_joypad_wii.c +++ b/input/apple_joypad_wii.c @@ -116,10 +116,9 @@ static void hidpad_wii_set_rumble(void *data, (void)strength; } -struct pad_connection_interface apple_pad_wii = -{ - &hidpad_wii_connect, - &hidpad_wii_disconnect, - &hidpad_wii_packet_handler, - &hidpad_wii_set_rumble +pad_connection_interface_t apple_pad_wii = { + hidpad_wii_connect, + hidpad_wii_disconnect, + hidpad_wii_packet_handler, + hidpad_wii_set_rumble }; diff --git a/input/joypad_connection.c b/input/joypad_connection.c index 42d5613489..3ac154a348 100644 --- a/input/joypad_connection.c +++ b/input/joypad_connection.c @@ -56,7 +56,7 @@ int32_t pad_connection_connect(const char* name, void *data) static const struct { const char* name; - struct pad_connection_interface *iface; + pad_connection_interface_t *iface; } pad_map[] = { { "Nintendo RVL-CNT-01", &apple_pad_wii }, diff --git a/input/joypad_connection.h b/input/joypad_connection.h index a202aefefc..62e8054b3e 100644 --- a/input/joypad_connection.h +++ b/input/joypad_connection.h @@ -17,9 +17,10 @@ #ifndef _JOYPAD_CONNECTION_H #define _JOYPAD_CONNECTION_H +#include #include -struct pad_connection_interface +typedef struct pad_connection_interface { void* (*connect)(void *data, uint32_t slot); @@ -29,7 +30,10 @@ struct pad_connection_interface void (*set_rumble)(void* device, enum retro_rumble_effect effect, uint16_t strength); -}; +} pad_connection_interface_t; + +extern pad_connection_interface_t apple_pad_wii; +extern pad_connection_interface_t apple_pad_ps3; int32_t pad_connection_connect(const char* name, void *data);