diff options
author | DoHyun Pyun <dh79.pyun@samsung.com> | 2016-06-29 21:55:15 +0900 |
---|---|---|
committer | DoHyun Pyun <dh79.pyun@samsung.com> | 2016-06-29 21:55:21 +0900 |
commit | 57933b7e3b3eb6cf11323d745a8b19947495cd75 (patch) | |
tree | cdd17c1ae489b911e9f557833c11c63f5d6601e2 | |
parent | 06ca04d3b5827d12adc8fd89d9573175cfca7af2 (diff) | |
download | bluetooth-57933b7e3b3eb6cf11323d745a8b19947495cd75.tar.gz bluetooth-57933b7e3b3eb6cf11323d745a8b19947495cd75.tar.bz2 bluetooth-57933b7e3b3eb6cf11323d745a8b19947495cd75.zip |
Revert "Move passkey reply APIs to internal header"submit/tizen/20160629.092010accepted/tizen/wearable/20160630.003458accepted/tizen/tv/20160630.003419accepted/tizen/mobile/20160630.003440accepted/tizen/ivi/20160630.003514accepted/tizen/common/20160703.130107
This reverts commit 06ca04d3b5827d12adc8fd89d9573175cfca7af2.
Change-Id: If4563eb7ccbaf5461a63596a23e1a0a9acda7737
-rw-r--r-- | include/bluetooth_private.h | 27 | ||||
-rw-r--r-- | include/mobile/bluetooth_internal.h | 27 | ||||
-rw-r--r-- | include/tv/bluetooth_internal.h | 27 | ||||
-rw-r--r-- | include/wearable/bluetooth_internal.h | 27 |
4 files changed, 27 insertions, 81 deletions
diff --git a/include/bluetooth_private.h b/include/bluetooth_private.h index f0acbdf..1407f6c 100644 --- a/include/bluetooth_private.h +++ b/include/bluetooth_private.h @@ -674,6 +674,33 @@ int bt_adapter_set_authentication_req_cb(bt_adapter_authentication_req_cb callba */ int bt_adapter_unset_authentication_req_cb(void); +/** + * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE + * @brief API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE. + * @remarks This function can be called by application when remote device requests PIN or PASSKEY from + * local adapter. + * @param[in] passkey The passkey to be provided by application when remote devices requests for it. + * @param[in] authentication_reply This indicates whether application wants to accept or cancel the on-going pairing + * @pre This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST) + * from remote device. + * @see bt_adapter_set_authentication_req_cb() + */ +int bt_passkey_reply(char *passkey, bool authentication_reply); + +/** + * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE + * @brief API to reply to the PASSKEY confirmation for on-going pairing with remote device. + * @remarks This function can be called by application, when local adapter wants PASSKEY confirmation from user. + * @param[in] confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing + * confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY + * confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation + * the pairing will be failed. + * @pre This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST) + * from remote device. + * @see bt_adapter_set_authentication_req_cb() + */ +int bt_passkey_confirmation_reply(bool confirmation_reply); + #ifdef __cplusplus } #endif diff --git a/include/mobile/bluetooth_internal.h b/include/mobile/bluetooth_internal.h index f2311f4..2fd346b 100644 --- a/include/mobile/bluetooth_internal.h +++ b/include/mobile/bluetooth_internal.h @@ -3018,33 +3018,6 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value); int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value); /** - * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE - * @brief API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE. - * @remarks This function can be called by application when remote device requests PIN or PASSKEY from - * local adapter. - * @param[in] passkey The passkey to be provided by application when remote devices requests for it. - * @param[in] authentication_reply This indicates whether application wants to accept or cancel the on-going pairing - * @pre This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST) - * from remote device. - * @see bt_adapter_set_authentication_req_cb() - */ -int bt_passkey_reply(char *passkey, bool authentication_reply); - -/** - * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE - * @brief API to reply to the PASSKEY confirmation for on-going pairing with remote device. - * @remarks This function can be called by application, when local adapter wants PASSKEY confirmation from user. - * @param[in] confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing - * confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY - * confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation - * the pairing will be failed. - * @pre This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST) - * from remote device. - * @see bt_adapter_set_authentication_req_cb() - */ -int bt_passkey_confirmation_reply(bool confirmation_reply); - -/** * @} */ diff --git a/include/tv/bluetooth_internal.h b/include/tv/bluetooth_internal.h index 283ebb7..ce3ba68 100644 --- a/include/tv/bluetooth_internal.h +++ b/include/tv/bluetooth_internal.h @@ -3019,33 +3019,6 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value); int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value); /** - * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE - * @brief API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE. - * @remarks This function can be called by application when remote device requests PIN or PASSKEY from - * local adapter. - * @param[in] passkey The passkey to be provided by application when remote devices requests for it. - * @param[in] authentication_reply This indicates whether application wants to accept or cancel the on-going pairing - * @pre This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST) - * from remote device. - * @see bt_adapter_set_authentication_req_cb() - */ -int bt_passkey_reply(char *passkey, bool authentication_reply); - -/** - * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE - * @brief API to reply to the PASSKEY confirmation for on-going pairing with remote device. - * @remarks This function can be called by application, when local adapter wants PASSKEY confirmation from user. - * @param[in] confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing - * confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY - * confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation - * the pairing will be failed. - * @pre This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST) - * from remote device. - * @see bt_adapter_set_authentication_req_cb() - */ -int bt_passkey_confirmation_reply(bool confirmation_reply); - -/** * @} */ diff --git a/include/wearable/bluetooth_internal.h b/include/wearable/bluetooth_internal.h index da17c82..72d23a3 100644 --- a/include/wearable/bluetooth_internal.h +++ b/include/wearable/bluetooth_internal.h @@ -3166,33 +3166,6 @@ int bt_dpm_set_data_transfer_state(bt_dpm_status_e value); int bt_dpm_get_data_transfer_state(bt_dpm_status_e *value); /** - * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE - * @brief API to reply with PIN or PASSKEY with authentication type - TRUE or FALSE. - * @remarks This function can be called by application when remote device requests PIN or PASSKEY from - * local adapter. - * @param[in] passkey The passkey to be provided by application when remote devices requests for it. - * @param[in] authentication_reply This indicates whether application wants to accept or cancel the on-going pairing - * @pre This function can only be called when application receieves authentication event (BT_AUTH_PIN_REQUEST) - * from remote device. - * @see bt_adapter_set_authentication_req_cb() - */ -int bt_passkey_reply(char *passkey, bool authentication_reply); - -/** - * @ingroup CAPI_NETWORK_BLUETOOTH_DEVICE_MODULE - * @brief API to reply to the PASSKEY confirmation for on-going pairing with remote device. - * @remarks This function can be called by application, when local adapter wants PASSKEY confirmation from user. - * @param[in] confirmation_reply This indicates whether application wants to accepts or cancels the on-going pairing - * confirmation_reply : TRUE will indicate that Application has confirmed the PASSKEY - * confirmation_reply : FALSE will indicate that Application has failed to confirm the PASSKEY. In this situation - * the pairing will be failed. - * @pre This function can only be called when application receives authentication event (BT_AUTH_PASSKEY_CONFIRM_REQUEST) - * from remote device. - * @see bt_adapter_set_authentication_req_cb() - */ -int bt_passkey_confirmation_reply(bool confirmation_reply); - -/** * @} */ |