From d9f53676a5b1911619269e9d31f823cd6a3ac49d Mon Sep 17 00:00:00 2001
From: Matthias Ringwald <matthias@ringwald.ch>
Date: Mon, 5 Jun 2017 11:52:35 +0200
Subject: [PATCH] test/flash_tlv: sort link key db using btstack_tlv on top of
 hal_flash_sector into main folders

---
 .../embedded}/btstack_tlv_flash_sector.c                   | 0
 .../embedded}/btstack_tlv_flash_sector.h                   | 1 +
 {test/flash_tlv => platform/embedded}/hal_flash_sector.h   | 0
 .../embedded}/hal_flash_sector_memory.c                    | 0
 .../embedded}/hal_flash_sector_memory.h                    | 0
 {test/flash_tlv => src}/btstack_tlv.h                      | 1 -
 {test/flash_tlv => src/classic}/btstack_link_key_db_tlv.c  | 0
 {test/flash_tlv => src/classic}/btstack_link_key_db_tlv.h  | 0
 test/flash_tlv/Makefile                                    | 7 ++++---
 test/flash_tlv/tlv_test.c                                  | 2 +-
 10 files changed, 6 insertions(+), 5 deletions(-)
 rename {test/flash_tlv => platform/embedded}/btstack_tlv_flash_sector.c (100%)
 rename {test/flash_tlv => platform/embedded}/btstack_tlv_flash_sector.h (98%)
 rename {test/flash_tlv => platform/embedded}/hal_flash_sector.h (100%)
 rename {test/flash_tlv => platform/embedded}/hal_flash_sector_memory.c (100%)
 rename {test/flash_tlv => platform/embedded}/hal_flash_sector_memory.h (100%)
 rename {test/flash_tlv => src}/btstack_tlv.h (98%)
 rename {test/flash_tlv => src/classic}/btstack_link_key_db_tlv.c (100%)
 rename {test/flash_tlv => src/classic}/btstack_link_key_db_tlv.h (100%)

diff --git a/test/flash_tlv/btstack_tlv_flash_sector.c b/platform/embedded/btstack_tlv_flash_sector.c
similarity index 100%
rename from test/flash_tlv/btstack_tlv_flash_sector.c
rename to platform/embedded/btstack_tlv_flash_sector.c
diff --git a/test/flash_tlv/btstack_tlv_flash_sector.h b/platform/embedded/btstack_tlv_flash_sector.h
similarity index 98%
rename from test/flash_tlv/btstack_tlv_flash_sector.h
rename to platform/embedded/btstack_tlv_flash_sector.h
index e9a105292..2c2a62e1e 100644
--- a/test/flash_tlv/btstack_tlv_flash_sector.h
+++ b/platform/embedded/btstack_tlv_flash_sector.h
@@ -41,6 +41,7 @@
 
 #include <stdint.h>
 #include "btstack_tlv.h"
+#include "hal_flash_sector.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/test/flash_tlv/hal_flash_sector.h b/platform/embedded/hal_flash_sector.h
similarity index 100%
rename from test/flash_tlv/hal_flash_sector.h
rename to platform/embedded/hal_flash_sector.h
diff --git a/test/flash_tlv/hal_flash_sector_memory.c b/platform/embedded/hal_flash_sector_memory.c
similarity index 100%
rename from test/flash_tlv/hal_flash_sector_memory.c
rename to platform/embedded/hal_flash_sector_memory.c
diff --git a/test/flash_tlv/hal_flash_sector_memory.h b/platform/embedded/hal_flash_sector_memory.h
similarity index 100%
rename from test/flash_tlv/hal_flash_sector_memory.h
rename to platform/embedded/hal_flash_sector_memory.h
diff --git a/test/flash_tlv/btstack_tlv.h b/src/btstack_tlv.h
similarity index 98%
rename from test/flash_tlv/btstack_tlv.h
rename to src/btstack_tlv.h
index bf551a663..9be3915f9 100644
--- a/test/flash_tlv/btstack_tlv.h
+++ b/src/btstack_tlv.h
@@ -40,7 +40,6 @@
 #define __BTSTACK_TLV_H
 
 #include <stdint.h>
-#include "hal_flash_sector.h"
 
 #if defined __cplusplus
 extern "C" {
diff --git a/test/flash_tlv/btstack_link_key_db_tlv.c b/src/classic/btstack_link_key_db_tlv.c
similarity index 100%
rename from test/flash_tlv/btstack_link_key_db_tlv.c
rename to src/classic/btstack_link_key_db_tlv.c
diff --git a/test/flash_tlv/btstack_link_key_db_tlv.h b/src/classic/btstack_link_key_db_tlv.h
similarity index 100%
rename from test/flash_tlv/btstack_link_key_db_tlv.h
rename to src/classic/btstack_link_key_db_tlv.h
diff --git a/test/flash_tlv/Makefile b/test/flash_tlv/Makefile
index 5a9579a5d..174d477ae 100644
--- a/test/flash_tlv/Makefile
+++ b/test/flash_tlv/Makefile
@@ -1,7 +1,6 @@
 CC=g++
 
 BTSTACK_ROOT = ../..
-POSIX_ROOT= ${BTSTACK_ROOT}/platform/posix
 CPPUTEST_HOME = ${BTSTACK_ROOT}/test/cpputest
 
 COMMON = \
@@ -14,7 +13,9 @@ COMMON = \
 COMMON_OBJ  = $(COMMON:.c=.o) 
 
 VPATH = \
-	${BTSTACK_ROOT}/src
+	${BTSTACK_ROOT}/src \
+	${BTSTACK_ROOT}/src/classic \
+	${BTSTACK_ROOT}/platform/embedded \
 
 CFLAGS  = \
     -DBTSTACK_TEST \
@@ -25,7 +26,7 @@ CFLAGS  = \
     -I. \
     -I.. \
     -I${BTSTACK_ROOT}/src \
-    -I${BTSTACK_ROOT}/platform/posix \
+    -I${BTSTACK_ROOT}/platform/embedded \
 
 LDFLAGS += -lCppUTest -lCppUTestExt
 
diff --git a/test/flash_tlv/tlv_test.c b/test/flash_tlv/tlv_test.c
index 813b98108..68b7a06d1 100644
--- a/test/flash_tlv/tlv_test.c
+++ b/test/flash_tlv/tlv_test.c
@@ -8,7 +8,7 @@
 #include "btstack_tlv_flash_sector.h"
 #include "hci_dump.h"
 #include "classic/btstack_link_key_db.h"
-#include "btstack_link_key_db_tlv.h"
+#include "classic/btstack_link_key_db_tlv.h"
 #include "btstack_util.h"
 #include "btstack_config.h"
 #include "btstack_debug.h"