[Wifi] Remove deprecated capi 80/124980/5
authorKamil Lipiszko <k.lipiszko@samsung.com>
Thu, 13 Apr 2017 08:04:51 +0000 (10:04 +0200)
committerKamil Lipiszko <k.lipiszko@samsung.com>
Wed, 19 Apr 2017 06:09:30 +0000 (08:09 +0200)
Previously indicator was using both wifi and wifi manager api. Now
the wifi capi is removed. According to the api reference the wifi
capi features are now captured by wifi manager.

Change-Id: I97e7e009aabf5dfe71b249cfe93c1da9902c6e9a

CMake/CMakeLists.txt
inc/util.h
packaging/org.tizen.indicator.spec
src/main.c
src/modules/connection/connection.c
src/modules/connection/wifi.c
src/util.c

index a755d9b664f0bc8de52ed5ce35bb6022844e97dd..18a3d748df114898a06371d4a9f7efebd261e250 100644 (file)
@@ -25,7 +25,6 @@ pkg_check_modules(pkgs REQUIRED
        capi-media-player
        capi-media-sound-manager
        capi-media-metadata-extractor
-       capi-network-wifi
        capi-network-wifi-manager
        capi-ui-efl-util
        appcore-common
index 84085ad70b6acc226b3bb8ff5c8452bdd33d43af..98e6dab3e81567c31ea7dc7f4957a656104c9539 100644 (file)
 #ifndef __INDICATOR_UTIL_H__
 #define __INDICATOR_UTIL_H__
 #include <Ecore.h>
-#include <wifi.h>
 #include <wifi-manager.h>
 #include <system_settings.h>
 #include <runtime_info.h>
-#include <network/wifi.h>
 
 /**
  * @file util.h
@@ -237,59 +235,6 @@ const char *util_get_file_path(enum app_subdir dir, const char *relative);
 #define util_get_external_data_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_DATA, (x))
 #define util_get_external_cache_file_path(x) util_get_file_path(APP_DIR_EXTERNAL_CACHE, (x))
 
-/**
- * @brief Initializes WiFi using wifi_initialize API
- * @remarks If WiFi is already initialized, WIFI_ERROR_NONE will be returned.
- * @return 0 on success, other value on failure
- */
-int util_wifi_initialize(void);
-int util_wifi_manager_initialize(wifi_manager_h *handle);
-/**
- * @brief Deinitializes WiFi using wifi_deinitialize API
- * @remarks Only last call of that function is effective to avoid unwanted deinitialization.
- * @return 0 on success, other value on failure
- */
-int util_wifi_deinitialize(void);
-int util_wifi_manager_deinitialize(wifi_manager_h handle);
-
-/**
- * @brief Allows to set multiple callbacks using wifi_set_connection_state_changed_cb API
- *
- * @param cb callback
- * @param data user_data passed to callback function.
- * @return 0 on success, other value on failure
- */
-int util_wifi_set_connection_state_changed_cb(wifi_connection_state_changed_cb cb, void *data);
-int util_wifi_manager_set_connection_state_changed_cb(wifi_manager_h wifi, wifi_manager_connection_state_changed_cb cb, void *data);
-
-/**
- * @brief Unregisters callback set with util_wifi_set_connection_state_changed_cb.
- *
- * @param cb callback
- */
-void util_wifi_unset_connection_state_changed_cb(wifi_connection_state_changed_cb cb);
-void util_wifi_manager_unset_connection_state_changed_cb(wifi_manager_h wifi, wifi_manager_connection_state_changed_cb cb);
-
-/**
- * @brief Allows to set multiple callbacks using wifi_set_device_state_changed_cb API
- *
- * @param cb callback
- * @param data user_data passed to callback function.
- * @return 0 on success, other value on failure
- */
-int util_wifi_set_device_state_changed_cb(wifi_device_state_changed_cb cb, void *data);
-int util_wifi_manager_set_device_state_changed_cb(wifi_manager_h wifi, wifi_manager_device_state_changed_cb cb, void *data);
-
-
-/**
- * @brief Unregisters callback set with util_wifi_set_device_state_changed_cb.
- *
- * @param cb callback
- */
-void util_wifi_unset_device_state_changed_cb(wifi_device_state_changed_cb cb);
-void util_wifi_manager_unset_device_state_changed_cb(wifi_manager_h wifi, wifi_manager_device_state_changed_cb cb);
-
-
 /**
  * @brief Allows to register multiple callbacks using system_settings_changed_cb API.
  *
index e983a6d9b0570e8520b7031d7f561cf91f8c314a..71ea960983ab0bbd4b890c6022aecb0694b9aa24 100644 (file)
@@ -15,7 +15,6 @@ BuildRequires: pkgconfig(capi-system-system-settings)
 BuildRequires: pkgconfig(capi-media-player)
 BuildRequires: pkgconfig(capi-media-sound-manager)
 BuildRequires: pkgconfig(capi-media-metadata-extractor)
-BuildRequires: pkgconfig(capi-network-wifi)
 BuildRequires: pkgconfig(capi-network-wifi-manager)
 BuildRequires: pkgconfig(capi-ui-efl-util)
 BuildRequires: pkgconfig(appcore-common)
index 0ec79dd6291e26fd9efd859cd8b6c2eceff9e8ae..b9cce2b4b03d78423086b80bf8bd03eb5f17a7bc 100644 (file)
@@ -22,7 +22,6 @@
 #include <feedback.h>
 #include <notification.h>
 #include <app_preference.h>
-#include <wifi.h>
 #include <device/display.h>
 #include <device/callback.h>
 #include <system_settings.h>
index 4cb6cb05e8f2962457e9dcebca402e0e06f1e20f..5c8f5f48b186ab248a0a940c62554d66b7153728 100644 (file)
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <wifi.h>
 #include <telephony.h>
 #include <system_settings.h>
 #include <runtime_info.h>
 #include <vconf.h>
 #include <app_event.h>
 #include <msg_storage.h>
+#include <wifi-manager.h>
 #include <msg.h>
 
 #include "common.h"
@@ -40,6 +40,8 @@ static int register_conn_module(void *data);
 static int unregister_conn_module(void);
 static int wake_up_cb(void *data);
 static void __deinit_tel(void);
+static int __init_wifi(void *data);
+static void __deinit_wifi();
 static void storage_change_cb(msg_handle_t handle, msg_storage_change_type_t storageChangeType,
                msg_id_list_s *pMsgIdList, void *user_param);
 static int transfer_state = -1;
@@ -49,6 +51,7 @@ static event_handler_h event;
 
 static bool mms_sending;
 static msg_handle_t msg_handle;
+static wifi_manager_h wifi_manager;
 
 
 icon_s conn = {
@@ -251,24 +254,31 @@ static void _view_icon_update(telephony_h handle, void *data)
 
 static void on_noti(telephony_h handle, void *user_data)
 {
-       wifi_connection_state_e wifi_state;
-
        int ret = 0;
        int network = 0;
        bool flight_mode;
        static bool bt_icon_shown = false;
        bool is_3G = false;
 
+       wifi_manager_connection_state_e wifi_state;
+
        retm_if(!user_data, "invalid parameter!!");
 
-       ret = wifi_get_connection_state(&wifi_state);
-       retm_if(ret != WIFI_ERROR_NONE, "wifi_get_connection_state failed: %s",
-                       get_error_message(ret));
+       if (!wifi_manager) {
+               _E("wifi_manager is not initialized");
+               return;
+       }
+
+       ret = wifi_manager_get_connection_state(wifi_manager ,&wifi_state);
+       if (ret != WIFI_MANAGER_ERROR_NONE) {
+               _E("util_wifi_manager_get_connection_state failed: %s", get_error_message(ret));
+               return;
+       }
 
        if (mms_sending && wifi_state)
                _D("MMS is being sent - show mobile data icon.");
 
-       if (wifi_state == WIFI_CONNECTION_STATE_CONNECTED && !mms_sending) {
+       if (wifi_state == WIFI_MANAGER_CONNECTION_STATE_CONNECTED && !mms_sending) {
                _D("WIFI connected - hiding mobile data icon");
                hide_image_icon();
                return;
@@ -319,27 +329,6 @@ static void _update_status_ri(runtime_info_key_e key, void *user_data)
        on_noti(tel_list.handle[0], user_data);
 }
 
-static void _wifi_status_changed_cb(wifi_device_state_e state, void *user_data)
-{
-       int status = 0;
-       int ret = 0;
-
-       ret = wifi_get_connection_state(&status);
-       if (ret == WIFI_ERROR_NONE) {
-               if (status == WIFI_CONNECTION_STATE_CONNECTED && !mms_sending) {
-                       _D("WIFI connected, hiding mobile data icon");
-                       hide_image_icon();
-               } else
-                       on_noti(tel_list.handle[0], user_data);
-       }
-}
-
-static void _wifi_connection_status_changed_cb(wifi_connection_state_e state, wifi_ap_h ap, void *user_data)
-{
-       /*First parameter of below function is not used*/
-       _wifi_status_changed_cb(0, user_data);
-}
-
 static void _flight_mode(system_settings_key_e key, void *user_data)
 {
        on_noti(tel_list.handle[0], user_data);
@@ -442,27 +431,6 @@ static int __init_tel(void *data)
                }
        }
 
