libusb, posix and windows ports: use '-' instead of ':' in btstack_BD_ADDR.tlv filename

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

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);

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);

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);

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:

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);

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:

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);

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);

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);

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
+                    strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-'));
-                    // 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, TLV_DB_PATH_POSTFIX);
                     tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path);
                     btstack_tlv_set_instance(tlv_impl, &tlv_context);

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
+                    strcat(tlv_db_path, bd_addr_to_str_with_delimiter(local_addr, '-'));
-                    // 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, TLV_DB_PATH_POSTFIX);
                     tlv_impl = btstack_tlv_posix_init_instance(&tlv_context, tlv_db_path);
                     btstack_tlv_set_instance(tlv_impl, &tlv_context);

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);

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);

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);

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);

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);

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);