diff --git a/apple/common/apple_gamecontroller.m b/apple/common/apple_gamecontroller.m index 7fc72c6c5b..e346a51cfe 100644 --- a/apple/common/apple_gamecontroller.m +++ b/apple/common/apple_gamecontroller.m @@ -126,7 +126,7 @@ static void apple_gamecontroller_disconnect(GCController* controller) if (controller.playerIndex == GCControllerPlayerIndexUnset) return; - apple_joypad_disconnect((uint32_t)controller.playerIndex); + pad_connection_disconnect((uint32_t)controller.playerIndex); } void apple_gamecontroller_init(void) diff --git a/apple/iOS/bluetooth/btpad.c b/apple/iOS/bluetooth/btpad.c index 9f7902a87e..0d3654d936 100644 --- a/apple/iOS/bluetooth/btpad.c +++ b/apple/iOS/bluetooth/btpad.c @@ -346,7 +346,7 @@ void btpad_packet_handler(uint8_t packet_type, { connection->handle = 0; - apple_joypad_disconnect(connection->slot); + pad_connection_disconnect(connection->slot); btpad_close_connection(connection); } } diff --git a/input/apple_input.h b/input/apple_input.h index 56919aaba8..9ff9a0f742 100644 --- a/input/apple_input.h +++ b/input/apple_input.h @@ -70,7 +70,7 @@ int32_t joypad_connection_connect(const char* name, void *data); int32_t apple_joypad_connect_gcapi(void); -void apple_joypad_disconnect(uint32_t slot); +void pad_connection_disconnect(uint32_t slot); void pad_connection_packet(uint32_t slot, uint8_t* data, uint32_t length); diff --git a/input/apple_joypad_hid.c b/input/apple_joypad_hid.c index 918292ca22..4657dd35e9 100644 --- a/input/apple_joypad_hid.c +++ b/input/apple_joypad_hid.c @@ -145,7 +145,7 @@ static void remove_device(void* context, IOReturn result, void* sender) apple->buttons[connection->slot] = 0; memset(apple->axes[connection->slot], 0, sizeof(apple->axes)); - apple_joypad_disconnect(connection->slot); + pad_connection_disconnect(connection->slot); free(connection); } @@ -299,7 +299,7 @@ int32_t apple_joypad_connect_gcapi(void) return pad; } -void apple_joypad_disconnect(uint32_t slot) +void pad_connection_disconnect(uint32_t slot) { if (slot < MAX_PLAYERS && slots[slot].used) { diff --git a/input/apple_joypad_ios.c b/input/apple_joypad_ios.c index b0b95b1b87..c7f1626c7f 100644 --- a/input/apple_joypad_ios.c +++ b/input/apple_joypad_ios.c @@ -103,7 +103,7 @@ int32_t apple_joypad_connect_gcapi(void) return pad; } -void apple_joypad_disconnect(uint32_t pad) +void pad_connection_disconnect(uint32_t pad) { if (pad < MAX_PLAYERS && slots[pad].used) {