zephyr
/
esp-idf
mirror of https://github.com/zephyrproject-rtos/esp-idf.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bugfix/bluedroid_const_char' into 'master' 

Bluedroid: remove warnings about discarding "const" for "const char*"

See merge request idf/esp-idf!2387
This commit is contained in:
Jiang Jiang Jian 2018-05-14 15:25:45 +08:00
parent adc3315677 2041c08681
commit d4276efed7
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/bluedroid/bta/dm/bta_dm_api.c
View File

@ -166,7 +166,7 @@ void BTA_DisableTestMode(void)
** Returns void
**
*******************************************************************************/
void BTA_DmSetDeviceName(char *p_name)
void BTA_DmSetDeviceName(const char *p_name)
{
tBTA_DM_API_SET_NAME *p_msg;

2
components/bt/bluedroid/bta/include/bta/bta_api.h
View File

@ -1416,7 +1416,7 @@ extern void BTA_DisableTestMode(void);
** Returns void
**
*******************************************************************************/
extern void BTA_DmSetDeviceName(char *p_name);
extern void BTA_DmSetDeviceName(const char *p_name);
extern void BTA_DmUpdateWhiteList(BOOLEAN add_remove, BD_ADDR remote_addr, tBTA_ADD_WHITELIST_CBACK *add_wl_cb);

6
components/bt/bluedroid/bta/jv/bta_jv_act.c
View File

@ -951,7 +951,7 @@ static bool create_base_record(const uint32_t sdp_handle, const char *name, cons
proto_list[2].num_params = 0;
}
char *stage = "protocol_list";
const char *stage = "protocol_list";
if (!SDP_AddProtocolList(sdp_handle, num_proto_elements, proto_list)){
APPL_TRACE_ERROR("create_base_record: failed to create base service "
"record, stage: %s, scn: %d, name: %s, with_obex: %d",
@ -1000,7 +1000,7 @@ static int add_spp_sdp(const char *name, const int channel) {
}
// Create the base SDP record.
char *stage = "create_base_record";
const char *stage = "create_base_record";
if (!create_base_record(handle, name, channel, FALSE /* with_obex */)){
SDP_DeleteRecord(handle);
APPL_TRACE_ERROR("add_spp_sdp: failed to register SPP service, "
@ -2769,4 +2769,4 @@ extern void bta_jv_l2cap_close_fixed (tBTA_JV_MSG *p_data)
}
#endif ///defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE
#endif ///defined BTA_JV_INCLUDED && BTA_JV_INCLUDED == TRUE

2
components/bt/bluedroid/btc/core/btc_dm.c
View File

@ -454,7 +454,7 @@ void btc_dm_sec_cb_handler(btc_msg_t *msg)
/* Set initial device name, it can be overwritten later */
if (p_data->enable.status == BTA_SUCCESS) {
char *initial_device_name = "ESP32";
const char *initial_device_name = "ESP32";
BTA_DmSetDeviceName(initial_device_name);
}
btc_enable_bluetooth_evt(p_data->enable.status);

2
components/bt/bluedroid/stack/gap/gap_conn.c
View File

@ -123,7 +123,7 @@ void gap_conn_init (void)
** Returns handle of the connection if successful, else GAP_INVALID_HANDLE
**
*******************************************************************************/
UINT16 GAP_ConnOpen (char *p_serv_name, UINT8 service_id, BOOLEAN is_server,
UINT16 GAP_ConnOpen (const char *p_serv_name, UINT8 service_id, BOOLEAN is_server,
BD_ADDR p_rem_bda, UINT16 psm, tL2CAP_CFG_INFO *p_cfg,
tL2CAP_ERTM_INFO *ertm_info, UINT16 security, UINT8 chan_mode_mask,
tGAP_CONN_CALLBACK *p_cb)

2
components/bt/bluedroid/stack/include/stack/gap_api.h
View File

@ -140,7 +140,7 @@ typedef void (tGAP_BLE_CMPL_CBACK)(BOOLEAN status, BD_ADDR addr, UINT16 length,
** Returns handle of the connection if successful, else GAP_INVALID_HANDLE
**
*******************************************************************************/
extern UINT16 GAP_ConnOpen (char *p_serv_name, UINT8 service_id, BOOLEAN is_server,
extern UINT16 GAP_ConnOpen (const char *p_serv_name, UINT8 service_id, BOOLEAN is_server,
BD_ADDR p_rem_bda, UINT16 psm, tL2CAP_CFG_INFO *p_cfg,
tL2CAP_ERTM_INFO *ertm_info,
UINT16 security, UINT8 chan_mode_mask, tGAP_CONN_CALLBACK *p_cb);