Remove TIZEN_WIFI_MODULE_BUNDLE & TIZEN_WLAN_CONCURRENT_ENABLE

Description: There's been support for the Wi-Fi module which
doesn't have the Wi-Fi & Wi-Fi P2P concurrent mode. But nowadays,
most of devices support the concurrent mode. So we remove this
compile flags and support Wi-Fi Direct only the device supports
Wi-Fi & Wi-Fi P2P concurrent mode.

Change-Id: Iacd6149aed87361f5d89f5e1e8fbb2a39cb133a1
Signed-off-by: Yu jiung <jiung.yu@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d3c3610..1846332 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,9 +42,6 @@ ENDIF(TIZEN_FEATURE_SERVICE_DISCOVERY)
 IF(TIZEN_FEATURE_WIFI_DISPLAY)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DISPLAY)
 ENDIF(TIZEN_FEATURE_WIFI_DISPLAY)
-IF(TIZEN_WLAN_CONCURRENT_ENABLE)
-       ADD_DEFINITIONS(-DTIZEN_WLAN_CONCURRENT_ENABLE)
-ENDIF(TIZEN_WLAN_CONCURRENT_ENABLE)
 IF(TIZEN_FEATURE_IP_OVER_EAPOL)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_IP_OVER_EAPOL)
 ENDIF(TIZEN_FEATURE_IP_OVER_EAPOL)
@@ -69,10 +66,6 @@ IF(TIZEN_PROFILE_TV)
        ADD_DEFINITIONS(-DTIZEN_PROFILE_TV)
 ENDIF(TIZEN_PROFILE_TV)
 
-IF(TIZEN_WIFI_MODULE_BUNDLE)
-       ADD_DEFINITIONS(-DTIZEN_WIFI_MODULE_BUNDLE)
-ENDIF(TIZEN_WIFI_MODULE_BUNDLE)
-
 IF(TIZEN_DEBUG_DBUS_VALUE)
        ADD_DEFINITIONS(-DTIZEN_DEBUG_DBUS_VALUE)
 ENDIF(TIZEN_DEBUG_DBUS_VALUE)

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index 0988a5d..ac53547 100644 (file)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -43,13 +43,8 @@
 #endif /* TIZEN_PROFILE_MOBILE */
 
 #if defined TIZEN_PROFILE_TV
-#      if defined TIZEN_WIFI_MODULE_BUNDLE
-#              define DEFAULT_IFNAME "wlan0"
-#              define GROUP_IFNAME "wlan0"
-#      else /* TIZEN_WIFI_MODULE_BUNDLE */
-#              define DEFAULT_IFNAME "p2p0"
-#              define GROUP_IFNAME "p2p0"
-#      endif /* TIZEN_WIFI_MODULE_BUNDLE */
+#      define DEFAULT_IFNAME "p2p0"
+#      define GROUP_IFNAME "p2p0"
 #      define DEFAULT_PRIMARY_DEVICE_TYPE WIFI_DIRECT_PRIMARY_DEVICE_TYPE_DISPLAY
 #      define DEFAULT_SECONDARY_DEVICE_TYPE WIFI_DIRECT_SECONDARY_DEVICE_TYPE_DISPLAY_TV
 #endif /* TIZEN_PROFILE_TV */

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 9cae31e..e74f749 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -8,7 +8,7 @@
 
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.228
+Version:       1.2.229
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -210,16 +210,11 @@ mkdir -p build_mobile
 pushd build_mobile
 cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_ENABLE_PRD=0 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
-%endif
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
@@ -244,16 +239,12 @@ mkdir -p build_tm1
 pushd build_tm1
 cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_ENABLE_PRD=0 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
-%endif
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_WLAN_BOARD_SPRD=1 \
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
        -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
@@ -283,15 +274,11 @@ mkdir -p build_wearable
 pushd build_wearable
 cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_ENABLE_PRD=0 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
-%endif
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
        -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
@@ -318,19 +305,14 @@ mkdir -p build_tv
 pushd build_tv
 cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_ENABLE_PRD=0 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
-%endif
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=0 \
        -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
-       -DTIZEN_WIFI_MODULE_BUNDLE=0 \
        -DTIZEN_PROFILE_TV=1 \
 %if "%{?_lib}" == "lib64"
        -DTIZEN_ARCH_64=1 \
@@ -353,15 +335,11 @@ popd
 # common
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_ENABLE_PRD=0 \
-%if 0%{?model_build_feature_wlan_concurrent_mode}
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
-%endif
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
        -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
index bdaaa2d..f071d6d 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -71,15 +71,9 @@
 
 #if defined TIZEN_PROFILE_TV
 
