Updated MACROS as per build option naming rule

This patch updates MACROS as per build option naming rule
(http://suprem.sec.samsung.net/confluence/display/SE/Build+Option+Naming+Rule)
TIZEN_MOBILE => TIZEN_PROFILE_MOBILE
TIZEN_TV => TIZEN_PROFILE_TV
TIZEN_WEARABLE => TIZEN_PROFILE_WEARABLE
TIZEN_COMMON => TIZEN_PROFILE_COMMON

Change-Id: I627b6d9ebb03522133ca2b2ebbea091d4d4d6831
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7114109..8248578 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,21 +46,21 @@ IF(TIZEN_ARCH_64)
        ADD_DEFINITIONS(-DTIZEN_ARCH_64)
 ENDIF(TIZEN_ARCH_64)
 
-IF(TIZEN_COMMON)
-       ADD_DEFINITIONS(-DTIZEN_COMMON)
-ENDIF(TIZEN_COMMON)
+IF(TIZEN_PROFILE_COMMON)
+       ADD_DEFINITIONS(-DTIZEN_PROFILE_COMMON)
+ENDIF(TIZEN_PROFILE_COMMON)
 
 IF(TIZEN_FEATURE_ASP)
        ADD_DEFINITIONS(-DTIZEN_FEATURE_ASP)
 ENDIF(TIZEN_FEATURE_ASP)
 
-IF(TIZEN_MOBILE)
-       ADD_DEFINITIONS(-DTIZEN_MOBILE)
-ENDIF(TIZEN_MOBILE)
+IF(TIZEN_PROFILE_MOBILE)
+       ADD_DEFINITIONS(-DTIZEN_PROFILE_MOBILE)
+ENDIF(TIZEN_PROFILE_MOBILE)
 
-IF(TIZEN_TV)
-       ADD_DEFINITIONS(-DTIZEN_TV)
-ENDIF(TIZEN_TV)
+IF(TIZEN_PROFILE_TV)
+       ADD_DEFINITIONS(-DTIZEN_PROFILE_TV)
+ENDIF(TIZEN_PROFILE_TV)
 
 IF(TIZEN_WIFI_MODULE_BUNDLE)
        ADD_DEFINITIONS(-DTIZEN_WIFI_MODULE_BUNDLE)

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index 2246a29..fb4eecc 100644 (file)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -30,7 +30,7 @@
 
 #define DEFAULT_DEVICE_NAME "Tizen_Device"
 
-#if defined TIZEN_MOBILE
+#if defined TIZEN_PROFILE_MOBILE
 #      if defined TIZEN_WLAN_BOARD_SPRD
 #              define DEFAULT_IFNAME "p2p0"
 #              define GROUP_IFNAME "p2p0"
@@ -38,9 +38,9 @@
 #              define DEFAULT_IFNAME "wlan0"
 #              define GROUP_IFNAME "p2p-wlan0-0"
 #      endif /* TIZEN_WLAN_BOARD_SPRD */
-#endif /* TIZEN_MOBILE */
+#endif /* TIZEN_PROFILE_MOBILE */
 
-#if defined TIZEN_TV
+#if defined TIZEN_PROFILE_TV
 #      if defined TIZEN_WIFI_MODULE_BUNDLE
 #              define DEFAULT_IFNAME "wlan0"
 #              define GROUP_IFNAME "wlan0"
@@ -48,7 +48,7 @@
 #              define DEFAULT_IFNAME "p2p0"
 #              define GROUP_IFNAME "p2p0"
 #      endif /* TIZEN_WIFI_MODULE_BUNDLE */
-#endif /* TIZEN_TV */
+#endif /* TIZEN_PROFILE_TV */
 
 #ifndef DEFAULT_IFNAME
 #      define DEFAULT_IFNAME "p2p0"

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index 09732a5..963ca22 100644 (file)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -83,7 +83,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
         -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
         -DCTRL_IFACE_DBUS=1 \
         -DTIZEN_DEBUG_DBUS_VALUE=1 \
-        -DTIZEN_COMMON=1 \
+        -DTIZEN_PROFILE_COMMON=1 \
 %else
 %if "%{profile}" == "wearable"
         -DTIZEN_FEATURE_SERVICE_DISCOVERY=0 \
@@ -100,7 +100,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
         -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
         -DCTRL_IFACE_DBUS=1 \
         -DTIZEN_DEBUG_DBUS_VALUE=1 \
-        -DTIZEN_MOBILE=1 \
+        -DTIZEN_PROFILE_MOBILE=1 \
         -DTIZEN_FEATURE_ASP=1 \
 %else
 %if "%{profile}" == "tv"
@@ -111,7 +111,7 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DCTRL_IFACE_DBUS=1 \
        -DTIZEN_DEBUG_DBUS_VALUE=1 \
        -DTIZEN_WIFI_MODULE_BUNDLE=0 \
-       -DTIZEN_TV=1 \
+       -DTIZEN_PROFILE_TV=1 \
 %endif
 %endif
 %endif

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 9ac8bad..bc1330e 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -42,7 +42,7 @@
 
 #define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
 
-#if defined(TIZEN_MOBILE) || defined(TIZEN_COMMON)
+#if defined(TIZEN_PROFILE_MOBILE) || defined(TIZEN_PROFILE_COMMON)
 #define COMMON_IFACE_NAME "wlan0"
 
 #      if defined TIZEN_WLAN_BOARD_SPRD
@@ -68,9 +68,9 @@
 #      define DEFAULT_CONFIG_METHOD "display push_button keypad p2ps"
 #endif
 #      define DEFAULT_NO_GROUP_IFACE 0
-#endif /* TIZEN_MOBILE */
+#endif /* TIZEN_PROFILE_MOBILE */
 
-#if defined TIZEN_TV
+#if defined TIZEN_PROFILE_TV
 
 #      if defined TIZEN_WIFI_MODULE_BUNDLE
 #              define COMMON_IFACE_NAME "wlan0"
@@ -92,7 +92,7 @@
 #      define DEFAULT_OPER_CHANNEL 1
 #      define DEFAULT_CONFIG_METHOD "keypad virtual_push_button physical_display"
 #      define DEFAULT_NO_GROUP_IFACE 1
-#endif /* TIZEN_TV */
+#endif /* TIZEN_PROFILE_TV */
 
 #if 0
 #define COMMON_IFACE_NAME "p2p0"

diff --git a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
index 6aa0a57..cc9fdaf 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
@@ -67,7 +67,7 @@
 
 #define NETCONFIG_DBUS_REPLY_TIMEOUT (10 * 1000)
 
-#if defined TIZEN_MOBILE
+#if defined TIZEN_PROFILE_MOBILE
 #define DEFAULT_MAC_FILE_PATH tzplatform_mkpath(TZ_SYS_ETC, ".mac.info")
 #endif
 
@@ -560,7 +560,7 @@ static void _supplicant_signal_cb(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_MOBILE)
+#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_PROFILE_MOBILE)
                else if (!g_strcmp0(g_pd->iface_path, interface_path)) {
 
                        WDP_LOGD("p2p interface removed");
@@ -574,7 +574,7 @@ static void _supplicant_signal_cb(GDBusConnection *connection,
 
                        memset(g_pd->iface_path, 0x0, DBUS_OBJECT_PATH_MAX);
                }
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_MOBILE */
+#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_PROFILE_MOBILE */
        } else if (!g_strcmp0(signal, "PropertiesChanged")) {
                WDP_LOGD("PropertiesChanged");
        }
@@ -3010,7 +3010,7 @@ static int _ws_get_interface(const char *iface_name, handle_reply function, void
        return res;
 }
 
-#if defined(TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD)
+#if defined(TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD)
 static void __ws_remove_interface(GVariant *value, void *user_data)
 {
        __WDP_LOG_FUNC_ENTER__;
@@ -3049,7 +3049,7 @@ static void __ws_remove_interface(GVariant *value, void *user_data)
        __WDP_LOG_FUNC_EXIT__;
        return;
 }
-#endif /* (TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
+#endif /* (TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
 
 static int _ws_init_dbus_connection(void)
 {
@@ -3090,15 +3090,15 @@ static int _ws_init_dbus_connection(void)
                NULL, NULL);
        WDP_LOGD("Subscribed supplicant iface signal: [%d]", g_pd->supp_sub_id);
 
-#if defined(TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD)
+#if defined(TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD)
        if (_ws_get_interface(COMMON_IFACE_NAME, NULL, NULL) < 0)
                _ws_create_interface(COMMON_IFACE_NAME, NULL, NULL);
        if (_ws_get_interface(P2P_IFACE_NAME, __register_p2pdevice_signal, NULL) < 0)
                res = _ws_create_interface(P2P_IFACE_NAME, __register_p2pdevice_signal, NULL);
-#else /* (TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
+#else /* (TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
        if (_ws_get_interface(COMMON_IFACE_NAME, __register_p2pdevice_signal, NULL) < 0)
                res = _ws_create_interface(COMMON_IFACE_NAME, __register_p2pdevice_signal, NULL);
-#endif /* (TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
+#endif /* (TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
 
        if (res < 0)
                WDP_LOGE("Failed to subscribe interface signal");
@@ -3708,11 +3708,11 @@ int ws_deactivate(int concurrent)
        ws_stop_scan();
 
        g_pd->concurrent = concurrent;
-#if defined(TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD)
+#if defined(TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD)
        _ws_get_interface(P2P_IFACE_NAME, __ws_remove_interface, NULL);
        if (concurrent == 0)
                _ws_get_interface(COMMON_IFACE_NAME, __ws_remove_interface, NULL);
-#endif /* (TIZEN_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
+#endif /* (TIZEN_PROFILE_MOBILE) && (TIZEN_WLAN_BOARD_SPRD) */
 
        _ws_deinit_dbus_connection();
 

diff --git a/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h b/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h
index a2f2835..a5c5e20 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h
@@ -42,7 +42,7 @@
 #define SOCK_FD_MIN 3
 #define GLOBAL_INTF_PATH "/tmp/wpa_ctrl_global"
 
-#if defined TIZEN_MOBILE
+#if defined TIZEN_PROFILE_MOBILE
 #define COMMON_IFACE_NAME "wlan0"
 #define GROUP_IFACE_NAME "p2p-wlan0-0"
 #define GROUP_IFACE_PREFIX "p2p-wlan0-"

diff --git a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
index 658facd..46f7063 100644 (file)
--- a/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
+++ b/plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
@@ -60,7 +60,7 @@
 #define SUPPL_IFACE_PATH tzplatform_mkpath(TZ_SYS_RUN, "wpa_supplicant/")
 #define SUPPL_GROUP_IFACE_PATH tzplatform_mkpath(TZ_SYS_RUN, "wpa_supplicant/")
 
-#if defined TIZEN_MOBILE
+#if defined TIZEN_PROFILE_MOBILE
 #define DEFAULT_MAC_FILE_PATH tzplatform_mkpath(TZ_SYS_ETC, ".mac.info")
 #endif
 

diff --git a/src/wifi-direct-manager.c b/src/wifi-direct-manager.c
index 0fe75ba..473564f 100644 (file)
--- a/src/wifi-direct-manager.c
+++ b/src/wifi-direct-manager.c
@@ -581,20 +581,20 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
                        WDS_LOGE("Failed to destroy group before deactivation");
        }
 
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_MOBILE)
+#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && 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_MOBILE */
+#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_PROFILE_MOBILE */
                res = wfd_oem_deactivate(manager->oem_ops, 0);
                if (res < 0) {
                        WDS_LOGE("Failed to deactivate");
                        wfd_state_set(manager, prev_state);
                        return WIFI_DIRECT_ERROR_OPERATION_FAILED;
                }
