Use shared connection instead of private connection

[platform/core/connectivity/bluetooth-frwk.git] / bt-api / bt-oob.c

diff --git a/bt-api/bt-oob.c b/bt-api/bt-oob.c
index 9f618c7..462bfc2 100644 (file)
--- a/bt-api/bt-oob.c
+++ b/bt-api/bt-oob.c
@@ -1,11 +1,5 @@
 /*
- * Bluetooth-frwk
- *
- * Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Contact:  Hocheol Seo <hocheol.seo@samsung.com>
- *              Girishashok Joshi <girish.joshi@samsung.com>
- *              Chanyeol Park <chanyeol.park@samsung.com>
+ * 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.
@@ -41,10 +35,8 @@ BT_EXPORT_API int bluetooth_oob_read_local_data(bt_oob_data_t *local_oob_data)
        result = _bt_send_request(BT_BLUEZ_SERVICE, BT_OOB_READ_LOCAL_DATA,
                in_param1, in_param2, in_param3, in_param4, &out_param);
 
-       if (result == BLUETOOTH_ERROR_NONE) {
-               *local_oob_data = g_array_index(out_param,
-                       bt_oob_data_t, 0);
-       }
+       if (result == BLUETOOTH_ERROR_NONE)
+               *local_oob_data = g_array_index(out_param, bt_oob_data_t, 0);
 
        BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
 
@@ -53,6 +45,7 @@ BT_EXPORT_API int bluetooth_oob_read_local_data(bt_oob_data_t *local_oob_data)
 
 BT_EXPORT_API int bluetooth_oob_add_remote_data(
                        const bluetooth_device_address_t *remote_device_address,
+                       bluetooth_bdaddr_type_e address_type,
                        bt_oob_data_t *remote_oob_data)
 {
        int result;
@@ -67,7 +60,9 @@ BT_EXPORT_API int bluetooth_oob_add_remote_data(
        g_array_append_vals(in_param1, remote_device_address,
                                sizeof(bluetooth_device_address_t));
 
-       g_array_append_vals(in_param2, remote_oob_data, sizeof(bt_oob_data_t));
+       g_array_append_vals(in_param2, &address_type, sizeof(unsigned short));
+
+       g_array_append_vals(in_param3, remote_oob_data, sizeof(bt_oob_data_t));
 
        result = _bt_send_request(BT_BLUEZ_SERVICE, BT_OOB_ADD_REMOTE_DATA,
                in_param1, in_param2, in_param3, in_param4, &out_param);
@@ -99,3 +94,53 @@ BT_EXPORT_API int bluetooth_oob_remove_remote_data(
        return result;
 }
 
+BT_EXPORT_API int bluetooth_le_oob_read_local_data(bt_oob_data_t *local_oob_data)
+{
+       int result;
+
+       BT_CHECK_PARAMETER(local_oob_data, return);
+       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_LE_OOB_READ_LOCAL_DATA,
+               in_param1, in_param2, in_param3, in_param4, &out_param);
+
+       if (result == BLUETOOTH_ERROR_NONE)
+               *local_oob_data = g_array_index(out_param, bt_oob_data_t, 0);
+
+       BT_FREE_PARAMS(in_param1, in_param2, in_param3, in_param4, out_param);
+
+       return result;
+}
+
+BT_EXPORT_API int bluetooth_le_oob_add_remote_data(
+                       const bluetooth_device_address_t *remote_device_address,
+                       bluetooth_bdaddr_type_e address_type,
+                       bt_oob_data_t *remote_oob_data)
+{
+       int result;
+
+       BT_CHECK_PARAMETER(remote_device_address, return);
+       BT_CHECK_PARAMETER(remote_oob_data, return);
+       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, remote_device_address,
+                               sizeof(bluetooth_device_address_t));
+
+       g_array_append_vals(in_param2, &address_type, sizeof(unsigned short));
+
+       g_array_append_vals(in_param3, remote_oob_data, sizeof(bt_oob_data_t));
+
+       result = _bt_send_request(BT_BLUEZ_SERVICE, BT_LE_OOB_ADD_REMOTE_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;
+}
+