From 07508f182a9bcecfacae1f42b556fec7bdfc0a8a Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 22 Jan 2016 14:32:28 +0100 Subject: [PATCH] posix-tc3566x: fix compile --- port/posix-tc35661/Makefile | 11 +++++------ port/posix-tc35661/main.c | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/port/posix-tc35661/Makefile b/port/posix-tc35661/Makefile index 26da5886a..fba8225d3 100644 --- a/port/posix-tc35661/Makefile +++ b/port/posix-tc35661/Makefile @@ -3,19 +3,18 @@ BTSTACK_ROOT = ../.. CORE += main.c stdin_support.c bt_control_tc3566x.c -COMMON += hci_transport_h4.c btstack_run_loop_posix.c remote_device_db_fs.c +COMMON += hci_transport_h4_posix.c btstack_run_loop_posix.c remote_device_db_fs.c include ${BTSTACK_ROOT}/example/embedded/Makefile.inc -CFLAGS += -I$(BTSTACK_ROOT)/chipset-tc3566x - -# CC = gcc-fsf-4.9 CFLAGS += -g -Wall \ + -I$(BTSTACK_ROOT)/chipset/tc3556x \ -I$(BTSTACK_ROOT)/platform/embedded \ -I$(BTSTACK_ROOT)/platform/posix +VPATH += ${BTSTACK_ROOT}/chipset/tc3556x +VPATH += ${BTSTACK_ROOT}/platform/embedded VPATH += ${BTSTACK_ROOT}/platform/posix -VPATH += ${BTSTACK_ROOT}/chipset-tc3566x # Command Line examples require porting to win32, so only build on other unix-ish hosts ifneq ($(OS),Windows_NT) @@ -25,4 +24,4 @@ endif # no BLE here EXAMPLES:= $(filter-out ${EXAMPLES_USING_LE},$(EXAMPLES)) -all: ${BTSTACK_ROOT}/include/btstack/btstack_version.h ${EXAMPLES} +all: ${BTSTACK_ROOT}/src/btstack_version.h ${EXAMPLES} diff --git a/port/posix-tc35661/main.c b/port/posix-tc35661/main.c index aaabc442f..93e18342c 100644 --- a/port/posix-tc35661/main.c +++ b/port/posix-tc35661/main.c @@ -49,18 +49,18 @@ #include "btstack_config.h" -#include - +#include "bt_control_tc3566x.h" #include "btstack_debug.h" #include "btstack_memory.h" +#include "hci_transport.h" +#include "btstack_run_loop.h" #include "hci.h" #include "hci_dump.h" #include "stdin_support.h" -#include "bt_control_tc3566x.h" int btstack_main(int argc, const char * argv[]); -static hci_uart_config_t hci_uart_config = { +static hci_transport_config_uart_t hci_uart_config = { NULL, 115200, 921600, // main baudrate: set to higher standard values if needed e.g. 460800 @@ -90,7 +90,7 @@ int main(int argc, const char * argv[]){ /// GET STARTED with BTstack /// btstack_memory_init(); - btstack_run_loop_init(btstack_run_loop_POSIX); + btstack_run_loop_init(btstack_run_loop_posix_get_instance()); // use logger: format HCI_DUMP_PACKETLOGGER, HCI_DUMP_BLUEZ or HCI_DUMP_STDOUT hci_dump_open("/tmp/hci_dump.pklg", HCI_DUMP_PACKETLOGGER);