-       ret = util_wifi_initialize();
-       if (ret != 0) {
-               _E("util_wifi_initialize failed[%d]:%s", ret, get_error_message(ret));
-               __deinit_tel();
-               return FAIL;
-       }
-
-       ret = util_wifi_set_device_state_changed_cb(_wifi_status_changed_cb, data);
-       if (ret != 0) {
-               _E("util_wifi_set_device_state_changed_cb failed");
-               __deinit_tel();
-               return FAIL;
-       }
-
-       ret = util_wifi_set_connection_state_changed_cb(_wifi_connection_status_changed_cb, data);
-       if (ret != 0) {
-               _E("util_wifi_set_connection_state_changed_cb failed");
-               __deinit_tel();
-               return FAIL;
-       }
-
        ret = util_system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE,
                        _flight_mode, data);
 
@@ -506,15 +474,12 @@ static void __deinit_tel()
        _D("Deinit");
 
        util_system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_NETWORK_FLIGHT_MODE, _flight_mode);
-       util_wifi_unset_device_state_changed_cb(_wifi_status_changed_cb);
        util_runtime_info_unset_changed_cb(RUNTIME_INFO_KEY_BLUETOOTH_TETHERING_ENABLED, _update_status_ri);
 
        if (tel_list.count)
                telephony_deinit(&tel_list);
        tel_list.count = 0;
 
