Merge branch 'bugfix/btdm_make_failed_due_to_macro' into 'master'

components/bt: Fix make errors due to macro usage error

See merge request idf/esp-idf!5105
pull/7874/head
Jiang Jiang Jian 2019-06-19 14:44:02 +08:00
commit 28e0a17e0a
1 zmienionych plików z 18 dodań i 19 usunięć

Wyświetl plik

@ -212,30 +212,29 @@ void bta_hf_client_sco_co_open(UINT16 handle, UINT8 air_mode, UINT8 inout_pkt_si
#endif /// (HFP_DYNAMIC_MEMORY == TRUE)
bta_hf_dec_init();
bta_hf_enc_init();
bta_hf_dec_init();
bta_hf_enc_init();
return;
error_exit:;
#if (HFP_DYNAMIC_MEMORY == TRUE)
if (bta_hf_client_co_cb_ptr) {
osi_free(bta_hf_client_co_cb_ptr);
bta_hf_client_co_cb_ptr = NULL;
}
#if (PLC_INCLUDED == TRUE)
if (bta_hf_ct_plc_ptr) {
osi_free(bta_hf_ct_plc_ptr);
bta_hf_ct_plc_ptr = NULL;
}
#endif ///(PLC_INCLUDED == TRUE)
#endif /// (HFP_DYNAMIC_MEMORY == TRUE)
return;
} else {
return;
// Nothing to do
}
#if (HFP_DYNAMIC_MEMORY == TRUE)
error_exit:;
if (bta_hf_client_co_cb_ptr) {
osi_free(bta_hf_client_co_cb_ptr);
bta_hf_client_co_cb_ptr = NULL;
}
#if (PLC_INCLUDED == TRUE)
if (bta_hf_ct_plc_ptr) {
osi_free(bta_hf_ct_plc_ptr);
bta_hf_ct_plc_ptr = NULL;
}
#endif ///(PLC_INCLUDED == TRUE)
#endif /// (HFP_DYNAMIC_MEMORY == TRUE)
return;
}