Fix formatting issues in wifi-direct.h and coding rule issue in test-wifi-direct.c 28/94928/1 accepted/tizen/common/20161116.134428 accepted/tizen/common/20170111.155011 accepted/tizen/ivi/20161117.010110 accepted/tizen/mobile/20161117.005951 accepted/tizen/tv/20161117.010011 accepted/tizen/wearable/20161117.010022 submit/tizen/20161116.043314 submit/tizen_common/20170111.150147
authorNishant Chaprana <n.chaprana@samsung.com>
Wed, 2 Nov 2016 04:27:11 +0000 (09:57 +0530)
committerNishant Chaprana <n.chaprana@samsung.com>
Wed, 2 Nov 2016 04:27:11 +0000 (09:57 +0530)
Change-Id: I8ddec5a05365c6e9ed36fcef7c9aaf441a9b8671
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
include/wifi-direct.h
test/test-wifi-direct.c

index b67e64a..2073f6d 100755 (executable)
@@ -205,9 +205,9 @@ typedef enum {
 } wifi_direct_wps_type_e;
 
 /**
-* @brief Enumeration for Wi-Fi Display device type
-* @since_tizen 2.3
-*/
+ * @brief Enumeration for Wi-Fi Display device type
+ * @since_tizen 2.3
+ */
 typedef enum {
        WIFI_DISPLAY_TYPE_NONE,  /**< Configure as WFD Source*/
        WIFI_DISPLAY_TYPE_SINK,  /**< Configure as WFD Primary Sink */
@@ -219,7 +219,7 @@ typedef enum {
 /**
  * @brief Enumeration for Service Discovery type.
  * @since_tizen 2.3
-*/
+ */
 typedef enum {
        WIFI_DIRECT_SERVICE_TYPE_ALL,  /**< Service discovery Type all*/
        WIFI_DIRECT_SERVICE_TYPE_BONJOUR,  /**< Service discovery Type bonjour*/
@@ -232,9 +232,9 @@ typedef enum {
 } wifi_direct_service_type_e;
 
 /**
-* @brief Enumeration for Wi-Fi Display device type.
-* @since_tizen 2.4
-*/
+ * @brief Enumeration for Wi-Fi Display device type.
+ * @since_tizen 2.4
+ */
 typedef enum {
        WIFI_DIRECT_DISPLAY_TYPE_SOURCE, /**< Configure as WFD Source*/
        WIFI_DIRECT_DISPLAY_TYPE_PRISINK, /**< Configure as WFD Primary Sink */
@@ -246,7 +246,7 @@ typedef enum {
 /**
  * @brief Enumeration for Wi-Fi Direct service Discovery state.
  * @since_tizen 2.3
-*/
+ */
 typedef enum {
        WIFI_DIRECT_SERVICE_DISCOVERY_STARTED,  /**< Service discovery started*/
        WIFI_DIRECT_SERVICE_DISCOVERY_FOUND,  /**< Service discovery found*/
@@ -256,7 +256,7 @@ typedef enum {
 /**
  * @brief Enumeration for Wi-Fi Direct Discovery Channel.
  * @since_tizen 2.3
-*/
+ */
 typedef enum {
        WIFI_DIRECT_DISCOVERY_FULL_SCAN = 0,  /**< Scan full channel*/
        WIFI_DIRECT_DISCOVERY_SOCIAL_CHANNEL = 1611,  /**< Scan social channel*/
@@ -329,8 +329,8 @@ typedef struct {
  * @see wifi_direct_unset_discovery_state_changed_cb()
  */
 typedef void (*wifi_direct_discovery_state_chagned_cb) (int error_code,
-                                               wifi_direct_discovery_state_e discovery_state,
-                                               void *user_data);
+                                                       wifi_direct_discovery_state_e discovery_state,
+                                                       void *user_data);
 
 /**
  * @brief Called when the peer is found.
@@ -352,9 +352,9 @@ typedef void (*wifi_direct_discovery_state_chagned_cb) (int error_code,
  * @see wifi_direct_unset_peer_found_cb()
  */
 typedef void (*wifi_direct_peer_found_cb) (int error_code,
-                                               wifi_direct_discovery_state_e discovery_state,
-                                               const char *mac_address,
-                                               void *user_data);
+                                          wifi_direct_discovery_state_e discovery_state,
+                                          const char *mac_address,
+                                          void *user_data);
 
 /**
  * @brief Called when the state of device is changed.
@@ -375,8 +375,8 @@ typedef void (*wifi_direct_peer_found_cb) (int error_code,
  * @see wifi_direct_unset_device_state_changed_cb()
  */
 typedef void (*wifi_direct_device_state_changed_cb) (int error_code,
-                                               wifi_direct_device_state_e device_state,
-                                               void *user_data);
+                                                    wifi_direct_device_state_e device_state,
+                                                    void *user_data);
 
 /**
  * @brief Called when the state of connection is changed.
@@ -402,9 +402,9 @@ typedef void (*wifi_direct_device_state_changed_cb) (int error_code,
  * @see wifi_direct_unset_connection_state_changed_cb()
  */
 typedef void (*wifi_direct_connection_state_changed_cb) (int error_code,
-                                               wifi_direct_connection_state_e connection_state,
-                                               const char *mac_address,
-                                               void *user_data);
+                                                        wifi_direct_connection_state_e connection_state,
+                                                        const char *mac_address,
+                                                        void *user_data);
 
 /**
  * @brief Called when IP address of client is assigned when your device is group owner.
@@ -424,11 +424,11 @@ typedef void (*wifi_direct_connection_state_changed_cb) (int error_code,
  * @see wifi_direct_unset_client_ip_address_assigned_cb()
  */
 typedef void (*wifi_direct_client_ip_address_assigned_cb) (const char *mac_address,
-                                               const char *ip_address,
-                                               const char *interface_address,
-                                               void *user_data);
+                                                          const char *ip_address,
+                                                          const char *interface_address,
+                                                          void *user_data);
 
- /**
+/**
  * @brief Called when the state of Service discovery is changed.
  * @since_tizen 2.3
  * @details The following error codes can be delivered
@@ -450,9 +450,9 @@ typedef void (*wifi_direct_client_ip_address_assigned_cb) (const char *mac_addre
  * @see wifi_direct_unset_discovery_state_changed_cb()
  */
 typedef void (*wifi_direct_service_state_changed_cb) (int error_code,
-                                               wifi_direct_service_discovery_state_e service_state,
-                                               wifi_direct_service_type_e service_type, void *response_data,
-                                               const char *mac_address, void *user_data);
+                                                     wifi_direct_service_discovery_state_e service_state,
+                                                     wifi_direct_service_type_e service_type, void *response_data,
+                                                     const char *mac_address, void *user_data);
 
 /**
  * @brief Called when the state of Wi-Fi Direct is changed.
@@ -465,7 +465,7 @@ typedef void (*wifi_direct_service_state_changed_cb) (int error_code,
  * @see wifi_direct_unset_state_changed_cb()
  */
 typedef void (*wifi_direct_state_changed_cb)  (wifi_direct_state_e state,
-               void *user_data);
+                                              void *user_data);
 
 /**
  * @brief Initializes Wi-Fi Direct service.
@@ -817,16 +817,16 @@ int wifi_direct_start_discovery_specific_channel(bool listen_only, int timeout,
  */
 int wifi_direct_cancel_discovery(void);
 
- /**
 * @brief Called repeatedly when you get the information of discovered peers.
 * @since_tizen 2.3
 * @privlevel public
 * @remarks @a peer is valid only in this function.
+/**
+ * @brief Called repeatedly when you get the information of discovered peers.
+ * @since_tizen 2.3
+ * @privlevel public
+ * @remarks @a peer is valid only in this function.
  * @param[in] peer The information of the discovered peer
  * @param[in] user_data The user data passed from foreach function
  * @return @c true to continue with the next iteration of the loop, \n @c false to break out of the loop
  * @see wifi_direct_foreach_discovered_peers()
 */
+ */
 typedef bool(*wifi_direct_discovered_peer_cb)  (wifi_direct_discovered_peer_info_s *peer, void *user_data);
 
 /**
@@ -1803,7 +1803,7 @@ int wifi_direct_is_persistent_group_enabled(bool *enabled);
  * @return  @c true to continue with the next iteration of the loop, \n @c false to break out of the loop
  * @pre  wifi_direct_foreach_persistent_groups() will invoke this callback.
  * @see  wifi_direct_foreach_persistent_groups()
-*/
+ */
 typedef bool(*wifi_direct_persistent_group_cb)(const char *mac_address, const char *ssid, void *user_data);
 
 /**
@@ -1826,7 +1826,7 @@ typedef bool(*wifi_direct_persistent_group_cb)(const char *mac_address, const ch
  * @post wifi_direct_persistent_group_cb() will be called.
  * @see wifi_direct_initialize()
  * @see wifi_direct_persistent_group_cb()
-*/
+ */
 int wifi_direct_foreach_persistent_groups(wifi_direct_persistent_group_cb callback, void *user_data);
 
 /**
@@ -1848,7 +1848,7 @@ int wifi_direct_foreach_persistent_groups(wifi_direct_persistent_group_cb callba
  * @pre Wi-Fi Direct service must be initialized by wifi_direct_initialize().
  * @see wifi_direct_initialize()
  * @see wifi_direct_foreach_persistent_groups()
-*/
+ */
 int wifi_direct_remove_persistent_group(char *mac_address, const char *ssid);
 
 /**
@@ -1872,9 +1872,9 @@ int wifi_direct_remove_persistent_group(char *mac_address, const char *ssid);
  * @post wifi_direct_set_service_state_changed_cb() will be invoked.
  * @see wifi_direct_activate()
  * @see wifi_direct_set_service_state_changed_cb()
-*/
+ */
 int wifi_direct_start_service_discovery(char *mac_address,
-       wifi_direct_service_type_e service_type);
+                                       wifi_direct_service_type_e service_type);
 
 /**
  * @brief A service started for WiFi Direct Service Discovery will be stopped.
@@ -1895,9 +1895,9 @@ int wifi_direct_start_service_discovery(char *mac_address,
  * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
  * @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
  * @see wifi_direct_activate()
-*/
+ */
 int wifi_direct_cancel_service_discovery(char *mac_address,
-       wifi_direct_service_type_e service_type);
+                                        wifi_direct_service_type_e service_type);
 
 /**
  * @brief Registers for a service using WiFi Direct Service Discovery.
@@ -1922,9 +1922,9 @@ int wifi_direct_cancel_service_discovery(char *mac_address,
  * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
  * @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
  * @see wifi_direct_activate()
-*/
+ */
 int wifi_direct_register_service(wifi_direct_service_type_e service_type,
-       char *info1, char *info2, unsigned int *service_id);
+                                char *info1, char *info2, unsigned int *service_id);
 
 /**
  * @brief Deregisters for a service used for WiFi Direct Service Discovery.
@@ -1944,7 +1944,7 @@ int wifi_direct_register_service(wifi_direct_service_type_e service_type,
  * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
  * @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
  * @see wifi_direct_activate()
-*/
+ */
 int wifi_direct_deregister_service(unsigned int service_id);
 
 /**
@@ -1964,7 +1964,7 @@ int wifi_direct_deregister_service(unsigned int service_id);
  * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
  * @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
  * @see wifi_direct_activate()
-*/
+ */
 int wifi_direct_init_miracast(bool enable);
 
 /**
@@ -2224,66 +2224,66 @@ int wifi_direct_get_peer_display_throughput(char *mac_address, int *throughput);
 int wifi_direct_set_auto_group_removal(bool enable);
 
 /**
-* @brief Sets the timer which is used to expire the connection session.
-* @since_tizen 3.0
-* @privlevel public
-* @privilege http://tizen.org/privilege/wifidirect
-* @param[in] seconds Set the connection session timer value in second
-* @return 0 on success, otherwise a negative error value
-* @retval #WIFI_DIRECT_ERROR_NONE  Successful
-* @retval #WIFI_DIRECT_ERROR_INVALID_PARAMETER  Invalid parameter
-* @retval #WIFI_DIRECT_ERROR_OPERATION_FAILED  Operation failed
-* @retval #WIFI_DIRECT_ERROR_COMMUNICATION_FAILED  Communication failed
- * @retval #WIFI_DIRECT_ERROR_PERMISSION_DENIED  Permission denied
-* @retval #WIFI_DIRECT_ERROR_NOT_PERMITTED  Operation not permitted
-* @retval #WIFI_DIRECT_ERROR_NOT_INITIALIZED  Not initialized
-* @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
-* @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
-* @see wifi_direct_activate()
-*/
+ * @brief Sets the timer which is used to expire the connection session.
+ * @since_tizen 3.0
+ * @privlevel public
+ * @privilege http://tizen.org/privilege/wifidirect
+ * @param[in] seconds Set the connection session timer value in second
+ * @return 0 on success, otherwise a negative error value
+ * @retval #WIFI_DIRECT_ERROR_NONE  Successful
+ * @retval #WIFI_DIRECT_ERROR_INVALID_PARAMETER  Invalid parameter
+ * @retval #WIFI_DIRECT_ERROR_OPERATION_FAILED  Operation failed
+ * @retval #WIFI_DIRECT_ERROR_COMMUNICATION_FAILED  Communication failed
+ * @retval #WIFI_DIRECT_ERROR_PERMISSION_DENIED  Permission denied
+ * @retval #WIFI_DIRECT_ERROR_NOT_PERMITTED  Operation not permitted
+ * @retval #WIFI_DIRECT_ERROR_NOT_INITIALIZED  Not initialized
+ * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
+ * @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
+ * @see wifi_direct_activate()
+ */
 int wifi_direct_set_session_timer(int seconds);
 
 /**
-* @brief Gets the timer which is used to expire the connection session.
-* @since_tizen 3.0
-* @privlevel public
-* @privilege http://tizen.org/privilege/wifidirect
-* @param[out] seconds  Connection session timer value
-* @return 0 on success, otherwise a negative error value
-* @retval #WIFI_DIRECT_ERROR_NONE  Successful
-* @retval #WIFI_DIRECT_ERROR_INVALID_PARAMETER  Invalid parameter
-* @retval #WIFI_DIRECT_ERROR_OPERATION_FAILED  Operation failed
-* @retval #WIFI_DIRECT_ERROR_COMMUNICATION_FAILED  Communication failed
-* @retval #WIFI_DIRECT_ERROR_PERMISSION_DENIED  Permission denied
-* @retval #WIFI_DIRECT_ERROR_NOT_PERMITTED  Operation not permitted
-* @retval #WIFI_DIRECT_ERROR_NOT_INITIALIZED  Not initialized
-* @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
-* @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
-* @see wifi_direct_activate()
-*/
+ * @brief Gets the timer which is used to expire the connection session.
+ * @since_tizen 3.0
+ * @privlevel public
+ * @privilege http://tizen.org/privilege/wifidirect
+ * @param[out] seconds  Connection session timer value
+ * @return 0 on success, otherwise a negative error value
+ * @retval #WIFI_DIRECT_ERROR_NONE  Successful
+ * @retval #WIFI_DIRECT_ERROR_INVALID_PARAMETER  Invalid parameter
+ * @retval #WIFI_DIRECT_ERROR_OPERATION_FAILED  Operation failed
+ * @retval #WIFI_DIRECT_ERROR_COMMUNICATION_FAILED  Communication failed
+ * @retval #WIFI_DIRECT_ERROR_PERMISSION_DENIED  Permission denied
+ * @retval #WIFI_DIRECT_ERROR_NOT_PERMITTED  Operation not permitted
+ * @retval #WIFI_DIRECT_ERROR_NOT_INITIALIZED  Not initialized
+ * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
+ * @pre Wi-Fi Direct service must be activated by wifi_direct_activate().
+ * @see wifi_direct_activate()
+ */
 int wifi_direct_get_session_timer(int *seconds);
 
 /**
-* @brief Gets the peer's RSSI value.
-* @since_tizen 3.0
-* @privlevel public
-* @privilege http://tizen.org/privilege/wifidirect
-* @param[in] mac_address  MAC Address of the peer device
-* @param[out] rssi RSSI value of the peer device
-* @return 0 on success, otherwise a negative error value
-* @retval #WIFI_DIRECT_ERROR_NONE  Successful
-* @retval #WIFI_DIRECT_ERROR_INVALID_PARAMETER  Invalid parameter
-* @retval #WIFI_DIRECT_ERROR_OPERATION_FAILED  Operation failed
-* @retval #WIFI_DIRECT_ERROR_COMMUNICATION_FAILED  Communication failed
-* @retval #WIFI_DIRECT_ERROR_PERMISSION_DENIED  Permission denied
-* @retval #WIFI_DIRECT_ERROR_NOT_PERMITTED  Operation not permitted
-* @retval #WIFI_DIRECT_ERROR_NOT_SUPPORTED  Not supported
-* @retval #WIFI_DIRECT_ERROR_NOT_INITIALIZED  Not initialized
-* @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
-* @pre Wi-Fi Direct service must be initialized by wifi_direct_initialize().
-* @see wifi_direct_activate()
-*/
- int wifi_direct_get_peer_rssi(char *mac_address, int *rssi);
+ * @brief Gets the peer's RSSI value.
+ * @since_tizen 3.0
+ * @privlevel public
+ * @privilege http://tizen.org/privilege/wifidirect
+ * @param[in] mac_address  MAC Address of the peer device
+ * @param[out] rssi RSSI value of the peer device
+ * @return 0 on success, otherwise a negative error value
+ * @retval #WIFI_DIRECT_ERROR_NONE  Successful
+ * @retval #WIFI_DIRECT_ERROR_INVALID_PARAMETER  Invalid parameter
+ * @retval #WIFI_DIRECT_ERROR_OPERATION_FAILED  Operation failed
+ * @retval #WIFI_DIRECT_ERROR_COMMUNICATION_FAILED  Communication failed
+ * @retval #WIFI_DIRECT_ERROR_PERMISSION_DENIED  Permission denied
+ * @retval #WIFI_DIRECT_ERROR_NOT_PERMITTED  Operation not permitted
+ * @retval #WIFI_DIRECT_ERROR_NOT_SUPPORTED  Not supported
+ * @retval #WIFI_DIRECT_ERROR_NOT_INITIALIZED  Not initialized
+ * @retval #WIFI_DIRECT_ERROR_RESOURCE_BUSY  Device or resource busy
+ * @pre Wi-Fi Direct service must be initialized by wifi_direct_initialize().
+ * @see wifi_direct_activate()
+ */
+int wifi_direct_get_peer_rssi(char *mac_address, int *rssi);
 
 /**
  * @}
@@ -2292,4 +2292,4 @@ int wifi_direct_get_session_timer(int *seconds);
 #ifdef __cplusplus
 }
 #endif
-#endif                                                 /* __TIZEN_NET_WIFI_DIRECT_H__ */
+#endif /* __TIZEN_NET_WIFI_DIRECT_H__ */
index bdfaf93..77d5dc9 100644 (file)
@@ -938,7 +938,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st
                        break;
 
                allow_connection = (pushbutton == 'Y') || (pushbutton == 'y');
-               if(!allow_connection) {
+               if (!allow_connection) {
                        result = wifi_direct_reject_connection(incomming_peer_mac);
                        printf("wifi_direct_reject_connection() result=[%d]\n", result);
                        break;