alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'test/bqb_test_bt_classic_sdp_v5.1' into 'release/v5.1'

Browse Source 
feat(bt/bluedroid): Add language base attr list to SDP record for BQB test (backport v5.1)

See merge request espressif/esp-idf!25929
This commit is contained in:
Wang Meng Yang 2023-09-13 14:48:41 +08:00
commit 8f05165284
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
components/bt/host/bluedroid/bta/jv/bta_jv_act.c
View File

@ -113,6 +113,10 @@ static void bta_jv_pm_conn_idle(tBTA_JV_PM_CB *p_cb);
static void bta_jv_pm_state_change(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_STATE state); static void bta_jv_pm_state_change(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_STATE state);
tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_STATE new_st); tBTA_JV_STATUS bta_jv_set_pm_conn_state(tBTA_JV_PM_CB *p_cb, const tBTA_JV_CONN_STATE new_st);
#if BT_SDP_BQB_INCLUDED
static BOOLEAN s_sdp_bqb_add_language_attr_flag = FALSE;
#endif /* BT_SDP_BQB_INCLUDED */
#if BTA_JV_RFCOMM_INCLUDED #if BTA_JV_RFCOMM_INCLUDED
static tBTA_JV_PCB *bta_jv_add_rfc_port(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pcb_open); static tBTA_JV_PCB *bta_jv_add_rfc_port(tBTA_JV_RFC_CB *p_cb, tBTA_JV_PCB *p_pcb_open);
static int find_rfc_pcb(void *user_data, tBTA_JV_RFC_CB **cb, tBTA_JV_PCB **pcb); static int find_rfc_pcb(void *user_data, tBTA_JV_RFC_CB **cb, tBTA_JV_PCB **pcb);
@ -1037,6 +1041,22 @@ void bta_jv_start_discovery(tBTA_JV_MSG *p_data)
*/ */
} }
/*******************************************************************************
**
** Function sdp_bqb_add_language_attr_ctrl
**
** Description Control adding of the language attribute for SDP BQB test
**
** Returns void
**
*******************************************************************************/
#if BT_SDP_BQB_INCLUDED
void sdp_bqb_add_language_attr_ctrl(BOOLEAN enable)
{
s_sdp_bqb_add_language_attr_flag = enable;
}
#endif /* BT_SDP_BQB_INCLUDED */
/** /**
* @brief Adds a protocol list and service name (if provided) to an SDP record given by * @brief Adds a protocol list and service name (if provided) to an SDP record given by
* sdp_handle, and marks it as browseable. This is a shortcut for defining a * sdp_handle, and marks it as browseable. This is a shortcut for defining a
@ -1088,6 +1108,19 @@ static bool create_base_record(const uint32_t sdp_handle, const char *name, cons
return FALSE; return FALSE;
} }
#if BT_SDP_BQB_INCLUDED
// SDP/SR/SA/BV-09-C,SDP/SR/SSA/BV-13-C
if (s_sdp_bqb_add_language_attr_flag == TRUE) {
stage = "language_base";
if (!SDP_AddLanguageBaseAttrIDList(sdp_handle, LANG_ID_CODE_ENGLISH, LANG_ID_CHAR_ENCODE_UTF8, LANGUAGE_BASE_ID)) {
APPL_TRACE_ERROR("create_base_record: failed to create base service "
"record, stage: %s, scn: %d, name: %s, with_obex: %d",
stage, channel, name, with_obex);
return FALSE;
}
}
#endif /* BT_SDP_BQB_INCLUDED */
// Add the name to the SDP record. // Add the name to the SDP record.
if (name[0] != '\0') { if (name[0] != '\0') {
stage = "service_name"; stage = "service_name";

6
components/bt/host/bluedroid/common/include/common/bt_target.h
View File

@ -1454,6 +1454,12 @@
#define SDP_INCLUDED FALSE #define SDP_INCLUDED FALSE
#endif #endif
#if (SDP_INCLUDED == TRUE) && (BTA_JV_INCLUDED == TRUE) && (BT_CLASSIC_BQB_INCLUDED == TRUE)
#define BT_SDP_BQB_INCLUDED TRUE
#else
#define BT_SDP_BQB_INCLUDED FALSE
#endif
/* This is set to enable SDP server functionality. */ /* This is set to enable SDP server functionality. */
#ifndef SDP_SERVER_ENABLED #ifndef SDP_SERVER_ENABLED
#if SDP_INCLUDED == TRUE #if SDP_INCLUDED == TRUE