-#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_MOBILE)
+#if defined(TIZEN_WLAN_CONCURRENT_ENABLE) && defined(TIZEN_PROFILE_MOBILE)
        } else {
                /* FIXME: We should do something to stop p2p feature of Driver */
                res = wfd_oem_deactivate(manager->oem_ops, res);
@@ -605,7 +605,7 @@ int wfd_manager_deactivate(wfd_manager_s *manager)
                }
                WDS_LOGE("Do not need to deactivate Wi-Fi");
        }
-#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && TIZEN_MOBILE */
+#endif /* TIZEN_WLAN_CONCURRENT_ENABLE && 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 05e5ffe..3942719 100644 (file)
--- a/src/wifi-direct-util.c
+++ b/src/wifi-direct-util.c
@@ -73,17 +73,17 @@
 #define TIZEN_P2P_GO_IPADDR "192.168.49.1"
 #define MAX_SIZE_ERROR_BUFFER 256
 
-#if defined TIZEN_MOBILE
+#if defined TIZEN_PROFILE_MOBILE
 #define DEFAULT_MAC_FILE_PATH tzplatform_mkpath(TZ_SYS_ETC, ".mac.info")
-#endif /* TIZEN_MOBILE */
+#endif /* TIZEN_PROFILE_MOBILE */
 
-#if defined TIZEN_TV
+#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 */
-#endif /* TIZEN_TV */
+#endif /* TIZEN_PROFILE_TV */
 
 #ifndef DEFAULT_MAC_FILE_PATH
 #      define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"