From 489a58de68564c0b95b21f381788d84b13e9fc85 Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Sat, 30 Mar 2019 21:30:47 +0100
Subject: [PATCH] fix compilation

---
 src/ble/sm.c                   |  3 +--
 test/avrcp/Makefile            |  6 ++++++
 test/gatt_client/Makefile      | 17 ++++++++---------
 test/gatt_client/mock.c        |  5 +++++
 test/security_manager/Makefile |  3 ++-
 test/security_manager/mock.c   |  4 ++++
 6 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/ble/sm.c b/src/ble/sm.c
index a32c475a5..a34653c9f 100644
--- a/src/ble/sm.c
+++ b/src/ble/sm.c
@@ -3972,8 +3972,7 @@ void sm_request_pairing(hci_con_handle_t con_handle){
                 case IRK_LOOKUP_SUCCEEDED:
 #ifndef ENABLE_LE_CENTRAL_AUTO_ENCRYPTION
                     le_device_db_encryption_get(sm_conn->sm_le_db_index, NULL, NULL, ltk, NULL, NULL, NULL, NULL);
-                    int have_ltk = !sm_is_null_key(ltk);
-                    log_info("have ltk %u", have_ltk);
+                    log_info("have ltk %u", !sm_is_null_key(ltk));
                     // trigger 'pairing complete' event on encryption change
                     sm_conn->sm_pairing_requested = 1;
                     sm_conn->sm_engine_state = SM_INITIATOR_PH0_HAS_LTK;
diff --git a/test/avrcp/Makefile b/test/avrcp/Makefile
index 2d5f0f314..0c4810526 100644
--- a/test/avrcp/Makefile
+++ b/test/avrcp/Makefile
@@ -31,10 +31,15 @@ COMMON += \
 	sdp_server.c			    \
 	sdp_client.c 				\
 	sdp_util.c	                \
+	btstack_chipset_zephyr.c    \
 	wav_util.c 					\
+	sm.c 						\
+	btstack_crypto.c            \
+	uECC.c                      \
 
 CFLAGS += -g -Wall -Wmissing-prototypes -Wshadow -Wunused-variable -Wunused-parameter -Werror 
 #  -Wstrict-prototypes disabled because of portaudio headers
+CFLAGS += -I${BTSTACK_ROOT}/chipset/zephyr
 CFLAGS += -I${BTSTACK_ROOT}/src
 CFLAGS += -I${BTSTACK_ROOT}/src/classic
 CFLAGS += -I${BTSTACK_ROOT}/3rd-party/bluedroid/decoder/include -D OI_DEBUG
@@ -44,6 +49,7 @@ CFLAGS += -I${BTSTACK_ROOT}/platform/posix
 CFLAGS += -I${BTSTACK_ROOT}/platform/embedded 
 CFLAGS += -I..
 
+VPATH += ${BTSTACK_ROOT}/chipset/zephyr
 VPATH += ${BTSTACK_ROOT}/src
 VPATH += ${BTSTACK_ROOT}/src/classic
 VPATH += ${BTSTACK_ROOT}/platform/posix
diff --git a/test/gatt_client/Makefile b/test/gatt_client/Makefile
index de525df68..18a37df69 100644
--- a/test/gatt_client/Makefile
+++ b/test/gatt_client/Makefile
@@ -13,18 +13,17 @@ VPATH += ${BTSTACK_ROOT}/platform/posix
 
 COMMON = \
     ad_parser.c                 \
-    att_db.c     					\
-    att_dispatch.c       	    \
-    btstack_linked_list.c		    \
-    btstack_memory.c			\
+    att_db.c                    \
+    att_dispatch.c              \
+    btstack_linked_list.c       \
+    btstack_memory.c            \
+    btstack_memory_pool.c       \
+    btstack_util.c              \
     gatt_client.c               \
-    hci_cmd.c					\
-    hci_dump.c     				\
+    hci_cmd.c                   \
+    hci_dump.c                  \
     le_device_db_memory.c       \
-    btstack_memory_pool.c			    \
     mock.c                      \
-    btstack_util.c			            \
-	
 
 COMMON_OBJ = $(COMMON:.c=.o)
 
diff --git a/test/gatt_client/mock.c b/test/gatt_client/mock.c
index 561a6cd59..5a29f0e2b 100644
--- a/test/gatt_client/mock.c
+++ b/test/gatt_client/mock.c
@@ -54,6 +54,11 @@ uint8_t gap_connect(bd_addr_t addr, bd_addr_type_t addr_type){
 void gap_set_scan_parameters(uint8_t scan_type, uint16_t scan_interval, uint16_t scan_window){
 }
 
+int gap_reconnect_security_setup_active(hci_con_handle_t con_handle){
+	UNUSED(con_handle);
+	return 0;
+}
+
 static void att_init_connection(att_connection_t * att_connection){
     att_connection->mtu = 23;
     att_connection->max_mtu = 23;
diff --git a/test/security_manager/Makefile b/test/security_manager/Makefile
index 0b954bcd5..39f777ee4 100644
--- a/test/security_manager/Makefile
+++ b/test/security_manager/Makefile
@@ -32,7 +32,8 @@ COMMON = \
     rijndael.c 					\
     sm.c     					\
     btstack_util.c			            \
-	
+	btstack_tlv.c \
+    
 COMMON_OBJ = $(COMMON:.c=.o)
 
 MBEDTLS = \
diff --git a/test/security_manager/mock.c b/test/security_manager/mock.c
index a954cb7d0..bf856151d 100644
--- a/test/security_manager/mock.c
+++ b/test/security_manager/mock.c
@@ -127,6 +127,10 @@ void gap_local_bd_addr(bd_addr_t address_buffer){
 		address_buffer[i] = 0x11 * (i+1);
 	}
 }
+
+void hci_halting_defer(void){
+}
+
 int hci_can_send_command_packet_now(void){
 	return 1;
 }