From 6106236cf6f2a277532f89630789c8de52904be7 Mon Sep 17 00:00:00 2001 From: "saerome.kim" Date: Tue, 4 Jul 2017 21:54:17 +0900 Subject: [PATCH] Change API name - wifi_mesh_start_mesh -> wifi_mesh_start - wifi_mesh_stop_mesh -> wifi_mesh_stop Signed-off-by: saerome.kim --- include/wifi-mesh.h | 22 ++++++++++++---------- src/wifi-mesh.c | 4 ++-- test/wifi-mesh-network.c | 8 ++++---- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/wifi-mesh.h b/include/wifi-mesh.h index 0951724..07d1799 100644 --- a/include/wifi-mesh.h +++ b/include/wifi-mesh.h @@ -765,8 +765,9 @@ int wifi_mesh_foreach_connected_peers(wifi_mesh_h handle, wifi_mesh_connected_peer_cb cb, void *user_data); /** - * @brief Enables the Wi-Fi mesh network. - * @details This function is to join or create Wi-Fi mesh network using saved Wi-Fi mesh network configuration + * @brief Start the Wi-Fi mesh network. + * @details This function is to create a Wi-Fi mesh network and do auto-connection + * using saved Wi-Fi mesh network configuration * * @since_tizen 4.0 * @@ -777,14 +778,15 @@ int wifi_mesh_foreach_connected_peers(wifi_mesh_h handle, * @retval #WIFI_MESH_ERROR_INVALID_PARAMETER Invalid parameter * @retval #WIFI_MESH_ERROR_IO_ERROR Unexpected d-bus error * - * @see wifi_mesh_stop_mesh() + * @see wifi_mesh_stop() * */ -int wifi_mesh_start_mesh(wifi_mesh_h handle); +int wifi_mesh_start(wifi_mesh_h handle); /** - * @brief Disables the Wi-Fi mesh network. - * @details This function is to disjoin or destroy current Wi-Fi mesh network + * @brief Stop the Wi-Fi mesh network. + * @details This function is to disconnect the current Wi-Fi mesh network and + * destroy all related to the Wi-Fi mesh network * * @since_tizen 4.0 * @@ -795,10 +797,10 @@ int wifi_mesh_start_mesh(wifi_mesh_h handle); * @retval #WIFI_MESH_ERROR_INVALID_PARAMETER Invalid parameter * @retval #WIFI_MESH_ERROR_IO_ERROR Unexpected d-bus error * - * @see wifi_mesh_start_mesh() + * @see wifi_mesh_start() * */ -int wifi_mesh_stop_mesh(wifi_mesh_h handle); +int wifi_mesh_stop(wifi_mesh_h handle); /** * @brief Get the Wi-Fi mesh connection state. @@ -815,7 +817,7 @@ int wifi_mesh_stop_mesh(wifi_mesh_h handle); * @retval #WIFI_MESH_ERROR_INVALID_PARAMETER Invalid parameter * @retval #WIFI_MESH_ERROR_IO_ERROR Unexpected d-bus error * - * @see wifi_mesh_start_mesh() + * @see wifi_mesh_start() * @see wifi_mesh_found_network_cb() * */ @@ -836,7 +838,7 @@ int wifi_mesh_is_joined(wifi_mesh_h handle, bool* is_joined); * @retval #WIFI_MESH_ERROR_INVALID_PARAMETER Invalid parameter * @retval #WIFI_MESH_ERROR_IO_ERROR Unexpected d-bus error * - * @see wifi_mesh_start_mesh() + * @see wifi_mesh_start() * */ int wifi_mesh_get_joined_network(wifi_mesh_h handle, wifi_mesh_network_h* network); diff --git a/src/wifi-mesh.c b/src/wifi-mesh.c index b34d3c7..17dc91f 100644 --- a/src/wifi-mesh.c +++ b/src/wifi-mesh.c @@ -506,7 +506,7 @@ EXPORT_API int wifi_mesh_foreach_connected_peers(wifi_mesh_h handle, return rv; } -EXPORT_API int wifi_mesh_start_mesh(wifi_mesh_h handle) +EXPORT_API int wifi_mesh_start(wifi_mesh_h handle) { int rv = 0; CHECK_FEATURE_SUPPORTED(MESH_FEATURE); @@ -517,7 +517,7 @@ EXPORT_API int wifi_mesh_start_mesh(wifi_mesh_h handle) return rv; } -EXPORT_API int wifi_mesh_stop_mesh(wifi_mesh_h handle) +EXPORT_API int wifi_mesh_stop(wifi_mesh_h handle) { int rv = 0; CHECK_FEATURE_SUPPORTED(MESH_FEATURE); diff --git a/test/wifi-mesh-network.c b/test/wifi-mesh-network.c index 77b05d5..9fc7b52 100644 --- a/test/wifi-mesh-network.c +++ b/test/wifi-mesh-network.c @@ -222,13 +222,13 @@ static int run_wifi_mesh_enable(MManager *mm, struct menu_data *menu) int ret; msg("Enable Mesh"); - ret = wifi_mesh_start_mesh(mesh); + ret = wifi_mesh_start(mesh); if (WIFI_MESH_ERROR_NONE != ret) { msgr("Failed to enable mesh network: [%s(0x%X)]", wifi_mesh_error_to_string(ret), ret); return RET_FAILURE; } - msg(" - wifi_mesh_start_mesh() ret: [0x%X] [%s]", ret, wifi_mesh_error_to_string(ret)); + msg(" - wifi_mesh_start() ret: [0x%X] [%s]", ret, wifi_mesh_error_to_string(ret)); return RET_SUCCESS; } @@ -238,12 +238,12 @@ static int run_wifi_mesh_disable(MManager *mm, struct menu_data *menu) int ret; msg("Disable Mesh"); - ret = wifi_mesh_stop_mesh(mesh); + ret = wifi_mesh_stop(mesh); if (WIFI_MESH_ERROR_NONE != ret) { msgr("Failed to disable mesh network: [%s(0x%X)]", wifi_mesh_error_to_string(ret), ret); return RET_FAILURE; } - msg(" - wifi_mesh_stop_mesh() ret: [0x%X] [%s]", ret, wifi_mesh_error_to_string(ret)); + msg(" - wifi_mesh_stop() ret: [0x%X] [%s]", ret, wifi_mesh_error_to_string(ret)); return RET_SUCCESS; } -- 2.34.1