Move some extension CAPIs to wifi-manager.h

Change-Id: Iad635537cf3eeac58180003cf082ae92d3d23b20
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/include/wifi-manager-extension.h b/include/wifi-manager-extension.h
index 71115b0..737c6e4 100644 (file)
--- a/include/wifi-manager-extension.h
+++ b/include/wifi-manager-extension.h
@@ -296,20 +296,6 @@ int wifi_manager_get_autoscan_mode(wifi_manager_h wifi,
                wifi_manager_autoscan_mode_e *mode);
 
 /**
- * @brief Flush BSS
- * @since_tizen 4.0
- *
- * @param[in] wifi           The Wi-Fi handle
- *
- * @return 0 on success, otherwise negative error value.
- * @retval #WIFI_MANAGER_ERROR_NONE  Successful
- * @retval #WIFI_MANAGER_ERROR_INVALID_PARAMETER    Invalid parameter
- * @retval #WIFI_MANAGER_ERROR_INVALID_OPERATION    Invalid operation
- * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
- */
-int wifi_manager_flush_bss(wifi_manager_h wifi);
-
-/**
 * @brief Set BSSID to connman to be connected
 * @since_tizen 5.0
 * @param[in] wifi               The Wi-Fi handle
@@ -810,40 +796,6 @@ int wifi_manager_set_roaming_cb(wifi_manager_h wifi,
 int wifi_manager_unset_roaming_cb(wifi_manager_h wifi);
 
 /**
- * @brief Checks available security types of the AP.
- * @details An AP may support several types of security modes together.
- * You can check all supported security modes with this API.
- * @since_tizen 7.0
- *
- * @param[in] ap             The access point handle
- * @param[in] type           Wi-Fi security type
- * @param[out] supported     true when enabled and false when disabled
- *
- * @return 0 on success, otherwise negative error value
- * @retval #WIFI_MANAGER_ERROR_NONE                 Successful
-  * @retval #WIFI_MANAGER_ERROR_INVALID_PARAMETER    Invalid parameter
-  * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
- * @pre This API needs wifi_manager_initialize() and wifi_manager_activate() before use.
- */
-int wifi_manager_ap_is_security_type_supported(wifi_manager_ap_h ap,
-                                       wifi_manager_security_type_e type, bool *supported);
-
-/**
- * @brief Checks whether Protected Management Frame is required.
- * @since_tizen 7.0
- *
- * @param[in] ap             The access point handle
- * @param[out] required      true when required and false when not required
- *
- * @return 0 on success, otherwise negative error value
- * @retval #WIFI_MANAGER_ERROR_NONE                 Successful
- * @retval #WIFI_MANAGER_ERROR_INVALID_PARAMETER    Invalid parameter
- * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
- * @pre This API needs wifi_manager_initialize() and wifi_manager_activate() before use.
- */
-int wifi_manager_ap_is_pmf_required(wifi_manager_ap_h ap, bool *required);
-
-/**
  * @}
  */
 

diff --git a/include/wifi-manager.h b/include/wifi-manager.h
index ed6159a..4ab34ca 100644 (file)
--- a/include/wifi-manager.h
+++ b/include/wifi-manager.h
@@ -1457,6 +1457,24 @@ int wifi_manager_specific_ap_start_multi_scan(wifi_manager_h wifi,
                wifi_manager_scan_finished_cb callback, void *user_data);
 
 /**
+ * @brief Flushes BSS entries from the cache.
+ * @since_tizen 7.0
+ * @privlevel public
+ * @privilege %http://tizen.org/privilege/network.set \n
+ *            %http://tizen.org/privilege/network.get
+ * @remarks This function needs both privileges.
+ * @param[in] wifi           The Wi-Fi handle
+ * @return 0 on success, otherwise negative error value.
+ * @retval #WIFI_MANAGER_ERROR_NONE  Successful
+ * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
+ * @retval #WIFI_MANAGER_ERROR_PERMISSION_DENIED    Permission Denied
+ * @retval #WIFI_MANAGER_ERROR_INVALID_PARAMETER    Invalid parameter
+ * @retval #WIFI_MANAGER_ERROR_NOT_INITIALIZED      Not initialized
+ * @retval #WIFI_MANAGER_ERROR_INVALID_OPERATION    Invalid operation
+ */
+int wifi_manager_flush_bss(wifi_manager_h wifi);
+
+/**
  * @brief Connects to the hidden AP, asynchronously.
  * @since_tizen 4.0
  * @privlevel public
@@ -2984,6 +3002,22 @@ int wifi_manager_foreach_found_bssid(wifi_manager_ap_h ap, wifi_manager_found_bs
 int wifi_manager_ap_get_security_type(wifi_manager_ap_h ap, wifi_manager_security_type_e *type);
 
 /**
+ * @brief Checks whether a given security type is available in a given AP..
+ * @details An AP may support several types of security modes together.
+ * You can check all supported security modes with this function.
+ * @since_tizen 7.0
+ * @param[in] ap             The access point handle
+ * @param[in] type           Wi-Fi security type
+ * @param[out] supported     true when enabled and false when disabled
+ * @return 0 on success, otherwise negative error value
+ * @retval #WIFI_MANAGER_ERROR_NONE                 Successful
+ * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
+ * @retval #WIFI_MANAGER_ERROR_INVALID_PARAMETER    Invalid parameter
+ */
+int wifi_manager_ap_is_security_type_supported(wifi_manager_ap_h ap,
+                                       wifi_manager_security_type_e type, bool *supported);
+
+/**
  * @brief Sets the Wi-Fi security mode.
  * @since_tizen 3.0
  * @param[in] ap                The access point handle
@@ -3073,6 +3107,17 @@ int wifi_manager_ap_set_passphrase(wifi_manager_ap_h ap, const char *passphrase)
 int wifi_manager_ap_is_wps_supported(wifi_manager_ap_h ap, bool *supported);
 
 /**
+ * @brief Checks whether Protected Management Frame is required.
+ * @since_tizen 7.0
+ * @param[in] ap             The access point handle
+ * @param[out] required      true when required and false when not required
+ * @return 0 on success, otherwise negative error value
+ * @retval #WIFI_MANAGER_ERROR_NONE                 Successful
+ * @retval #WIFI_MANAGER_ERROR_NOT_SUPPORTED        Not supported
+ * @retval #WIFI_MANAGER_ERROR_INVALID_PARAMETER    Invalid parameter
+ */
+int wifi_manager_ap_is_pmf_required(wifi_manager_ap_h ap, bool *required);
+/**
 * @}
 */