X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=bt-api%2Fbt-adapter.c;h=422dde5f901de72eb03f78c4b933f3eebc044c64;hb=8a0b5bf9224860f122da83c59cb45a1303c16713;hp=68441c0db0ff86575fc54a6adeffa91f59778dfc;hpb=12ceaf09c6ccc9578f8235951d22b4fea1a52cd1;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-adapter.c b/bt-api/bt-adapter.c old mode 100644 new mode 100755 index 68441c0..422dde5 --- a/bt-api/bt-adapter.c +++ b/bt-api/bt-adapter.c @@ -1,13 +1,17 @@ /* - * bluetooth-frwk + * Bluetooth-frwk * - * Copyright (c) 2012-2013 Samsung Electronics Co., Ltd. + * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. + * + * Contact: Hocheol Seo + * Girishashok Joshi + * Chanyeol Park * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -17,9 +21,8 @@ * */ - #include -#ifndef LIBNOTIFY_SUPPORT +#if !defined(LIBNOTIFY_SUPPORT) && !defined(LIBNOTIFICATION_SUPPORT) #include #endif @@ -40,7 +43,11 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list) BT_CHECK_PARAMETER(dev_list, return); size = out_param2->len; - retv_if(size == 0, BLUETOOTH_ERROR_NONE); + + if (size == 0) { + BT_ERR("No bonded device"); + return BLUETOOTH_ERROR_NONE; + } size = (out_param2->len) / sizeof(bluetooth_device_info_t); @@ -63,23 +70,38 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list) BT_EXPORT_API int bluetooth_check_adapter(void) { int ret; + int value; + + ret = _bt_get_adapter_path(_bt_gdbus_get_system_gconn(), NULL); + + if (ret != BLUETOOTH_ERROR_NONE) { + BT_ERR("error in get adapter "); + return BLUETOOTH_ADAPTER_DISABLED; + } - ret = _bt_get_adapter_path(_bt_get_system_gconn(), NULL); + /* check VCONFKEY_BT_STATUS */ + if (vconf_get_int(VCONFKEY_BT_STATUS, &value) != 0) { + BT_ERR("fail to get vconf key! return disabled"); + return BLUETOOTH_ADAPTER_DISABLED; + } + + BT_ERR("get status from vconf key \n"); - return ret == BLUETOOTH_ERROR_NONE ? BLUETOOTH_ADAPTER_ENABLED : - BLUETOOTH_ADAPTER_DISABLED; + return value == VCONFKEY_BT_STATUS_OFF ? BLUETOOTH_ADAPTER_DISABLED : + BLUETOOTH_ADAPTER_ENABLED; } BT_EXPORT_API int bluetooth_enable_adapter(void) { int result; - BT_INIT_PARAMS(); - BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); - + BT_INFO(""); retv_if(bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED, BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED); + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_ENABLE_ADAPTER, in_param1, in_param2, in_param3, in_param4, &out_param); @@ -92,6 +114,8 @@ BT_EXPORT_API int bluetooth_disable_adapter(void) { int result; + BT_INFO(""); + BT_CHECK_ENABLED(return); BT_INIT_PARAMS(); @@ -105,10 +129,29 @@ BT_EXPORT_API int bluetooth_disable_adapter(void) return result; } +BT_EXPORT_API int bluetooth_recover_adapter(void) +{ + int result; + + BT_INFO(""); + BT_CHECK_ENABLED(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_RECOVER_ADAPTER, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + return result; +} + BT_EXPORT_API int bluetooth_reset_adapter(void) { int result; + BT_INFO(""); BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -125,7 +168,6 @@ BT_EXPORT_API int bluetooth_get_local_address(bluetooth_device_address_t *local_ int result; BT_CHECK_PARAMETER(local_address, return); - BT_CHECK_ENABLED(return); BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -143,12 +185,33 @@ BT_EXPORT_API int bluetooth_get_local_address(bluetooth_device_address_t *local_ return result; } +BT_EXPORT_API int bluetooth_get_local_version(bluetooth_version_t *local_version) +{ + int result; + + BT_CHECK_PARAMETER(local_version, return); + BT_CHECK_ENABLED_ANY(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GET_LOCAL_VERSION, + in_param1, in_param2, in_param3, in_param4, &out_param); + + if (result == BLUETOOTH_ERROR_NONE) { + *local_version = g_array_index(out_param, bluetooth_version_t, 0); + } + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + return result; +} + BT_EXPORT_API int bluetooth_get_local_name(bluetooth_device_name_t *local_name) { int result; BT_CHECK_PARAMETER(local_name, return); - BT_CHECK_ENABLED(return); BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -171,7 +234,7 @@ BT_EXPORT_API int bluetooth_set_local_name(const bluetooth_device_name_t *local_ int result; BT_CHECK_PARAMETER(local_name, return); - BT_CHECK_ENABLED(return); + BT_CHECK_ENABLED_ANY(return); BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -218,26 +281,9 @@ BT_EXPORT_API int bluetooth_get_discoverable_mode(bluetooth_discoverable_mode_t discoverable_mode_ptr) { int result; - int timeout = 0; BT_CHECK_PARAMETER(discoverable_mode_ptr, return); - /* Requirement in OSP */ - if (bluetooth_check_adapter() == BLUETOOTH_ADAPTER_DISABLED) { - if (vconf_get_int(BT_FILE_VISIBLE_TIME, &timeout) != 0) { - BT_ERR("Fail to get the timeout value"); - return BLUETOOTH_ERROR_INTERNAL; - } - - if (timeout == -1) { - *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE; - } else { - *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE; - } - - return BLUETOOTH_ERROR_NONE; - } - BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -316,6 +362,30 @@ BT_EXPORT_API int bluetooth_start_discovery(unsigned short max_response, return result; } +BT_EXPORT_API int bluetooth_start_custom_discovery(bt_discovery_role_type_t role, + unsigned short max_response, + unsigned short discovery_duration, + unsigned int classOfDeviceMask) +{ + int result; + + if (role == DISCOVERY_ROLE_LE) + BT_CHECK_ENABLED_LE(return); + else + BT_CHECK_ENABLED(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_array_append_vals(in_param1, &role, sizeof(bt_discovery_role_type_t)); + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_START_CUSTOM_DISCOVERY, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + return result; +} + BT_EXPORT_API int bluetooth_cancel_discovery(void) { int result; @@ -359,6 +429,48 @@ BT_EXPORT_API int bluetooth_is_discovering(void) return is_discovering; } +BT_EXPORT_API int bluetooth_is_connectable(gboolean *is_connectable) +{ + int result; + + BT_CHECK_ENABLED_ANY(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_IS_CONNECTABLE, + in_param1, in_param2, in_param3, in_param4, &out_param); + + if (result == BLUETOOTH_ERROR_NONE) { + *is_connectable = g_array_index(out_param, int, 0); + } else { + BT_ERR("Fail to send request"); + } + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + return result; +} + +BT_EXPORT_API int bluetooth_set_connectable(gboolean is_connectable) +{ + int result; + + BT_CHECK_ENABLED_ANY(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_array_append_vals(in_param1, &is_connectable, sizeof(gboolean)); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_SET_CONNECTABLE, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + return result; +} + BT_EXPORT_API int bluetooth_get_bonded_device_list(GPtrArray **dev_list) { int result; @@ -372,12 +484,33 @@ BT_EXPORT_API int bluetooth_get_bonded_device_list(GPtrArray **dev_list) result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GET_BONDED_DEVICES, in_param1, in_param2, in_param3, in_param4, &out_param); - if (result == BLUETOOTH_ERROR_NONE) { + if (result == BLUETOOTH_ERROR_NONE) result = __bt_fill_device_list(out_param, dev_list); - } BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); return result; } +BT_EXPORT_API int bluetooth_set_manufacturer_data(const bluetooth_manufacturer_data_t *value) +{ + int result; + + BT_CHECK_PARAMETER(value, return); + BT_CHECK_ENABLED_ANY(return); + + if (value->data_len > BLUETOOTH_MANUFACTURER_DATA_LENGTH_MAX) + return BLUETOOTH_ERROR_INVALID_PARAM; + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_array_append_vals(in_param1, value, sizeof(bluetooth_manufacturer_data_t)); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_SET_MANUFACTURER_DATA, + in_param1, in_param2, in_param3, in_param4, &out_param); + + BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + return result; +}