[wfd-manager]:Add support of Tizen TV WLAN Module

Change-Id: I0f179f17dab26e3c04ca9a83656cac0e7df3fdbf
Signed-off-by: Maneesh Jain <maneesh.jain@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75121fb..1a6264f 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,10 @@ IF(TIZEN_WIFI_MODULE_BUNDLE)
        ADD_DEFINITIONS(-DTIZEN_WIFI_MODULE_BUNDLE)
 ENDIF(TIZEN_WIFI_MODULE_BUNDLE)
 
+IF(TIZEN_TV_BOARD_PRD)
+       ADD_DEFINITIONS(-DTIZEN_TV_BOARD_PRD)
+ENDIF(TIZEN_TV_BOARD_PRD)
+
 IF(CTRL_IFACE_DBUS)
        ADD_DEFINITIONS(-DCTRL_IFACE_DBUS)
 ENDIF(CTRL_IFACE_DBUS)
@@ -99,18 +103,25 @@ IF(TIZEN_WIFI_MODULE_BUNDLE)
        INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/wifi-direct-dhcp.sh DESTINATION bin)
 ELSE(TIZEN_WIFI_MODULE_BUNDLE)
        INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/dhcpd-notify.sh DESTINATION bin)
-IF(TIZEN_WLAN_BOARD_SPRD)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/p2p_supp.conf DESTINATION etc/wifi-direct)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/p2p_supp.conf DESTINATION /opt/etc)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/wifi-direct-dhcp.sh DESTINATION bin)
-ELSE(TIZEN_WLAN_BOARD_SPRD)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.conf DESTINATION etc/wifi-direct)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.conf DESTINATION /opt/etc)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
-       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/wifi-direct-dhcp.sh DESTINATION bin)
-ENDIF(TIZEN_WLAN_BOARD_SPRD)
-ENDIF(TIZEN_WIFI_MODULE_BUNDLE)
+       IF(TIZEN_WLAN_BOARD_SPRD)
+               INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/p2p_supp.conf DESTINATION etc/wifi-direct)
+               INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/p2p_supp.conf DESTINATION /opt/etc)
+               INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
+               INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/TM1/wifi-direct-dhcp.sh DESTINATION bin)
+       ELSE(TIZEN_WLAN_BOARD_SPRD)
+               IF(TIZEN_TV_BOARD_PRD)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/p2p_supp.conf DESTINATION etc/wifi-direct)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/p2p_supp.conf DESTINATION /opt/etc)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/wifi-direct-dhcp.sh DESTINATION bin)
+               ELSE(TIZEN_TV_BOARD_PRD)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.conf DESTINATION etc/wifi-direct)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.conf DESTINATION /opt/etc)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/dhcpd.p2p.conf DESTINATION etc/wifi-direct)
+                       INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/wifi-direct-dhcp.sh DESTINATION bin)
+               ENDIF(TIZEN_WLAN_BOARD_SPRD)
+       ENDIF(TIZEN_WIFI_MODULE_BUNDLE)
+ENDIF(TIZEN_TV_BOARD_PRD)
 
 IF("${ARCH}" MATCHES "^arm.*|.*86.*")
 IF(CTRL_IFACE_DBUS)

diff --git a/include/wifi-direct-manager.h b/include/wifi-direct-manager.h
index b42b9e4..98dc6a2 100755 (executable)
--- a/include/wifi-direct-manager.h
+++ b/include/wifi-direct-manager.h
@@ -45,6 +45,12 @@
 #define GROUP_IFNAME "wlan0"
 #endif
 
+#if defined TIZEN_TV_BOARD_PRD
+#define DEFAULT_IFNAME "p2p0"
+#define GROUP_IFNAME "p2p0"
+#endif
+
+
 #ifndef DEFAULT_IFNAME
 #define DEFAULT_IFNAME "p2p0"
 #endif

diff --git a/include/wifi-direct-util.h b/include/wifi-direct-util.h
index 6315c27..8581ab3 100755 (executable)
--- a/include/wifi-direct-util.h
+++ b/include/wifi-direct-util.h
@@ -36,6 +36,10 @@
 #define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
 #endif
 
+#if defined TIZEN_TV_BOARD_PRD
+#define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
+#endif
+
 #ifndef DEFAULT_MAC_FILE_PATH
 #define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
 #endif

diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec
index d4222bc..cec6578 100755 (executable)
--- a/packaging/wifi-direct-manager.spec
+++ b/packaging/wifi-direct-manager.spec
@@ -1,6 +1,6 @@
 Name:          wifi-direct-manager
 Summary:       Wi-Fi Direct manger
-Version:       1.2.104
+Version:       1.2.105
 Release:       1
 Group:      Network & Connectivity/Wireless
 License:    Apache-2.0
@@ -85,8 +85,9 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
        -DTIZEN_WLAN_CONCURRENT_ENABLE=0 \
        -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
        -DCTRL_IFACE_DBUS=1 \
-       -DTIZEN_WIFI_MODULE_BUNDLE=1 \
+       -DTIZEN_WIFI_MODULE_BUNDLE=0 \
        -DTIZEN_TV=1 \
+       -DTIZEN_TV_BOARD_PRD=1 \
 %endif
 %endif
 %endif
@@ -113,7 +114,9 @@ cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir}/license/wif
 %post
 #TV profile uses default XU3 device which creates wlan interface only
 %if "%{profile}" == "tv"
-chmod 644 /usr/etc/wifi-direct/dhcpd.wlan.conf
+# Comment it for temp puprose. Tizen TV Board supports p2p0 interface
+#chmod 644 /usr/etc/wifi-direct/dhcpd.wlan.conf
+chmod 644 /usr/etc/wifi-direct/dhcpd.p2p.conf
 %else
 chmod 644 /usr/etc/wifi-direct/dhcpd.p2p.conf
 %endif
@@ -148,7 +151,8 @@ chmod 755 /usr/sbin/p2p_supp.sh
 %{_bindir}/wfd-manager
 #TV profile uses default XU3 device which creates wlan interface only
 %if "%{profile}" == "tv"
-/usr/etc/wifi-direct/dhcpd.wlan.conf
+/usr/etc/wifi-direct/dhcpd.p2p.conf
+#/usr/etc/wifi-direct/dhcpd.wlan.conf
 %else
 /usr/etc/wifi-direct/dhcpd.p2p.conf
 %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 2ad2935..3fb47d8 100755 (executable)
--- a/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
+++ b/plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
@@ -50,9 +50,9 @@
 #define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
 #endif
 
-#if 0
+#if defined TIZEN_TV_BOARD_PRD
 #define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
-#define CONF_FILE_PATH "/opt/etc/p2p_supp.conf"
+#define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
 #endif
 
 #if defined TIZEN_MOBILE
@@ -83,6 +83,12 @@
 #define GROUP_IFACE_PREFIX "wlan"
 #endif
 
+#if defined TIZEN_TV_BOARD_PRD
+#define COMMON_IFACE_NAME "p2p0"
+#define GROUP_IFACE_NAME "p2p0"
+#define GROUP_IFACE_PREFIX "p2p"
+#endif
+
 #if defined TIZEN_TV
 #define PRIMARY_DEVICE_TYPE "\x00\x07\x00\x50\xf2\x04\x00\x01"
 #define DEFAULT_DEVICE_NAME "[TV]Tizen"