From 30a255e70a02a36f9a76599aab81f8086a0f6659 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 4 Oct 2014 18:49:45 +0200 Subject: [PATCH] Rename apple_joypad_has_interface to pad_connection_has_interface --- input/apple_input.h | 2 +- input/apple_joypad_hid.c | 4 ++-- input/apple_joypad_ios.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/input/apple_input.h b/input/apple_input.h index 9ff9a0f742..b957b3640a 100644 --- a/input/apple_input.h +++ b/input/apple_input.h @@ -76,7 +76,7 @@ void pad_connection_packet(uint32_t slot, uint8_t* data, uint32_t length); /* Determine if connected joypad is a hidpad backed device. * If false, pad_connection_packet cannot be used */ -bool apple_joypad_has_interface(uint32_t slot); +bool pad_connection_has_interface(uint32_t slot); void apple_input_enable_icade(bool on); diff --git a/input/apple_joypad_hid.c b/input/apple_joypad_hid.c index 4657dd35e9..c98463211f 100644 --- a/input/apple_joypad_hid.c +++ b/input/apple_joypad_hid.c @@ -195,7 +195,7 @@ static void add_device(void* context, IOReturn result, connection->slot = joypad_connection_connect(device_name, connection); - if (apple_joypad_has_interface(connection->slot)) + if (pad_connection_has_interface(connection->slot)) IOHIDDeviceRegisterInputReportCallback(device, connection->data + 1, sizeof(connection->data) - 1, hid_device_report, connection); @@ -324,7 +324,7 @@ void pad_connection_packet(uint32_t slot, } } -bool apple_joypad_has_interface(uint32_t slot) +bool pad_connection_has_interface(uint32_t slot) { if (slot < MAX_PLAYERS && slots[slot].used) return slots[slot].iface ? true : false; diff --git a/input/apple_joypad_ios.c b/input/apple_joypad_ios.c index c7f1626c7f..6791e773a6 100644 --- a/input/apple_joypad_ios.c +++ b/input/apple_joypad_ios.c @@ -128,7 +128,7 @@ void pad_connection_packet(uint32_t pad, } } -bool apple_joypad_has_interface(uint32_t pad) +bool pad_connection_has_interface(uint32_t pad) { if (pad < MAX_PLAYERS && slots[pad].used) return slots[pad].iface ? true : false;