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)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/p2p_supp.sh DESTINATION sbin)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/ccode.conf DESTINATION etc/wifi-direct)
INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/common/persistent-peer DESTINATION /opt/etc)
-IF(TIZEN_WIFI_MODULE_BUNDLE)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/p2p_supp.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/p2p_supp.conf DESTINATION /opt/etc)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/dhcpd.wlan.conf DESTINATION etc/wifi-direct)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/dhcpd-notify.sh DESTINATION bin)
- INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/wifi-direct-dhcp.sh DESTINATION bin)
-ELSE(TIZEN_WIFI_MODULE_BUNDLE)
+IF(TIZEN_TV)
+ IF(TIZEN_WIFI_MODULE_BUNDLE)
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/p2p_supp.conf DESTINATION etc/wifi-direct)
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/p2p_supp.conf DESTINATION /opt/etc)
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/dhcpd.wlan.conf DESTINATION etc/wifi-direct)
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/dhcpd-notify.sh DESTINATION bin)
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/bundle/wifi-direct-dhcp.sh DESTINATION bin)
+ ELSE(TIZEN_WIFI_MODULE_BUNDLE)
+ INSTALL(FILES ${CMAKE_SOURCE_DIR}/files/tv/dhcpd-notify.sh DESTINATION bin)
+ 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)
+ ENDIF(TIZEN_WIFI_MODULE_BUNDLE)
+ELSE(TIZEN_TV)
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/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)
+ 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_TV)
IF("${ARCH}" MATCHES "^arm.*|.*86.*")
-IF(CTRL_IFACE_DBUS)
- ADD_SUBDIRECTORY(plugin/wpasupplicant/ctrl_iface_dbus)
-ELSE(CTRL_IFACE_DBUS)
- ADD_SUBDIRECTORY(plugin/wpasupplicant/ctrl_iface_sock)
-ENDIF(CTRL_IFACE_DBUS)
+ IF(CTRL_IFACE_DBUS)
+ ADD_SUBDIRECTORY(plugin/wpasupplicant/ctrl_iface_dbus)
+ ELSE(CTRL_IFACE_DBUS)
+ ADD_SUBDIRECTORY(plugin/wpasupplicant/ctrl_iface_sock)
+ ENDIF(CTRL_IFACE_DBUS)
ELSE()
ADD_SUBDIRECTORY(plugin/wpasupplicant/emul)
ENDIF()
#define DEFAULT_DEVICE_NAME "Tizen_Device"
#if defined TIZEN_MOBILE
-#if defined TIZEN_WLAN_BOARD_SPRD
-#define DEFAULT_IFNAME "p2p0"
-#define GROUP_IFNAME "p2p0"
-#else /* TIZEN_WLAN_BOARD_SPRD */
-#define DEFAULT_IFNAME "wlan0"
-#define GROUP_IFNAME "p2p-wlan0-0"
-#endif /* TIZEN_WLAN_BOARD_SPRD */
-#endif
-
-#if defined TIZEN_WIFI_MODULE_BUNDLE
-#define DEFAULT_IFNAME "wlan0"
-#define GROUP_IFNAME "wlan0"
-#endif
-
-#if defined TIZEN_TV_BOARD_PRD
-#define DEFAULT_IFNAME "p2p0"
-#define GROUP_IFNAME "p2p0"
-#endif
-
+# if defined TIZEN_WLAN_BOARD_SPRD
+# define DEFAULT_IFNAME "p2p0"
+# define GROUP_IFNAME "p2p0"
+# else /* TIZEN_WLAN_BOARD_SPRD */
+# define DEFAULT_IFNAME "wlan0"
+# define GROUP_IFNAME "p2p-wlan0-0"
+# endif /* TIZEN_WLAN_BOARD_SPRD */
+#endif /* TIZEN_MOBILE */
+
+#if defined TIZEN_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 */
+#endif /* TIZEN_TV */
#ifndef DEFAULT_IFNAME
-#define DEFAULT_IFNAME "p2p0"
+# define DEFAULT_IFNAME "p2p0"
#endif
#ifndef GROUP_IFNAME
-#define GROUP_IFNAME "p2p0"
+# define GROUP_IFNAME "p2p0"
#endif
#define WFD_MAX_CLIENT 16
#define __WIFI_DIRECT_UTIL_H__
#if defined TIZEN_MOBILE
-#define DEFAULT_MAC_FILE_PATH "/opt/etc/.mac.info"
-#endif
-
-#if defined TIZEN_WIFI_MODULE_BUNDLE
-#define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
-#endif
+# define DEFAULT_MAC_FILE_PATH "/opt/etc/.mac.info"
+#endif /* TIZEN_MOBILE */
-#if defined TIZEN_TV_BOARD_PRD
-#define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
-#endif
+#if defined TIZEN_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 */
#ifndef DEFAULT_MAC_FILE_PATH
-#define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
+# define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
#endif
#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
Name: wifi-direct-manager
Summary: Wi-Fi Direct manger
-Version: 1.2.133
+Version: 1.2.134
Release: 1
Group: Network & Connectivity/Wireless
License: Apache-2.0
-DCTRL_IFACE_DBUS=1 \
-DTIZEN_WIFI_MODULE_BUNDLE=0 \
-DTIZEN_TV=1 \
- -DTIZEN_TV_BOARD_PRD=1 \
%endif
%endif
%endif
cp %{_builddir}/%{buildsubdir}/LICENSE.APLv2 %{buildroot}%{_datadir}/license/wifi-direct-plugin-wpasupplicant
%post
-#TV profile uses default XU3 device which creates wlan interface only
-%if "%{profile}" == "tv"
-# 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
+chmod 644 /usr/etc/wifi-direct/dhcpd.*.conf
chmod 755 /usr/bin/dhcpd-notify.sh
chmod 755 /usr/etc/wifi-direct/udhcp_script.non-autoip
chmod 755 /usr/bin/wifi-direct-server.sh
%manifest wifi-direct-manager.manifest
%defattr(-,root,root,-)
%{_bindir}/wfd-manager
-#TV profile uses default XU3 device which creates wlan interface only
-%if "%{profile}" == "tv"
-/usr/etc/wifi-direct/dhcpd.p2p.conf
-#/usr/etc/wifi-direct/dhcpd.wlan.conf
-%else
-/usr/etc/wifi-direct/dhcpd.p2p.conf
-%endif
+/usr/etc/wifi-direct/dhcpd.*.conf
/usr/etc/wifi-direct/udhcp_script.non-autoip
/usr/etc/wifi-direct/p2p_supp.conf
/opt/etc/p2p_supp.conf
#define IPSECSTR "%d..%d"
#define OBJECT_PATH_MAX 150
-#if defined TIZEN_MOBILE
-#define DEFAULT_MAC_FILE_PATH "/opt/etc/.mac.info"
#define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
-#endif
-
-#if defined TIZEN_WIFI_MODULE_BUNDLE
-#define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
-#define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
-#endif
-
-#if defined TIZEN_TV_BOARD_PRD
-#define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
-#define CONF_FILE_PATH "/etc/wpa_supplicant/wpa_supplicant.conf"
-#endif
#if defined TIZEN_MOBILE
-#define COMMON_IFACE_NAME "wlan0"
-#if defined TIZEN_WLAN_BOARD_SPRD
-#define P2P_IFACE_NAME "p2p0"
-#define GROUP_IFACE_NAME "p2p0"
-#define GROUP_IFACE_PREFIX "p2p"
-#else /* TIZEN_WLAN_BOARD_SPRD */
-#define GROUP_IFACE_NAME "p2p-wlan0-0"
-#define GROUP_IFACE_PREFIX "p2p-wlan0-"
-#endif /* TIZEN_WLAN_BOARD_SPRD */
-#define PRIMARY_DEVICE_TYPE "\x00\x0a\x00\x50\xf2\x04\x00\x05"
-#define DEFAULT_DEVICE_NAME "Tizen"
-#define DEFAULT_GO_INTENT 7
-#define DEFAULT_PERSISTENT_RECONNECT 1
-#define DEFAULT_LISTEN_REG_CLASS 81
-#define DEFAULT_LISTEN_CHANNEL 1
-#define DEFAULT_OPER_REG_CLASS 81
-#define DEFAULT_OPER_CHANNEL 1
-#define DEFAULT_CONFIG_METHOD "display push_button keypad"
-#define DEFAULT_NO_GROUP_IFACE 0
-#endif
-
-#if defined TIZEN_WIFI_MODULE_BUNDLE
-#define COMMON_IFACE_NAME "wlan0"
-#define GROUP_IFACE_NAME "wlan0"
-#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
+# define DEFAULT_MAC_FILE_PATH "/opt/etc/.mac.info"
+# define COMMON_IFACE_NAME "wlan0"
+
+# if defined TIZEN_WLAN_BOARD_SPRD
+# define P2P_IFACE_NAME "p2p0"
+# define GROUP_IFACE_NAME "p2p0"
+# define GROUP_IFACE_PREFIX "p2p"
+# else /* TIZEN_WLAN_BOARD_SPRD */
+# define GROUP_IFACE_NAME "p2p-wlan0-0"
+# define GROUP_IFACE_PREFIX "p2p-wlan0-"
+# endif /* TIZEN_WLAN_BOARD_SPRD */
+
+# define PRIMARY_DEVICE_TYPE "\x00\x0a\x00\x50\xf2\x04\x00\x05"
+# define DEFAULT_DEVICE_NAME "Tizen"
+# define DEFAULT_GO_INTENT 7
+# define DEFAULT_PERSISTENT_RECONNECT 1
+# define DEFAULT_LISTEN_REG_CLASS 81
+# define DEFAULT_LISTEN_CHANNEL 1
+# define DEFAULT_OPER_REG_CLASS 81
+# define DEFAULT_OPER_CHANNEL 1
+# define DEFAULT_CONFIG_METHOD "display push_button keypad"
+# define DEFAULT_NO_GROUP_IFACE 0
+#endif /* TIZEN_MOBILE */
#if defined TIZEN_TV
-#define PRIMARY_DEVICE_TYPE "\x00\x07\x00\x50\xf2\x04\x00\x01"
-#define DEFAULT_DEVICE_NAME "[TV]Tizen"
-#define DEFAULT_GO_INTENT 7
-#define DEFAULT_PERSISTENT_RECONNECT 1
-#define DEFAULT_LISTEN_REG_CLASS 81
-#define DEFAULT_LISTEN_CHANNEL 1
-#define DEFAULT_OPER_REG_CLASS 81
-#define DEFAULT_OPER_CHANNEL 1
-#define DEFAULT_CONFIG_METHOD "keypad virtual_push_button physical_display"
-#define DEFAULT_NO_GROUP_IFACE 1
-#endif
+
+# if defined TIZEN_WIFI_MODULE_BUNDLE
+# define DEFAULT_MAC_FILE_PATH "/sys/class/net/wlan0/address"
+# define COMMON_IFACE_NAME "wlan0"
+# define GROUP_IFACE_NAME "wlan0"
+# define GROUP_IFACE_PREFIX "wlan"
+# else /* TIZEN_WIFI_MODULE_BUNDLE */
+# define DEFAULT_MAC_FILE_PATH "/sys/class/net/p2p0/address"
+# define COMMON_IFACE_NAME "p2p0"
+# define GROUP_IFACE_NAME "p2p0"
+# define GROUP_IFACE_PREFIX "p2p"
+# endif /* TIZEN_WIFI_MODULE_BUNDLE */
+
+# define PRIMARY_DEVICE_TYPE "\x00\x07\x00\x50\xf2\x04\x00\x01"
+# define DEFAULT_DEVICE_NAME "[TV]Tizen"
+# define DEFAULT_GO_INTENT 7
+# define DEFAULT_PERSISTENT_RECONNECT 1
+# define DEFAULT_LISTEN_REG_CLASS 81
+# define DEFAULT_LISTEN_CHANNEL 1
+# define DEFAULT_OPER_REG_CLASS 81
+# define DEFAULT_OPER_CHANNEL 1
+# define DEFAULT_CONFIG_METHOD "keypad virtual_push_button physical_display"
+# define DEFAULT_NO_GROUP_IFACE 1
+#endif /* TIZEN_TV */
#if 0
#define COMMON_IFACE_NAME "p2p0"