Explorar o código

Merge branch 'bugfix/remove_bt_dft_init_semicolon' into 'master'

bt: Remove trailing semicolon from bt dft initializer

Closes IDFGH-8058

See merge request espressif/esp-idf!19773
Wang Meng Yang %!s(int64=3) %!d(string=hai) anos
pai
achega
cf8abdb554

+ 1 - 1
components/bt/include/esp32/include/esp_bt.h

@@ -183,7 +183,7 @@ the adv packet will be discarded until the memory is restored. */
     .pcm_polar = CONFIG_BTDM_CTRL_PCM_POLAR_EFF,                           \
     .pcm_polar = CONFIG_BTDM_CTRL_PCM_POLAR_EFF,                           \
     .hli = BTDM_CTRL_HLI,                                                  \
     .hli = BTDM_CTRL_HLI,                                                  \
     .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
     .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
-};
+}
 
 
 #else
 #else
 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");
 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");

+ 1 - 1
components/bt/include/esp32c2/include/esp_bt.h

@@ -255,7 +255,7 @@ typedef struct {
     .ble_scan_classify_filter_enable         = 0,                                       \
     .ble_scan_classify_filter_enable         = 0,                                       \
     .main_xtal_freq             = CONFIG_XTAL_FREQ,                                     \
     .main_xtal_freq             = CONFIG_XTAL_FREQ,                                     \
     .config_magic = CONFIG_MAGIC,                                                       \
     .config_magic = CONFIG_MAGIC,                                                       \
-};
+}
 
 
 esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg);
 esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg);
 
 

+ 1 - 1
components/bt/include/esp32c3/include/esp_bt.h

@@ -181,7 +181,7 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
     .slave_ce_len_min = SLAVE_CE_LEN_MIN_DEFAULT,                          \
     .slave_ce_len_min = SLAVE_CE_LEN_MIN_DEFAULT,                          \
     .hw_recorrect_en = AGC_RECORRECT_EN,                                   \
     .hw_recorrect_en = AGC_RECORRECT_EN,                                   \
     .cca_thresh = CONFIG_BT_CTRL_HW_CCA_VAL,                               \
     .cca_thresh = CONFIG_BT_CTRL_HW_CCA_VAL,                               \
-};
+}
 
 
 #else
 #else
 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");
 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");

+ 1 - 1
components/bt/include/esp32h2/include/esp_bt.h

@@ -227,7 +227,7 @@ typedef struct {
     .coex_phy_coded_tx_rx_time_limit = DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF,     \
     .coex_phy_coded_tx_rx_time_limit = DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF,     \
     .scan_classify_filter_enable = false,                                               \
     .scan_classify_filter_enable = false,                                               \
     .config_magic = CONFIG_MAGIC,                                                       \
     .config_magic = CONFIG_MAGIC,                                                       \
-};
+}
 
 
 esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg);
 esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg);
 
 

+ 1 - 1
components/bt/include/esp32s3/include/esp_bt.h

@@ -180,7 +180,7 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
     .slave_ce_len_min = SLAVE_CE_LEN_MIN_DEFAULT,                          \
     .slave_ce_len_min = SLAVE_CE_LEN_MIN_DEFAULT,                          \
     .hw_recorrect_en = AGC_RECORRECT_EN,                                   \
     .hw_recorrect_en = AGC_RECORRECT_EN,                                   \
     .cca_thresh = CONFIG_BT_CTRL_HW_CCA_VAL,                               \
     .cca_thresh = CONFIG_BT_CTRL_HW_CCA_VAL,                               \
-};
+}
 
 
 #else
 #else
 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");
 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");