mirror of
				https://github.com/espressif/esp-idf.git
				synced 2025-11-04 06:11:06 +00:00 
			
		
		
		
	Merge branch 'bugfix/remove_bt_dft_init_semicolon_v4.3' into 'release/v4.3'
bt: Remove trailing semicolon from bt dft initializer(v4.3) See merge request espressif/esp-idf!19916
This commit is contained in:
		@@ -147,7 +147,7 @@ the adv packet will be discarded until the memory is restored. */
 | 
			
		||||
    .pcm_polar = CONFIG_BTDM_CTRL_PCM_POLAR_EFF,                           \
 | 
			
		||||
    .hli = BTDM_CTRL_HLI,                                                  \
 | 
			
		||||
    .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
 | 
			
		||||
};
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
#define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use 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,                          \
 | 
			
		||||
    .hw_recorrect_en = AGC_RECORRECT_EN,                                   \
 | 
			
		||||
    .cca_thresh = CONFIG_BT_CTRL_HW_CCA_VAL,                               \
 | 
			
		||||
};
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
#define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {0}; _Static_assert(0, "please enable bluetooth in menuconfig to use bt.h");
 | 
			
		||||
 
 | 
			
		||||
@@ -122,7 +122,7 @@ enum {
 | 
			
		||||
    .txant_dft = CONFIG_BT_CTRL_TX_ANTENNA_INDEX_EFF,                      \
 | 
			
		||||
    .rxant_dft = CONFIG_BT_CTRL_RX_ANTENNA_INDEX_EFF,                      \
 | 
			
		||||
    .txpwr_dft = CONFIG_BT_CTRL_DFT_TX_POWER_LEVEL_EFF,                    \
 | 
			
		||||
};
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#else
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user