ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename apple_joypad_connect to joypad_connection_connect

This commit is contained in:
twinaphex 2014-10-04 18:43:30 +02:00
parent 5b4df0edd2
commit 14b17ed7d5
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apple/iOS/bluetooth/btpad.c
View File

@ -319,7 +319,7 @@ void btpad_packet_handler(uint8_t packet_type,
RARCH_LOG("BTpad: Got %.200s\n", (char*)&packet[9]); RARCH_LOG("BTpad: Got %.200s\n", (char*)&packet[9]);
connection->slot = apple_joypad_connect( connection->slot = joypad_connection_connect(
(char*)packet + 9, connection); (char*)packet + 9, connection);
connection->state = BTPAD_CONNECTED; connection->state = BTPAD_CONNECTED;
} }

2
input/apple_input.h
View File

@ -66,7 +66,7 @@ struct pad_connection_interface
}; };
/* Joypad data */ /* Joypad data */
int32_t apple_joypad_connect(const char* name, void *data); int32_t joypad_connection_connect(const char* name, void *data);
int32_t apple_joypad_connect_gcapi(void); int32_t apple_joypad_connect_gcapi(void);

4
input/apple_joypad_hid.c
View File

@ -193,7 +193,7 @@ static void add_device(void* context, IOReturn result,
productID = (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey)); productID = (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey));
CFNumberGetValue(productID, kCFNumberIntType, &connection->p_id); CFNumberGetValue(productID, kCFNumberIntType, &connection->p_id);
connection->slot = apple_joypad_connect(device_name, connection); connection->slot = joypad_connection_connect(device_name, connection);
if (apple_joypad_has_interface(connection->slot)) if (apple_joypad_has_interface(connection->slot))
IOHIDDeviceRegisterInputReportCallback(device, IOHIDDeviceRegisterInputReportCallback(device,
@ -249,7 +249,7 @@ static int find_vacant_pad(void)
return -1; return -1;
} }
int32_t apple_joypad_connect(const char* name, void *data) int32_t joypad_connection_connect(const char* name, void *data)
{ {
struct pad_connection* connection = (struct pad_connection*)data; struct pad_connection* connection = (struct pad_connection*)data;
int pad = find_vacant_pad(); int pad = find_vacant_pad();

2
input/apple_joypad_ios.c
View File

@ -49,7 +49,7 @@ static int find_vacant_pad(void)
return -1; return -1;
} }
int32_t apple_joypad_connect(const char* name, void *data) int32_t joypad_connection_connect(const char* name, void *data)
{ {
struct pad_connection* connection = (struct pad_connection*)data; struct pad_connection* connection = (struct pad_connection*)data;
int pad = find_vacant_pad(); int pad = find_vacant_pad();