Remove the TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND build flag

Description: We'll handle this feature only in wfd-manager and
it's configuration file.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1832156..bc444e7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,9 +12,5 @@ SET(pc_dependents "capi-base-common")
 #SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fprofile-arcs -ftest-coverage")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
 
-IF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-ENDIF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-
 ADD_SUBDIRECTORY(src)
 #ADD_SUBDIRECTORY(test)

diff --git a/packaging/capi-network-wifi-direct.spec b/packaging/capi-network-wifi-direct.spec
index a8917cf..a6734bf 100644 (file)
--- a/packaging/capi-network-wifi-direct.spec
+++ b/packaging/capi-network-wifi-direct.spec
@@ -3,7 +3,7 @@
 
 Name:       capi-network-wifi-direct
 Summary:    Network WiFi-Direct Library
-Version:    1.2.86
+Version:    1.2.87
 Release:    1
 Group:      Network & Connectivity/API
 License:    Apache-2.0
@@ -81,7 +81,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 mkdir -p build_extension
 pushd build_extension
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        .. -DVERSION=%{version} -DMAJORVERSION=${MAJORVER} -DCMAKE_LIB_DIR=%{_libdir}
 make %{?jobs:-j%jobs}
 popd

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 40ce26f..6d1e153 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -87,10 +87,6 @@ ENDIF("${ARCH}" STREQUAL "arm")
 
 ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DEXPORT_API=\"__attribute__((visibility(\\\"default\\\")))\" ")
-IF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
-       SET(FEATURES "${FEATURES} -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND")
-ENDIF(TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND)
 
 # Linker flags
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed, --rpath=${LIBDIR}")

diff --git a/src/wifi-direct-client-proxy.c b/src/wifi-direct-client-proxy.c
index 8de51db..9c98c25 100644 (file)
--- a/src/wifi-direct-client-proxy.c
+++ b/src/wifi-direct-client-proxy.c
@@ -835,7 +835,6 @@ int wifi_direct_initialize(void)
                return WIFI_DIRECT_ERROR_OPERATION_FAILED; //LCOV_EXCL_LINE
        }
 
-#ifdef TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND
        reply = wifi_direct_dbus_method_call_sync(WFD_MANAGER_MANAGE_INTERFACE,
                                                  "AddClient", NULL, &error);
        res = __net_wifidirect_gerror_to_enum(error);
@@ -846,7 +845,6 @@ int wifi_direct_initialize(void)
 
        g_variant_get(reply, "(i)", &res);
        WDC_LOGD("Active Client id Added, ret[%d]", res);
-#endif/* TIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND */
 
        reply = wifi_direct_dbus_method_call_sync(WFD_MANAGER_GROUP_INTERFACE,
                                                  "IsGroupOwner", NULL, &error);
@@ -3528,15 +3526,7 @@ int wifi_direct_start_service_discovery(char *mac_address,
                __WDC_LOG_FUNC_END__;
                return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
        }
-
-       if (type >= WIFI_DIRECT_SERVICE_TYPE_ALL &&
-                       type <= WIFI_DIRECT_SERVICE_TYPE_CONTACT_INFO) {
-               WDC_LOGD("Param service_type [%d]", type);
-       } else {
-               WDC_LOGE("Invalid Param [type]!");
-               __WDC_LOG_FUNC_END__;
-               return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
-       }
+       WDC_LOGD("Param service_type [%d]", type);
 
        if (mac_address)
                params = g_variant_new("(is)", type, mac_address);
@@ -3578,15 +3568,7 @@ int wifi_direct_cancel_service_discovery(char *mac_address,
                __WDC_LOG_FUNC_END__;
                return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
        }
-
-       if (type >= WIFI_DIRECT_SERVICE_TYPE_ALL &&
-                       type <= WIFI_DIRECT_SERVICE_TYPE_CONTACT_INFO) {
-               WDC_LOGD("Param service_type [%d]", type);
-       } else {
-               WDC_LOGE("Invalid Param [type]!");
-               __WDC_LOG_FUNC_END__;
-               return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
-       }
+       WDC_LOGD("Param service_type [%d]", type);
 
        if (mac_address)
                params = g_variant_new("(is)", type, mac_address);
@@ -3635,13 +3617,6 @@ int wifi_direct_register_service(wifi_direct_service_type_e type, char *info1, c
                return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
        }
 
-       if (type < WIFI_DIRECT_SERVICE_TYPE_ALL ||
-                       type > WIFI_DIRECT_SERVICE_TYPE_VENDOR) {
-               WDC_LOGE("Invalid Param [type]!");
-               __WDC_LOG_FUNC_END__;
-               return WIFI_DIRECT_ERROR_INVALID_PARAMETER;
-       }
-
        if (!service_id) {
                WDC_LOGE("Invalid Param [service_id]!");
                __WDC_LOG_FUNC_END__;
@@ -4054,9 +4029,7 @@ int wifi_direct_set_display(wifi_direct_display_type_e type, int port, int hdcp)
                return WIFI_DIRECT_ERROR_NOT_INITIALIZED;
        }
 
-       if (type < WIFI_DIRECT_DISPLAY_TYPE_SOURCE ||
-                       type > WIFI_DIRECT_DISPLAY_TYPE_DUAL || port < 0 ||
-                       hdcp < 0) {
+       if (port < 0 || hdcp < 0) {
                WDC_LOGE("Invalid paramaeters passed type[%d], port[%d], hdcp[%d]!", type, port, hdcp);
                __WDC_LOG_FUNC_END__;
                return WIFI_DIRECT_ERROR_INVALID_PARAMETER;