Do not use enable_config for wifi_aware_enable

diff --git a/include/wifi-aware.h b/include/wifi-aware.h
index a1f8330..63e48ea 100644 (file)
--- a/include/wifi-aware.h
+++ b/include/wifi-aware.h
@@ -118,7 +118,6 @@ typedef void *wifi_aware_h;
  * @brief Handle for Wi-Fi Aware configuration.
  * @since_tizen 6.0
  */
-typedef void *wifi_aware_enable_config_h;
 typedef void *wifi_aware_publish_config_h;
 typedef void *wifi_aware_subscribe_config_h;
 
@@ -152,26 +151,6 @@ int wifi_aware_initialize(wifi_aware_h *wifi_aware);
 int wifi_aware_deinitialize(wifi_aware_h wifi_aware);
 
 /**
- * @brief TODO (can be removed) Create a configuration for Enable request.
- * @since_tizen 6.0
- * @param[out] config
- * @return     0 on success, otherwise a negative error value
- * @retval     #WIFI_AWARE_ERROR_NONE
- * @see        wifi_aware_enable_config_destroy
- */
-int wifi_aware_enable_config_create(wifi_aware_enable_config_h *config);
-
-/**
- * @brief TODO (can be removed) Destroy a configuration for Enable request.
- * @since_tizen 6.0
- * @param[in] config
- * @return     0 on success, otherwise a negative error value
- * @retval     #WIFI_AWARE_ERROR_NONE
- * @see        wifi_aware_enable_config_create
- */
-int wifi_aware_enable_config_destroy(wifi_aware_enable_config_h config);
-
-/**
  * @brief Create a configuration for Publish request.
  * @since_tizen 6.0
  * @param[out] config
@@ -398,7 +377,6 @@ typedef void(*wifi_aware_enabled_cb)(wifi_aware_error_e error, void *user_data);
  * @retval     #WIFI_AWARE_ERROR_NONE
  */
 int wifi_aware_enable(wifi_aware_h wifi_aware,
-               wifi_aware_enable_config_h config,
                wifi_aware_enabled_cb callback, void *user_data);
 
 

diff --git a/src/include/wifi-aware-private.h b/src/include/wifi-aware-private.h
index 41b7726..0c070d6 100644 (file)
--- a/src/include/wifi-aware-private.h
+++ b/src/include/wifi-aware-private.h
@@ -41,8 +41,7 @@ void _add_published_callback(wifi_aware_h wifi_aware,
                wifi_aware_published_cb callback, void *user_data);
 void _add_subscribed_callback(wifi_aware_h wifi_aware,
                wifi_aware_subscribed_cb, void *user_data);
