From 9e6885ad820a9f42bf93df56eb3f3be0c8639622 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Sat, 22 Apr 2023 00:39:31 +1000
Subject: [PATCH] extmod/btstack: Switch to use hci_dump_init instead of
 hci_dump_open.

The latter is no longer available in the version of BTstack now in use by
this repository.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/btstack/btstack.mk              | 1 +
 extmod/btstack/btstack_config_common.h | 1 +
 ports/stm32/mpbtstackport.c            | 3 ++-
 ports/unix/mpbtstackport_common.c      | 3 ++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/extmod/btstack/btstack.mk b/extmod/btstack/btstack.mk
index ef730d2cf3..281d032ae1 100644
--- a/extmod/btstack/btstack.mk
+++ b/extmod/btstack/btstack.mk
@@ -35,6 +35,7 @@ INC += -I$(BTSTACK_DIR)/3rd-party/yxml
 SRC_BTSTACK_C = \
 	$(addprefix lib/btstack/src/, $(SRC_FILES)) \
 	$(addprefix lib/btstack/src/ble/, $(filter-out %_tlv.c, $(SRC_BLE_FILES))) \
+	lib/btstack/platform/embedded/hci_dump_embedded_stdout.c \
 
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_USB),1)
 ifeq ($(MICROPY_BLUETOOTH_BTSTACK_H4),1)
diff --git a/extmod/btstack/btstack_config_common.h b/extmod/btstack/btstack_config_common.h
index 8118c4c1a9..0f616f7505 100644
--- a/extmod/btstack/btstack_config_common.h
+++ b/extmod/btstack/btstack_config_common.h
@@ -7,6 +7,7 @@
 #define ENABLE_LE_CENTRAL
 // #define ENABLE_CLASSIC
 #define ENABLE_L2CAP_LE_CREDIT_BASED_FLOW_CONTROL_MODE
+#define ENABLE_PRINTF_HEXDUMP
 // #define ENABLE_LOG_INFO
 // #define ENABLE_LOG_DEBUG
 #define ENABLE_LOG_ERROR
diff --git a/ports/stm32/mpbtstackport.c b/ports/stm32/mpbtstackport.c
index 301ac30e20..728594d19c 100644
--- a/ports/stm32/mpbtstackport.c
+++ b/ports/stm32/mpbtstackport.c
@@ -32,6 +32,7 @@
 
 #include "lib/btstack/src/btstack.h"
 #include "lib/btstack/src/hci_transport_h4.h"
+#include "lib/btstack/platform/embedded/hci_dump_embedded_stdout.h"
 #include "extmod/mpbthci.h"
 #include "extmod/btstack/btstack_hci_uart.h"
 #include "extmod/btstack/modbluetooth_btstack.h"
@@ -140,7 +141,7 @@ void mp_bluetooth_hci_poll(void) {
 void mp_bluetooth_btstack_port_init(void) {
     btstack_run_loop_init(&mp_btstack_runloop_stm32);
 
-    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
+    // hci_dump_init(hci_dump_embedded_stdout_get_instance());
     const hci_transport_t *transport = hci_transport_h4_instance_for_uart(&mp_bluetooth_btstack_hci_uart_block);
     hci_init(transport, &hci_transport_config_uart);
 
diff --git a/ports/unix/mpbtstackport_common.c b/ports/unix/mpbtstackport_common.c
index 66a3a0536a..36412e96f4 100644
--- a/ports/unix/mpbtstackport_common.c
+++ b/ports/unix/mpbtstackport_common.c
@@ -35,6 +35,7 @@
 #include "lib/btstack/platform/embedded/btstack_run_loop_embedded.h"
 #include "lib/btstack/platform/embedded/hal_cpu.h"
 #include "lib/btstack/platform/embedded/hal_time_ms.h"
+#include "lib/btstack/platform/embedded/hci_dump_embedded_stdout.h"
 
 #include "extmod/btstack/modbluetooth_btstack.h"
 
@@ -81,7 +82,7 @@ uint32_t hal_time_ms(void) {
 void mp_bluetooth_btstack_port_init(void) {
     btstack_run_loop_init(btstack_run_loop_embedded_get_instance());
 
-    // hci_dump_open(NULL, HCI_DUMP_STDOUT);
+    // hci_dump_init(hci_dump_embedded_stdout_get_instance());
 
     #if MICROPY_BLUETOOTH_BTSTACK_H4
     mp_bluetooth_btstack_port_init_h4();