[Fixed] Typo error in wifi-direct-manager package 92/49092/1
authorNishant Chaprana <n.chaprana@samsung.com>
Tue, 6 Oct 2015 09:03:03 +0000 (14:33 +0530)
committerNishant Chaprana <n.chaprana@samsung.com>
Tue, 6 Oct 2015 09:03:03 +0000 (14:33 +0530)
Change-Id: I426c1b519aa4d458801365fd28fe9aa96ccebe06
Signed-off-by: Nishant Chaprana <n.chaprana@samsung.com>
include/wifi-direct-manager.h
oem/wifi-direct-oem.h
plugin/wpasupplicant/ctrl_iface_dbus/include/wfd-plugin-wpasupplicant.h
plugin/wpasupplicant/ctrl_iface_dbus/wfd-plugin-wpasupplicant.c
plugin/wpasupplicant/ctrl_iface_sock/include/wfd-plugin-wpasupplicant.h
plugin/wpasupplicant/ctrl_iface_sock/wfd-plugin-wpasupplicant.c
src/wifi-direct-client.c
src/wifi-direct-manager.c
src/wifi-direct-session.c

index 821371f..b8195de 100755 (executable)
@@ -112,7 +112,7 @@ typedef enum {
 
 typedef struct {
        int type;
-       int availablity;
+       int availability;
        int wsd_support;
        int tdls_support;
        int hdcp_support;
index 0d5f6dc..dd7eb06 100755 (executable)
@@ -125,7 +125,7 @@ typedef enum {
 
 typedef struct {
        int type;
-       int availablity;
+       int availability;
        int wsd_support;
        int tdls_support;
        int hdcp_support;
index d0e4021..78c9e12 100755 (executable)
 #ifdef TIZEN_FEATURE_WIFI_DISPLAY
 #define WS_WFD_INFO_PRIMARY_SINK 0x01
 #define WS_WFD_INFO_SECONDARY_SINK 0x02
-#define WS_WFD_INFO_AVAILABLITY 0x10
+#define WS_WFD_INFO_AVAILABILITY 0x10
 #define WS_WFD_INFO_WSD_SUPPORT 0x40
 #define WS_WFD_INFO_TDLS_SUPPORT 0x80
 #define WS_WFD_INFO_HDCP_SUPPORT 0x100
index 89d0210..b168b59 100755 (executable)
@@ -460,14 +460,14 @@ static int __parsing_wfd_info(unsigned char *wfd_dev_info,
        if (wfd_info & WS_WFD_INFO_SECONDARY_SINK)
                display->type |= WS_WFD_INFO_SECONDARY_SINK;
 
-       display->availablity = (wfd_info & WS_WFD_INFO_AVAILABLITY) >> 4;
+       display->availability = (wfd_info & WS_WFD_INFO_AVAILABILITY) >> 4;
        display->hdcp_support = (wfd_info & WS_WFD_INFO_HDCP_SUPPORT) >> 8;
 
        display->port = (wfd_dev_info[5]<<8 | wfd_dev_info[6]);
        display->max_tput = (wfd_dev_info[7]<<8 | wfd_dev_info[8]);
 
-       WDP_LOGD("type [%d],availablity [%d],hdcp_support [%d],ctrl_port [%d] "
-                       "max_tput[%d]", display->type, display->availablity,
+       WDP_LOGD("type [%d],availability [%d],hdcp_support [%d],ctrl_port [%d] "
+                       "max_tput[%d]", display->type, display->availability,
                        display->hdcp_support, display->port,display->max_tput);
 
        __WDP_LOG_FUNC_EXIT__;
@@ -4887,7 +4887,7 @@ int ws_miracast_init(int enable)
 
        memset(&wifi_display, 0x0, sizeof(wfd_oem_display_s));
 
-       wifi_display.availablity = enable;
+       wifi_display.availability = enable;
        wifi_display.hdcp_support = 1;
        wifi_display.port = 0x07E6;
        wifi_display.max_tput = 0x0028;
@@ -4940,7 +4940,7 @@ int ws_set_display(wfd_oem_display_s *wifi_display)
 
        ies[2] = WFD_SUBELEM_LEN_DEV_INFO;
        ies[3] = wifi_display->hdcp_support;
-       ies[4] = (wifi_display->type) | (wifi_display->availablity<<4);
+       ies[4] = (wifi_display->type) | (wifi_display->availability<<4);
        ies[5] = wifi_display->port>>8;
        ies[6] = wifi_display->port&0xff;
        ies[7] = wifi_display->max_tput>>8;
index f3f410b..969ab4e 100755 (executable)
 #ifdef TIZEN_FEATURE_WIFI_DISPLAY
 #define WS_WFD_INFO_PRIMARY_SINK 0x01
 #define WS_WFD_INFO_SECONDARY_SINK 0x02
-#define WS_WFD_INFO_AVAILABLITY 0x10
+#define WS_WFD_INFO_AVAILABILITY 0x10
 #define WS_WFD_INFO_WSD_SUPPORT 0x40
 #define WS_WFD_INFO_TDLS_SUPPORT 0x80
 #define WS_WFD_INFO_HDCP_SUPPORT 0x100
index 50f0c0c..2eae5c0 100755 (executable)
@@ -1168,7 +1168,7 @@ static int _parsing_wfd_info(char *msg, wfd_oem_display_s *display )
        if (wfd_info & WS_WFD_INFO_SECONDARY_SINK)
                display->type |= WS_WFD_INFO_SECONDARY_SINK;
 
-       display->availablity = (wfd_info & WS_WFD_INFO_AVAILABLITY) >> 4;
+       display->availability = (wfd_info & WS_WFD_INFO_AVAILABILITY) >> 4;
        display->hdcp_support = (wfd_info & WS_WFD_INFO_HDCP_SUPPORT) >> 8;
 
        strncpy(ctrl_port_msg, msg+4, 4);
@@ -1176,8 +1176,8 @@ static int _parsing_wfd_info(char *msg, wfd_oem_display_s *display )
        strncpy(max_tput_msg, msg+8, 4);
        display->max_tput =  strtoul(max_tput_msg, NULL, 16);
 
-       WDP_LOGE("type [%d],availablity [%d],hdcp_support [%d],ctrl_port [%d] max_tput[%d]",
-                       display->type,display->availablity,display->hdcp_support,
+       WDP_LOGE("type [%d],availability [%d],hdcp_support [%d],ctrl_port [%d] max_tput[%d]",
+                       display->type,display->availability,display->hdcp_support,
                        display->port,display->max_tput);
 
        __WDP_LOG_FUNC_EXIT__;
@@ -4648,14 +4648,14 @@ int ws_set_display(wfd_oem_display_s *wifi_display)
        }
 
        WDP_LOGD("Wi-Fi Display type: [%d]", wifi_display->type);
-       WDP_LOGD("Wi-Fi Display avai: [%d]", wifi_display->availablity);
+       WDP_LOGD("Wi-Fi Display avai: [%d]", wifi_display->availability);
        WDP_LOGD("Wi-Fi Display hdcp: [%d]", wifi_display->hdcp_support);
        WDP_LOGD("Wi-Fi Display hdcp: [%d]", wifi_display->port);
        WDP_LOGD("Wi-Fi Display sync: [%d]", wifi_display->max_tput);
 
        device_info = wifi_display->type;
        device_info+= (wifi_display->hdcp_support)<<8;
-       device_info+= (wifi_display->availablity)<<4;                                           //for availability bit
+       device_info+= (wifi_display->availability)<<4;                                          //for availability bit
 
        g_snprintf(cmd, sizeof(cmd), WS_CMD_SUBELEM_SET "%d %04x%04x%04x%04x",
                                                        WFD_SUBELM_ID_DEV_INFO, WFD_SUBELEM_LEN_DEV_INFO,
index a1c1d8a..4dae071 100755 (executable)
@@ -1960,7 +1960,7 @@ static gboolean wfd_client_process_request(GIOChannel *source,
                                if(miracast_enable) {
                                        manager->local->display.type = WIFI_DISPLAY_DEFAULT_TYPE;
                                        manager->local->display.port = WIFI_DISPLAY_DEFAULT_PORT;
-                                       manager->local->display.availablity = WIFI_DISPLAY_DEFAULT_AVAIL;
+                                       manager->local->display.availability = WIFI_DISPLAY_DEFAULT_AVAIL;
                                        manager->local->display.hdcp_support = WIFI_DISPLAY_DEFAULT_HDCP;
                                        manager->local->display.max_tput = WIFI_DISPLAY_DEFAULT_TPUT;
                                } else {
@@ -2020,7 +2020,7 @@ static gboolean wfd_client_process_request(GIOChannel *source,
                        } else {
                                device->display.type = WIFI_DISPLAY_DEFAULT_TYPE;
                                device->display.port = WIFI_DISPLAY_DEFAULT_PORT;
-                               device->display.availablity = WIFI_DISPLAY_DEFAULT_AVAIL;
+                               device->display.availability = WIFI_DISPLAY_DEFAULT_AVAIL;
                                device->display.hdcp_support = WIFI_DISPLAY_DEFAULT_HDCP;
                                device->display.max_tput = WIFI_DISPLAY_DEFAULT_TPUT;
                        }
@@ -2106,7 +2106,7 @@ static gboolean wfd_client_process_request(GIOChannel *source,
 
                peer = wfd_manager_get_peer_by_addr(manager, req.data.mac_addr);
                if(peer) {
-                       rsp.param1 = peer->display.availablity;
+                       rsp.param1 = peer->display.availability;
                } else {
                        WDS_LOGE("Failed to get peer");
                        rsp.result = WIFI_DIRECT_ERROR_INVALID_PARAMETER;
index 27711a8..7a73c93 100755 (executable)
@@ -1052,7 +1052,7 @@ int wfd_manager_get_peer_info(wfd_manager_s *manager, unsigned char *addr, wfd_d
        peer_info->subcategory = peer_dev->sec_dev_type;
 
 #ifdef TIZEN_FEATURE_WIFI_DISPLAY
-       if (peer_dev->display.availablity && peer_dev->display.port)
+       if (peer_dev->display.availability && peer_dev->display.port)
                peer_info->is_wfd_device = 1;
 #endif /* TIZEN_FEATURE_WIFI_DISPLAY */
 
@@ -1137,7 +1137,7 @@ int wfd_manager_get_peers(wfd_manager_s *manager, wfd_discovery_entry_s **peers_
                peers[count].subcategory = peer->sec_dev_type;
 
 #ifdef TIZEN_FEATURE_WIFI_DISPLAY
-               if (peer->display.availablity && peer->display.port)
+               if (peer->display.availability && peer->display.port)
                        peers[count].is_wfd_device = 1;
 #endif /* TIZEN_FEATURE_WIFI_DISPLAY */
                count++;
@@ -1206,7 +1206,7 @@ int wfd_manager_get_connected_peers(wfd_manager_s *manager, wfd_connected_peer_i
 #endif /* TIZEN_FEATURE_SERVICE_DISCOVERY */
 
 #ifdef TIZEN_FEATURE_WIFI_DISPLAY
-                       if (peer->display.availablity && peer->display.port)
+                       if (peer->display.availability && peer->display.port)
                                peers[count].is_wfd_device = 1;
 
 #endif /* TIZEN_FEATURE_WIFI_DISPLAY */
@@ -1285,7 +1285,7 @@ int wfd_manager_set_display_device(int type, int port, int hdcp)
        display.port = port;
        display.hdcp_support = hdcp;
 
-       display.availablity = device->display.availablity;
+       display.availability = device->display.availability;
        display.max_tput = device->display.max_tput;
 
        res = wfd_oem_set_display(g_manager->oem_ops, (wfd_oem_display_s*)&display);
@@ -1317,7 +1317,7 @@ int wfd_manager_set_session_availability(int availability)
 
        memset(&display, 0x0, sizeof(wfd_oem_display_s));
 
-       display.availablity = availability;
+       display.availability = availability;
 
        display.type = device->display.type;
        display.hdcp_support = device->display.hdcp_support;
@@ -1330,7 +1330,7 @@ int wfd_manager_set_session_availability(int availability)
                return -1;
        }
 
-       device->display.availablity = availability;
+       device->display.availability = availability;
 
        __WDS_LOG_FUNC_EXIT__;
        return res;
index 4387c53..0e3c309 100644 (file)
@@ -839,7 +839,7 @@ int wfd_session_process_event(wfd_manager_s *manager, wfd_oem_event_s *event)
                                res = wfd_session_connect(session);
                        } else {
                                /* In autoconnection mode, MT should not send GO Nego Req
-                                  before receving the GO Nego Req from peer (MO). */
+                                  before receiving the GO Nego Req from peer (MO). */
                                if (manager->autoconnection == TRUE)
                                        res  = wfd_session_connect(session);
                        }