-int _wifi_aware_enable_request(wifi_aware_h wifi_aware,
-               wifi_aware_enable_config_h config);
+int _wifi_aware_enable_request(wifi_aware_h wifi_aware);
 int _wifi_aware_publish_request(wifi_aware_h wifi_aware,
                wifi_aware_publish_config_h config);
 int _wifi_aware_subscribe_request(wifi_aware_h wifi_aware,

diff --git a/src/wifi-aware-enable.c b/src/wifi-aware-enable.c
index c3dee44..2862207 100644 (file)
--- a/src/wifi-aware-enable.c
+++ b/src/wifi-aware-enable.c
@@ -26,45 +26,7 @@
 #include "wifi-aware-private.h"
 #include "wifi-aware-utils.h"
 
-static void __wifi_aware_enable_request_set_default_values(wifi_aware_enable_request_s *req)
-{
-       req->master_pref = 0x2;
-       req->cluster_low = 0;
-       req->cluster_high = 0xFFFF;
-       req->support_5g = 1;
-       req->discovery_window_interval_24g = 1;
-       req->discovery_window_interval_5g = 0;
-}
-
-API int wifi_aware_enable_config_create(wifi_aware_enable_config_h *config)
-{
-       __WIFI_AWARE_FUNC_ENTER__;
-       CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-
-       wifi_aware_enable_request_s *req =
-               (wifi_aware_enable_request_s *)g_try_malloc0(sizeof(wifi_aware_enable_request_s));
-       RET_VAL_IF(req == NULL, WIFI_AWARE_ERROR_OUT_OF_MEMORY, "Out of memory");
-
-       __wifi_aware_enable_request_set_default_values(req);
-
-       *config = (wifi_aware_enable_config_h)req;
-
-       __WIFI_AWARE_FUNC_EXIT__;
-       return WIFI_AWARE_ERROR_NONE;
-}
-
-API int wifi_aware_enable_config_destroy(wifi_aware_enable_config_h config)
-{
-       __WIFI_AWARE_FUNC_ENTER__;
-       CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
-       RET_VAL_IF(config == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "Enable Config is NULL");
-
-       g_free(config);
-       return WIFI_AWARE_ERROR_NONE;
-}
-
 API int wifi_aware_enable(wifi_aware_h wifi_aware,
-               wifi_aware_enable_config_h config,
                wifi_aware_enabled_cb callback, void *user_data)
 {
        int ret = WIFI_AWARE_ERROR_NONE;
@@ -72,11 +34,10 @@ API int wifi_aware_enable(wifi_aware_h wifi_aware,
        __WIFI_AWARE_FUNC_ENTER__;
        CHECK_FEATURE_SUPPORTED(TIZEN_FEATURE_WIFI_AWARE);
        RET_ERR_IF_HANDLE_IS_NOT_VALID_OR_NOT_INITIALIZED(wifi_aware);
-       RET_VAL_IF(config == NULL, WIFI_AWARE_ERROR_INVALID_PARAMETER, "Enable Config is NULL");
 
        _add_enabled_callback(wifi_aware, callback, user_data);
 
-       ret = _wifi_aware_enable_request(wifi_aware, config);
+       ret = _wifi_aware_enable_request(wifi_aware);
        RET_VAL_IF(ret != WIFI_AWARE_ERROR_NONE, ret, "_wifi_aware_enable_request");
 
        __WIFI_AWARE_FUNC_EXIT__;

diff --git a/src/wifi-aware-private.c b/src/wifi-aware-private.c
index ce43e78..9747ce8 100644 (file)
--- a/src/wifi-aware-private.c
+++ b/src/wifi-aware-private.c
@@ -298,13 +298,24 @@ void _add_subscribed_callback(wifi_aware_h wifi_aware,
        aware->subscribed_cb_data = user_data;
 }
 
-int _wifi_aware_enable_request(wifi_aware_h wifi_aware,
-               wifi_aware_enable_config_h config)
+static void __wifi_aware_enable_request_set_default_values(wifi_aware_enable_request_s *req)
 {
-       if (config == NULL) {
-               WIFI_AWARE_LOGE("config is NULL");
-       }
-       wifi_aware_enable_request_s *req = (wifi_aware_enable_request_s *)config;
+       req->master_pref = 0x2;
+       req->cluster_low = 0;
+       req->cluster_high = 0xFFFF;
+       req->support_5g = 1;
+       req->discovery_window_interval_24g = 1;
+       req->discovery_window_interval_5g = 0;
+}
+
+int _wifi_aware_enable_request(wifi_aware_h wifi_aware)
+{
+       wifi_aware_enable_request_s *req =
+               (wifi_aware_enable_request_s *)g_try_malloc0(sizeof(wifi_aware_enable_request_s));
+       RET_VAL_IF(req == NULL, WIFI_AWARE_ERROR_OUT_OF_MEMORY, "Out of memory");
+
+       __wifi_aware_enable_request_set_default_values(req);
+
        return wifi_aware_gdbus_enable(wifi_aware, req, __enable_request_reply);
 }
 

diff --git a/test/wifi-aware-test.c b/test/wifi-aware-test.c
index 67c4308..5f3deac 100644 (file)
--- a/test/wifi-aware-test.c
+++ b/test/wifi-aware-test.c
@@ -313,19 +313,12 @@ static void __enabled_cb(wifi_aware_error_e error, void *user_data)
 void test_enable()
 {
        int ret = 0;
-       wifi_aware_enable_config_h config = NULL;
 
        RET_IF_LOOP_IS_NULL();
        RET_IF_HANDLE_IS_NULL();
 
-       ret = wifi_aware_enable_config_create(&config);
-       __print_result(ret, "wifi_aware_enable_config_create");
-
-       ret = wifi_aware_enable(g_wifi_aware_handle, config, __enabled_cb, NULL);
+       ret = wifi_aware_enable(g_wifi_aware_handle, __enabled_cb, NULL);
        __print_result(ret, "wifi_aware_enable");
-
-       ret = wifi_aware_enable_config_destroy(config);
-       __print_result(ret, "wifi_aware_enable_config_destroy");
 }
 
 static void __published_cb(wifi_aware_error_e error, unsigned int publish_id, void *user_data)