From 8fce0df8feb97abd0f76b5959053d30de8ab5c3f Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Tue, 22 Oct 2019 14:44:26 +0200
Subject: [PATCH] map_client: enable ASSERT, fix compile

---
 test/map_client/Makefile          |  6 ++++--
 test/map_client/btstack_config.h  |  1 +
 test/map_client/map_client_test.c | 14 +++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/test/map_client/Makefile b/test/map_client/Makefile
index 57e65533e..649f3e174 100644
--- a/test/map_client/Makefile
+++ b/test/map_client/Makefile
@@ -1,7 +1,7 @@
 BTSTACK_ROOT =  ../..
 CORE += main.c btstack_stdin_posix.c btstack_tlv_posix.c
 
-COMMON  += hci_transport_h2_libusb.c btstack_run_loop_posix.c le_device_db_fs.c btstack_link_key_db_fs.c
+COMMON  += hci_transport_h2_libusb.c btstack_run_loop_posix.c btstack_chipset_zephyr.c btstack_link_key_db_tlv.c le_device_db_tlv.c 
 
 include ${BTSTACK_ROOT}/example/Makefile.inc
 
@@ -16,12 +16,14 @@ CFLAGS  += -g -std=c99 -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow -
 
 CFLAGS += -I${BTSTACK_ROOT}/platform/posix \
 		  -I${BTSTACK_ROOT}/platform/embedded \
-		  -I${BTSTACK_ROOT}/3rd-party/tinydir
+		  -I${BTSTACK_ROOT}/3rd-party/tinydir \
+		  -I${BTSTACK_ROOT}/chipset/zephyr
 
 VPATH += ${BTSTACK_ROOT}/platform/embedded
 VPATH += ${BTSTACK_ROOT}/platform/posix
 VPATH += ${BTSTACK_ROOT}/platform/libusb
 VPATH += ${BTSTACK_ROOT}/port/libusb
+VPATH += ${BTSTACK_ROOT}/chipset/zephyr
 
 # use pkg-config
 CFLAGS  += $(shell pkg-config libusb-1.0 --cflags)
diff --git a/test/map_client/btstack_config.h b/test/map_client/btstack_config.h
index 66d77ad64..87eb27c4a 100644
--- a/test/map_client/btstack_config.h
+++ b/test/map_client/btstack_config.h
@@ -6,6 +6,7 @@
 #define __BTSTACK_CONFIG
 
 // Port related features
+#define HAVE_ASSERT
 #define HAVE_MALLOC
 #define HAVE_POSIX_FILE_IO
 #define HAVE_BTSTACK_STDIN
diff --git a/test/map_client/map_client_test.c b/test/map_client/map_client_test.c
index 2c1a66887..d85da9617 100644
--- a/test/map_client/map_client_test.c
+++ b/test/map_client/map_client_test.c
@@ -54,18 +54,18 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "btstack_run_loop.h"
-#include "l2cap.h"
-#include "classic/rfcomm.h"
-#include "btstack_event.h"
 #include "bluetooth_sdp.h"
+#include "btstack_event.h"
+#include "btstack_run_loop.h"
 #include "classic/goep_client.h"
 #include "classic/obex.h"
+#include "classic/rfcomm.h"
+#include "classic/sdp_client.h"
+#include "classic/sdp_server.h"
+#include "classic/sdp_util.h"
+#include "l2cap.h"
 #include "map_client.h"
 #include "map_server.h"
-#include "classic/sdp_client.h"
-#include "classic/sdp_util.h"
-#include "classic/sdp_server.h"
 
 #ifdef HAVE_BTSTACK_STDIN
 #include "btstack_stdin.h"