From dde31d0bb5565f3c4bedadbb911169c8d70930b5 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Mon, 28 Mar 2016 11:13:53 +0200 Subject: [PATCH] msp430: fix hci setup --- port/msp-exp430f5438-cc2564b/src/main.c | 15 +++++++-------- port/msp430f5229lp-cc2564b/src/main.c | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/port/msp-exp430f5438-cc2564b/src/main.c b/port/msp-exp430f5438-cc2564b/src/main.c index b6ba10694..db36a622a 100644 --- a/port/msp-exp430f5438-cc2564b/src/main.c +++ b/port/msp-exp430f5438-cc2564b/src/main.c @@ -51,16 +51,15 @@ #include #include "btstack_chipset_cc256x.h" +#include "btstack_config.h" +#include "btstack_memory.h" +#include "btstack_run_loop.h" +#include "btstack_run_loop_embedded.h" +#include "classic/btstack_link_key_db.h" #include "hal_board.h" #include "hal_compat.h" #include "hal_usb.h" - -#include "btstack_run_loop.h" - #include "hci.h" -#include "btstack_memory.h" -#include "classic/btstack_link_key_db.h" -#include "btstack_config.h" static void hw_setup(void){ // stop watchdog timer @@ -98,8 +97,8 @@ static void btstack_setup(void){ btstack_run_loop_init(btstack_run_loop_embedded_get_instance()); // init HCI - hci_init(hci_transport_h4_instance, &config); - hci_set_link_key_db(btstack_link_key_db_memory_instance); + hci_init(hci_transport_h4_instance(), &config); + hci_set_link_key_db(btstack_link_key_db_memory_instance()); hci_set_chipset(btstack_chipset_cc256x_instance()); // use eHCILL diff --git a/port/msp430f5229lp-cc2564b/src/main.c b/port/msp430f5229lp-cc2564b/src/main.c index c6a7f1e0c..d13a6bc78 100644 --- a/port/msp430f5229lp-cc2564b/src/main.c +++ b/port/msp430f5229lp-cc2564b/src/main.c @@ -105,7 +105,7 @@ static void btstack_setup(void){ btstack_run_loop_init(btstack_run_loop_embedded_get_instance()); // init HCI - hci_init(hci_transport_h4_instance, &config); + hci_init(hci_transport_h4_instance(), &config); hci_set_link_key_db(btstack_link_key_db_memory_instance()); hci_set_chipset(btstack_chipset_cc256x_instance());