From 96f9ed180206fc3d032ead376bc8b2f370e982bb Mon Sep 17 00:00:00 2001
From: Bartosz Cichocki <bartosz.cichocki@mudita.com>
Date: Thu, 24 Jun 2021 21:31:03 +0200
Subject: [PATCH] [EGD-6972] Update BT stack to 1.4.1 version

This PR updates the BT stack to the newest version
---
 module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.cpp | 4 +++-
 module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.hpp | 2 ++
 module-bluetooth/lib/btstack                                 | 2 +-
 module-bluetooth/lib/btstack.cmake                           | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.cpp b/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.cpp
index b9d6eaacacb7fb700809562a18edc5774da6a566..f1bc377af2c03d31577d9f4afdf201ec466f03bc 100644
--- a/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.cpp
+++ b/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.cpp
@@ -25,6 +25,8 @@ extern "C"
 #else
 extern "C"
 {
+#include <btstack_uart.h>
+
 #include <btstack_run_loop_posix.h>
 #include <btstack_tlv_posix.h>
 }
@@ -73,7 +75,7 @@ namespace bluetooth
         auto uartDriver = runLoopInitLinux(runLoop);
 #endif
 
-        const hci_transport_t *transport = hci_transport_h4_instance(uartDriver);
+        const hci_transport_t *transport = hci_transport_h4_instance_for_uart(uartDriver);
         hci_init(transport, (void *)&config);
 
         hci_set_link_key_db(bluetooth::KeyStorage::getKeyStorage());
diff --git a/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.hpp b/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.hpp
index b73e1a37699460cd7f332e740a3f8cecad21b210..28e770b6e84efa6bbf0553cafe496da51c6448a2 100644
--- a/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.hpp
+++ b/module-bluetooth/Bluetooth/interface/BluetoothDriverImpl.hpp
@@ -8,6 +8,8 @@
 extern "C"
 {
 #include <btstack.h>
+#include <hci_transport.h>
+#include <hci_transport_h4.h>
 }
 #include "GAP/GAP.hpp"
 
diff --git a/module-bluetooth/lib/btstack b/module-bluetooth/lib/btstack
index 8ccf25d5f4657e9b6140d2ea04a023af80e42909..96a5ae5fb5a377999803460345ada731cc2767af 160000
--- a/module-bluetooth/lib/btstack
+++ b/module-bluetooth/lib/btstack
@@ -1 +1 @@
-Subproject commit 8ccf25d5f4657e9b6140d2ea04a023af80e42909
+Subproject commit 96a5ae5fb5a377999803460345ada731cc2767af
diff --git a/module-bluetooth/lib/btstack.cmake b/module-bluetooth/lib/btstack.cmake
index 98f26de9d391add64e8762ff42cda291d700f38d..645898b1251332a7518a2ffd88a2eb713b41b2be 100644
--- a/module-bluetooth/lib/btstack.cmake
+++ b/module-bluetooth/lib/btstack.cmake
@@ -203,11 +203,11 @@ set(BOARD_DIR_SOURCES
 if(${PROJECT_TARGET} STREQUAL "TARGET_Linux")
 message("Linux specyfic sources")
 message("----------------------")
-# include(${CMAKE_CURRENT_SOURCE_DIR}/targets/Target_Linux.cmake)
+ include(${CMAKE_CURRENT_SOURCE_DIR}/targets/Target_Linux.cmake)
 list(APPEND BOARD_DIR_SOURCES
     # ${BOARD_SOURCES}
     ${BT_STACK_ROOT}/platform/posix/btstack_stdin_posix.c
-    ${BT_STACK_ROOT}/platform/posix/btstack_uart_block_posix.c
+    ${BT_STACK_ROOT}/platform/posix/btstack_uart_posix.c
     ${BT_STACK_ROOT}/platform/posix/btstack_run_loop_posix.c
     ${BT_STACK_ROOT}/platform/posix/btstack_tlv_posix.c
     )