From f99d22f6e083a880cb0352c7316c8c978e83a3b4 Mon Sep 17 00:00:00 2001 From: "injun.yang" Date: Tue, 28 Jan 2020 17:09:32 +0900 Subject: [PATCH] Remove redundant debug message Change-Id: I407609671b339894131b505e41ab8d7dbac8e347 Signed-off-by: injun.yang Signed-off-by: DoHyun Pyun --- bt-oal/bluez_hal/src/bt-hal-adapter-le.c | 13 ++++------ bt-oal/bluez_hal/src/bt-hal-gatt-server.c | 29 +++++++--------------- bt-oal/oal-gatt.c | 11 -------- .../services/bt-request-handler.c | 9 +++---- .../services/gatt/bt-service-gatt.c | 9 +++---- 5 files changed, 21 insertions(+), 50 deletions(-) diff --git a/bt-oal/bluez_hal/src/bt-hal-adapter-le.c b/bt-oal/bluez_hal/src/bt-hal-adapter-le.c index fb8ca81..856f022 100644 --- a/bt-oal/bluez_hal/src/bt-hal-adapter-le.c +++ b/bt-oal/bluez_hal/src/bt-hal-adapter-le.c @@ -723,6 +723,7 @@ int _bt_hal_set_advertising_params(int server_if, int min_interval, int _bt_hal_set_advertising_data(btgatt_adv_param_setup_t adv_param_setup) { uint8_t adv_data[31]; + char adv_data_str[(31 * 2) + 1]; int index = 0; GDBusProxy *proxy; GError *error = NULL; @@ -750,7 +751,6 @@ int _bt_hal_set_advertising_data(btgatt_adv_param_setup_t adv_param_setup) memset(&adv_data, 0, 31); /* Service UUID */ - DBG("Service UUID length [%d]", adv_param_setup.service_uuid_len); if (adv_param_setup.service_uuid_len > 0) { __bt_hal_parse_uuid(adv_param_setup.service_uuid_len, adv_param_setup.service_uuid, &adv_data[index], &length, FALSE); @@ -759,7 +759,6 @@ int _bt_hal_set_advertising_data(btgatt_adv_param_setup_t adv_param_setup) } /* Solicit UUID */ - DBG("Solicit UUID length [%d]", adv_param_setup.solicit_uuid_len); if (adv_param_setup.solicit_uuid_len > 0) { __bt_hal_parse_uuid(adv_param_setup.solicit_uuid_len, adv_param_setup.solicit_uuid, &adv_data[index], &length, TRUE); @@ -768,7 +767,6 @@ int _bt_hal_set_advertising_data(btgatt_adv_param_setup_t adv_param_setup) } /* Service Data UUID*/ - DBG("Service Data length [%d]", adv_param_setup.service_data_len); if (adv_param_setup.service_data_len > 0) { adv_data[index] = 1 + adv_param_setup.service_data_len; adv_data[index+1] = 0x16; /* Fixed */ @@ -825,10 +823,6 @@ int _bt_hal_set_advertising_data(btgatt_adv_param_setup_t adv_param_setup) temp = g_variant_new("ay", builder); g_variant_builder_unref(builder); - DBG("####Adv data length [%d] Index [%d]", length, index); - for (i = 0; i < length; i++) - DBG("##Data[%d] [0x%x]", i, adv_data[i]); - if (adv_param_setup.set_scan_rsp == 0) { /* Set Advertising data to stack */ ret = g_dbus_proxy_call_sync(proxy, "SetAdvertisingData", @@ -849,7 +843,10 @@ int _bt_hal_set_advertising_data(btgatt_adv_param_setup_t adv_param_setup) return BT_STATUS_FAIL; } - INFO("Set advertising data"); + for (i = 0; i < length; i++) + snprintf(&adv_data_str[i * 2], 3, "%02X", adv_data[i]); + INFO("Set adv data. Index [%d] length [%d] Data[%s]", index, length, adv_data_str); + if (ret) g_variant_unref(ret); diff --git a/bt-oal/bluez_hal/src/bt-hal-gatt-server.c b/bt-oal/bluez_hal/src/bt-hal-gatt-server.c index 90550f0..54de27a 100644 --- a/bt-oal/bluez_hal/src/bt-hal-gatt-server.c +++ b/bt-oal/bluez_hal/src/bt-hal-gatt-server.c @@ -1799,8 +1799,6 @@ static struct hal_gatts_server_register_info_t * bt_hal_gatts_find_server_regist static struct hal_gatts_server_register_info_t * bt_hal_gatts_find_server_register_info(int server_if) { - DBG("+"); - GSList *l; struct hal_gatts_server_register_info_t *info = NULL; @@ -1811,7 +1809,6 @@ static struct hal_gatts_server_register_info_t * bt_hal_gatts_find_server_regist } if (info->server_if == server_if) { - DBG("gatt server register found"); return info; } } @@ -1843,8 +1840,6 @@ static struct hal_gatts_server_register_info_t * bt_hal_gatts_find_server_regist static struct hal_gatts_server_register_info_t * bt_hal_gatts_add_server_app(bt_uuid_t *app_uuid) { - DBG("+"); - struct hal_gatts_server_register_info_t * server_register_info = NULL; server_register_info = bt_hal_gatts_find_server_register_info_from_uuid(app_uuid); @@ -1853,12 +1848,10 @@ static struct hal_gatts_server_register_info_t * bt_hal_gatts_add_server_app(bt_ return server_register_info; } - DBG("adding the gatt server app"); - server_register_info = g_malloc0(sizeof(struct hal_gatts_server_register_info_t)); server_register_info->server_if = bt_hal_gatts_generate_server_id(); - DBG("amit server_if:[%d]", server_register_info->server_if); + DBG("Adding the gatt server app. server_if:[%d]", server_register_info->server_if); server_register_info->adv_slot_id = -1; memcpy(&server_register_info->app_uuid, app_uuid, sizeof(bt_uuid_t)); @@ -3432,20 +3425,18 @@ static int bt_hal_gatts_allocate_adv_slot(struct hal_gatts_server_register_info_ { int adv_slot_id = -1; - DBG("gatt server:[%d], adv_slot:[%d]", server_register_info->server_if, server_register_info->adv_slot_id); - /* allocate adv slot for gatt server if not assigned */ if (server_register_info->adv_slot_id < 0 ) { adv_slot_id = _bt_hal_get_available_adv_slot_id(&server_register_info->app_uuid, FALSE); if (adv_slot_id < 0) { - DBG("failed to get the adv_slot \n"); + ERR("failed to get the adv_slot"); return -1; } server_register_info->adv_slot_id = adv_slot_id; } - DBG("gatt server is assigned with adv_slot [%d]", server_register_info->adv_slot_id); + DBG("gatt server:[%d] Assigned adv_slot [%d]", server_register_info->server_if, server_register_info->adv_slot_id); return 0; } @@ -3487,14 +3478,12 @@ void bt_hal_gatts_release_adv_slot(int server_if) server_register_info = bt_hal_gatts_find_server_register_info(server_if); if (server_register_info == NULL) { - DBG("failed to get server_register_info"); + ERR("failed to get server_register_info"); return; } - DBG("gatt server:[%d], adv_slot:[%d]", server_register_info->server_if, server_register_info->adv_slot_id); - if (server_register_info->adv_slot_id < 0) { - DBG("adv_slot is not allocated"); + ERR("adv_slot is not allocated"); return; } @@ -3543,18 +3532,18 @@ static bt_status_t gatt_server_multi_adv_enable(int server_if) server_register_info = bt_hal_gatts_find_server_register_info(server_if); if (server_register_info == NULL) { - DBG("gatt server is not registered"); + ERR("gatt server is not registered"); return BT_STATUS_FAIL; } DBG("gatt server:[%d], adv_slot:[%d]", server_register_info->server_if, server_register_info->adv_slot_id); if (server_register_info->adv_slot_id < 0 ) { - DBG("adv_slot is not assigned to server:[%d] \n", server_if); + DBG("adv_slot is not assigned to server:[%d]", server_if); ret = bt_hal_gatts_allocate_adv_slot(server_register_info); if (ret < 0) { - DBG("failed to get adv_slot"); + ERR("failed to get adv_slot"); return BT_STATUS_FAIL; } } @@ -3585,7 +3574,7 @@ static bt_status_t gatt_server_set_filter_policy(int filter_policy) static bt_status_t gatt_server_multi_adv_set_inst_data(btgatt_adv_param_setup_t adv_param_setup) { CHECK_BTGATT_INIT(); - DBG("+"); + /* Send Data to LE Module */ return _bt_hal_set_advertising_data(adv_param_setup); } diff --git a/bt-oal/oal-gatt.c b/bt-oal/oal-gatt.c index bf4a07b..761ad37 100644 --- a/bt-oal/oal-gatt.c +++ b/bt-oal/oal-gatt.c @@ -620,19 +620,8 @@ oal_status_t gatts_multi_adv_set_inst_data(int instance_id, adv_setup.timeout_s = adv_param_setup->timeout_s; adv_setup.server_if = gatt_servers[instance_id - 1].server_id; - if (adv_setup.manufacturer_data_len > 0 && adv_setup.manufacturer_data != NULL) { - BT_INFO("Manufacture data.....\n"); - PRINT_ADV_DATA(adv_setup.manufacturer_data_len, (unsigned char *)adv_setup.manufacturer_data, adv_setup.set_scan_rsp); - } - - if (adv_setup.service_uuid_len > 0 && adv_setup.service_uuid != NULL) { - BT_INFO("Service uuid.....\n"); - PRINT_ADV_DATA(adv_setup.service_uuid_len, (unsigned char*)adv_setup.service_uuid, FALSE); - } - ret = gatt_api->server->multi_adv_set_inst_data(adv_setup); - if (ret != BT_STATUS_SUCCESS) { BT_ERR("GATT Set Multi advertising data failed: %s", status2string(ret)); gatt_servers[instance_id - 1].state = GATT_INS_DISABLED; diff --git a/bt-service-adaptation/services/bt-request-handler.c b/bt-service-adaptation/services/bt-request-handler.c index df21be2..cdd32e6 100644 --- a/bt-service-adaptation/services/bt-request-handler.c +++ b/bt-service-adaptation/services/bt-request-handler.c @@ -2697,8 +2697,6 @@ int __bt_bluez_request(int function_name, int mtu = -1; bluetooth_gatt_client_char_prop_info_t param; - BT_INFO("GATT Client ACQUIRE WRITE recived"); - sender = (char*)g_dbus_method_invocation_get_sender(context); __bt_service_get_parameters(in_param1, ¶m, @@ -2710,9 +2708,9 @@ int __bt_bluez_request(int function_name, g_array_append_vals(*out_param1, &mtu, sizeof(int)); if (BLUETOOTH_ERROR_NONE == result) - BT_INFO("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd); + BT_DBG("GATT Client: Save Invocation data for characteristic props app[%s] fd[ %d]", sender, fd); else { - BT_ERR("Gatt Client Acqure Write"); + BT_ERR("GATT Client: gatt acquire write failed"); break; } @@ -2761,7 +2759,7 @@ int __bt_bluez_request(int function_name, _bt_save_invocation_context(context, result, sender, function_name, (gpointer)addr); } else { - BT_INFO("GATT Client: gatt connect failed"); + BT_ERR("GATT Client: gatt connect failed"); g_array_append_vals(*out_param1, &address, sizeof(bluetooth_device_address_t)); } @@ -3084,6 +3082,7 @@ normal: } case BT_SET_SCAN_PARAMETERS: { bluetooth_le_scan_params_t scan_params; + __bt_service_get_parameters(in_param1, &scan_params, sizeof(bluetooth_le_scan_params_t)); diff --git a/bt-service-adaptation/services/gatt/bt-service-gatt.c b/bt-service-adaptation/services/gatt/bt-service-gatt.c index 8bfdf8a..f2b577c 100644 --- a/bt-service-adaptation/services/gatt/bt-service-gatt.c +++ b/bt-service-adaptation/services/gatt/bt-service-gatt.c @@ -547,7 +547,7 @@ char * _bt_get_sender_and_handle(int server_instance, int *adv_handle) void _bt_set_new_adv_data(bluetooth_advertising_data_t *adv, int len, int instance) { int k; - BT_DBG("+"); + BT_DBG(""); bt_service_app_info_t *info = NULL; for (k = 1; k < MAX_APPS_SUPPORTED; k++) { info = &numapps[k]; @@ -557,13 +557,12 @@ void _bt_set_new_adv_data(bluetooth_advertising_data_t *adv, int len, int instan break; } } - BT_DBG("-"); } void _bt_set_new_scan_rsp_data(bluetooth_scan_resp_data_t *scan, int len, int instance) { int k; - BT_DBG("+"); + BT_DBG(""); bt_service_app_info_t *info = NULL; for (k = 1; k < MAX_APPS_SUPPORTED; k++) { info = &numapps[k]; @@ -573,13 +572,11 @@ void _bt_set_new_scan_rsp_data(bluetooth_scan_resp_data_t *scan, int len, int in break; } } - BT_DBG("-"); } void _bt_get_previous_adv_data(bluetooth_advertising_data_t *adv, int *len, int instance) { int k; - BT_DBG("+"); bt_service_app_info_t *info = NULL; for (k = 1; k < MAX_APPS_SUPPORTED; k++) { @@ -596,7 +593,7 @@ void _bt_get_previous_adv_data(bluetooth_advertising_data_t *adv, int *len, int void _bt_get_previous_scan_rsp_data(bluetooth_scan_resp_data_t *scan, int *len, int instance) { int k; - BT_DBG("+"); + BT_DBG(""); bt_service_app_info_t *info = NULL; for (k = 1; k < MAX_APPS_SUPPORTED; k++) { -- 2.7.4