From 15d217585718297f89c661a103c7d1222a0ab1b0 Mon Sep 17 00:00:00 2001 From: Matthias Ringwald Date: Fri, 25 Feb 2022 17:09:50 +0100 Subject: [PATCH] libusb, posix and windows ports: use '-' instead of ':' in btstack_BD_ADDR.tlv filename --- CHANGELOG.md | 3 ++- port/libusb-intel/main.c | 2 +- port/libusb/main.c | 2 +- port/posix-h4-atwilc3000/main.c | 2 +- port/posix-h4-da14531/main.c | 10 +++++----- port/posix-h4-da14581/main.c | 2 +- port/posix-h4-da14585/main.c | 10 +++++----- port/posix-h4-zephyr/main.c | 2 +- port/posix-h4/main.c | 2 +- port/posix-h5/main.c | 2 +- port/qt-h4/main.cpp | 5 +---- port/qt-usb/main.cpp | 5 +---- port/raspi/main.c | 2 +- port/windows-h4-da14585/main.c | 2 +- port/windows-h4-zephyr/main.c | 2 +- port/windows-h4/main.c | 2 +- port/windows-winusb-intel/main.c | 2 +- port/windows-winusb/main.c | 2 +- 18 files changed, 27 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 440283601..a34c2bf29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,7 +29,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Chipset: use da145xx in folder/file/function names for these SoCs - ATT Server: use uint8_t for status returns - AVDTP: use BLUETOOTH_SERVICE_CLASS_AUDIO_SINK / SOURCE instead of BLUETOOTH_PROTOCOL_AVDTP in SDP queries - +- libusb, POSIX and Windows ports: use '-' instead of ':' in btstack_BD_ADDR.tlv filename + ## Release v1.5.1 ### Added diff --git a/port/libusb-intel/main.c b/port/libusb-intel/main.c index 8c2209930..3953df00f 100644 --- a/port/libusb-intel/main.c +++ b/port/libusb-intel/main.c @@ -99,7 +99,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/libusb/main.c b/port/libusb/main.c index 385a13844..89d2ea660 100644 --- a/port/libusb/main.c +++ b/port/libusb/main.c @@ -129,7 +129,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack } printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/posix-h4-atwilc3000/main.c b/port/posix-h4-atwilc3000/main.c index 97d002bd1..f30523fa1 100644 --- a/port/posix-h4-atwilc3000/main.c +++ b/port/posix-h4-atwilc3000/main.c @@ -107,7 +107,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/posix-h4-da14531/main.c b/port/posix-h4-da14531/main.c index 41a3c7c8b..82c86fe42 100644 --- a/port/posix-h4-da14531/main.c +++ b/port/posix-h4-da14531/main.c @@ -94,16 +94,16 @@ static hci_transport_config_uart_t transport_config = { static btstack_packet_callback_registration_t hci_event_callback_registration; -static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ +static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) { if (packet_type != HCI_EVENT_PACKET) return; - switch (hci_event_packet_get_type(packet)){ + switch (hci_event_packet_get_type(packet)) { case BTSTACK_EVENT_STATE: - switch(btstack_event_state_get_state(packet)){ + switch (btstack_event_state_get_state(packet)) { case HCI_STATE_WORKING: gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); @@ -118,7 +118,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack exit(0); break; default: - break; + break; } break; default: diff --git a/port/posix-h4-da14581/main.c b/port/posix-h4-da14581/main.c index 46b9355c9..6f71c7a5a 100644 --- a/port/posix-h4-da14581/main.c +++ b/port/posix-h4-da14581/main.c @@ -103,7 +103,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/posix-h4-da14585/main.c b/port/posix-h4-da14585/main.c index a6800f6ba..5beb7d07d 100644 --- a/port/posix-h4-da14585/main.c +++ b/port/posix-h4-da14585/main.c @@ -94,16 +94,16 @@ static hci_transport_config_uart_t transport_config = { static btstack_packet_callback_registration_t hci_event_callback_registration; -static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ +static void packet_handler(uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) { if (packet_type != HCI_EVENT_PACKET) return; - switch (hci_event_packet_get_type(packet)){ + switch (hci_event_packet_get_type(packet)) { case BTSTACK_EVENT_STATE: - switch(btstack_event_state_get_state(packet)){ + switch (btstack_event_state_get_state(packet)) { case HCI_STATE_WORKING: gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); @@ -118,7 +118,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack exit(0); break; default: - break; + break; } break; default: diff --git a/port/posix-h4-zephyr/main.c b/port/posix-h4-zephyr/main.c index 2690c80f6..4c49910fd 100644 --- a/port/posix-h4-zephyr/main.c +++ b/port/posix-h4-zephyr/main.c @@ -100,7 +100,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack printf("BTstack up and running as %s\n", bd_addr_to_str(static_address)); // setup TLV strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(static_address)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/posix-h4/main.c b/port/posix-h4/main.c index 2e64a41c9..a8d6a5bda 100644 --- a/port/posix-h4/main.c +++ b/port/posix-h4/main.c @@ -110,7 +110,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/posix-h5/main.c b/port/posix-h5/main.c index 52d3708fb..967842664 100644 --- a/port/posix-h5/main.c +++ b/port/posix-h5/main.c @@ -158,7 +158,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/qt-h4/main.cpp b/port/qt-h4/main.cpp index 6dd4cb3f3..acd791217 100644 --- a/port/qt-h4/main.cpp +++ b/port/qt-h4/main.cpp @@ -186,10 +186,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack } printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); -#ifndef Q_OS_WIN - // bd_addr_to_str use ":" which is not allowed in windows file names - strcat(tlv_db_path, bd_addr_to_str(local_addr)); -#endif + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/qt-usb/main.cpp b/port/qt-usb/main.cpp index c06596af8..99c3a0b06 100644 --- a/port/qt-usb/main.cpp +++ b/port/qt-usb/main.cpp @@ -130,10 +130,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack } printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); -#ifndef Q_OS_WIN - // bd_addr_to_str use ":" which is not allowed in windows file names - strcat(tlv_db_path, bd_addr_to_str(local_addr)); -#endif + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/raspi/main.c b/port/raspi/main.c index b5fd0af3e..7600bea8a 100644 --- a/port/raspi/main.c +++ b/port/raspi/main.c @@ -209,7 +209,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/windows-h4-da14585/main.c b/port/windows-h4-da14585/main.c index 1feb8c245..63d7d29d8 100644 --- a/port/windows-h4-da14585/main.c +++ b/port/windows-h4-da14585/main.c @@ -102,7 +102,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/windows-h4-zephyr/main.c b/port/windows-h4-zephyr/main.c index d3466fb5d..815b14c1d 100644 --- a/port/windows-h4-zephyr/main.c +++ b/port/windows-h4-zephyr/main.c @@ -98,7 +98,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack case HCI_STATE_WORKING: printf("BTstack up and running as %s\n", bd_addr_to_str(static_address)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(static_address)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/windows-h4/main.c b/port/windows-h4/main.c index 4db7ed136..d344ac07e 100644 --- a/port/windows-h4/main.c +++ b/port/windows-h4/main.c @@ -114,7 +114,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/windows-winusb-intel/main.c b/port/windows-winusb-intel/main.c index f23547a16..e5e6dd228 100644 --- a/port/windows-winusb-intel/main.c +++ b/port/windows-winusb-intel/main.c @@ -93,7 +93,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context); diff --git a/port/windows-winusb/main.c b/port/windows-winusb/main.c index 6f4ed6199..c4f263fb2 100644 --- a/port/windows-winusb/main.c +++ b/port/windows-winusb/main.c @@ -88,7 +88,7 @@ static void packet_handler (uint8_t packet_type, uint16_t channel, uint8_t *pack gap_local_bd_addr(local_addr); printf("BTstack up and running on %s.\n", bd_addr_to_str(local_addr)); strcpy(tlv_db_path, TLV_DB_PATH_PREFIX); - strcat(tlv_db_path, bd_addr_to_str(local_addr)); + strcat(tlv_db_path, bd_addr_to_str_with_delimiter(static_address, '-')); strcat(tlv_db_path, TLV_DB_PATH_POSTFIX); tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path); btstack_tlv_set_instance(tlv_impl, &tlv_context);