(Apple) Build fixes

This commit is contained in:
Twinaphex 2014-10-04 19:14:04 +02:00
parent 640fa534cd
commit 1fe04654ce
3 changed files with 12 additions and 9 deletions

View File

@ -116,10 +116,9 @@ static void hidpad_wii_set_rumble(void *data,
(void)strength; (void)strength;
} }
struct pad_connection_interface apple_pad_wii = pad_connection_interface_t apple_pad_wii = {
{ hidpad_wii_connect,
&hidpad_wii_connect, hidpad_wii_disconnect,
&hidpad_wii_disconnect, hidpad_wii_packet_handler,
&hidpad_wii_packet_handler, hidpad_wii_set_rumble
&hidpad_wii_set_rumble
}; };

View File

@ -56,7 +56,7 @@ int32_t pad_connection_connect(const char* name, void *data)
static const struct static const struct
{ {
const char* name; const char* name;
struct pad_connection_interface *iface; pad_connection_interface_t *iface;
} pad_map[] = } pad_map[] =
{ {
{ "Nintendo RVL-CNT-01", &apple_pad_wii }, { "Nintendo RVL-CNT-01", &apple_pad_wii },

View File

@ -17,9 +17,10 @@
#ifndef _JOYPAD_CONNECTION_H #ifndef _JOYPAD_CONNECTION_H
#define _JOYPAD_CONNECTION_H #define _JOYPAD_CONNECTION_H
#include <stdint.h>
#include <stddef.h> #include <stddef.h>
struct pad_connection_interface typedef struct pad_connection_interface
{ {
void* (*connect)(void *data, uint32_t slot); 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, void (*set_rumble)(void* device, enum retro_rumble_effect effect,
uint16_t strength); 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); int32_t pad_connection_connect(const char* name, void *data);