From 63c42ef39bb7e88534a059c01a9ac02439bae665 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Fri, 3 Apr 2015 15:23:35 +0200 Subject: [PATCH] (iOS) Buildfix --- apple/iOS/bluetooth/btdynamic.h | 1 - apple/iOS/bluetooth/btstack/btstack.h | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apple/iOS/bluetooth/btdynamic.h b/apple/iOS/bluetooth/btdynamic.h index 5e143e47b5..fb908c3e7c 100644 --- a/apple/iOS/bluetooth/btdynamic.h +++ b/apple/iOS/bluetooth/btdynamic.h @@ -18,7 +18,6 @@ #define __IOS_RARCH_BTDYNAMIC_H__ #include -#include "btstack/utils.h" #include "btstack/btstack.h" bool btstack_try_load(void); diff --git a/apple/iOS/bluetooth/btstack/btstack.h b/apple/iOS/bluetooth/btstack/btstack.h index 274800846b..efdfd58407 100644 --- a/apple/iOS/bluetooth/btstack/btstack.h +++ b/apple/iOS/bluetooth/btstack/btstack.h @@ -386,7 +386,7 @@ void linked_list_add(linked_list_t * list, linked_item_t *item); void linked_list_add_tail(linked_list_t * list, linked_item_t *item); -int linked_list_remove(linked_list_t * list, linked_item_t *item) +int linked_list_remove(linked_list_t * list, linked_item_t *item); linked_item_t * linked_list_get_last_item(linked_list_t * list); @@ -467,22 +467,22 @@ uint32_t embedded_get_ticks(void); #endif /* utils.h */ + +/* Length of a Bluetooth device address. */ +#define BD_ADDR_LEN 6 + +/* The link key type. */ +#define LINK_KEY_LEN 16 + +/* The device name type. */ +#define DEVICE_NAME_LEN 248 /* Connection handle type. */ typedef uint16_t hci_con_handle_t; typedef uint8_t bd_addr_t[BD_ADDR_LEN]; typedef uint8_t link_key_t[LINK_KEY_LEN]; -typedef uint8_t device_name_t[DEVICE_NAME_LEN+1]; - -/* Length of a Bluetooth device address. */ -#define BD_ADDR_LEN 6 - -/* The link key type. */ -#define LINK_KEY_LEN 16 - -/* The device name type. */ -#define DEVICE_NAME_LEN 248 +typedef uint8_t device_name_t[DEVICE_NAME_LEN+1]; /* helper for BT little endian format. */ #define READ_BT_16( buffer, pos) ( ((uint16_t) buffer[pos]) | (((uint16_t)buffer[pos+1]) << 8))