X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-adapter.c;h=418613f35392e71b827516b2d2c271885154fd9b;hb=1fa07edcd0e77a445700975773db3300f556caf5;hp=422dde5f901de72eb03f78c4b933f3eebc044c64;hpb=8a0b5bf9224860f122da83c59cb45a1303c16713;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-adapter.c b/bt-api/bt-adapter.c old mode 100755 new mode 100644 index 422dde5..418613f --- a/bt-api/bt-adapter.c +++ b/bt-api/bt-adapter.c @@ -1,11 +1,5 @@ /* - * Bluetooth-frwk - * - * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved. - * - * Contact: Hocheol Seo - * Girishashok Joshi - * Chanyeol Park + * Copyright (c) 2011 Samsung Electronics Co., Ltd All Rights Reserved * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,9 +16,6 @@ */ #include -#if !defined(LIBNOTIFY_SUPPORT) && !defined(LIBNOTIFICATION_SUPPORT) -#include -#endif #include "bluetooth-api.h" #include "bt-internal-types.h" @@ -37,7 +28,7 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list) { int i; guint size; - bluetooth_device_info_t info; + bluetooth_device_info_t *info; BT_CHECK_PARAMETER(out_param2, return); BT_CHECK_PARAMETER(dev_list, return); @@ -54,14 +45,13 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list) for (i = 0; i < size; i++) { bluetooth_device_info_t *dev_info = NULL; - info = g_array_index(out_param2, + info = &g_array_index(out_param2, bluetooth_device_info_t, i); - dev_info = g_memdup(&info, sizeof(bluetooth_device_info_t)); + dev_info = g_memdup(info, sizeof(bluetooth_device_info_t)); - if (dev_info) { + if (dev_info) g_ptr_array_add(*dev_list, (gpointer)dev_info); - } } return BLUETOOTH_ERROR_NONE; @@ -69,24 +59,23 @@ static int __bt_fill_device_list(GArray *out_param2, GPtrArray **dev_list) BT_EXPORT_API int bluetooth_check_adapter(void) { + int value = VCONFKEY_BT_STATUS_OFF; + +#ifndef TIZEN_TEST_EMUL int ret; - int value; - ret = _bt_get_adapter_path(_bt_gdbus_get_system_gconn(), NULL); + ret = _bt_get_adapter_path(_bt_get_system_private_conn(), NULL); - if (ret != BLUETOOTH_ERROR_NONE) { - BT_ERR("error in get adapter "); + if (ret != BLUETOOTH_ERROR_NONE) return BLUETOOTH_ADAPTER_DISABLED; - } +#endif /* check VCONFKEY_BT_STATUS */ if (vconf_get_int(VCONFKEY_BT_STATUS, &value) != 0) { - BT_ERR("fail to get vconf key! return disabled"); + BT_ERR("fail to get vconf key!"); return BLUETOOTH_ADAPTER_DISABLED; } - BT_ERR("get status from vconf key \n"); - return value == VCONFKEY_BT_STATUS_OFF ? BLUETOOTH_ADAPTER_DISABLED : BLUETOOTH_ADAPTER_ENABLED; } @@ -95,10 +84,16 @@ BT_EXPORT_API int bluetooth_enable_adapter(void) { int result; - BT_INFO(""); + BT_INFO_C("### Enable adapter"); + _bt_print_api_caller_name(); retv_if(bluetooth_check_adapter() == BLUETOOTH_ADAPTER_ENABLED, BLUETOOTH_ERROR_DEVICE_ALREADY_ENABLED); +#ifdef TIZEN_FEATURE_BT_DPM + retv_if(bluetooth_dpm_is_mode_allowed() == BLUETOOTH_ERROR_PERMISSION_DEINED, + BLUETOOTH_ERROR_PERMISSION_DEINED); +#endif + BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -114,8 +109,8 @@ BT_EXPORT_API int bluetooth_disable_adapter(void) { int result; - BT_INFO(""); - + BT_INFO_C("### Disable adapter"); + _bt_print_api_caller_name(); BT_CHECK_ENABLED(return); BT_INIT_PARAMS(); @@ -133,7 +128,7 @@ BT_EXPORT_API int bluetooth_recover_adapter(void) { int result; - BT_INFO(""); + BT_INFO_C("### Recover adapter"); BT_CHECK_ENABLED(return); BT_INIT_PARAMS(); @@ -168,6 +163,7 @@ BT_EXPORT_API int bluetooth_get_local_address(bluetooth_device_address_t *local_ int result; BT_CHECK_PARAMETER(local_address, return); + BT_CHECK_ENABLED_ANY(return); BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -198,9 +194,8 @@ BT_EXPORT_API int bluetooth_get_local_version(bluetooth_version_t *local_version 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) { + 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); @@ -212,6 +207,7 @@ 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_ANY(return); BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -268,9 +264,8 @@ BT_EXPORT_API int bluetooth_is_service_used(const char *service_uuid, result = _bt_send_request(BT_BLUEZ_SERVICE, BT_IS_SERVICE_USED, in_param1, in_param2, in_param3, in_param4, &out_param); - if (result == BLUETOOTH_ERROR_NONE) { + if (result == BLUETOOTH_ERROR_NONE) *used = g_array_index(out_param, gboolean, 0); - } BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -284,16 +279,34 @@ BT_EXPORT_API int bluetooth_get_discoverable_mode(bluetooth_discoverable_mode_t BT_CHECK_PARAMETER(discoverable_mode_ptr, return); + if (!TIZEN_PROFILE_WEARABLE) { + int timeout = 0; + /* 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_DEVICE_NOT_ENABLED; + } + + if (timeout == -1) + *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_GENERAL_DISCOVERABLE; + else + *discoverable_mode_ptr = BLUETOOTH_DISCOVERABLE_MODE_CONNECTABLE; + + return BLUETOOTH_ERROR_NONE; + } + } else { + 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_GET_DISCOVERABLE_MODE, in_param1, in_param2, in_param3, in_param4, &out_param); - if (result == BLUETOOTH_ERROR_NONE) { - *discoverable_mode_ptr = g_array_index(out_param, - int, 0); - } + if (result == BLUETOOTH_ERROR_NONE) + *discoverable_mode_ptr = g_array_index(out_param, int, 0); BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -334,9 +347,8 @@ BT_EXPORT_API int bluetooth_get_timeout_value(int *timeout) result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GET_DISCOVERABLE_TIME, in_param1, in_param2, in_param3, in_param4, &out_param); - if (result == BLUETOOTH_ERROR_NONE) { + if (result == BLUETOOTH_ERROR_NONE) *timeout = g_array_index(out_param, int, 0); - } BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -354,6 +366,10 @@ BT_EXPORT_API int bluetooth_start_discovery(unsigned short max_response, BT_INIT_PARAMS(); BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + g_array_append_vals(in_param1, &max_response, sizeof(unsigned short)); + g_array_append_vals(in_param2, &discovery_duration, sizeof(unsigned short)); + g_array_append_vals(in_param3, &classOfDeviceMask, sizeof(unsigned int)); + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_START_DISCOVERY, in_param1, in_param2, in_param3, in_param4, &out_param); @@ -422,6 +438,7 @@ BT_EXPORT_API int bluetooth_is_discovering(void) int, 0); } else { BT_ERR("Fail to send request"); + is_discovering = result; } BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -441,11 +458,10 @@ BT_EXPORT_API int bluetooth_is_connectable(gboolean *is_connectable) 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) { + if (result == BLUETOOTH_ERROR_NONE) *is_connectable = g_array_index(out_param, int, 0); - } else { + else BT_ERR("Fail to send request"); - } BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); @@ -492,6 +508,59 @@ BT_EXPORT_API int bluetooth_get_bonded_device_list(GPtrArray **dev_list) return result; } +BT_EXPORT_API int bluetooth_get_profile_connected_device_list( + const char *profile_uuid, GPtrArray **addr_list) +{ + char uuid[BLUETOOTH_UUID_STRING_MAX]; + int result; + guint size; + int i; + + BT_CHECK_PARAMETER(profile_uuid, return); + BT_CHECK_PARAMETER(addr_list, return); + BT_CHECK_ENABLED(return); + + BT_INIT_PARAMS(); + BT_ALLOC_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param); + + g_strlcpy(uuid, profile_uuid, sizeof(uuid)); + g_array_append_vals(in_param1, uuid, BLUETOOTH_UUID_STRING_MAX); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_GET_PROFILE_CONNECTED_DEVICES, + in_param1, in_param2, in_param3, in_param4, &out_param); + + if (result == BLUETOOTH_ERROR_NONE) { + if (out_param == NULL) { + BT_ERR("out_param is NULL"); + result = BLUETOOTH_ERROR_INTERNAL; + } else { + size = (out_param->len) / sizeof(bluetooth_device_address_t); + + if (size == 0) { + BT_ERR("No connected device"); + result = BLUETOOTH_ERROR_NOT_CONNECTED; + } + + for (i = 0; i < size; i++) { + bluetooth_device_address_t *addr = NULL; + bluetooth_device_address_t *ptr = NULL; + + ptr = &g_array_index(out_param, + bluetooth_device_address_t, i); + + addr = g_memdup(ptr, sizeof(bluetooth_device_address_t)); + + if (addr) + g_ptr_array_add(*addr_list, (gpointer)addr); + } + } + } + + 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; @@ -514,3 +583,23 @@ BT_EXPORT_API int bluetooth_set_manufacturer_data(const bluetooth_manufacturer_d return result; } + +BT_EXPORT_API int bluetooth_set_passkey_notification(gboolean enable) +{ + 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, &enable, sizeof(gboolean)); + + result = _bt_send_request(BT_BLUEZ_SERVICE, BT_SET_PASSKEY_NOTIFICATION, + 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; +} +