X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-service%2Fbt-service-adapter-le.c;h=b27d208d515d7f7fc57efe38c785529b5712ea27;hb=9ea304b1ed16b230eec6bbdf9a5444ccd721133f;hp=5a8aeb31daad7d4ff7665b7e31e1b446fc820ef6;hpb=7bc42638e68108fa84929daeff1f457136c3898b;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-service/bt-service-adapter-le.c b/bt-service/bt-service-adapter-le.c index 5a8aeb3..b27d208 100644 --- a/bt-service/bt-service-adapter-le.c +++ b/bt-service/bt-service-adapter-le.c @@ -16,7 +16,6 @@ */ #include -#include #include #include #include @@ -400,7 +399,7 @@ int _bt_set_advertising(const char *sender, int adv_handle, gboolean enable, gbo __bt_register_adv_slot_owner(sender, adv_handle, slot_id); le_adv_slot[slot_id].is_advertising = enable; - BT_INFO("Set advertising [%d]", enable); + BT_INFO_C("### Set advertising [%d]", enable); if (ret) g_variant_unref(ret); @@ -467,7 +466,7 @@ int _bt_set_custom_advertising(const char *sender, int adv_handle, max = params->interval_max / BT_ADV_INTERVAL_SPLIT; ret = g_dbus_proxy_call_sync(proxy, "SetAdvertisingParameters", - g_variant_new("(uuuui)", min, max, + g_variant_new("(uuuui)", min, max, params->filter_policy, params->type, slot_id), G_DBUS_CALL_FLAGS_NONE, -1, NULL, &error); @@ -574,6 +573,9 @@ int _bt_hold_current_advertising(void) le_adv_slot[0].hold_timer_id = g_timeout_add(2000, __bt_hold_current_advertising_timeout_cb, NULL); + } else { + BT_ERR("It's NOT advertising"); + return BLUETOOTH_ERROR_NOT_IN_OPERATION; } return BLUETOOTH_ERROR_NONE; @@ -676,9 +678,8 @@ int _bt_set_advertising_data(const char *sender, int adv_handle, } builder = g_variant_builder_new(G_VARIANT_TYPE("ay")); - for (i = 0; i < length; i++) { + for (i = 0; i < length; i++) g_variant_builder_add(builder, "y", adv->data[i]); - } temp = g_variant_new("ay", builder); g_variant_builder_unref(builder); @@ -702,8 +703,8 @@ int _bt_set_advertising_data(const char *sender, int adv_handle, if (old_len != new_len || (old_mdata && new_mdata && memcmp(old_mdata, new_mdata, new_len))) { - ad_data = g_variant_new_from_data((const GVariantType *)"ay", - new_mdata, new_len, TRUE, NULL, NULL); + ad_data = g_variant_new_from_data((const GVariantType *)"ay", + new_mdata, new_len, TRUE, NULL, NULL); param = g_variant_new("(@ay)", ad_data); _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_ADVERTISING_MANUFACTURER_DATA_CHANGED, @@ -770,9 +771,8 @@ int _bt_set_scan_response_data(const char *sender, int adv_handle, return BLUETOOTH_ERROR_NO_RESOURCES; } builder = g_variant_builder_new(G_VARIANT_TYPE("ay")); - for (i = 0; i < length; i++) { + for (i = 0; i < length; i++) g_variant_builder_add(builder, "y", response->data[i]); - } temp = g_variant_new("ay", builder); g_variant_builder_unref(builder); @@ -798,7 +798,7 @@ int _bt_set_scan_response_data(const char *sender, int adv_handle, (old_mdata && new_mdata && memcmp(old_mdata, new_mdata, new_len))) { scan_data = g_variant_new_from_data((const GVariantType *)"ay", - new_mdata, new_len, TRUE, NULL, NULL); + new_mdata, new_len, TRUE, NULL, NULL); param = g_variant_new("(@ay)", scan_data); _bt_send_event(BT_ADAPTER_EVENT, BLUETOOTH_EVENT_SCAN_RESPONSE_MANUFACTURER_DATA_CHANGED, @@ -896,18 +896,13 @@ int __bt_get_available_scan_filter_slot_id(void) return -1; } slot_check_list = g_malloc0(sizeof(gboolean) * le_feature_info.max_filter); - if (slot_check_list == NULL) { - BT_ERR("Fail to allocate memory"); - return -1; - } for (l = scanner_list; l != NULL; l = g_slist_next(l)) { scanner = l->data; for (fl = scanner->filter_list; fl != NULL; fl = g_slist_next(fl)) { filter_data = fl->data; - if (filter_data->slot_id < le_feature_info.max_filter) { + if (filter_data->slot_id < le_feature_info.max_filter) slot_check_list[filter_data->slot_id] = TRUE; - } } } @@ -925,9 +920,8 @@ int __bt_get_available_scan_filter_slot_id(void) gboolean _bt_is_scan_filter_supported(void) { - if (le_feature_info.max_filter > 0) { + if (le_feature_info.max_filter > 0) return TRUE; - } return FALSE; } @@ -1043,9 +1037,9 @@ int _bt_register_scan_filter(const char *sender, bluetooth_le_scan_filter_t *fil g_array_append_vals(arr_uuid_mask, filter->service_uuid_mask.data.data, filter->service_uuid_mask.data_len * sizeof(guint8)); arr_uuid_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_uuid->data, arr_uuid->len, TRUE, NULL, NULL); + arr_uuid->data, arr_uuid->len, TRUE, NULL, NULL); arr_uuid_mask_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_uuid_mask->data, arr_uuid_mask->len, TRUE, NULL, NULL); + arr_uuid_mask->data, arr_uuid_mask->len, TRUE, NULL, NULL); arr_data_param = g_variant_new_from_data((const GVariantType *)"ay", NULL, 0, TRUE, NULL, NULL); arr_data_mask_param = g_variant_new_from_data((const GVariantType *)"ay", @@ -1092,9 +1086,9 @@ int _bt_register_scan_filter(const char *sender, bluetooth_le_scan_filter_t *fil g_array_append_vals(arr_uuid_mask, filter->service_solicitation_uuid_mask.data.data, filter->service_solicitation_uuid_mask.data_len * sizeof(guint8)); arr_uuid_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_uuid->data, arr_uuid->len, TRUE, NULL, NULL); + arr_uuid->data, arr_uuid->len, TRUE, NULL, NULL); arr_uuid_mask_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_uuid_mask->data, arr_uuid_mask->len, TRUE, NULL, NULL); + arr_uuid_mask->data, arr_uuid_mask->len, TRUE, NULL, NULL); arr_data_param = g_variant_new_from_data((const GVariantType *)"ay", NULL, 0, TRUE, NULL, NULL); arr_data_mask_param = g_variant_new_from_data((const GVariantType *)"ay", @@ -1143,9 +1137,9 @@ int _bt_register_scan_filter(const char *sender, bluetooth_le_scan_filter_t *fil arr_uuid_mask_param = g_variant_new_from_data((const GVariantType *)"ay", NULL, 0, TRUE, NULL, NULL); arr_data_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_data->data, arr_data->len, TRUE, NULL, NULL); + arr_data->data, arr_data->len, TRUE, NULL, NULL); arr_data_mask_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_data_mask->data, arr_data_mask->len, TRUE, NULL, NULL); + arr_data_mask->data, arr_data_mask->len, TRUE, NULL, NULL); param = g_variant_new("(iiiiii@ay@aysu@ay@ay)", 0, // client_if @@ -1190,9 +1184,9 @@ int _bt_register_scan_filter(const char *sender, bluetooth_le_scan_filter_t *fil arr_uuid_mask_param = g_variant_new_from_data((const GVariantType *)"ay", NULL, 0, TRUE, NULL, NULL); arr_data_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_data->data, arr_data->len, TRUE, NULL, NULL); + arr_data->data, arr_data->len, TRUE, NULL, NULL); arr_data_mask_param = g_variant_new_from_data((const GVariantType *)"ay", - arr_data_mask->data, arr_data_mask->len, TRUE, NULL, NULL); + arr_data_mask->data, arr_data_mask->len, TRUE, NULL, NULL); param = g_variant_new("(iiiiii@ay@aysu@ay@ay)", 0, // client_if @@ -1250,20 +1244,16 @@ int _bt_register_scan_filter(const char *sender, bluetooth_le_scan_filter_t *fil scanner = __bt_find_scanner_from_list(sender); if (scanner == NULL) { scanner = g_malloc0(sizeof(bt_adapter_le_scanner_t)); - if (scanner) { - scanner->sender = strdup(sender); - scanner_list = g_slist_append(scanner_list, scanner); - } + scanner->sender = strdup(sender); + scanner_list = g_slist_append(scanner_list, scanner); } filter_data = g_malloc0(sizeof(bluetooth_le_scan_filter_t)); - if (filter_data) { - memcpy(filter_data, filter, sizeof(bluetooth_le_scan_filter_t)); - filter_data->slot_id = *slot_id; + memcpy(filter_data, filter, sizeof(bluetooth_le_scan_filter_t)); + filter_data->slot_id = *slot_id; - if (scanner) - scanner->filter_list = g_slist_append(scanner->filter_list, filter_data); - } + if (scanner) + scanner->filter_list = g_slist_append(scanner->filter_list, filter_data); if (ret) g_variant_unref(ret); @@ -1365,15 +1355,8 @@ int _bt_start_le_scan(const char *sender) GVariant *ret; bt_adapter_le_scanner_t *scanner = __bt_find_scanner_from_list(sender); - /* Before finishing kernel merge, temperary return TRUE always for TCT issue */ -#ifdef USB_BLUETOOTH - return BLUETOOTH_ERROR_NONE; -#endif - if (scanner == NULL) { scanner = g_malloc0(sizeof(bt_adapter_le_scanner_t)); - retv_if(scanner == NULL, BLUETOOTH_ERROR_INTERNAL); - scanner->sender = strdup(sender); scanner_list = g_slist_append(scanner_list, scanner); } @@ -1465,11 +1448,6 @@ int _bt_stop_le_scan(const char *sender) gboolean next_scanning = FALSE; gboolean need_scan_filter = TRUE; -/* Before finishing kernel merge, temperary return TRUE always for TCT issue */ -#ifdef USB_BLUETOOTH - return BLUETOOTH_ERROR_NONE; -#endif - if (scanner == NULL || scanner->is_scanning == FALSE) return BLUETOOTH_ERROR_NOT_IN_OPERATION; @@ -2259,7 +2237,7 @@ int _bt_le_set_data_length(bluetooth_device_address_t *device_address, return BLUETOOTH_ERROR_INTERNAL; } - conn = _bt_get_system_gconn(); + conn = _bt_gdbus_get_system_gconn(); if (conn == NULL) { BT_ERR("conn == NULL"); g_free(device_path);