-       util_wifi_deinitialize();
-
        msg_close_msg_handle(&msg_handle);
 
        hide_image_icon();
@@ -551,6 +516,62 @@ static void network_status_cb(keynode_t *node, void *data)
        on_noti(tel_list.handle[0], data);
 }
 
+static void _wifi_device_state_changed_cb(wifi_manager_device_state_e state, void *user_data)
+{
+       on_noti(tel_list.handle[0], user_data);
+}
+
+static void _wifi_state_changed_cb(wifi_manager_connection_state_e state, wifi_manager_ap_h ap, void *user_data)
+{
+       on_noti(tel_list.handle[0], user_data);
+}
+
+static int __init_wifi(void *data) {
+
+       int ret = WIFI_MANAGER_ERROR_NONE;
+
+       if (wifi_manager) {
+               _W("wifi_manager already initialized");
+               return FAIL;
+       }
+
+               ret = wifi_manager_initialize(&wifi_manager);
+       retvm_if(ret != WIFI_MANAGER_ERROR_NONE, FAIL, "wifi_manager_initialize failed: %s",
+                       get_error_message(ret));
+
+       ret = wifi_manager_set_connection_state_changed_cb(wifi_manager, _wifi_state_changed_cb, data);
+       if (ret != WIFI_MANAGER_ERROR_NONE) {
+               _E("wifi_manager_set_connection_state_changed_cb failed: %s", get_error_message(ret));
+               wifi_manager_deinitialize(wifi_manager);
+               wifi_manager = NULL;
+               return FAIL;
+       }
+
+       ret = wifi_manager_set_device_state_changed_cb(wifi_manager, _wifi_device_state_changed_cb, data);
+       if (ret != WIFI_MANAGER_ERROR_NONE) {
+               _E("wifi_manager_set_device_state_changed_cb failed: %s", get_error_message(ret));
+               wifi_manager_unset_connection_state_changed_cb(wifi_manager);
+               wifi_manager_deinitialize(wifi_manager);
+               wifi_manager = NULL;
+               return FAIL;
+       }
+
+       return OK;
+}
+
+static void __deinit_wifi() {
+
+       if (!wifi_manager)
+               return;
+
+       wifi_manager_unset_connection_state_changed_cb(wifi_manager);
+       wifi_manager_unset_device_state_changed_cb(wifi_manager);
+
+       wifi_manager_deinitialize(wifi_manager);
+       wifi_manager = NULL;
+}
+
+
 static int register_conn_module(void *data)
 {
        int ret;
@@ -561,23 +582,40 @@ static int register_conn_module(void *data)
 
        set_app_state(data);
 
+       ret = __init_wifi(data);
+       retvm_if(ret != OK, FAIL, "wifi initialization failed");
+
        ret = telephony_get_state(&state);
-       retvm_if(ret != TELEPHONY_ERROR_NONE, FAIL, "telephony_get_state failed: %s",
-                       get_error_message(ret));
+       if (ret != TELEPHONY_ERROR_NONE) {
+               _E("telephony_get_state failed: %s", get_error_message(ret));
+               __deinit_wifi();
+               return FAIL;
+       }
 
        ret = telephony_init(&tel_list);
-       retvm_if(ret != TELEPHONY_ERROR_NONE, FAIL, "telephony_init failed: %s",
-                       get_error_message(ret));
+       if (ret != TELEPHONY_ERROR_NONE) {
+               _E("telephony_init failed: %s", get_error_message(ret));
+               __deinit_wifi();
+               return FAIL;
+       }
 
        if (state == TELEPHONY_STATE_READY) {
                _D("Telephony ready");
-               retv_if(__init_tel(data) != OK, FAIL);
+
+               if (__init_tel(data) != OK) {
+
+                       telephony_deinit(&tel_list);
+                       __deinit_wifi();
+
+                       return FAIL;
+               }
        } else if (state == TELEPHONY_STATE_NOT_READY)
                _D("Telephony not ready");
 
        ret = telephony_set_state_changed_cb(tel_ready_cb, data);
        if (ret != TELEPHONY_ERROR_NONE) {
                _E("telephony_set_state_changed_cb failed: %s", get_error_message(ret));
+               __deinit_wifi();
                __deinit_tel();
                return FAIL;
        }
@@ -585,6 +623,7 @@ static int register_conn_module(void *data)
        ret = event_add_event_handler(SYSTEM_EVENT_MOBILE_DATA_STATE, data_event_cb, data, &event);
        if (ret != EVENT_ERROR_NONE) {
                _E("event_add_event_handler failed: %s", get_error_message(ret));
+               __deinit_wifi();
                __deinit_tel();
                return FAIL;
        }
@@ -592,6 +631,7 @@ static int register_conn_module(void *data)
        ret = vconf_notify_key_changed(VCONFKEY_NETWORK_STATUS, network_status_cb, data);
        if (ret != OK) {
                _E("vconf_notify_kay_change failed: %s", get_error_message(ret));
+               __deinit_wifi();
                __deinit_tel();
                return FAIL;
        }
@@ -599,6 +639,7 @@ static int register_conn_module(void *data)
        ret = vconf_notify_key_changed(VCONFKEY_PACKET_STATE, network_status_cb, data);
        if (ret != OK) {
                _E("vconf_notify_kay_change failed: %s", get_error_message(ret));
+               __deinit_wifi();
                __deinit_tel();
                return FAIL;
        }
@@ -607,6 +648,8 @@ static int register_conn_module(void *data)
 
 static int unregister_conn_module(void)
 {
+       __deinit_wifi();
+
        vconf_ignore_key_changed(VCONFKEY_NETWORK_STATUS, network_status_cb);
        vconf_ignore_key_changed(VCONFKEY_PACKET_STATE, network_status_cb);
        telephony_unset_state_changed_cb(tel_ready_cb);
index 859490fb0577a87752f584656902d3a54c0f2085..d9e6978ecd68e4bffb6a1ccf4165da86ff2fe632 100644 (file)
@@ -160,17 +160,17 @@ static void show_wifi_transfer_icon(void *data)
 static int _rssi_level_to_strength(wifi_manager_rssi_level_e level)
 {
        switch (level) {
-               case WIFI_RSSI_LEVEL_0:
-               case WIFI_RSSI_LEVEL_1:
+               case WIFI_MANAGER_RSSI_LEVEL_0:
+               case WIFI_MANAGER_RSSI_LEVEL_1:
                        return LEVEL_WIFI_01;
-               case WIFI_RSSI_LEVEL_2:
+               case WIFI_MANAGER_RSSI_LEVEL_2:
                        return LEVEL_WIFI_02;
-               case WIFI_RSSI_LEVEL_3:
+               case WIFI_MANAGER_RSSI_LEVEL_3:
                        return LEVEL_WIFI_03;
-               case WIFI_RSSI_LEVEL_4:
+               case WIFI_MANAGER_RSSI_LEVEL_4:
                        return LEVEL_WIFI_04;
                default:
-                       return WIFI_RSSI_LEVEL_0;
+                       return WIFI_MANAGER_RSSI_LEVEL_0;
        }
 }
 
@@ -238,9 +238,8 @@ static int register_wifi_module(void *data)
 
        set_app_state(data);
 
-       int ret = util_wifi_manager_initialize(&wifi_manager);
-       retvm_if(ret != WIFI_MANAGER_ERROR_NONE, FAIL, "util_wifi_manager_initialize failed : %s", get_error_message(ret));
-
+       int ret = wifi_manager_initialize(&wifi_manager);
+       retvm_if(ret != WIFI_MANAGER_ERROR_NONE, FAIL, "wifi_manager_initialize failed : %s", get_error_message(ret));
 
        ret = wifi_manager_get_connection_state(wifi_manager, &connection_state);
        if (ret != WIFI_MANAGER_ERROR_NONE) {
@@ -255,16 +254,16 @@ static int register_wifi_module(void *data)
                return FAIL;
        }
 
-       ret = util_wifi_manager_set_device_state_changed_cb(wifi_manager, _wifi_manager_device_state_changed, data);
+       ret = wifi_manager_set_device_state_changed_cb(wifi_manager, _wifi_manager_device_state_changed, data);
        if (ret != WIFI_MANAGER_ERROR_NONE) {
-               _E("util_wifi_manager_set_device_state_changed_cb failed: %s", get_error_message(ret));
+               _E("wifi_manager_set_device_state_changed_cb failed: %s", get_error_message(ret));
                unregister_wifi_module();
                return FAIL;
        }
 
-       ret = util_wifi_manager_set_connection_state_changed_cb(wifi_manager, _wifi_manager_connection_state_changed, data);
-       if (ret != 0) {
-               _E("util_wifi_manager_set_connection_state_changed_cb failed: %s", get_error_message(ret));
+       ret = wifi_manager_set_connection_state_changed_cb(wifi_manager, _wifi_manager_connection_state_changed, data);
+       if (ret != WIFI_MANAGER_ERROR_NONE) {
+               _E("wifi_manager_set_connection_state_changed_cb failed: %s", get_error_message(ret));
                unregister_wifi_module();
                return FAIL;
        }
@@ -290,14 +289,14 @@ static int register_wifi_module(void *data)
 
 static int unregister_wifi_module(void)
 {
-       util_wifi_manager_unset_device_state_changed_cb(wifi_manager, _wifi_manager_device_state_changed);
-       util_wifi_manager_unset_connection_state_changed_cb(wifi_manager, _wifi_manager_connection_state_changed);
+       wifi_manager_unset_device_state_changed_cb(wifi_manager);
+       wifi_manager_unset_connection_state_changed_cb(wifi_manager);
        wifi_manager_unset_rssi_level_changed_cb(wifi_manager);
        vconf_ignore_key_changed(VCONFKEY_WIFI_TRANSFER_STATE, _wifi_changed_cb);
 
-       int ret = util_wifi_manager_deinitialize(wifi_manager);
+       int ret = wifi_manager_deinitialize(wifi_manager);
        if (ret != WIFI_MANAGER_ERROR_NONE) {
-               _E("util_wifi_manager_deinitialize failed : %s", get_error_message(ret));
+               _E("wifi_manager_deinitialize failed : %s", get_error_message(ret));
        }
 
        return OK;
index ed89fd920c0a2e0d8972f96a98e0a3b3d04f65ba..f9e0fead4cb44287cf94f3b991b22a337ace18ba 100644 (file)
 #define MSG_SIM_FULL_STATUS_ICON       MSG_RESERVED"icons/sim_card_full"
 
 
-typedef struct {
-       wifi_connection_state_changed_cb cb;
-       void *data;
-} wifi_handler_t;
-
-typedef struct {
-       wifi_manager_connection_state_changed_cb cb;
-       void *data;
-} wifi_manager_handler_t;
-
-
-typedef struct {
-       wifi_device_state_changed_cb cb;
-       void *data;
-} wifi_device_handler_t;
-
-typedef struct {
-       wifi_manager_device_state_changed_cb cb;
-       void *data;
-} wifi_manager_device_handler_t;
-
-
 typedef struct {
        system_settings_key_e key;
        system_settings_changed_cb cb;
@@ -84,14 +62,8 @@ typedef struct {
        char *icon;
 } reserved_t;
 
-static Eina_List *wifi_callbacks;
-static Eina_List *wifi_manager_callbacks;
-static Eina_List *wifi_device_callbacks;
-static Eina_List *wifi_manager_device_callbacks;
 static Eina_List *ss_callbacks;
 static Eina_List *ri_callbacks;
-static int wifi_init_cnt;
-static int wifi_manager_init_cnt;
 
 const reserved_t reserved_paths[] = {
        {MSG_NORMAL_STATUS_ICON, "Notify/b03_notify_message.png"},
@@ -358,269 +330,6 @@ const char *util_get_file_path(enum app_subdir dir, const char *relative)
        return &buf[0];
 }
 
-int util_wifi_initialize(void)
-{
-       _D("util_wifi_initialize");
-
-       ++wifi_init_cnt;
-
-       int ret = wifi_initialize();
-       if (ret == WIFI_ERROR_INVALID_OPERATION) {
-               _W("WiFi already initialized");
-               return OK;
-       }
-       retv_if(ret != WIFI_ERROR_NONE, ret);
-
-       return OK;
-}
-
-int util_wifi_deinitialize(void)
-{
-       _D("util_wifi_deinitialize");
-
-       --wifi_init_cnt;
-
-       if (wifi_init_cnt == 0) {
-               int ret = wifi_deinitialize();
-               retv_if(ret != WIFI_ERROR_NONE, ret);
-       }
-       return OK;
-}
-
-int util_wifi_manager_initialize(wifi_manager_h *handle)
-{
-       _D("util_wifi_manager_initialize");
-
-       static wifi_manager_h wifi = NULL;
-       ++wifi_manager_init_cnt;
-
-       int ret = wifi_manager_initialize(&wifi);
-       if (ret == WIFI_MANAGER_ERROR_ALREADY_INITIALIZED) {
-               _W("WiFi manager already initialized");
-               *handle = wifi;
-               return OK;
-       }
-       retv_if(ret != WIFI_MANAGER_ERROR_NONE, ret);
-
-       *handle = wifi;
-
-       return OK;
-}
-
-int util_wifi_manager_deinitialize(wifi_manager_h handle)
-{
-       _D("util_wifi_deinitialize");
-
-       --wifi_manager_init_cnt;
-
-       if (wifi_manager_init_cnt == 0) {
-               int ret = wifi_manager_deinitialize(handle);
-               retv_if(ret != WIFI_ERROR_NONE, ret);
-       }
-       return OK;
-}
-
-static void _wifi_state_cb(wifi_connection_state_e state, wifi_ap_h ap, void *user_data)
-{
-       Eina_List *l;
-       wifi_handler_t *hdl;
-
-       EINA_LIST_FOREACH(wifi_callbacks, l, hdl) {
-               if (hdl->cb)
-                       hdl->cb(state, ap, hdl->data);
-       }
-}
-
-int util_wifi_set_connection_state_changed_cb(wifi_connection_state_changed_cb cb, void *data)
-{
-       wifi_handler_t *hdl = malloc(sizeof(wifi_handler_t));
-       if (!hdl)
-               return -1;
-
-       if (!wifi_callbacks) {
-               int err = wifi_set_connection_state_changed_cb(_wifi_state_cb, NULL);
-               if (err != WIFI_ERROR_NONE) {
-                       free(hdl);
-                       return -1;
-               }
-       }
-
-       hdl->cb = cb;
-       hdl->data = data;
-       wifi_callbacks = eina_list_append(wifi_callbacks, hdl);
-
-       return 0;
-}
-
-void util_wifi_unset_connection_state_changed_cb(wifi_connection_state_changed_cb cb)
-{
-       Eina_List *l, *l2;
-       wifi_handler_t *hdl;
-
-       EINA_LIST_FOREACH_SAFE(wifi_callbacks, l, l2, hdl) {
-               if (hdl->cb == cb) {
-                       wifi_callbacks = eina_list_remove_list(wifi_callbacks, l);
-                       free(hdl);
-               }
-       }
-       if (!wifi_callbacks)
-               wifi_unset_connection_state_changed_cb();
-}
-
-
-
-static void _wifi_manager_state_cb(wifi_manager_connection_state_e state, wifi_manager_ap_h ap, void *user_data)
-{
-       Eina_List *l;
-       wifi_manager_handler_t *hdl;
-
-       EINA_LIST_FOREACH(wifi_manager_callbacks, l, hdl) {
-               if (hdl->cb)
-                       hdl->cb(state, ap, hdl->data);
-       }
-}
-
-int util_wifi_manager_set_connection_state_changed_cb(wifi_manager_h wifi, wifi_manager_connection_state_changed_cb cb, void *data)
-{
-       wifi_manager_handler_t *hdl = malloc(sizeof(wifi_manager_handler_t));
-       if (!hdl)
-               return -1;
-
-       if (!wifi_manager_callbacks) {
-               int err = wifi_manager_set_connection_state_changed_cb(wifi, _wifi_manager_state_cb, NULL);
-               if (err != WIFI_ERROR_NONE) {
-                       free(hdl);
-                       return -1;
-               }
-       }
-
-       hdl->cb = cb;
-       hdl->data = data;
-       wifi_manager_callbacks = eina_list_append(wifi_manager_callbacks, hdl);
-
-       return 0;
-}
-
-void util_wifi_manager_unset_connection_state_changed_cb(wifi_manager_h wifi, wifi_manager_connection_state_changed_cb cb)
-{
-       Eina_List *l, *l2;
-       wifi_manager_handler_t *hdl;
-
-       EINA_LIST_FOREACH_SAFE(wifi_manager_callbacks, l, l2, hdl) {
-               if (hdl->cb == cb) {
-                       wifi_manager_callbacks = eina_list_remove_list(wifi_manager_callbacks, l);
-                       free(hdl);
-                       break;
-               }
-       }
-       if (!wifi_manager_callbacks)
-               wifi_manager_unset_connection_state_changed_cb(wifi);
-}
-/** WIFI DEVICE STATE CB **/
-
-static void _wifi_device_state_cb(wifi_device_state_e state, void *user_data)
-{
-       Eina_List *l;
-       wifi_device_handler_t *hdl;
-
-       EINA_LIST_FOREACH(wifi_device_callbacks, l, hdl) {
-               if (hdl->cb)
-                       hdl->cb(state, hdl->data);
-       }
-}
-
-int util_wifi_set_device_state_changed_cb(wifi_device_state_changed_cb cb, void *data)
-{
-       wifi_device_handler_t *hdl = malloc(sizeof(wifi_device_handler_t));
-       if (!hdl) {
-               _D("malloc failed");
-               return WIFI_ERROR_OUT_OF_MEMORY;
-       }
-
-       if (!wifi_device_callbacks) {
-               int err = wifi_set_device_state_changed_cb(_wifi_device_state_cb, NULL);
-
-               if (err != WIFI_ERROR_NONE) {
-                       _D("wifi_set_device_state_changed_cb failed[%d]:%s", err, get_error_message(err));
-                       free(hdl);
-                       return err;
-               }
-       }
-
-       hdl->cb = cb;
-       hdl->data = data;
-       wifi_device_callbacks = eina_list_append(wifi_device_callbacks, hdl);
-
-       return 0;
-}
-
-void util_wifi_unset_device_state_changed_cb(wifi_device_state_changed_cb cb)
-{
-       Eina_List *l, *l2;
-       wifi_device_handler_t *hdl;
-
-       EINA_LIST_FOREACH_SAFE(wifi_device_callbacks, l, l2, hdl) {
-               if (hdl->cb == cb) {
-                       wifi_device_callbacks = eina_list_remove_list(wifi_device_callbacks, l);
-                       free(hdl);
-               }
-       }
-       if (!wifi_device_callbacks)
-               wifi_unset_device_state_changed_cb();
-}
-
-
-
-static void _wifi_manager_device_state_cb(wifi_manager_device_state_e state, void *user_data)
-{
-       Eina_List *l;
-       wifi_manager_device_handler_t *hdl;
-
-       EINA_LIST_FOREACH(wifi_manager_device_callbacks, l, hdl) {
-               if (hdl->cb)
-                       hdl->cb(state, hdl->data);
-       }
-}
-
-int util_wifi_manager_set_device_state_changed_cb(wifi_manager_h wifi, wifi_manager_device_state_changed_cb cb, void *data)
-{
-       wifi_manager_device_handler_t *hdl = malloc(sizeof(wifi_manager_device_handler_t));
-       if (!hdl) {
-               _D("malloc failed");
-               return WIFI_MANAGER_ERROR_OUT_OF_MEMORY;
-       }
-
-       if (!wifi_manager_device_callbacks) {
-               int err = wifi_manager_set_device_state_changed_cb(wifi, _wifi_manager_device_state_cb, NULL);
-               if (err != WIFI_MANAGER_ERROR_NONE) {
-                       _D("wifi_manager_set_device_state_changed_cb failed[%d]:%s", err, get_error_message(err));
-                       free(hdl);
-                       return err;
-               }
-       }
-       hdl->cb = cb;
-       hdl->data = data;
-       wifi_manager_device_callbacks = eina_list_append(wifi_manager_device_callbacks, hdl);
-
-       return 0;
-}
-
-void util_wifi_manager_unset_device_state_changed_cb(wifi_manager_h wifi, wifi_manager_device_state_changed_cb cb)
-{
-       Eina_List *l, *l2;
-       wifi_manager_device_handler_t *hdl;
-
-       EINA_LIST_FOREACH_SAFE(wifi_manager_device_callbacks, l, l2, hdl) {
-               if (hdl->cb == cb) {
-                       wifi_manager_device_callbacks = eina_list_remove_list(wifi_manager_device_callbacks, l);
-                       free(hdl);
-                       break;
-               }
-       }
-       if (!wifi_manager_device_callbacks)
-               wifi_manager_unset_device_state_changed_cb(wifi);
-}
-
 /** SYSTEM SETTINGS CB **/
 
 static void _system_settings_cb(system_settings_key_e key, void *data)