-#      if defined TIZEN_WIFI_MODULE_BUNDLE
-#              define COMMON_IFACE_NAME "wlan0"
-#              define GROUP_IFACE_NAME "wlan0"
-#              define GROUP_IFACE_PREFIX "wlan"
-#      else /* TIZEN_WIFI_MODULE_BUNDLE */
-#              define COMMON_IFACE_NAME "p2p0"
-#              define GROUP_IFACE_NAME "p2p0"
-#              define GROUP_IFACE_PREFIX "p2p"
-#      endif /* TIZEN_WIFI_MODULE_BUNDLE */
+#      define COMMON_IFACE_NAME "p2p0"
+#      define GROUP_IFACE_NAME "p2p0"
+#      define GROUP_IFACE_PREFIX "p2p"
 
 #      define PRIMARY_DEVICE_TYPE "\x00\x07\x00\x50\xf2\x04\x00\x01"
 #      define DEFAULT_DEVICE_NAME "[TV]Tizen"

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index 9369abc..5d917f3 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -69,10 +69,6 @@
 
 #define CONF_FILE_PATH tzplatform_mkpath(TZ_SYS_ETC, "wpa_supplicant/wpa_supplicant.conf")
 
-#if defined TIZEN_WIFI_MODULE_BUNDLE
-#define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
-#endif
-
 #ifndef DEFAULT_MAC_FILE_PATH
 #define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
 #endif
@@ -662,7 +658,7 @@ static void _ws_process_interface_removed(GDBusConnection *connection,
                WDP_LOGD("p2p group interface removed");
                memset(g_pd->group_iface_path, 0x0, DBUS_OBJECT_PATH_MAX);
        }
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_PROFILE_MOBILE)
+#if defined(TIZEN_PROFILE_MOBILE)
        else if (!g_strcmp0(g_pd->iface_path, interface_path)) {
 
                WDP_LOGD("p2p interface removed");
@@ -677,7 +673,7 @@ static void _ws_process_interface_removed(GDBusConnection *connection,
 
                memset(g_pd->iface_path, 0x0, DBUS_OBJECT_PATH_MAX);
        }
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_PROFILE_MOBILE */
+#endif /* TIZEN_PROFILE_MOBILE */
        __WDP_LOG_FUNC_EXIT__;
 }
 
@@ -3916,7 +3912,6 @@ static int _ws_reset_plugin(ws_dbus_plugin_data_s *f_pd)
        return 0;
 }
 
-#ifndef TIZEN_WIFI_MODULE_BUNDLE
 static int __ws_check_net_interface(char* if_name)
 {
        struct ifreq ifr;
@@ -3956,7 +3951,6 @@ static int __ws_check_net_interface(char* if_name)
        }
        return 0;
 }
-#endif
 
 int ws_init(wfd_oem_event_cbs_s *event_cbs)
 {
@@ -4043,7 +4037,6 @@ gboolean _ws_util_execute_file(const char *file_path,
        return FALSE;
 }
 
-#ifndef TIZEN_WIFI_MODULE_BUNDLE
 static int __ws_p2p_firmware_start(void)
 {
        gboolean rv = FALSE;
@@ -4072,7 +4065,6 @@ static int __ws_p2p_firmware_stop(void)
        WDP_LOGI("Successfully removed p2p device driver");
        return 0;
 }
-#endif
 
 static int __ws_p2p_supplicant_start(void)
 {
@@ -4390,7 +4382,7 @@ int ws_activate(int concurrent)
                __WDP_LOG_FUNC_EXIT__;
                return -1;
        }
-#ifndef TIZEN_WIFI_MODULE_BUNDLE
+
        while (retry_count < WS_CONN_RETRY_COUNT) {
                /* load wlan driver */
                if (concurrent == 0)
@@ -4410,7 +4402,7 @@ int ws_activate(int concurrent)
                        break;
                }
        }
