diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c index b99909431d..9f7902a87e 100644 --- a/apple/iOS/bluetooth/btpad.c +++ b/apple/iOS/bluetooth/btpad.c @@ -135,7 +135,7 @@ void btpad_packet_handler(uint8_t packet_type, if (connection && connection->state == BTPAD_CONNECTED && (connection->channels[0] == channel || connection->channels[1] == channel)) - apple_joypad_packet(connection->slot, packet, size); + pad_connection_packet(connection->slot, packet, size); } break; case HCI_EVENT_PACKET: diff --git a/input/apple_input.h b/input/apple_input.h index 80506e6387..56919aaba8 100644 --- a/input/apple_input.h +++ b/input/apple_input.h @@ -72,18 +72,12 @@ int32_t apple_joypad_connect_gcapi(void); void apple_joypad_disconnect(uint32_t slot); -void apple_joypad_packet(uint32_t slot, uint8_t* data, uint32_t length); +void pad_connection_packet(uint32_t slot, uint8_t* data, uint32_t length); /* Determine if connected joypad is a hidpad backed device. - * If false, apple_joypad_packet cannot be used */ + * If false, pad_connection_packet cannot be used */ bool apple_joypad_has_interface(uint32_t slot); -/* This is implemented in the platform-specific - * portions of the input code */ -void apple_joypad_send_hid_control(void *connect_data, - uint8_t* data, size_t size); - -/* Main thread only */ void apple_input_enable_icade(bool on); void apple_input_enable_small_keyboard(bool on); diff --git a/input/apple_joypad_hid.c b/input/apple_joypad_hid.c index 58bd856086..918292ca22 100644 --- a/input/apple_joypad_hid.c +++ b/input/apple_joypad_hid.c @@ -159,7 +159,7 @@ static void hid_device_report(void* context, IOReturn result, void *sender, struct pad_connection* connection = (struct pad_connection*)context; if (connection) - apple_joypad_packet(connection->slot, connection->data, reportLength + 1); + pad_connection_packet(connection->slot, connection->data, reportLength + 1); } static void add_device(void* context, IOReturn result, @@ -312,7 +312,7 @@ void apple_joypad_disconnect(uint32_t slot) } } -void apple_joypad_packet(uint32_t slot, +void pad_connection_packet(uint32_t slot, uint8_t* data, uint32_t length) { if (slot < MAX_PLAYERS && slots[slot].used) diff --git a/input/apple_joypad_ios.c b/input/apple_joypad_ios.c index 5102492463..b0b95b1b87 100644 --- a/input/apple_joypad_ios.c +++ b/input/apple_joypad_ios.c @@ -116,7 +116,7 @@ void apple_joypad_disconnect(uint32_t pad) } } -void apple_joypad_packet(uint32_t pad, +void pad_connection_packet(uint32_t pad, uint8_t* data, uint32_t length) { if (pad < MAX_PLAYERS && slots[pad].used)