diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c index 5e85898f84..b99909431d 100644 --- a/apple/iOS/bluetooth/btpad.c +++ b/apple/iOS/bluetooth/btpad.c @@ -319,7 +319,7 @@ void btpad_packet_handler(uint8_t packet_type, RARCH_LOG("BTpad: Got %.200s\n", (char*)&packet[9]); - connection->slot = apple_joypad_connect( + connection->slot = joypad_connection_connect( (char*)packet + 9, connection); connection->state = BTPAD_CONNECTED; } diff --git a/input/apple_input.h b/input/apple_input.h index 1cbc73845a..80506e6387 100644 --- a/input/apple_input.h +++ b/input/apple_input.h @@ -66,7 +66,7 @@ struct pad_connection_interface }; /* 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); diff --git a/input/apple_joypad_hid.c b/input/apple_joypad_hid.c index 2100bfbf96..58bd856086 100644 --- a/input/apple_joypad_hid.c +++ b/input/apple_joypad_hid.c @@ -193,7 +193,7 @@ static void add_device(void* context, IOReturn result, productID = (CFNumberRef)IOHIDDeviceGetProperty(device, CFSTR(kIOHIDProductIDKey)); 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)) IOHIDDeviceRegisterInputReportCallback(device, @@ -249,7 +249,7 @@ static int find_vacant_pad(void) 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; int pad = find_vacant_pad(); diff --git a/input/apple_joypad_ios.c b/input/apple_joypad_ios.c index 33f1d64cd6..5102492463 100644 --- a/input/apple_joypad_ios.c +++ b/input/apple_joypad_ios.c @@ -49,7 +49,7 @@ static int find_vacant_pad(void) 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; int pad = find_vacant_pad();