X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=bt-api%2Fbt-oob.c;h=462bfc2dc918299c86925da5b037adccb0d58d80;hb=62a00d2e3430ed504bc220bcfe67387dd0507e22;hp=cf831e12b8e20db72edb1db8ded993465b8809b0;hpb=39a6cbc0e0b202a9ec628daacc1cd4128912964d;p=platform%2Fcore%2Fconnectivity%2Fbluetooth-frwk.git diff --git a/bt-api/bt-oob.c b/bt-api/bt-oob.c index cf831e1..462bfc2 100644 --- a/bt-api/bt-oob.c +++ b/bt-api/bt-oob.c @@ -35,9 +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) { + 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); @@ -46,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; @@ -60,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); @@ -92,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; +} +