Remove build flag TIZEN_FEATURE_WIFI_DISPLAY

Description: We have added new features with build flags. But it makes
spec file complicated. So we'll manage this feature at run time not
compile time.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1846332..5e8ed00 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,9 +39,6 @@ ENDIF(TIZEN_FEATURE_DEFAULT_CONNECTION_AGENT)
 IF(TIZEN_FEATURE_SERVICE_DISCOVERY)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_SERVICE_DISCOVERY)
 ENDIF(TIZEN_FEATURE_SERVICE_DISCOVERY)
-IF(TIZEN_FEATURE_WIFI_DISPLAY)
-       ADD_DEFINITIONS(-DTIZEN_FEATURE_WIFI_DISPLAY)
-ENDIF(TIZEN_FEATURE_WIFI_DISPLAY)
 IF(TIZEN_FEATURE_IP_OVER_EAPOL)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_IP_OVER_EAPOL)
 ENDIF(TIZEN_FEATURE_IP_OVER_EAPOL)

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index ac53547..d92b1fa 100644 (file)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -112,7 +112,6 @@ typedef enum {
 #endif /* TIZEN_FEATURE_IP_OVER_EAPOL */
 } wfd_ip_type_e;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 typedef enum {
        WFD_DISPLAY_TYPE_SOURCE,
        WFD_DISPLAY_TYPE_PRISINK,
@@ -136,7 +135,6 @@ typedef struct {
 #define WIFI_DISPLAY_DEFAULT_HDCP 1
 #define WIFI_DISPLAY_DEFAULT_PORT 7236
 #define WIFI_DISPLAY_DEFAULT_TPUT 54
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 typedef struct {
        int state;
@@ -158,9 +156,7 @@ typedef struct {
 
        char passphrase[PASSPHRASE_LEN_MAX + 1];
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        wfd_display_s display;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 #ifdef TIZEN_FEATURE_SERVICE_DISCOVERY
        GList *services;
@@ -253,10 +249,8 @@ int wfd_manager_get_peers(wfd_manager_s *manager, wfd_discovery_entry_s **peers)
 int wfd_manager_get_connected_peers(wfd_manager_s *manager, wfd_connected_peer_info_s **peers_data);
 int wfd_manager_get_goup_ifname(char **ifname);
 wfd_device_s *wfd_manager_get_peer_by_addr(wfd_manager_s *manager, unsigned char *peer_addr);
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int wfd_manager_set_display_device(int type, int port, int hdcp);
 int wfd_manager_set_session_availability(int availability);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 int wfd_manager_start_discovery(wfd_manager_s *manager, int mode, int timeout,
                                const char* type, int channel, int frequency);
 int wfd_manager_cancel_discovery(wfd_manager_s *manager);

diff --git a/oem/wifi-direct-oem.c b/oem/wifi-direct-oem.c
index 7e37c2f..d10682f 100644 (file)
--- a/oem/wifi-direct-oem.c
+++ b/oem/wifi-direct-oem.c
@@ -391,7 +391,6 @@ int wfd_oem_serv_disc_stop(wfd_oem_ops_s *ops, int handle)
 }
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int wfd_oem_miracast_init(wfd_oem_ops_s *ops, int enable)
 {
        if (!ops || !ops->miracast_init)
@@ -409,8 +408,6 @@ int wfd_oem_set_display(wfd_oem_ops_s *ops, wfd_oem_display_s *wifi_display)
        return ops->set_display(wifi_display);
 }
 
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
-
 int wfd_oem_refresh(wfd_oem_ops_s *ops)
 {
        if (!ops || !ops->refresh)

diff --git a/oem/wifi-direct-oem.h b/oem/wifi-direct-oem.h
index c3bf64d..b41f934 100644 (file)
--- a/oem/wifi-direct-oem.h
+++ b/oem/wifi-direct-oem.h
@@ -175,7 +175,6 @@ typedef enum {
        WFD_OEM_VSIE_FRAME_MAX
 } wfd_oem_vsie_frames_e;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 typedef enum {
        WFD_OEM_DISPLAY_TYPE_SOURCE,
        WFD_OEM_DISPLAY_TYPE_PRISINK,
@@ -193,7 +192,6 @@ typedef struct {
        int port;
        int max_tput;
 } wfd_oem_display_s;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 #if defined(TIZEN_FEATURE_ASP)
 typedef struct {
@@ -221,9 +219,7 @@ typedef struct {
        int dev_flags;
        int group_flags;
        int wps_mode;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        wfd_oem_display_s display;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
        int rssi;
 } wfd_oem_device_s;
 
@@ -238,9 +234,7 @@ typedef struct {
        int group_flags;
        int dev_role;
        int device_go_intent;
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        wfd_oem_display_s display;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
        unsigned char p2p_go_addr[OEM_MACADDR_LEN];
 #if defined(TIZEN_FEATURE_ASP)
        int has_asp_services;
@@ -675,10 +669,8 @@ typedef struct {
        int (*serv_disc_stop) (int handle);
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        int (*miracast_init) (int enable);
        int (*set_display) (wfd_oem_display_s *wifi_display);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
        int (*refresh) (void);
        int (*save_config) (void);
@@ -752,10 +744,8 @@ int wfd_oem_serv_disc_start(wfd_oem_ops_s *ops, wfd_oem_new_service_s *service);
 int wfd_oem_serv_disc_stop(wfd_oem_ops_s *ops, int handle);
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int wfd_oem_miracast_init(wfd_oem_ops_s *ops, int enable);
 int wfd_oem_set_display(wfd_oem_ops_s *ops, wfd_oem_display_s *wifi_display);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 int wfd_oem_refresh(wfd_oem_ops_s *ops);
 #if defined(TIZEN_FEATURE_ASP)

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index e74f749..96d89b7 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.229
+Version:       1.2.230
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -245,7 +245,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_WLAN_BOARD_SPRD=1 \
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
@@ -279,7 +278,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_COMMON=1 \
@@ -310,7 +308,6 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_TV=1 \
@@ -340,7 +337,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %endif
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
-       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_PROFILE_COMMON=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 f071d6d..a949984 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -160,7 +160,6 @@
 #define WS_DBUS_STR_AUTH "auth"
 #define WS_DBUS_STR_PERSISTENT "persistent"
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 #define WS_WFD_INFO_PRIMARY_SINK 0x01
 #define WS_WFD_INFO_SECONDARY_SINK 0x02
 #define WS_WFD_INFO_AVAILABILITY 0x10
@@ -168,7 +167,6 @@
 #define WS_WFD_INFO_TDLS_SUPPORT 0x80
 #define WS_WFD_INFO_HDCP_SUPPORT 0x100
 #define WS_WFD_INFO_SYNC_SUPPORT 0x200
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 typedef enum {
        WS_IFTYPE_NONE,
@@ -332,7 +330,6 @@ typedef enum {
        WPS_ERROR_PASSWORD_MISMATCH,
 } ws_wps_error_e;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 typedef enum {
        WFD_SUBELM_ID_DEV_INFO,
        WFD_SUBELM_ID_ASSOC_BSSID,
@@ -347,10 +344,10 @@ typedef enum {
        WFD_SUBELM_ID_SESSION_INFO,
        WFD_SUBELM_ID_ALT_MAC,
 } ws_wfd_subelm_id_e;
+
 #define WFD_SUBELEM_LEN_DEV_INFO 6
 #define WFD_SUBELM_LEN_ASSOC_BSSID 6
 #define WFD_SUBELM_LEN_CUPLED_SYNC_INFO 7
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 typedef enum {
        WFD_OEM_NETFLAG_CURRENT,
@@ -436,10 +433,8 @@ int ws_serv_add(wfd_oem_new_service_s *service);
 int ws_serv_del(wfd_oem_new_service_s *service);
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int ws_miracast_init(int enable);
 int ws_set_display(wfd_oem_display_s *wifi_display);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 int ws_refresh(void);
 int ws_save_config(void);

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index 5d917f3..e65588b 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -126,10 +126,8 @@ static wfd_oem_ops_s supplicant_ops = {
        .serv_del = ws_serv_del,
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        .miracast_init = ws_miracast_init,
        .set_display = ws_set_display,
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
        .refresh = ws_refresh,
        .save_config =  ws_save_config,
@@ -552,7 +550,6 @@ static int __ws_unpack_ay_malloc(unsigned char **dst, GVariantIter *iter)
        return length;
 }
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 static int __parsing_wfd_info(unsigned char *wfd_dev_info,
                wfd_oem_display_s* display)
 {
@@ -585,7 +582,6 @@ static int __parsing_wfd_info(unsigned char *wfd_dev_info,
        __WDP_LOG_FUNC_EXIT__;
        return 0;
 }
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 static int _ws_get_local_dev_mac(unsigned char *dev_mac)
 {
@@ -765,13 +761,11 @@ static void __ws_get_peer_property(const char *key, GVariant *value, void *user_
                }
        } else if (g_strcmp0(key, "SecondaryDeviceTypes") == 0) {
        } else if (g_strcmp0(key, "VendorExtension") == 0) {
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        } else if (g_strcmp0(key, "IEs") == 0) {
                unsigned char ies[WFD_SUBELEM_LEN_DEV_INFO + 3] = {0,};
 
                if (__ws_unpack_ay(ies, value, WFD_SUBELEM_LEN_DEV_INFO + 3))
                        __parsing_wfd_info(ies, &(peer->display));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
        } else if (g_strcmp0(key, "DeviceAddress") == 0) {
 
                if (__ws_unpack_ay(peer->dev_addr, value, WS_MACADDR_LEN))
@@ -863,13 +857,11 @@ static void __ws_peer_property(const char *key, GVariant *value, void *user_data
                }
        } else if (g_strcmp0(key, "SecondaryDeviceTypes") == 0) {
        } else if (g_strcmp0(key, "VendorExtension") == 0) {
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        } else if (g_strcmp0(key, "IEs") == 0) {
                unsigned char ies[WFD_SUBELEM_LEN_DEV_INFO + 3] = {0,};
 
                if (__ws_unpack_ay(ies, value, WFD_SUBELEM_LEN_DEV_INFO + 3))
                        __parsing_wfd_info(ies, &(peer->display));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
        } else if (g_strcmp0(key, "DeviceAddress") == 0) {
 
                if (__ws_unpack_ay(peer->p2p_dev_addr, value, WS_MACADDR_LEN))
@@ -6608,8 +6600,6 @@ int ws_serv_del(wfd_oem_new_service_s *service)
 }
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-
 int _ws_disable_display()
 {
        __WDP_LOG_FUNC_ENTER__;
@@ -6744,7 +6734,6 @@ int ws_set_display(wfd_oem_display_s *wifi_display)
        __WDP_LOG_FUNC_EXIT__;
        return res;
 }
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 int ws_refresh(void)
 {
@@ -7390,7 +7379,7 @@ int ws_add_vsie(wfd_oem_vsie_frames_e frame_id, const char* vsie)
        unsigned char *bytearray = NULL;
        size_t bytearray_len = 0;
 
-       if (frame_id < 0 || frame_id >= WFD_OEM_VSIE_FRAME_MAX ||
+       if (frame_id >= WFD_OEM_VSIE_FRAME_MAX ||
            vsie == NULL) {
                WDP_LOGE("Invalid parameter");
                return -1;
@@ -7469,7 +7458,7 @@ int ws_get_vsie(wfd_oem_vsie_frames_e frame_id, char **vsie)
        GVariant *reply = NULL;
        GError *error = NULL;
 
-       if (frame_id < 0 || frame_id >= WFD_OEM_VSIE_FRAME_MAX ||
+       if (frame_id >= WFD_OEM_VSIE_FRAME_MAX ||
            vsie == NULL) {
                WDP_LOGE("Invalid parameter");
                __WDP_LOG_FUNC_EXIT__;
@@ -7565,7 +7554,7 @@ int ws_remove_vsie(wfd_oem_vsie_frames_e frame_id, const char *vsie)
        unsigned char *bytearray = NULL;
        size_t bytearray_len = 0;
 
-       if (frame_id < 0 || frame_id >= WFD_OEM_VSIE_FRAME_MAX ||
+       if (frame_id >= WFD_OEM_VSIE_FRAME_MAX ||
            vsie == NULL) {
                WDP_LOGE("Invalid parameter");
                return -1;

diff --git a/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
index 62edeeb..be0b3e3 100644 (file)
--- a/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/emul/include/wfd-plugin-wpasupplicant.h
@@ -112,10 +112,8 @@ int ws_serv_add(wfd_oem_new_service_s *service);
 int ws_serv_del(wfd_oem_new_service_s *service);
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int ws_miracast_init(int enable);
 int ws_set_display(wfd_oem_display_s *wifi_display);
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
 int ws_refresh();
 int ws_save_config(void);

diff --git a/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c b/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c
index 0c3414f..a7f3edb 100644 (file)
--- a/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c
+++ b/plugin/wpasupplicant/emul/wfd-plugin-wpasupplicant-emul.c
@@ -64,10 +64,8 @@ static wfd_oem_ops_s supplicant_ops = {
        .serv_del = ws_serv_del,
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        .miracast_init = ws_miracast_init,
        .set_display = ws_set_display,
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
        .save_config = ws_save_config,
        .set_operating_channel = ws_set_operating_channel,
        .remove_all_network = ws_remove_all_network,
@@ -433,7 +431,6 @@ int ws_serv_del(wfd_oem_new_service_s *service)
 }
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int ws_miracast_init(int enable)
 {
        __WDP_LOG_FUNC_ENTER__;
@@ -450,8 +447,6 @@ int ws_set_display(wfd_oem_display_s *wifi_display)
        return -1;
 }
 
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
-
 int ws_save_config(void)
 {
        __WDP_LOG_FUNC_ENTER__;

diff --git a/src/wifi-direct-event.c b/src/wifi-direct-event.c
index 56e2f15..2a15fbd 100644 (file)
--- a/src/wifi-direct-event.c
+++ b/src/wifi-direct-event.c
@@ -88,9 +88,8 @@ static int _wfd_event_update_peer(wfd_manager_s *manager, wfd_oem_dev_data_s *da
        peer->rssi =  data->rssi;
        WDS_LOGD("Peer RSSI value is %d", peer->rssi);
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       memcpy(&(peer->display), &(data->display), sizeof(wfd_display_s));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+       if (manager->is_wifi_display_supported)
+               memcpy(&(peer->display), &(data->display), sizeof(wfd_display_s));
 
 #if !(__GNUC__ <= 4 && __GNUC_MINOR__ < 8)
        wfd_util_get_current_time(&peer->time);

diff --git a/src/wifi-direct-iface.c b/src/wifi-direct-iface.c
index b7b9121..052d1d2 100644 (file)
--- a/src/wifi-direct-iface.c
+++ b/src/wifi-direct-iface.c
@@ -385,7 +385,6 @@ const gchar wfd_manager_introspection_xml[] = {
                        "</signal>"
                "</interface>"
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
                "<interface name='net.wifidirect.display'>"
                        "<method name='Init'>"
                                "<arg type='i' name='error_code' direction='out'/>"
@@ -429,7 +428,6 @@ const gchar wfd_manager_introspection_xml[] = {
                                "<arg type='i' name='result' direction='out'/>"
                        "</method>"
                "</interface>"
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 #if defined(TIZEN_FEATURE_ASP)
                "<interface name='net.wifidirect.asp'>"
                        "<method name='AdvertiseService'>"
@@ -663,11 +661,11 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        g_variant_builder_add(&builder_peer, "{sv}",
                                        "SubCategory",
                                        g_variant_new_uint16(peers[i].subcategory));
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                       g_variant_builder_add(&builder_peer, "{sv}",
-                                       "IsWfdDevice",
-                                       g_variant_new_boolean(peers[i].is_wfd_device));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+
+                       if (manager->is_wifi_display_supported)
+                               g_variant_builder_add(&builder_peer, "{sv}",
+                                               "IsWfdDevice",
+                                               g_variant_new_boolean(peers[i].is_wfd_device));
 
                        WDS_LOGD("%dth peer [%s]", i, peers[i].device_name);
                        g_variant_builder_add_value(builder_peers, g_variant_builder_end(&builder_peer));
@@ -952,11 +950,11 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                        g_variant_builder_add(&builder_peer, "{sv}",
                                        "IsP2P",
                                        g_variant_new_boolean(peers[i].is_p2p));
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                       g_variant_builder_add(&builder_peer, "{sv}",
-                                       "IsWfdDevice",
-                                       g_variant_new_boolean(peers[i].is_wfd_device));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+
+                       if (manager->is_wifi_display_supported)
+                               g_variant_builder_add(&builder_peer, "{sv}",
+                                               "IsWfdDevice",
+                                               g_variant_new_boolean(peers[i].is_wfd_device));
 
                        WDS_LOGD("%dth peer [%s]", i, peers[i].device_name);
                        g_variant_builder_add_value(builder_peers, g_variant_builder_end(&builder_peer));
@@ -1028,11 +1026,11 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                g_variant_builder_add(builder_peer, "{sv}",
                                "WpsCfgMethods",
                                g_variant_new_uint16(peer->config_methods));
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-               g_variant_builder_add(builder_peer, "{sv}",
-                               "IsWfdDevice",
-                               g_variant_new_boolean(false));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+
+               if (manager->is_wifi_display_supported)
+                       g_variant_builder_add(builder_peer, "{sv}",
+                                       "IsWfdDevice",
+                                       g_variant_new_boolean(false));
 
                ret = WIFI_DIRECT_ERROR_NONE;
                return_parameters = g_variant_new("(ia{sv})", ret,
@@ -1113,11 +1111,12 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                g_variant_builder_add(builder_peer, "{sv}",
                                "SubCategory",
                                g_variant_new_uint16(peer->subcategory));
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-               g_variant_builder_add(builder_peer, "{sv}",
-                               "IsWfdDevice",
-                               g_variant_new_boolean(peer->is_wfd_device));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+
+               if (manager->is_wifi_display_supported)
+                       g_variant_builder_add(builder_peer, "{sv}",
+                                       "IsWfdDevice",
+                                       g_variant_new_boolean(peer->is_wfd_device));
+
 #ifdef TIZEN_FEATURE_ASP
                wfd_device_s *connected_peer = NULL;
                connected_peer = wfd_group_find_member_by_addr(manager->group, mac_addr);
@@ -1129,7 +1128,7 @@ static void __wfd_manager_manage_iface_handler(const gchar *method_name,
                                        "IPAddress",
                                        wfd_manager_dbus_pack_ay(connected_peer->ip_addr, IPADDR_LEN));
                }
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+#endif /* TIZEN_FEATURE_ASP */
 
                ret = WIFI_DIRECT_ERROR_NONE;
                return_parameters = g_variant_new("(ia{sv})", ret, builder_peer);
@@ -2143,7 +2142,6 @@ failed:
 }
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 static void __wfd_manager_display_iface_handler(const gchar *method_name,
                                               GVariant    *parameters,
                                               GDBusMethodInvocation *invocation)
@@ -2155,6 +2153,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
        WDS_LOGD("%s", method_name);
 
        if (!g_strcmp0(method_name, "Init")) {
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2179,6 +2182,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                goto done;
 
        } else if (!g_strcmp0(method_name, "Deinit")) {
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2201,13 +2209,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
 
        } else if (!g_strcmp0(method_name, "SetConfig")) {
                int type, port, hdcp;
-               g_variant_get(parameters, "(iii)", &type, &port, &hdcp);
+
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
 
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(iii)", &type, &port, &hdcp);
                WDS_LOGD("type %d port %d hdcp %d", type, port, hdcp);
 
                ret = wfd_manager_set_display_device(type, port, hdcp);
@@ -2223,13 +2236,18 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
 
        } else if (!g_strcmp0(method_name, "SetAvailiability")) {
                int availability;
-               g_variant_get(parameters, "(i)", &availability);
+
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
 
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
                }
 
+               g_variant_get(parameters, "(i)", &availability);
                ret = wfd_manager_set_session_availability(availability);
                if (ret < 0) {
                        WDS_LOGE("Failed to set session availability");
@@ -2246,6 +2264,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2274,6 +2297,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2302,6 +2330,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2330,6 +2363,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2358,6 +2396,11 @@ static void __wfd_manager_display_iface_handler(const gchar *method_name,
                const char *mac_address = NULL;
                unsigned char mac_addr[MACADDR_LEN] = {0, };
 
+               if (!manager->is_wifi_display_supported) {
+                       ret = WIFI_DIRECT_ERROR_NOT_SUPPORTED;
+                       goto failed;
+               }
+
                if (manager->state < WIFI_DIRECT_STATE_ACTIVATED) {
                        ret = WIFI_DIRECT_ERROR_NOT_PERMITTED;
                        goto failed;
@@ -2397,7 +2440,6 @@ failed:
        g_clear_error(&err);
        return;
 }
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 #if defined(TIZEN_FEATURE_ASP)
 
 static void __g_variant_to_txt_record(GVariant *variant, char **txt_record)
@@ -2926,13 +2968,11 @@ static struct {
                __wfd_manager_service_iface_handler
        },
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
        {
                0,
                WFD_MANAGER_DISPLAY_INTERFACE,
                __wfd_manager_display_iface_handler
        },
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 #if defined(TIZEN_FEATURE_ASP)
        {
                0,

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index d4a00b1..268af1f 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -247,9 +247,8 @@ int wfd_local_reset_data(wfd_manager_s *manager)
        local->dev_role = WFD_DEV_ROLE_NONE;
        local->wps_mode = WFD_WPS_MODE_PBC;
        memset(local->go_dev_addr, 0x0, MACADDR_LEN);
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       memset(&(local->display), 0x0, sizeof(wfd_display_s));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+       if (manager->is_wifi_display_supported)
+               memset(&(local->display), 0x0, sizeof(wfd_display_s));
        memset(local->ip_addr, 0x0, IPADDR_LEN);
 
        __WDS_LOG_FUNC_EXIT__;
@@ -678,11 +677,11 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
        wfd_state_set(manager, WIFI_DIRECT_STATE_DEACTIVATING);
        wfd_util_set_wifi_direct_state(WIFI_DIRECT_STATE_DEACTIVATING);
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       res = wfd_oem_miracast_init(manager->oem_ops, false);
-       if (res < 0)
-               WDS_LOGE("Failed to initialize miracast");
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+       if (manager->is_wifi_display_supported) {
+               res = wfd_oem_miracast_init(manager->oem_ops, false);
+               if (res < 0)
+                       WDS_LOGE("Failed to initialize miracast");
+       }
 
        group = (wfd_group_s*) manager->group;
        if (group && group->pending == FALSE) {
@@ -1261,9 +1260,8 @@ int wfd_manager_get_peer_info(wfd_manager_s *manager, unsigned char *addr, wfd_d
        peer_dev->group_flags = oem_dev->group_flags;
        peer_dev->wps_mode =  oem_dev->wps_mode;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       memcpy(&(peer_dev->display), &(oem_dev->display), sizeof(wfd_display_s));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+       if (manager->is_wifi_display_supported)
+               memcpy(&(peer_dev->display), &(oem_dev->display), sizeof(wfd_display_s));
 
        peer_dev->time = time;
        peer_dev->channel = oem_dev->channel;
@@ -1292,10 +1290,9 @@ int wfd_manager_get_peer_info(wfd_manager_s *manager, unsigned char *addr, wfd_d
        peer_info->category = peer_dev->pri_dev_type;
        peer_info->subcategory = peer_dev->sec_dev_type;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       if (peer_dev->display.availability && peer_dev->display.port)
-               peer_info->is_wfd_device = 1;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+       if (manager->is_wifi_display_supported)
+               if (peer_dev->display.availability && peer_dev->display.port)
+                       peer_info->is_wfd_device = 1;
 
        *peer = peer_info;
 
@@ -1379,10 +1376,10 @@ int wfd_manager_get_peers(wfd_manager_s *manager, wfd_discovery_entry_s **peers_
                peers[count].category = peer->pri_dev_type;
                peers[count].subcategory = peer->sec_dev_type;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-               if (peer->display.availability && peer->display.port)
-                       peers[count].is_wfd_device = 1;
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+
+               if (manager->is_wifi_display_supported)
+                       if (peer->display.availability && peer->display.port)
+                               peers[count].is_wfd_device = 1;
                count++;
                WDS_LOGD("%dth peer [%s]", count, peer->dev_name);
 next:
@@ -1450,11 +1447,9 @@ int wfd_manager_get_connected_peers(wfd_manager_s *manager, wfd_connected_peer_i
                        peers[count].services = 0;
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                       if (peer->display.availability && peer->display.port)
-                               peers[count].is_wfd_device = 1;
-
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+                       if (manager->is_wifi_display_supported)
+                               if (peer->display.availability && peer->display.port)
+                                       peers[count].is_wfd_device = 1;
 
                        WDS_LOGD("%dth member converted[%s]", count, peers[count].device_name);
                        count++;
@@ -1530,7 +1525,6 @@ int wfd_manager_get_goup_ifname(char **ifname)
        return 0;
 }
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
 int wfd_manager_set_display_device(int type, int port, int hdcp)
 {
        __WDS_LOG_FUNC_ENTER__;
@@ -1601,8 +1595,6 @@ int wfd_manager_set_session_availability(int availability)
        return res;
 }
 
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
-
 int wfd_manager_start_discovery(wfd_manager_s *manager, int mode, int timeout,
                                const char* type, int channel, int frequency)
 {

diff --git a/src/wifi-direct-peer.c b/src/wifi-direct-peer.c
index b0dc68f..b4bee08 100644 (file)
--- a/src/wifi-direct-peer.c
+++ b/src/wifi-direct-peer.c
@@ -171,9 +171,8 @@ int wfd_update_peer(void *data, wfd_device_s *peer)
        peer->group_flags = oem_dev->group_flags;
        peer->wps_mode =  oem_dev->wps_mode;
 
-#ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       memcpy(&(peer->display), &(oem_dev->display), sizeof(wfd_display_s));
-#endif /* TIZEN_FEATURE_WIFI_DISPLAY */
+       if (manager->is_wifi_display_supported)
+               memcpy(&(peer->display), &(oem_dev->display), sizeof(wfd_display_s));
 
        g_free(oem_dev);