diff --git a/feature/feature_async/src/bluetooth_ble_impl.c b/feature/feature_async/src/bluetooth_ble_impl.c index 2052fb16b..fe50d4314 100644 --- a/feature/feature_async/src/bluetooth_ble_impl.c +++ b/feature/feature_async/src/bluetooth_ble_impl.c @@ -299,7 +299,7 @@ static void on_advertising_stopped_cb(bt_advertiser_t* adv, uint8_t adv_id) adv_info->busy = false; } -static advertiser_callback_t adv_callback = { +static const advertiser_callback_t adv_callback = { sizeof(adv_callback), on_advertising_start_cb, on_advertising_stopped_cb @@ -595,7 +595,7 @@ void system_bluetooth_ble_Advertiser_interface_adv_startAdvertising(FeatureInter adv_info->start_userdata = (void*)data; status = bt_le_start_advertising_async(adv_info->ins, &adv_params, - p_adv_data, adv_len, p_scan_rsp_data, scan_rsp_len, &adv_callback, + p_adv_data, adv_len, p_scan_rsp_data, scan_rsp_len, (advertiser_callback_t *)&adv_callback, start_adv_cb, (void*)data); if (status != BT_STATUS_SUCCESS) { @@ -1563,7 +1563,7 @@ static void mtu_updated_callback(gattc_handle_t conn_handle, gatt_status_t statu bt_list_remove(gattc_info->userdata_list, data); } -static bt_gattc_feature_callbacks_t gattc_cbs = { +static const bt_gattc_feature_callbacks_t gattc_cbs = { sizeof(gattc_cbs), .on_connected = connect_callback, .on_disconnected = disconnect_callback, @@ -1761,7 +1761,7 @@ void system_bluetooth_ble_GattClient_interface_gattc_connect(FeatureInterfaceHan gattc_info->gattc->addr_type, gattc_connect_cb, (void*)data); } else { status = bt_gattc_feature_create_client_async(gattc_info->ins, &gattc_info->gattc->remote_address, gattc_create_cb, - &gattc_cbs, (void*)data); + (bt_gattc_feature_callbacks_t *)&gattc_cbs, (void*)data); } if (status != BT_STATUS_SUCCESS) { diff --git a/framework/btwrap/async/bt_gatt_feature.c b/framework/btwrap/async/bt_gatt_feature.c index 25b53a4a5..32fdd67d3 100644 --- a/framework/btwrap/async/bt_gatt_feature.c +++ b/framework/btwrap/async/bt_gatt_feature.c @@ -716,7 +716,7 @@ static void feature_on_mtu_updated(void* conn_handle, gatt_status_t status, uint client->conn, status, mtu); } -static gattc_callbacks_t s_feature_gattc_cbs = { +static const gattc_callbacks_t s_feature_gattc_cbs = { sizeof(s_feature_gattc_cbs), feature_on_connected, feature_on_disconnected, @@ -806,7 +806,7 @@ bt_status_t bt_gattc_feature_create_client_async(bt_instance_t* ins, bt_address_ bt_list_add_tail(g_gatt_client_list, client); status = bt_gattc_create_connect_async( - ins, &client->conn, &s_feature_gattc_cbs, create_client_cb, client); + ins, &client->conn, (gattc_callbacks_t *)&s_feature_gattc_cbs, create_client_cb, client); if (status != BT_STATUS_SUCCESS) { bt_list_remove(g_gatt_client_list, client); diff --git a/service/ipc/socket/src/bt_socket_advertiser.c b/service/ipc/socket/src/bt_socket_advertiser.c index 7cdee8914..b42e48c21 100644 --- a/service/ipc/socket/src/bt_socket_advertiser.c +++ b/service/ipc/socket/src/bt_socket_advertiser.c @@ -82,7 +82,7 @@ static void on_advertising_stopped_cb(bt_advertiser_t* adv, uint8_t adv_id) free(adv); } -static advertiser_callback_t g_advertiser_socket_cb = { +static const advertiser_callback_t g_advertiser_socket_cb = { sizeof(g_advertiser_socket_cb), on_advertising_start_cb, on_advertising_stopped_cb, @@ -106,7 +106,7 @@ void bt_socket_server_advertiser_process(service_poll_t* poll, packet->adv_pl._bt_le_start_advertising.adv_len, packet->adv_pl._bt_le_start_advertising.scan_rsp_data, packet->adv_pl._bt_le_start_advertising.scan_rsp_len, - &g_advertiser_socket_cb); + (advertiser_callback_t *)&g_advertiser_socket_cb); if (!packet->adv_r.remote) free(adver); diff --git a/service/ipc/socket/src/bt_socket_scan.c b/service/ipc/socket/src/bt_socket_scan.c index 43cd0750c..2a946a3dd 100644 --- a/service/ipc/socket/src/bt_socket_scan.c +++ b/service/ipc/socket/src/bt_socket_scan.c @@ -201,7 +201,7 @@ static void on_scan_stopped_cb(bt_scanner_t* scanner) free(scanner); } -static scanner_callbacks_t g_scanner_socket_cb = { +static const scanner_callbacks_t g_scanner_socket_cb = { sizeof(g_scanner_socket_cb), on_scan_result_cb, on_scan_status_cb, @@ -221,7 +221,7 @@ void bt_socket_server_scan_process(service_poll_t* poll, scan->ins = ins; scan->remote = packet->scan_pl._bt_le_start_scan.remote; - packet->scan_r.remote = PTR2INT(uint64_t) scanner_start_scan(scan, &g_scanner_socket_cb); + packet->scan_r.remote = PTR2INT(uint64_t) scanner_start_scan(scan, (scanner_callbacks_t *)&g_scanner_socket_cb); if (!packet->scan_r.remote) free(scan); break; diff --git a/service/ipc/socket/src/bt_socket_spp.c b/service/ipc/socket/src/bt_socket_spp.c index fe145e9ba..02d0b6315 100644 --- a/service/ipc/socket/src/bt_socket_spp.c +++ b/service/ipc/socket/src/bt_socket_spp.c @@ -95,7 +95,7 @@ static void spp_connection_state_cb(void* handle, bt_address_t* addr, bt_socket_server_send(ins, &packet, BT_SPP_CONNECTION_STATE_CB); } -static spp_callbacks_t g_spp_socket_cb = { +static const spp_callbacks_t g_spp_socket_cb = { .size = sizeof(g_spp_socket_cb), .connection_state_cb = spp_connection_state_cb, .proxy_state_cb = spp_proxy_state_cb, @@ -113,7 +113,7 @@ void bt_socket_server_spp_process(service_poll_t* poll, switch (packet->code) { case BT_SPP_REGISTER_APP: { if (ins->spp_cookie == NULL) { - ins->spp_cookie = profile->register_app(ins, packet->spp_pl._bt_spp_register_app.name_len ? packet->spp_pl._bt_spp_register_app.name : NULL, &g_spp_socket_cb); + ins->spp_cookie = profile->register_app(ins, packet->spp_pl._bt_spp_register_app.name_len ? packet->spp_pl._bt_spp_register_app.name : NULL, (spp_callbacks_t *)&g_spp_socket_cb); packet->spp_r.handle = PTR2INT(uint64_t) ins->spp_cookie; } else { packet->spp_r.handle = 0; diff --git a/service/profiles/hid/hid_device_service.c b/service/profiles/hid/hid_device_service.c index 5ef936623..1461ae0a6 100644 --- a/service/profiles/hid/hid_device_service.c +++ b/service/profiles/hid/hid_device_service.c @@ -546,7 +546,7 @@ static bt_status_t hid_device_virtual_unplug(bt_address_t* addr) return status; } -static hid_device_interface_t deviceInterface = { +static const hid_device_interface_t deviceInterface = { .size = sizeof(deviceInterface), .register_callbacks = hid_device_register_callbacks, .unregister_callbacks = hid_device_unregister_callbacks, diff --git a/service/profiles/spp/spp_service.c b/service/profiles/spp/spp_service.c index 8841d5b8e..66ca00104 100644 --- a/service/profiles/spp/spp_service.c +++ b/service/profiles/spp/spp_service.c @@ -1252,7 +1252,7 @@ static int spp_dump(void) return 0; } -static spp_interface_t sppInterface = { +static const spp_interface_t sppInterface = { .size = sizeof(sppInterface), .register_app = spp_register_app, .unregister_app = spp_unregister_app, diff --git a/service/stacks/zephyr/sal_a2dp_interface.c b/service/stacks/zephyr/sal_a2dp_interface.c index 7d6382cc9..1d2954392 100644 --- a/service/stacks/zephyr/sal_a2dp_interface.c +++ b/service/stacks/zephyr/sal_a2dp_interface.c @@ -137,7 +137,7 @@ NET_BUF_POOL_DEFINE(bt_a2dp_tx_pool, CONFIG_BT_MAX_CONN, CONFIG_ZBLUE_A2DP_SOURC CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL); /* codec information elements for the endpoint */ -static struct bt_a2dp_codec_ie sbc_src_ie = { +static const struct bt_a2dp_codec_ie sbc_src_ie = { .len = 4, /* BT_A2DP_SBC_IE_LENGTH */ .codec_ie = { 0x2B, /* 16000 | 32000 | 44100 | 48000 | mono | dual channel | stereo | join stereo */ @@ -1104,7 +1104,7 @@ static void zblue_on_stream_recv(struct bt_a2dp_stream* stream, } #endif /* CONFIG_BLUETOOTH_A2DP_SINK */ -static struct bt_a2dp_stream_ops stream_ops = { +static const struct bt_a2dp_stream_ops stream_ops = { .configured = zblue_on_stream_configured, .established = zblue_on_stream_established, .released = zblue_on_stream_released, @@ -1164,7 +1164,7 @@ static uint8_t bt_a2dp_discover_endpoint_cb(struct bt_a2dp* a2dp, } a2dp_info->stream = (struct bt_a2dp_stream*)calloc(1, sizeof(struct bt_a2dp_stream)); - bt_a2dp_stream_cb_register(a2dp_info->stream, &stream_ops); + bt_a2dp_stream_cb_register(a2dp_info->stream, (struct bt_a2dp_stream_ops *)&stream_ops); if (a2dp_info->role == SEP_SRC) { #ifdef CONFIG_BLUETOOTH_A2DP_SOURCE @@ -1430,7 +1430,7 @@ static int zblue_on_config_req(struct bt_a2dp* a2dp, struct bt_a2dp_ep* ep, a2dp_info->stream = (struct bt_a2dp_stream*)calloc(1, sizeof(struct bt_a2dp_stream)); *stream = a2dp_info->stream; /* The a2dp_stream saved in SAL is assigned a value in zblue. */ - bt_a2dp_stream_cb_register(a2dp_info->stream, &stream_ops); + bt_a2dp_stream_cb_register(a2dp_info->stream, (struct bt_a2dp_stream_ops *)&stream_ops); *rsp_err_code = BT_AVDTP_SUCCESS; return 0; } @@ -1516,7 +1516,7 @@ static void zblue_on_suspend_rsp(struct bt_a2dp_stream* stream, uint8_t rsp_err_ BT_LOGE("%s, suspend fail: %d", __func__, rsp_err_code); } -static struct bt_a2dp_cb a2dp_cbks = { +static const struct bt_a2dp_cb a2dp_cbks = { .connected = zblue_on_connected, .disconnected = zblue_on_disconnected, .config_req = zblue_on_config_req, @@ -1565,7 +1565,7 @@ bt_status_t bt_sal_a2dp_source_init(uint8_t max_connections) } #endif /* CONFIG_BLUETOOTH_A2DP_AAC_CODEC */ - SAL_CHECK_RET(bt_a2dp_register_cb(&a2dp_cbks), 0); + SAL_CHECK_RET(bt_a2dp_register_cb((struct bt_a2dp_cb *)&a2dp_cbks), 0); return BT_STATUS_SUCCESS; #else @@ -1605,7 +1605,7 @@ bt_status_t bt_sal_a2dp_sink_init(uint8_t max_connections) } #endif /* CONFIG_BLUETOOTH_A2DP_AAC_CODEC */ - SAL_CHECK_RET(bt_a2dp_register_cb(&a2dp_cbks), 0); + SAL_CHECK_RET(bt_a2dp_register_cb((struct bt_a2dp_cb *)&a2dp_cbks), 0); return BT_STATUS_SUCCESS; #else diff --git a/service/stacks/zephyr/sal_adapter_interface.c b/service/stacks/zephyr/sal_adapter_interface.c index b25ab95ae..7b38557f5 100644 --- a/service/stacks/zephyr/sal_adapter_interface.c +++ b/service/stacks/zephyr/sal_adapter_interface.c @@ -149,7 +149,7 @@ static int zblue_on_link_key_load(bt_addr_le_t* addr, uint8_t* key_value, uint8_ static bt_security_t g_security_level = BT_SECURITY_L2; -static struct bt_conn_cb g_conn_cbs = { +static const struct bt_conn_cb g_conn_cbs = { #ifndef CONFIG_BT_CONN_REQ_AUTO_HANDLE .connect_req = zblue_on_connect_req, #endif /* CONFIG_BT_CONN_REQ_AUTO_HANDLE */ @@ -166,13 +166,13 @@ static struct bt_conn_cb g_conn_cbs = { }; #if defined(CONFIG_SETTINGS_ZBLUE) -static struct bt_settings_zblue_cb g_setting_cbs = { +static const struct bt_settings_zblue_cb g_setting_cbs = { .linkkey_notify = zblue_on_link_key_notify, .linkkey_load = zblue_on_link_key_load, }; #endif -static struct bt_conn_auth_info_cb g_conn_auth_info_cbs = { +static const struct bt_conn_auth_info_cb g_conn_auth_info_cbs = { .pairing_complete = zblue_on_br_pairing_complete, .pairing_complete_ctkd = zblue_on_br_pairing_complete_ctkd, .pairing_failed = zblue_on_br_pairing_failed, @@ -653,27 +653,27 @@ static void zblue_on_discovery_complete_cb(const struct bt_br_discovery_result* adapter_on_discovery_state_changed(BT_DISCOVERY_STOPPED); } -static struct bt_br_discovery_cb g_br_discovery_cb = { +static const struct bt_br_discovery_cb g_br_discovery_cb = { .recv = zblue_on_discovery_recv_cb, .timeout = zblue_on_discovery_complete_cb }; static void zblue_register_callback(void) { - bt_br_discovery_cb_register(&g_br_discovery_cb); - bt_conn_cb_register(&g_conn_cbs); - bt_conn_auth_cb_register(&g_conn_auth_cbs); - bt_conn_auth_info_cb_register(&g_conn_auth_info_cbs); + bt_br_discovery_cb_register((struct bt_br_discovery_cb *)&g_br_discovery_cb); + bt_conn_cb_register((struct bt_conn_cb *)&g_conn_cbs); + bt_conn_auth_cb_register((struct bt_conn_auth_cb *)&g_conn_auth_cbs); + bt_conn_auth_info_cb_register((struct bt_conn_auth_info_cb *)&g_conn_auth_info_cbs); #ifdef CONFIG_SETTINGS_ZBLUE - bt_setting_cb_register(&g_setting_cbs); + bt_setting_cb_register((struct bt_settings_zblue_cb *)&g_setting_cbs); #endif } static void zblue_unregister_callback(void) { - bt_br_discovery_cb_unregister(&g_br_discovery_cb); + bt_br_discovery_cb_unregister((struct bt_br_discovery_cb *)&g_br_discovery_cb); bt_conn_auth_cb_register(NULL); - bt_conn_auth_info_cb_unregister(&g_conn_auth_info_cbs); + bt_conn_auth_info_cb_unregister((struct bt_conn_auth_info_cb *)&g_conn_auth_info_cbs); } #endif diff --git a/service/stacks/zephyr/sal_adapter_le_interface.c b/service/stacks/zephyr/sal_adapter_le_interface.c index 6eed0d1ec..a7f22f67f 100644 --- a/service/stacks/zephyr/sal_adapter_le_interface.c +++ b/service/stacks/zephyr/sal_adapter_le_interface.c @@ -107,7 +107,10 @@ static enum bt_security_err zblue_on_pairing_accept(struct bt_conn* conn, const static void zblue_register_callback(void); static void zblue_unregister_callback(void); -static struct bt_conn_cb g_conn_cbs = { +static le_conn_info_t* le_conn_add(const bt_address_t* addr); +static le_conn_info_t* le_conn_find(const bt_address_t* addr); + +static const struct bt_conn_cb g_conn_cbs = { .connected = zblue_on_connected, .disconnected = zblue_on_disconnected, #ifdef CONFIG_BT_SMP @@ -119,7 +122,7 @@ static struct bt_conn_cb g_conn_cbs = { #endif }; -static struct bt_conn_auth_info_cb g_conn_auth_info_cbs = { +static const struct bt_conn_auth_info_cb g_conn_auth_info_cbs = { .pairing_complete_ctkd = zblue_on_pairing_complete_ctkd, .pairing_complete = zblue_on_pairing_complete, .pairing_failed = zblue_on_pairing_failed, @@ -127,7 +130,7 @@ static struct bt_conn_auth_info_cb g_conn_auth_info_cbs = { }; #if defined(CONFIG_SETTINGS_ZBLUE) -static struct bt_settings_zblue_cb g_setting_cbs = { +static const struct bt_settings_zblue_cb g_setting_cbs = { .irk_notify = zblue_on_irk_notify, .irk_load = zblue_on_irk_load, .ltk_notify = zblue_on_ltk_notify, @@ -758,22 +761,22 @@ static void zblue_on_bond_deleted(uint8_t id, const bt_addr_le_t* peer) static void zblue_register_callback(void) { - bt_conn_cb_register(&g_conn_cbs); + bt_conn_cb_register((struct bt_conn_cb *)&g_conn_cbs); #ifdef CONFIG_BT_SMP - bt_conn_le_auth_cb_register(&g_conn_auth_cbs); - bt_conn_auth_info_cb_register(&g_conn_auth_info_cbs); + bt_conn_le_auth_cb_register((struct bt_conn_auth_cb *)&g_conn_auth_cbs); + bt_conn_auth_info_cb_register((struct bt_conn_auth_info_cb *)&g_conn_auth_info_cbs); #endif #ifdef CONFIG_SETTINGS_ZBLUE - bt_setting_cb_register(&g_setting_cbs); + bt_setting_cb_register((struct bt_settings_zblue_cb *)&g_setting_cbs); #endif } static void zblue_unregister_callback(void) { - bt_conn_cb_unregister(&g_conn_cbs); + bt_conn_cb_unregister((struct bt_conn_cb *)&g_conn_cbs); #ifdef CONFIG_BT_SMP bt_conn_le_auth_cb_register(NULL); - bt_conn_auth_info_cb_unregister(&g_conn_auth_info_cbs); + bt_conn_auth_info_cb_unregister((struct bt_conn_auth_info_cb *)&g_conn_auth_info_cbs); #endif } diff --git a/service/stacks/zephyr/sal_avrcp_interface.c b/service/stacks/zephyr/sal_avrcp_interface.c index 171613db9..4cb8c6479 100644 --- a/service/stacks/zephyr/sal_avrcp_interface.c +++ b/service/stacks/zephyr/sal_avrcp_interface.c @@ -130,7 +130,7 @@ static void zblue_on_tg_register_notification_req(struct bt_avrcp_tg* tg, uint8_ static void zblue_on_tg_set_absolute_volume_req(struct bt_avrcp_tg* tg, uint8_t tid, uint8_t absolute_volume); #endif -static struct bt_avrcp_tg_cb avrcp_tg_cbks = { +static const struct bt_avrcp_tg_cb avrcp_tg_cbks = { #ifdef CONFIG_BLUETOOTH_AVRCP_TARGET .unit_info_req = zblue_on_tg_unit_info_req, .subunit_info_req = zblue_on_tg_subunit_info_req, diff --git a/service/stacks/zephyr/sal_hfp_ag_interface.c b/service/stacks/zephyr/sal_hfp_ag_interface.c index e16e6d36a..0f1c43a5b 100644 --- a/service/stacks/zephyr/sal_hfp_ag_interface.c +++ b/service/stacks/zephyr/sal_hfp_ag_interface.c @@ -952,7 +952,7 @@ static void zblue_on_ag_transmit_dtmf_code(struct bt_hfp_ag* ag, char code) hfp_ag_on_received_dtmf(&sal_conn->addr, code); } -static struct bt_hfp_ag_cb g_hfp_ag_cb = { +static const struct bt_hfp_ag_cb g_hfp_ag_cb = { .connected = zblue_on_ag_connected, .disconnected = zblue_on_ag_disconnected, .sco_connected = zblue_on_ag_sco_connected, @@ -992,7 +992,7 @@ bt_status_t bt_sal_hfp_ag_init(uint32_t features, uint8_t max_connection) BT_LOGD("%s, HFP AG init", __func__); g_sal_ag_conn_list = bt_list_new(free_connection); - SAL_CHECK_RET(Z_API(bt_hfp_ag_register)(&g_hfp_ag_cb), 0); + SAL_CHECK_RET(Z_API(bt_hfp_ag_register)((struct bt_hfp_ag_cb *)&g_hfp_ag_cb), 0); return BT_STATUS_SUCCESS; } diff --git a/service/stacks/zephyr/sal_hfp_hf_interface.c b/service/stacks/zephyr/sal_hfp_hf_interface.c index 96674de12..7d9d764dd 100644 --- a/service/stacks/zephyr/sal_hfp_hf_interface.c +++ b/service/stacks/zephyr/sal_hfp_hf_interface.c @@ -888,7 +888,7 @@ static void zblue_on_current_call(struct bt_hfp_hf* hf, struct bt_hfp_hf_current hfp_hf_on_current_call_response(&sal_conn->addr, idx, dir, status, mpty, call->number, call->type); } -static struct bt_hfp_hf_cb hf_callbacks = { +static const struct bt_hfp_hf_cb hf_callbacks = { .connected = zblue_on_connected, .disconnected = zblue_hf_disconnected, .sco_connected = zblue_on_sco_connected, @@ -932,7 +932,7 @@ bt_status_t bt_sal_hfp_hf_init(uint32_t hf_features, uint8_t max_connection) int err; g_sal_hf_conn_list = bt_list_new(free_connection); - err = Z_API(bt_hfp_hf_register)(&hf_callbacks); + err = Z_API(bt_hfp_hf_register)((struct bt_hfp_hf_cb *)&hf_callbacks); if (err) { bt_list_free(g_sal_hf_conn_list); diff --git a/service/stacks/zephyr/sal_hid_device_interface.c b/service/stacks/zephyr/sal_hid_device_interface.c index de7c3968c..d0cb0fd3d 100644 --- a/service/stacks/zephyr/sal_hid_device_interface.c +++ b/service/stacks/zephyr/sal_hid_device_interface.c @@ -61,7 +61,7 @@ typedef struct sal_bt_hid_device_mgr { uint8_t* description; } sal_bt_hid_device_mgr_t; -static struct bt_sdp_attribute hid_attrs_template[] = { +static const struct bt_sdp_attribute hid_attrs_template[] = { BT_SDP_NEW_SERVICE, BT_SDP_LIST( BT_SDP_ATTR_SVCLASS_ID_LIST, @@ -539,7 +539,7 @@ void hid_vc_unplug_callback(struct bt_hid_device* hid) hid_device_on_virtual_cable_unplug(&hid_conn->addr); } -static struct bt_hid_device_cb hid_callback = { +static const struct bt_hid_device_cb hid_callback = { .accept = hid_accept_callback, .connected = hid_connect_callback, .disconnected = hid_disconnected_callback, @@ -556,7 +556,7 @@ bt_status_t bt_sal_hid_device_init() int err; sal_bt_hid_device_mgr_t* hid_mgr = &g_hid_device_mgr; - err = Z_API(bt_hid_device_register)(&hid_callback); + err = Z_API(bt_hid_device_register)((struct bt_hid_device_cb *)&hid_callback); if (err != 0) { BT_LOGE("HID register cb fail,err:%d", err); return BT_STATUS_FAIL; diff --git a/service/stacks/zephyr/sal_spp_interface.c b/service/stacks/zephyr/sal_spp_interface.c index 598d6b4b4..129723891 100644 --- a/service/stacks/zephyr/sal_spp_interface.c +++ b/service/stacks/zephyr/sal_spp_interface.c @@ -95,7 +95,7 @@ extern struct net_buf_pool sdp_pool; NET_BUF_POOL_FIXED_DEFINE(rfcomm_tx_pool, SPP_DEFAULT_CREDITS, SAL_SPP_RFCOMM_MFS + SPP_MFS_EXTRA_SIZE, CONFIG_BT_CONN_TX_USER_DATA_SIZE, NULL); -static struct bt_sdp_attribute spp_attrs_template[] = { +static const struct bt_sdp_attribute spp_attrs_template[] = { BT_SDP_NEW_SERVICE, BT_SDP_LIST( BT_SDP_ATTR_SVCLASS_ID_LIST, @@ -438,7 +438,7 @@ static void spp_rfcomm_sent(struct bt_rfcomm_dlc* rfcomm_dlc, int err) spp_conn_unlock(); } -static struct bt_rfcomm_dlc_ops g_rfcomm_ops = { +static const struct bt_rfcomm_dlc_ops g_rfcomm_ops = { .connected = spp_rfcomm_connected, .disconnected = spp_rfcomm_disconnected, .recv = spp_rfcomm_recv, @@ -523,7 +523,7 @@ static sal_spp_connection_t* spp_connection_new(bt_address_t* addr, uint16_t con return NULL; } - spp_conn->rfcomm_dlc.ops = &g_rfcomm_ops; + spp_conn->rfcomm_dlc.ops = (struct bt_rfcomm_dlc_ops *)&g_rfcomm_ops; spp_conn->rfcomm_dlc.mtu = SAL_SPP_RFCOMM_MFS; memcpy(&spp_conn->addr, addr, sizeof(bt_address_t)); diff --git a/tools/a2dp_source.c b/tools/a2dp_source.c index e48c25c7c..2e1af5947 100644 --- a/tools/a2dp_source.c +++ b/tools/a2dp_source.c @@ -27,7 +27,7 @@ static int connect_cmd(void* handle, int argc, char* argv[]); static int disconnect_cmd(void* handle, int argc, char* argv[]); static int get_state_cmd(void* handle, int argc, char* argv[]); -static bt_command_t g_a2dp_tables[] = { +static const bt_command_t g_a2dp_tables[] = { { "connect", connect_cmd, 0, "\"establish a2dp signal and stream connection, params:
\"" }, { "disconnect", disconnect_cmd, 0, "\"disconnect a2dp signal and stream connection, params:
\"" }, { "state", get_state_cmd, 0, "\"get a2dp connection or audio state , params:
\"" }, @@ -131,7 +131,7 @@ int a2dp_src_command_exec(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_a2dp_tables, ARRAY_SIZE(g_a2dp_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_a2dp_tables, ARRAY_SIZE(g_a2dp_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/adv.c b/tools/adv.c index 4eee9e210..c5ca5f78b 100644 --- a/tools/adv.c +++ b/tools/adv.c @@ -28,7 +28,7 @@ static int stop_adv_cmd(void* handle, int argc, char* argv[]); static int set_adv_data_cmd(void* handle, int argc, char* argv[]); static int dump_adv_cmd(void* handle, int argc, char* argv[]); -static struct option adv_options[] = { +static const struct option adv_options[] = { { "adv_type", required_argument, 0, 't' }, { "mode", required_argument, 0, 'm' }, { "interval", required_argument, 0, 'i' }, @@ -45,13 +45,13 @@ static struct option adv_options[] = { { 0, 0, 0, 0 } }; -static struct option adv_stop_options[] = { +static const struct option adv_stop_options[] = { { "advid", required_argument, 0, 'i' }, { "handle", required_argument, 0, 'h' }, { 0, 0, 0, 0 } }; -static bt_command_t g_adv_tables[] = { +static const bt_command_t g_adv_tables[] = { { "start", start_adv_cmd, 1, "start advertising\n" "\t -t or --adv_type, advertising type opt(adv_ind/direct_ind/nonconn_ind/scan_ind)\n" "\t -m or --mode, advertising mode opt(legacy/ext/auto, default auto)\n" @@ -98,7 +98,7 @@ static void on_advertising_stopped_cb(bt_advertiser_t* adv, uint8_t adv_id) PRINT("%s, handle:%p, adv_id:%d", __func__, adv, adv_id); } -static advertiser_callback_t adv_callback = { +static const advertiser_callback_t adv_callback = { sizeof(adv_callback), on_advertising_start_cb, on_advertising_stopped_cb @@ -404,7 +404,7 @@ static int start_adv_cmd(void* handle, int argc, char* argv[]) adv_handle = bt_le_start_advertising(handle, ¶ms, p_adv_data, adv_len, p_scan_rsp_data, scan_rsp_len, - &adv_callback); + (advertiser_callback_t *)&adv_callback); PRINT("Advertising handle:%p", adv_handle); /* free advertiser data */ @@ -482,7 +482,7 @@ int adv_command_exec(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table_offset(handle, g_adv_tables, ARRAY_SIZE(g_adv_tables), argc, argv, 0); + ret = execute_command_in_table_offset(handle, (bt_command_t *)g_adv_tables, ARRAY_SIZE(g_adv_tables), argc, argv, 0); if (ret < 0) usage(); diff --git a/tools/async/adv.c b/tools/async/adv.c index 665df8474..a2073df2c 100644 --- a/tools/async/adv.c +++ b/tools/async/adv.c @@ -33,7 +33,7 @@ static int stop_adv_cmd(void* handle, int argc, char* argv[]); static int set_adv_data_cmd(void* handle, int argc, char* argv[]); static int dump_adv_cmd(void* handle, int argc, char* argv[]); -static struct option adv_options[] = { +static const struct option adv_options[] = { { "adv_type", required_argument, 0, 't' }, { "mode", required_argument, 0, 'm' }, { "interval", required_argument, 0, 'i' }, @@ -49,13 +49,13 @@ static struct option adv_options[] = { { 0, 0, 0, 0 } }; -static struct option adv_stop_options[] = { +static const struct option adv_stop_options[] = { { "advid", required_argument, 0, 'i' }, { "handle", required_argument, 0, 'h' }, { 0, 0, 0, 0 } }; -static bt_command_t g_adv_async_tables[] = { +static const bt_command_t g_adv_async_tables[] = { { "start", start_adv_cmd, 1, "start advertising\n" "\t -t or --adv_type, advertising type opt(adv_ind/direct_ind/nonconn_ind/scan_ind)\n" "\t -m or --mode, advertising mode opt(legacy/ext/auto, default auto)\n" @@ -105,7 +105,7 @@ static void on_advertising_stopped_cb(bt_advertiser_t* adv, uint8_t adv_id) PRINT("%s, handle:%p, adv_id:%d", __func__, adv, adv_id); } -static advertiser_callback_t adv_callback = { +static const advertiser_callback_t adv_callback = { sizeof(adv_callback), on_advertising_start_cb, on_advertising_stopped_cb @@ -346,7 +346,7 @@ static int start_adv_cmd(void* handle, int argc, char* argv[]) bt_le_start_advertising_async(handle, ¶ms, p_adv_data, adv_len, p_scan_rsp_data, scan_rsp_len, - &adv_callback, + (advertiser_callback_t *)&adv_callback, start_advertising_callback_cb, NULL); /* free advertiser data */ @@ -421,7 +421,7 @@ int adv_command_exec_async(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table_offset(handle, g_adv_async_tables, ARRAY_SIZE(g_adv_async_tables), argc, argv, 0); + ret = execute_command_in_table_offset(handle, (bt_command_t *)g_adv_async_tables, ARRAY_SIZE(g_adv_async_tables), argc, argv, 0); if (ret < 0) usage(); diff --git a/tools/async/gap.c b/tools/async/gap.c index 40aeede74..c92e9e09b 100644 --- a/tools/async/gap.c +++ b/tools/async/gap.c @@ -80,7 +80,7 @@ static int set_phy_cmd(void* handle, int argc, char** argv); static int dump_cmd(void* handle, int argc, char** argv); static int quit_cmd(void* handle, int argc, char** argv); -static struct option le_conn_options[] = { +static const struct option le_conn_options[] = { { "addr", required_argument, 0, 'a' }, { "type", required_argument, 0, 't' }, { "defaults", no_argument, 0, 'd' }, @@ -210,7 +210,7 @@ static bt_command_t g_async_cmd_tables[] = { #define SET_CLASS_USAGE "params: , range in 0x0-0xFFFFFC, the 2 least significant shall be 0b00, example: 0x00640404" #define SET_SCANPARAMS_USAGE "set scan parameters, params: (0: INQUIRY, 1: PAGE), (0: standard, 1: interlaced), (range in 18-4096), (range in 17-4096)" -static bt_command_t g_set_cmd_tables[] = { +static const bt_command_t g_set_cmd_tables[] = { { "scanmode", set_scanmode_cmd, 0, "params: (0:none, 1:connectable 2:connectable&discoverable)" }, { "iocap", set_iocap_cmd, 0, SET_IOCAP_USAGE }, { "name", set_local_name_cmd, 0, "params: , example \"vela-bt\"" }, @@ -223,7 +223,7 @@ static bt_command_t g_set_cmd_tables[] = { //{ "", , "set " }, }; -static bt_command_t g_get_cmd_tables[] = { +static const bt_command_t g_get_cmd_tables[] = { { "scanmode", get_scanmode_cmd, 0, "get adapter scan mode" }, { "iocap", get_iocap_cmd, 0, "get adapter io capability" }, { "addr", get_local_addr_cmd, 0, "get adapter local addr" }, @@ -240,7 +240,7 @@ static bt_command_t g_get_cmd_tables[] = { #define PAIR_PASSKEY_USAGE "input ssp passkey, params: (0:BLE, 1:BREDR)(0 :reject, 1: accept)" #define PAIR_CONFIRM_USAGE "set ssp confirmation, params: (0:BLE, 1:BREDR)(0 :reject, 1: accept)" -static bt_command_t g_pair_cmd_tables[] = { +static const bt_command_t g_pair_cmd_tables[] = { { "auto", pair_set_auto_cmd, 0, "enable pair auto reply, params: (0:disable, 1:enable)" }, { "reply", pair_reply_cmd, 0, "reply the pair request, params: (0 :reject, 1: accept)" }, { "pin", pair_set_pincode_cmd, 0, "input pin code, params: (0 :reject, 1: accept)" }, @@ -399,7 +399,7 @@ static int set_adapter_cmd(void* handle, int argc, char** argv) return CMD_PARAM_NOT_ENOUGH; } - int ret = execute_command_in_table(handle, g_set_cmd_tables, ARRAY_SIZE(g_set_cmd_tables), argc, argv); + int ret = execute_command_in_table(handle, (bt_command_t *)g_set_cmd_tables, ARRAY_SIZE(g_set_cmd_tables), argc, argv); if (ret != CMD_OK) set_usage(); @@ -413,7 +413,7 @@ static int get_adapter_cmd(void* handle, int argc, char** argv) return CMD_PARAM_NOT_ENOUGH; } - int ret = execute_command_in_table(handle, g_get_cmd_tables, ARRAY_SIZE(g_get_cmd_tables), argc, argv); + int ret = execute_command_in_table(handle, (bt_command_t *)g_get_cmd_tables, ARRAY_SIZE(g_get_cmd_tables), argc, argv); if (ret != CMD_OK) get_usage(); @@ -649,7 +649,7 @@ static int pair_cmd(void* handle, int argc, char** argv) return CMD_PARAM_NOT_ENOUGH; } - int ret = execute_command_in_table(handle, g_pair_cmd_tables, ARRAY_SIZE(g_pair_cmd_tables), argc, argv); + int ret = execute_command_in_table(handle, (bt_command_t *)g_pair_cmd_tables, ARRAY_SIZE(g_pair_cmd_tables), argc, argv); if (ret != CMD_OK) pair_usage(); diff --git a/tools/async/gatt_client.c b/tools/async/gatt_client.c index ed0cbee44..05e71dbe5 100644 --- a/tools/async/gatt_client.c +++ b/tools/async/gatt_client.c @@ -80,7 +80,7 @@ typedef struct { } \ } -static bt_command_t g_gattc_async_tables[] = { +static const bt_command_t g_gattc_async_tables[] = { { "create", create_cmd, 0, "\"create gatt client :\"" }, { "delete", delete_cmd, 0, "\"delete gatt client :\"" }, { "connect", connect_cmd, 0, "\"connect remote device :
[addr type(0:public,1:random,2:public_id,3:random_id)]\"" }, @@ -729,7 +729,7 @@ static void conn_param_updated_callback(void* conn_handle, bt_status_t status, u status, connection_interval, peripheral_latency, supervision_timeout); } -static gattc_callbacks_t gattc_cbs = { +static const gattc_callbacks_t gattc_cbs = { sizeof(gattc_cbs), connect_callback, disconnect_callback, @@ -761,7 +761,7 @@ static int create_cmd(void* handle, int argc, char* argv[]) int* conn_id = (int*)malloc(sizeof(int)); *conn_id = index; - if (bt_gattc_create_connect_async(handle, &g_gattc_devies[index].handle, &gattc_cbs, create_connect_cb, + if (bt_gattc_create_connect_async(handle, &g_gattc_devies[index].handle, (gattc_callbacks_t *)&gattc_cbs, create_connect_cb, conn_id) != BT_STATUS_SUCCESS) { free(conn_id); @@ -812,7 +812,7 @@ int gattc_command_exec_async(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_gattc_async_tables, ARRAY_SIZE(g_gattc_async_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_gattc_async_tables, ARRAY_SIZE(g_gattc_async_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/async/log.c b/tools/async/log.c index 033963679..f2738ae19 100644 --- a/tools/async/log.c +++ b/tools/async/log.c @@ -50,7 +50,7 @@ static int unfilter_cmd(void* handle, int argc, char* argv[]); static int unmask_cmd(void* handle, int argc, char* argv[]); static int level_cmd(void* handle, int argc, char* argv[]); -static bt_command_t g_log_async_tables[] = { +static const bt_command_t g_log_async_tables[] = { { "enable", enable_cmd, 0, "\"Enable param: (\"snoop\" or \"stack\")\"" }, { "disable", disable_cmd, 0, "\"Disable param: (\"snoop\" or \"stack\")\"" }, { "mask", mask_cmd, 0, "\"Enable Stack Profile & Protocol Log \"\n" @@ -243,7 +243,7 @@ int log_command_async(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_log_async_tables, ARRAY_SIZE(g_log_async_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_log_async_tables, ARRAY_SIZE(g_log_async_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/async/scan.c b/tools/async/scan.c index ce6ff42a8..2442c9f96 100644 --- a/tools/async/scan.c +++ b/tools/async/scan.c @@ -34,7 +34,7 @@ static int dump_scan_cmd(void* handle, int argc, char* argv[]); static bt_scanner_t* g_scanner = NULL; -static struct option scan_options[] = { +static const struct option scan_options[] = { { "type", required_argument, 0, 't' }, { "phy", required_argument, 0, 'p' }, { "mode", required_argument, 0, 'm' }, @@ -43,7 +43,7 @@ static struct option scan_options[] = { { 0, 0, 0, 0 } }; -static bt_command_t g_scanner_async_tables[] = { +static const bt_command_t g_scanner_async_tables[] = { { "start", start_scan_cmd, 0, "start scan\n" "\t -t or --type, le scan type (0: passive, 1: active)\n" "\t -p or --phy, le scan phy (1M/2M/Coded)\n" @@ -226,7 +226,7 @@ int scan_command_exec_async(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table_offset(handle, g_scanner_async_tables, + ret = execute_command_in_table_offset(handle, (bt_command_t *)g_scanner_async_tables, ARRAY_SIZE(g_scanner_async_tables), argc, argv, 0); diff --git a/tools/bt_tools.c b/tools/bt_tools.c index 50cb9df1e..34b0e4646 100644 --- a/tools/bt_tools.c +++ b/tools/bt_tools.c @@ -111,7 +111,7 @@ static struct option main_options[] = { { 0, 0, 0, 0 } }; -static struct option le_conn_options[] = { +static const struct option le_conn_options[] = { { "addr", required_argument, 0, 'a' }, { "type", required_argument, 0, 't' }, { "defaults", no_argument, 0, 'd' }, @@ -150,7 +150,7 @@ static struct option le_conn_options[] = { #define SET_LE_PHY_USAGE "set le tx and rx phy, params: (0:1M, 1:2M, 2:CODED)" -static bt_command_t g_cmd_tables[] = { +static const bt_command_t g_cmd_tables[] = { { "enable", enable_cmd, 0, "enable stack" }, { "disable", disable_cmd, 0, "disable stack" }, { "state", get_state_cmd, 0, "get adapter state" }, @@ -250,7 +250,7 @@ static bt_command_t g_cmd_tables[] = { #define SET_CLASS_USAGE "params: , range in 0x0-0xFFFFFC, the 2 least significant shall be 0b00, example: 0x00640404" #define SET_SCANPARAMS_USAGE "set scan parameters, params: (0: INQUIRY, 1: PAGE), (0: standard, 1: interlaced), (range in 18-4096), (range in 17-4096)" -static bt_command_t g_set_cmd_tables[] = { +static const bt_command_t g_set_cmd_tables[] = { { "scanmode", set_scanmode_cmd, 0, "params: (0:none, 1:connectable 2:connectable&discoverable)" }, { "iocap", set_iocap_cmd, 0, SET_IOCAP_USAGE }, { "le_iocap", set_le_iocap_cmd, 0, SET_IOCAP_USAGE }, @@ -267,7 +267,7 @@ static bt_command_t g_set_cmd_tables[] = { //{ "", , "set " }, }; -static bt_command_t g_get_cmd_tables[] = { +static const bt_command_t g_get_cmd_tables[] = { { "scanmode", get_scanmode_cmd, 0, "get adapter scan mode" }, { "iocap", get_iocap_cmd, 0, "get adapter io capability" }, { "le_iocap", get_le_iocap_cmd, 0, "get adapter le io capability" }, @@ -285,7 +285,7 @@ static bt_command_t g_get_cmd_tables[] = { #define PAIR_PASSKEY_USAGE "input ssp passkey, params: (0:BLE, 1:BREDR)(0 :reject, 1: accept)" #define PAIR_CONFIRM_USAGE "set ssp confirmation, params: (0:BLE, 1:BREDR)(0 :reject, 1: accept)" -static bt_command_t g_pair_cmd_tables[] = { +static const bt_command_t g_pair_cmd_tables[] = { { "auto", pair_set_auto_cmd, 0, "enable pair auto reply, params: (0:disable, 1:enable)" }, { "reply", pair_reply_cmd, 0, "reply the pair request, params: (0 :reject, 1: accept)" }, { "pin", pair_set_pincode_cmd, 0, "input pin code, params: (0 :reject, 1: accept)" }, @@ -554,7 +554,7 @@ static int set_adapter_cmd(void* handle, int argc, char** argv) return CMD_PARAM_NOT_ENOUGH; } - int ret = execute_command_in_table(handle, g_set_cmd_tables, ARRAY_SIZE(g_set_cmd_tables), argc, argv); + int ret = execute_command_in_table(handle, (bt_command_t *)g_set_cmd_tables, ARRAY_SIZE(g_set_cmd_tables), argc, argv); if (ret != CMD_OK) set_usage(); @@ -568,7 +568,7 @@ static int get_adapter_cmd(void* handle, int argc, char** argv) return CMD_PARAM_NOT_ENOUGH; } - int ret = execute_command_in_table(handle, g_get_cmd_tables, ARRAY_SIZE(g_get_cmd_tables), argc, argv); + int ret = execute_command_in_table(handle, (bt_command_t *)g_get_cmd_tables, ARRAY_SIZE(g_get_cmd_tables), argc, argv); if (ret != CMD_OK) get_usage(); @@ -871,7 +871,7 @@ static int pair_cmd(void* handle, int argc, char** argv) return CMD_PARAM_NOT_ENOUGH; } - int ret = execute_command_in_table(handle, g_pair_cmd_tables, ARRAY_SIZE(g_pair_cmd_tables), argc, argv); + int ret = execute_command_in_table(handle, (bt_command_t *)g_pair_cmd_tables, ARRAY_SIZE(g_pair_cmd_tables), argc, argv); if (ret != CMD_OK) pair_usage(); diff --git a/tools/gatt_client.c b/tools/gatt_client.c index addd1e999..77efa9274 100644 --- a/tools/gatt_client.c +++ b/tools/gatt_client.c @@ -68,7 +68,7 @@ static volatile uint32_t throughtput_cursor = 0; } \ } -static bt_command_t g_gattc_tables[] = { +static const bt_command_t g_gattc_tables[] = { { "create", create_cmd, 0, "\"create gatt client :\"" }, { "delete", delete_cmd, 0, "\"delete gatt client :\"" }, { "connect", connect_cmd, 0, "\"connect remote device :
[addr type(0:public,1:random,2:public_id,3:random_id)]\"" }, @@ -678,7 +678,7 @@ static void conn_param_updated_callback(void* conn_handle, bt_status_t status, u status, connection_interval, peripheral_latency, supervision_timeout); } -static gattc_callbacks_t gattc_cbs = { +static const gattc_callbacks_t gattc_cbs = { sizeof(gattc_cbs), connect_callback, disconnect_callback, @@ -708,7 +708,7 @@ static int create_cmd(void* handle, int argc, char* argv[]) return CMD_OK; } - if (bt_gattc_create_connect(handle, &g_gattc_devies[conn_id].handle, &gattc_cbs) != BT_STATUS_SUCCESS) + if (bt_gattc_create_connect(handle, &g_gattc_devies[conn_id].handle, (gattc_callbacks_t *)&gattc_cbs) != BT_STATUS_SUCCESS) return CMD_ERROR; PRINT("create connection success, conn_id: %d", conn_id); @@ -752,7 +752,7 @@ int gattc_command_exec(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_gattc_tables, ARRAY_SIZE(g_gattc_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_gattc_tables, ARRAY_SIZE(g_gattc_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/gatt_server.c b/tools/gatt_server.c index 38f5f22b2..58418da34 100644 --- a/tools/gatt_server.c +++ b/tools/gatt_server.c @@ -205,7 +205,7 @@ const uint8_t pnp_id[7] = { 0x00, 0x01 // pnp_ver }; -static gatt_attr_db_t s_dis_attr_db[] = { +static const gatt_attr_db_t s_dis_attr_db[] = { GATT_H_PRIMARY_SERVICE(BT_UUID_DECLARE_16(0x180A), DIS_SERVICE_ID), GATT_H_CHARACTERISTIC_AUTO_RSP(BT_UUID_DECLARE_16(0x2A24), GATT_PROP_READ, GATT_PERM_READ, (uint8_t*)model_number_str, sizeof(model_number_str), DIS_MODEL_NUMBER_CHR_ID), GATT_H_CHARACTERISTIC_AUTO_RSP(BT_UUID_DECLARE_16(0x2A29), GATT_PROP_READ, GATT_PERM_READ, (uint8_t*)manufacturer_name_str, sizeof(manufacturer_name_str), DIS_MANUFACTURER_NAME_CHR_ID), @@ -213,24 +213,24 @@ static gatt_attr_db_t s_dis_attr_db[] = { }; static gatt_srv_db_t s_dis_service_db = { - .attr_db = s_dis_attr_db, + .attr_db = (gatt_attr_db_t *)s_dis_attr_db, .attr_num = sizeof(s_dis_attr_db) / sizeof(gatt_attr_db_t), }; static uint8_t battery_level = 100U; -static gatt_attr_db_t s_bas_attr_db[] = { +static const gatt_attr_db_t s_bas_attr_db[] = { GATT_H_PRIMARY_SERVICE(BT_UUID_DECLARE_16(0x180F), BAS_SERVICE_ID), GATT_H_CHARACTERISTIC_AUTO_RSP(BT_UUID_DECLARE_16(0x2A19), GATT_PROP_READ | GATT_PROP_NOTIFY, GATT_PERM_READ, &battery_level, sizeof(battery_level), BAS_BATTERY_LEVEL_CHR_ID), GATT_H_CCCD(GATT_PERM_READ | GATT_PERM_WRITE, tx_char_ccc_changed, BAS_BATTERY_LEVEL_CHR_CCC_ID), }; static gatt_srv_db_t s_bas_service_db = { - .attr_db = s_bas_attr_db, + .attr_db = (gatt_attr_db_t *)s_bas_attr_db, .attr_num = sizeof(s_bas_attr_db) / sizeof(gatt_attr_db_t), }; -static gatt_attr_db_t s_iot_attr_db[] = { +static const gatt_attr_db_t s_iot_attr_db[] = { /* Private IOT Service - 0xFF00 */ GATT_H_PRIMARY_SERVICE(BT_UUID_DECLARE_16(0xFF00), IOT_SERVICE_ID), /* Private Characteristic for TX - 0xFF01 */ @@ -250,11 +250,11 @@ static gatt_attr_db_t s_iot_attr_db[] = { }; static gatt_srv_db_t s_iot_service_db = { - .attr_db = s_iot_attr_db, + .attr_db = (gatt_attr_db_t *)s_iot_attr_db, .attr_num = sizeof(s_iot_attr_db) / sizeof(gatt_attr_db_t), }; -static bt_command_t g_gatts_tables[] = { +static const bt_command_t g_gatts_tables[] = { { "register", register_cmd, 0, "\"register gatt service(DIS = 1, BAS = 2, CUSTOM = 3) :\"" }, { "unregister", unregister_cmd, 0, "\"unregister gatt service :\"" }, { "start", start_cmd, 0, "\"start gatt service :\"" }, diff --git a/tools/hfp_ag.c b/tools/hfp_ag.c index 8e64cc66a..867278fa5 100644 --- a/tools/hfp_ag.c +++ b/tools/hfp_ag.c @@ -34,7 +34,7 @@ static int stop_voice_recognition_cmd(void* handle, int argc, char* argv[]); static int send_at_cmd_cmd(void* handle, int argc, char* argv[]); static int send_vendor_result_cmd(void* handle, int argc, char* argv[]); -static bt_command_t g_hfp_ag_tables[] = { +static const bt_command_t g_hfp_ag_tables[] = { { "connect", connect_cmd, 0, "\"establish hfp SLC connection , params:
\"" }, { "disconnect", disconnect_cmd, 0, "\"disconnect hfp SLC connection , params:
\"" }, { "connectaudio", connect_audio_cmd, 0, "\"establish hfp SCO connection , params:
\"" }, @@ -326,7 +326,7 @@ int hfp_ag_command_exec(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_hfp_ag_tables, ARRAY_SIZE(g_hfp_ag_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_hfp_ag_tables, ARRAY_SIZE(g_hfp_ag_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/hfp_hf.c b/tools/hfp_hf.c index f8f045dcd..a7a85d70b 100644 --- a/tools/hfp_hf.c +++ b/tools/hfp_hf.c @@ -78,7 +78,7 @@ static int get_subscriber_number(void* handle, int argc, char* argv[]); "\t\t\t1: CONNECTION_POLICY_FORBIDDEN \n" \ "\t\t\t2: CONNECTION_POLICY_UNKNOWN \n" -static bt_command_t g_hfp_tables[] = { +static const bt_command_t g_hfp_tables[] = { { "connect", connect_cmd, 0, "Establish hfp SLC connection params:
" }, { "disconnect", disconnect_cmd, 0, "Disconnect hfp SLC connection params:
" }, { "policy", set_policy_cmd, 0, SET_POLICY_USAGE }, @@ -595,7 +595,7 @@ int hfp_hf_command_exec(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_hfp_tables, ARRAY_SIZE(g_hfp_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_hfp_tables, ARRAY_SIZE(g_hfp_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/hid_device.c b/tools/hid_device.c index 556cb7969..d8e5ff5a1 100644 --- a/tools/hid_device.c +++ b/tools/hid_device.c @@ -31,7 +31,7 @@ static int send_consumer_cmd(void* handle, int argc, char* argv[]); static int unplug_cmd(void* handle, int argc, char* argv[]); static int dump_cmd(void* handle, int argc, char* argv[]); -static bt_command_t g_hidd_tables[] = { +static const bt_command_t g_hidd_tables[] = { { "register", register_cmd, 0, "\"register HID app: (1:KEYBOARD, 2:MOUSE, 3:KBMS_COMBO) (0:BLE, 1:BREDR)\"" }, { "unregister", unregister_cmd, 0, "\"unregister HID app \"" }, { "connect", connect_cmd, 0, "\"connect HID host param:
\"" }, @@ -565,7 +565,7 @@ int hidd_command_exec(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_hidd_tables, ARRAY_SIZE(g_hidd_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_hidd_tables, ARRAY_SIZE(g_hidd_tables), argc, argv); if (ret < 0) usage(); diff --git a/tools/log.c b/tools/log.c index 21dfe099e..1c842e069 100644 --- a/tools/log.c +++ b/tools/log.c @@ -50,7 +50,7 @@ static int unfilter_cmd(void* handle, int argc, char* argv[]); static int unmask_cmd(void* handle, int argc, char* argv[]); static int level_cmd(void* handle, int argc, char* argv[]); -static bt_command_t g_log_tables[] = { +static const bt_command_t g_log_tables[] = { { "enable", enable_cmd, 0, "\"Enable param: (\"snoop\" or \"stack\")\"" }, { "disable", disable_cmd, 0, "\"Disable param: (\"snoop\" or \"stack\")\"" }, { "mask", mask_cmd, 0, "\"Enable Stack Profile & Protocol Log \"\n" @@ -243,7 +243,7 @@ int log_command(void* handle, int argc, char* argv[]) int ret = CMD_USAGE_FAULT; if (argc > 0) - ret = execute_command_in_table(handle, g_log_tables, ARRAY_SIZE(g_log_tables), argc, argv); + ret = execute_command_in_table(handle, (bt_command_t *)g_log_tables, ARRAY_SIZE(g_log_tables), argc, argv); if (ret < 0) usage();