Remove useless code(wifi direct CAPIs)

In Tizen 4.0, concurrent mode is always supported when wifi direct is enabled.

Change-Id: I8b1bf4658f17cbb7ec43fa53705be3de3a127b5f

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 233e35d..c7b4f54 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,6 @@ ENDIF(TIZEN_WLAN_USE_P2P_INTERFACE)
 
 IF(TIZEN_P2P_ENABLE)
        ADD_DEFINITIONS(-DTIZEN_P2P_ENABLE)
-       SET(P2P_REQUIRED_PKGS "capi-network-wifi-direct")
 ENDIF(TIZEN_P2P_ENABLE)
 
 IF(TIZEN_TETHERING_ENABLE)

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index cb61ec9..fba58f6 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -1,6 +1,6 @@
 Name:          net-config
 Summary:       TIZEN Network Configuration service
-Version:       1.1.111
+Version:       1.1.112
 Release:       2
 Group:         System/Network
 License:       Apache-2.0
@@ -10,7 +10,6 @@ BuildRequires:        pkgconfig(vconf)
 BuildRequires: pkgconfig(gio-2.0)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(capi-system-info)
-BuildRequires: pkgconfig(capi-network-wifi-direct)
 BuildRequires: pkgconfig(capi-vpnsvc)
 BuildRequires: cmake
 BuildRequires: pkgconfig(sqlite3)

diff --git a/src/wifi-power.c b/src/wifi-power.c
index 72b8673..bac5015 100755 (executable)
--- a/src/wifi-power.c
+++ b/src/wifi-power.c
@@ -25,10 +25,6 @@
 #include <glib.h>
 #include <tzplatform_config.h>
 
-#if defined TIZEN_P2P_ENABLE && !defined WLAN_CONCURRENT_MODE
-#include <wifi-direct.h>
-#endif
-
 #include "log.h"
 #include "util.h"
 #include "netdbus.h"
@@ -150,28 +146,6 @@ static int __execute_supplicant(gboolean enable)
        return 0;
 }
 
-#if defined TIZEN_P2P_ENABLE && defined WLAN_CONCURRENT_MODE
-static int __netconfig_p2p_supplicant(gboolean enable)
-{
-       int rv = 0;
-       const char *path = P2P_SUPPLICANT_SCRIPT;
-       char *const args_enable[] = { P2P_SUPPLICANT_SCRIPT, "start", NULL };
-       char *const args_disable[] = { P2P_SUPPLICANT_SCRIPT, "stop", NULL };
-       char *const envs[] = { NULL };
-
-       if (enable == TRUE)
-               rv = netconfig_execute_file(path, args_enable, envs);
-       else
-               rv = netconfig_execute_file(path, args_disable, envs);
-       if (rv < 0)
-               return -EIO;
-
-       DBG("p2p_supplicant %s", enable == TRUE ? "started" : "stopped");
-
-       return 0;
-}
-#endif
-
 void netconfig_wifi_recover_firmware(void)
 {
        wifi_firmware_recovery_mode = TRUE;
@@ -181,42 +155,6 @@ void netconfig_wifi_recover_firmware(void)
        wifi_power_off();
 }
 
-#if defined TIZEN_P2P_ENABLE && !defined WLAN_CONCURRENT_MODE
-static void __netconfig_wifi_direct_state_cb(int error_code, wifi_direct_device_state_e device_state, void *user_data)
-{
-       int err;
-
-       wifi_direct_unset_device_state_changed_cb();
-       wifi_direct_deinitialize();
-
-       if (device_state == WIFI_DIRECT_DEVICE_STATE_DEACTIVATED) {
-               err = wifi_power_on();
-               if (err < 0) {
-                       if (err == -EALREADY)
-                               wifi_state_update_power_state(TRUE);
-                       else
-                               wifi_state_emit_power_failed();
-               }
-       }
-}
-
-static gboolean __netconfig_wifi_direct_power_off(void)
-{
-       DBG("Wi-Fi direct is turning off");
-
-       if (wifi_direct_initialize() < 0)
-               return FALSE;
-
-       if (wifi_direct_set_device_state_changed_cb(__netconfig_wifi_direct_state_cb, NULL) < 0)
-               return FALSE;
-
-       if (wifi_direct_deactivate() < 0)
-               return FALSE;
-
-       return TRUE;
-}
-#endif
-
 static int _load_driver_and_supplicant(void)
 {
        int err = 0;
@@ -732,17 +670,6 @@ int wifi_power_on(void)
                return -EBUSY;
        }
 
-#if defined TIZEN_P2P_ENABLE && !defined WLAN_CONCURRENT_MODE
-       if (netconfig_is_wifi_direct_on() == TRUE) {
-               if (__netconfig_wifi_direct_power_off() == TRUE)
-                       return -EINPROGRESS;
-               else {
-                       ERR("Failed to turn Wi-Fi direct off");
-                       return -EBUSY;
-               }
-       }
-#endif
-
        err = wifi_power_driver_and_supplicant(TRUE);
        if (err < 0 && err != -EALREADY)
                return err;