espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/resolve_redefinition_in_spp_and_hid_v4.2' into 'release/v4.2'

Browse Source 
bugfix/resolve redefinition in btc_spp.h and btc_hd.h/btc_hh.h (v4.2)

See merge request espressif/esp-idf!18826
This commit is contained in:
Jiang Jiang Jian
2022-07-10 15:47:02 +08:00
parent 6afad65ecb aeeb255d35
commit 02c3414fc0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/host/bluedroid/btc/profile/std/include/btc_spp.h
View File

@ -58,14 +58,14 @@ typedef union {
tSDP_UUID *p_uuid_list;
} start_discovery;
//BTC_SPP_ACT_CONNECT
struct connect_arg {
struct conn_arg {
esp_spp_sec_t sec_mask;
esp_spp_role_t role;
UINT8 remote_scn;
esp_bd_addr_t peer_bd_addr;
} connect;
//BTC_SPP_ACT_DISCONNECT
struct disconnect_arg {
struct disconn_arg {
UINT32 handle;
} disconnect;
//BTC_SPP_ACT_START_SRV