-#endif
+
        if (retry_count >= WS_CONN_RETRY_COUNT) {
                WDP_LOGE("Driver loading is failed", res);
                __WDP_LOG_FUNC_EXIT__;
@@ -4428,10 +4420,8 @@ int ws_activate(int concurrent)
        if (res < 0) {
                res = __ws_p2p_supplicant_stop();
                WDP_LOGI("[/usr/sbin/p2p_supp.sh stop] returns %d", res);
-#ifndef TIZEN_WIFI_MODULE_BUNDLE
                res = __ws_p2p_firmware_stop();
                WDP_LOGI("P2P firmware stopped with error %d", res);
-#endif
                __WDP_LOG_FUNC_EXIT__;
                return -1;
        }
@@ -4479,10 +4469,8 @@ int ws_deactivate(int concurrent)
        if (concurrent == 0) {
                res = __ws_p2p_supplicant_stop();
                WDP_LOGI("[/usr/sbin/p2p_supp.sh stop] returns %d", res);
-#ifndef TIZEN_WIFI_MODULE_BUNDLE
                res = __ws_p2p_firmware_stop();
                WDP_LOGI("P2P firmware stopped with error %d", res);
-#endif
        }
        g_pd->activated = FALSE;
 

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index 2783a7d..d4a00b1 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -617,21 +617,18 @@ int wfd_manager_activate(wfd_manager_s *manager)
        wfd_state_get(manager, &prev_state);
        wfd_state_set(manager, WIFI_DIRECT_STATE_ACTIVATING);
        wfd_util_set_wifi_direct_state(WIFI_DIRECT_STATE_ACTIVATING);
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE)
        res = wfd_util_check_wifi_state();
        if (res < 0) {
                WDS_LOGE("Failed to get wifi state");
                return WIFI_DIRECT_ERROR_OPERATION_FAILED;
        } else if (res == 0) {
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE */
-       res = wfd_oem_activate(manager->oem_ops, 0);
-       if (res < 0) {
-               WDS_LOGE("Failed to activate");
-               wfd_state_set(manager, prev_state);
-               wfd_util_set_wifi_direct_state(prev_state);
-               return WIFI_DIRECT_ERROR_OPERATION_FAILED;
-       }
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE)
+               res = wfd_oem_activate(manager->oem_ops, 0);
+               if (res < 0) {
+                       WDS_LOGE("Failed to activate");
+                       wfd_state_set(manager, prev_state);
+                       wfd_util_set_wifi_direct_state(prev_state);
+                       return WIFI_DIRECT_ERROR_OPERATION_FAILED;
+               }
        } else {
                res = wfd_oem_activate(manager->oem_ops, res);
                if (res < 0) {
@@ -641,7 +638,6 @@ int wfd_manager_activate(wfd_manager_s *manager)
                        return WIFI_DIRECT_ERROR_OPERATION_FAILED;
                }
        }
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE */
        WDS_LOGE("Succeeded to activate");
 
        wfd_state_set(manager, WIFI_DIRECT_STATE_ACTIVATED);
@@ -695,13 +691,13 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
                        WDS_LOGE("Failed to destroy group before deactivation");
        }
 
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_PROFILE_MOBILE)
+#if defined(TIZEN_PROFILE_MOBILE)
        res = wfd_util_check_wifi_state();
        if (res < 0) {
                WDS_LOGE("Failed to get wifi state");
                return WIFI_DIRECT_ERROR_OPERATION_FAILED;
        } else if (res == 0) {
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_PROFILE_MOBILE */
+#endif /* TIZEN_PROFILE_MOBILE */
                res = wfd_oem_deactivate(manager->oem_ops, 0);
                if (res < 0) {
                        WDS_LOGE("Failed to deactivate");
@@ -709,7 +705,7 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
                        wfd_util_set_wifi_direct_state(prev_state);
                        return WIFI_DIRECT_ERROR_OPERATION_FAILED;
                }
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_PROFILE_MOBILE)
+#if defined(TIZEN_PROFILE_MOBILE)
        } else {
                /* FIXME: We should do something to stop p2p feature of Driver */
                res = wfd_oem_deactivate(manager->oem_ops, res);
@@ -721,7 +717,7 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
                }
                WDS_LOGE("Do not need to deactivate Wi-Fi");
        }
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_PROFILE_MOBILE */
+#endif /* TIZEN_PROFILE_MOBILE */
        WDS_LOGE("Succeeded to deactivate");
 
        wfd_state_set(manager, WIFI_DIRECT_STATE_DEACTIVATED);

diff --git a/src/wifi-direct-util.c b/src/wifi-direct-util.c
index 7a278f0..4e1a22b 100644 (file)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -84,11 +84,7 @@
 #define MAX_SIZE_ERROR_BUFFER 256
 
 #if defined TIZEN_PROFILE_TV
-#      if defined TIZEN_WIFI_MODULE_BUNDLE
-#              define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
-#      else /* TIZEN_WIFI_MODULE_BUNDLE */
-#              define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
-#      endif /* TIZEN_WIFI_MODULE_BUNDLE */
+#      define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
 #endif /* TIZEN_PROFILE_TV */
 
 #ifndef DEFAULT_MAC_FILE_PATH
@@ -616,25 +612,6 @@ int wfd_util_wifi_direct_activatable()
 {
        __WDS_LOG_FUNC_ENTER__;
 
-#ifndef TIZEN_WLAN_CONCURRENT_ENABLE
-       int res_wifi = 0;
-
-       res_wifi = wfd_util_check_wifi_state();
-       if (res_wifi < 0) {
-               WDS_LOGE("Failed to check Wi-Fi state");
-               __WDS_LOG_FUNC_EXIT__;
-               return WIFI_DIRECT_ERROR_OPERATION_FAILED;
-       } else if (res_wifi > 0) {
-               WDS_LOGE("Wi-Fi is On");
-               __WDS_LOG_FUNC_EXIT__;
-               return WIFI_DIRECT_ERROR_WIFI_USED;
-       } else {
-               WDS_LOGE("Wi-Fi is Off");
-               __WDS_LOG_FUNC_EXIT__;
-               return WIFI_DIRECT_ERROR_NONE;
-       }
-#endif
-
 #if defined TIZEN_TETHERING_ENABLE
        int res_mobap = 0;