staging: wilc1000: remove WILC_Uint8
[firefly-linux-kernel-4.4.55.git] / drivers / staging / wilc1000 / host_interface.c
index 6d9bd4983e900070116318a34d7e9f8337c6a722..afe5126f3655aa4f4b604eec7e6b770e1201dd27 100644 (file)
@@ -5,7 +5,7 @@
 
 extern WILC_Sint32 TransportInit(void);
 extern WILC_Sint32 TransportDeInit(void);
-extern WILC_Uint8 connecting;
+extern u8 connecting;
 
 #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 extern WILC_TimerHandle hDuringIpTimer;
@@ -13,7 +13,7 @@ extern WILC_TimerHandle hDuringIpTimer;
 
 extern WILC_Bool bEnablePS;
 /*BugID_5137*/
-extern WILC_Uint8 g_wilc_initialized;
+extern u8 g_wilc_initialized;
 /*****************************************************************************/
 /*                                                             Macros                                       */
 /*****************************************************************************/
@@ -96,13 +96,13 @@ typedef struct _tstrHostIFCfgParamAttr {
  *  @version           1.0
  */
 typedef struct _tstrHostIFwpaAttr {
-       WILC_Uint8 *pu8key;
-       const WILC_Uint8 *pu8macaddr;
-       WILC_Uint8 *pu8seq;
-       WILC_Uint8 u8seqlen;
-       WILC_Uint8 u8keyidx;
-       WILC_Uint8 u8Keylen;
-       WILC_Uint8 u8Ciphermode;
+       u8 *pu8key;
+       const u8 *pu8macaddr;
+       u8 *pu8seq;
+       u8 u8seqlen;
+       u8 u8keyidx;
+       u8 u8Keylen;
+       u8 u8Ciphermode;
 } tstrHostIFwpaAttr;
 
 
@@ -117,10 +117,10 @@ typedef struct _tstrHostIFwpaAttr {
  *  @version           1.0
  */
 typedef struct _tstrHostIFwepAttr {
-       WILC_Uint8 *pu8WepKey;
-       WILC_Uint8 u8WepKeylen;
-       WILC_Uint8 u8Wepidx;
-       WILC_Uint8 u8mode;
+       u8 *pu8WepKey;
+       u8 u8WepKeylen;
+       u8 u8Wepidx;
+       u8 u8mode;
        AUTHTYPE_T tenuAuth_type;
 
 } tstrHostIFwepAttr;
@@ -153,7 +153,7 @@ typedef union _tuniHostIFkeyAttr {
  */
 typedef struct _tstrHostIFkeyAttr {
        tenuKeyType enuKeyType;
-       WILC_Uint8 u8KeyAction;
+       u8 u8KeyAction;
        tuniHostIFkeyAttr uniHostIFkeyAttr;
 } tstrHostIFkeyAttr;
 
@@ -171,11 +171,11 @@ typedef struct _tstrHostIFkeyAttr {
  *  @version           1.0
  */
 typedef struct _tstrHostIFscanAttr {
-       WILC_Uint8 u8ScanSource;
-       WILC_Uint8 u8ScanType;
-       WILC_Uint8 *pu8ChnlFreqList;
-       WILC_Uint8 u8ChnlListLen;
-       WILC_Uint8 *pu8IEs;
+       u8 u8ScanSource;
+       u8 u8ScanType;
+       u8 *pu8ChnlFreqList;
+       u8 u8ChnlListLen;
+       u8 *pu8IEs;
        size_t IEsLen;
        tWILCpfScanResult pfScanResult;
        void *pvUserArg;
@@ -195,16 +195,16 @@ typedef struct _tstrHostIFscanAttr {
  *  @version           1.0
  */
 typedef struct _tstrHostIFconnectAttr {
-       WILC_Uint8 *pu8bssid;
-       WILC_Uint8 *pu8ssid;
+       u8 *pu8bssid;
+       u8 *pu8ssid;
        size_t ssidLen;
-       WILC_Uint8 *pu8IEs;
+       u8 *pu8IEs;
        size_t IEsLen;
-       WILC_Uint8 u8security;
+       u8 u8security;
        tWILCpfConnectResult pfConnectResult;
        void *pvUserArg;
        AUTHTYPE_T tenuAuth_type;
-       WILC_Uint8 u8channel;
+       u8 u8channel;
        void *pJoinParams;
 } tstrHostIFconnectAttr;
 
@@ -219,7 +219,7 @@ typedef struct _tstrHostIFconnectAttr {
  *  @version           1.0
  */
 typedef struct _tstrRcvdGnrlAsyncInfo {
-       WILC_Uint8 *pu8Buffer;
+       u8 *pu8Buffer;
        WILC_Uint32 u32Length;
 } tstrRcvdGnrlAsyncInfo;
 
@@ -234,7 +234,7 @@ typedef struct _tstrRcvdGnrlAsyncInfo {
  *  @version           1.0
  */
 typedef struct _tstrHostIFSetChan {
-       WILC_Uint8 u8SetChan;
+       u8 u8SetChan;
 } tstrHostIFSetChan;
 
 /*!
@@ -248,7 +248,7 @@ typedef struct _tstrHostIFSetChan {
  *  @version           1.0
  */
 typedef struct _tstrHostIFGetChan {
-       WILC_Uint8 u8GetChan;
+       u8 u8GetChan;
 } tstrHostIFGetChan;
 
 /*bug3819: Add Scan acomplete notification to host*/
@@ -264,7 +264,7 @@ typedef struct _tstrHostIFGetChan {
  */
 /*typedef struct _tstrScanComplete
  * {
- *      WILC_Uint8* pu8Buffer;
+ *      u8* pu8Buffer;
  *      WILC_Uint32 u32Length;
  * } tstrScanComplete;*/
 
@@ -283,10 +283,10 @@ typedef struct _tstrHostIFSetBeacon {
        WILC_Uint32 u32DTIMPeriod;              /*!< DTIM Period. Indicates how many Beacon frames
                                                                                        *                              (including the current frame) appear before the next DTIM                */
        WILC_Uint32 u32HeadLen;                         /*!< Length of the head buffer in bytes         */
-       WILC_Uint8 *pu8Head;                    /*!< Pointer to the beacon's head buffer. Beacon's head is the part
+       u8 *pu8Head;                    /*!< Pointer to the beacon's head buffer. Beacon's head is the part
                                                                                        *              from the beacon's start till the TIM element, NOT including the TIM              */
        WILC_Uint32 u32TailLen;                         /*!< Length of the tail buffer in bytes */
-       WILC_Uint8 *pu8Tail;                    /*!< Pointer to the beacon's tail buffer. Beacon's tail starts just
+       u8 *pu8Tail;                    /*!< Pointer to the beacon's tail buffer. Beacon's tail starts just
                                                                                        *                              after the TIM inormation element */
 } tstrHostIFSetBeacon;
 
@@ -303,7 +303,7 @@ typedef struct _tstrHostIFSetBeacon {
  *  @version           1.0
  */
 typedef struct _tstrHostIFDelBeacon {
-       WILC_Uint8 u8dummy;
+       u8 u8dummy;
 } tstrHostIFDelBeacon;
 
 /*!
@@ -334,8 +334,8 @@ typedef struct {
  */
 
 typedef struct {
-       WILC_Uint8 au8Sta_DelAllSta[MAX_NUM_STA][ETH_ALEN];
-       WILC_Uint8 u8Num_AssocSta;
+       u8 au8Sta_DelAllSta[MAX_NUM_STA][ETH_ALEN];
+       u8 u8Num_AssocSta;
 } tstrHostIFDelAllSta;
 
 /*!
@@ -350,7 +350,7 @@ typedef struct {
  */
 
 typedef struct {
-       WILC_Uint8 au8MacAddr[ETH_ALEN];
+       u8 au8MacAddr[ETH_ALEN];
 } tstrHostIFDelSta;
 
 /*!
@@ -395,8 +395,8 @@ typedef struct {
  */
 
 typedef struct {
-       WILC_Uint8 *au8IPAddr;
-       WILC_Uint8 idx;
+       u8 *au8IPAddr;
+       u8 idx;
 } tstrHostIFSetIPAddr;
 
 /*!
@@ -410,7 +410,7 @@ typedef struct {
  *  @version           1.0
  */
 typedef struct {
-       WILC_Uint8 mac[6];
+       u8 mac[6];
 
 } tstrHostIfStaInactiveT;
 /**/
@@ -476,8 +476,8 @@ typedef struct _tstrHostIFmsg {
 #ifdef CONNECT_DIRECT
 typedef struct _tstrWidJoinReqExt {
        WILC_Char SSID[MAX_SSID_LEN];
-       WILC_Uint8 u8channel;
-       WILC_Uint8 BSSID[6];
+       u8 u8channel;
+       u8 BSSID[6];
 } tstrWidJoinReqExt;
 #endif
 
@@ -486,39 +486,39 @@ typedef struct _tstrWidJoinReqExt {
 /*Struct containg joinParam of each AP*/
 typedef struct _tstrJoinBssParam {
        BSSTYPE_T bss_type;
-       WILC_Uint8 dtim_period;
+       u8 dtim_period;
        WILC_Uint16 beacon_period;
        WILC_Uint16 cap_info;
-       WILC_Uint8 au8bssid[6];
+       u8 au8bssid[6];
        WILC_Char ssid[MAX_SSID_LEN];
-       WILC_Uint8 ssidLen;
-       WILC_Uint8 supp_rates[MAX_RATES_SUPPORTED + 1];
-       WILC_Uint8 ht_capable;
-       WILC_Uint8 wmm_cap;
-       WILC_Uint8 uapsd_cap;
+       u8 ssidLen;
+       u8 supp_rates[MAX_RATES_SUPPORTED + 1];
+       u8 ht_capable;
+       u8 wmm_cap;
+       u8 uapsd_cap;
        WILC_Bool rsn_found;
-       WILC_Uint8 rsn_grp_policy;
-       WILC_Uint8 mode_802_11i;
-       WILC_Uint8 rsn_pcip_policy[3];
-       WILC_Uint8 rsn_auth_policy[3];
-       WILC_Uint8 rsn_cap[2];
+       u8 rsn_grp_policy;
+       u8 mode_802_11i;
+       u8 rsn_pcip_policy[3];
+       u8 rsn_auth_policy[3];
+       u8 rsn_cap[2];
        struct _tstrJoinParam *nextJoinBss;
        #ifdef WILC_P2P
        WILC_Uint32 tsf;
-       WILC_Uint8 u8NoaEnbaled;
-       WILC_Uint8 u8OppEnable;
-       WILC_Uint8 u8CtWindow;
-       WILC_Uint8 u8Count;
-       WILC_Uint8 u8Index;
-       WILC_Uint8 au8Duration[4];
-       WILC_Uint8 au8Interval[4];
-       WILC_Uint8 au8StartTime[4];
+       u8 u8NoaEnbaled;
+       u8 u8OppEnable;
+       u8 u8CtWindow;
+       u8 u8Count;
+       u8 u8Index;
+       u8 au8Duration[4];
+       u8 au8Interval[4];
+       u8 au8StartTime[4];
        #endif
 } tstrJoinBssParam;
 /*Bug4218: Parsing Join Param*/
 /*a linked list table containing needed join parameters entries for each AP found in most recent scan*/
 typedef struct _tstrBssTable {
-       WILC_Uint8 u8noBssEntries;
+       u8 u8noBssEntries;
        tstrJoinBssParam *head;
        tstrJoinBssParam *tail;
 } tstrBssTable;
@@ -537,12 +537,12 @@ typedef enum {
 /*****************************************************************************/
 
 
-tstrWILC_WFIDrv *terminated_handle = WILC_NULL;
-tstrWILC_WFIDrv *gWFiDrvHandle = WILC_NULL;
+tstrWILC_WFIDrv *terminated_handle = NULL;
+tstrWILC_WFIDrv *gWFiDrvHandle = NULL;
 #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
 WILC_Bool g_obtainingIP = WILC_FALSE;
 #endif
-WILC_Uint8 P2P_LISTEN_STATE;
+u8 P2P_LISTEN_STATE;
 static struct task_struct *HostIFthreadHandler;
 static WILC_MsgQueueHandle gMsgQHostIF;
 static struct semaphore hSemHostIFthrdEnd;
@@ -554,34 +554,34 @@ WILC_TimerHandle g_hPeriodicRSSI;
 
 
 
-WILC_Uint8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
+u8 gau8MulticastMacAddrList[WILC_MULTICAST_TABLE_SIZE][ETH_ALEN];
 
 #ifndef CONNECT_DIRECT
-static WILC_Uint8 gapu8RcvdSurveyResults[2][MAX_SURVEY_RESULT_FRAG_SIZE];
+static u8 gapu8RcvdSurveyResults[2][MAX_SURVEY_RESULT_FRAG_SIZE];
 #endif
 
-static WILC_Uint8 gapu8RcvdAssocResp[MAX_ASSOC_RESP_FRAME_SIZE];
+static u8 gapu8RcvdAssocResp[MAX_ASSOC_RESP_FRAME_SIZE];
 
 WILC_Bool gbScanWhileConnected = WILC_FALSE;
 
 static WILC_Sint8 gs8Rssi;
 static WILC_Sint8 gs8lnkspd;
-static WILC_Uint8 gu8Chnl;
-static WILC_Uint8 gs8SetIP[2][4];
-static WILC_Uint8 gs8GetIP[2][4];
+static u8 gu8Chnl;
+static u8 gs8SetIP[2][4];
+static u8 gs8GetIP[2][4];
 #ifdef WILC_AP_EXTERNAL_MLME
 static WILC_Uint32 gu32InactiveTime;
-static WILC_Uint8 gu8DelBcn;
+static u8 gu8DelBcn;
 #endif
 #ifndef SIMULATION
 static WILC_Uint32 gu32WidConnRstHack;
 #endif
 
 /*BugID_5137*/
-WILC_Uint8 *gu8FlushedJoinReq;
-WILC_Uint8 *gu8FlushedInfoElemAsoc;
-WILC_Uint8 gu8Flushed11iMode;
-WILC_Uint8 gu8FlushedAuthType;
+u8 *gu8FlushedJoinReq;
+u8 *gu8FlushedInfoElemAsoc;
+u8 gu8Flushed11iMode;
+u8 gu8FlushedAuthType;
 WILC_Uint32 gu32FlushedJoinReqSize;
 WILC_Uint32 gu32FlushedInfoElemAsocSize;
 WILC_Uint32 gu8FlushedJoinReqDrvHandler;
@@ -728,13 +728,13 @@ static WILC_Sint32 Handle_SetOperationMode(void *drvHandler, tstrHostIfSetOperat
 /**
  *  @brief host_int_set_IPAddress
  *  @details       Setting IP address params in message queue
- *  @param[in]    WILC_WFIDrvHandle hWFIDrv, WILC_Uint8* pu8IPAddr
+ *  @param[in]    WILC_WFIDrvHandle hWFIDrv, u8* pu8IPAddr
  *  @return         Error code.
  *  @author
  *  @date
  *  @version   1.0
  */
-WILC_Sint32 Handle_set_IPAddress(void *drvHandler, WILC_Uint8 *pu8IPAddr, WILC_Uint8 idx)
+WILC_Sint32 Handle_set_IPAddress(void *drvHandler, u8 *pu8IPAddr, u8 idx)
 {
 
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -752,7 +752,7 @@ WILC_Sint32 Handle_set_IPAddress(void *drvHandler, WILC_Uint8 *pu8IPAddr, WILC_U
        /*prepare configuration packet*/
        strWID.u16WIDid = (WILC_Uint16)WID_IP_ADDRESS;
        strWID.enuWIDtype = WID_STR;
-       strWID.ps8WidVal = (WILC_Uint8 *)pu8IPAddr;
+       strWID.ps8WidVal = (u8 *)pu8IPAddr;
        strWID.s32ValueSize = IP_ALEN;
 
        s32Error = SendConfigPkt(SET_CFG, &strWID, 1, WILC_TRUE, (WILC_Uint32)pstrWFIDrv);
@@ -780,13 +780,13 @@ WILC_Sint32 Handle_set_IPAddress(void *drvHandler, WILC_Uint8 *pu8IPAddr, WILC_U
 /**
  *  @brief Handle_get_IPAddress
  *  @details       Setting IP address params in message queue
- *  @param[in]    WILC_WFIDrvHandle hWFIDrv, WILC_Uint8* pu8IPAddr
+ *  @param[in]    WILC_WFIDrvHandle hWFIDrv, u8* pu8IPAddr
  *  @return         Error code.
  *  @author
  *  @date
  *  @version   1.0
  */
-WILC_Sint32 Handle_get_IPAddress(void *drvHandler, WILC_Uint8 *pu8IPAddr, WILC_Uint8 idx)
+WILC_Sint32 Handle_get_IPAddress(void *drvHandler, u8 *pu8IPAddr, u8 idx)
 {
 
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -796,12 +796,12 @@ WILC_Sint32 Handle_get_IPAddress(void *drvHandler, WILC_Uint8 *pu8IPAddr, WILC_U
        /*prepare configuration packet*/
        strWID.u16WIDid = (WILC_Uint16)WID_IP_ADDRESS;
        strWID.enuWIDtype = WID_STR;
-       strWID.ps8WidVal = (WILC_Uint8 *)WILC_MALLOC(IP_ALEN);
+       strWID.ps8WidVal = (u8 *)WILC_MALLOC(IP_ALEN);
        strWID.s32ValueSize = IP_ALEN;
 
        s32Error = SendConfigPkt(GET_CFG, &strWID, 1, WILC_TRUE, (WILC_Uint32)pstrWFIDrv);
 
-       PRINT_INFO(HOSTINF_DBG, "%d.%d.%d.%d\n", (WILC_Uint8)(strWID.ps8WidVal[0]), (WILC_Uint8)(strWID.ps8WidVal[1]), (WILC_Uint8)(strWID.ps8WidVal[2]), (WILC_Uint8)(strWID.ps8WidVal[3]));
+       PRINT_INFO(HOSTINF_DBG, "%d.%d.%d.%d\n", (u8)(strWID.ps8WidVal[0]), (u8)(strWID.ps8WidVal[1]), (u8)(strWID.ps8WidVal[2]), (u8)(strWID.ps8WidVal[3]));
 
        WILC_memcpy(gs8GetIP[idx], strWID.ps8WidVal, IP_ALEN);
 
@@ -845,7 +845,7 @@ static WILC_Sint32 Handle_SetMacAddress(void *drvHandler, tstrHostIfSetMacAddres
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
-       WILC_Uint8 *mac_buf = (WILC_Uint8 *)WILC_MALLOC(ETH_ALEN);
+       u8 *mac_buf = (u8 *)WILC_MALLOC(ETH_ALEN);
        if (mac_buf == NULL) {
                PRINT_ER("No buffer to send mac address\n");
                return WILC_FAIL;
@@ -925,7 +925,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWIDList[32];
-       WILC_Uint8 u8WidCnt = 0;
+       u8 u8WidCnt = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
 
@@ -946,7 +946,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
                        strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Char);
-                       pstrWFIDrv->strCfgValues.bss_type = (WILC_Uint8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
+                       pstrWFIDrv->strCfgValues.bss_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.bss_type;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -964,7 +964,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
                        strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Char);
-                       pstrWFIDrv->strCfgValues.auth_type = (WILC_Uint8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
+                       pstrWFIDrv->strCfgValues.auth_type = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.auth_type;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -996,7 +996,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
                        strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Char);
-                       pstrWFIDrv->strCfgValues.power_mgmt_mode = (WILC_Uint8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
+                       pstrWFIDrv->strCfgValues.power_mgmt_mode = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.power_mgmt_mode;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -1078,7 +1078,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
                        strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Char);
-                       pstrWFIDrv->strCfgValues.short_slot_allowed = (WILC_Uint8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
+                       pstrWFIDrv->strCfgValues.short_slot_allowed = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.short_slot_allowed;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -1094,7 +1094,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
                        strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Char);
-                       pstrWFIDrv->strCfgValues.txop_prot_disabled = (WILC_Uint8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
+                       pstrWFIDrv->strCfgValues.txop_prot_disabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.txop_prot_disabled;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -1137,7 +1137,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
                        strWIDList[u8WidCnt].enuWIDtype = WID_CHAR;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Char);
-                       pstrWFIDrv->strCfgValues.site_survey_enabled = (WILC_Uint8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
+                       pstrWFIDrv->strCfgValues.site_survey_enabled = (u8)strHostIFCfgParamAttr->pstrCfgParamVal.site_survey_enabled;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -1199,7 +1199,7 @@ static WILC_Sint32 Handle_CfgParam(void *drvHandler, tstrHostIFCfgParamAttr *str
                        strWIDList[u8WidCnt].ps8WidVal = (WILC_Sint8 *)&curr_tx_rate;
                        strWIDList[u8WidCnt].enuWIDtype = WID_SHORT;
                        strWIDList[u8WidCnt].s32ValueSize = sizeof(WILC_Uint16);
-                       pstrWFIDrv->strCfgValues.curr_tx_rate = (WILC_Uint8)curr_tx_rate;
+                       pstrWFIDrv->strCfgValues.curr_tx_rate = (u8)curr_tx_rate;
                } else {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
@@ -1251,9 +1251,9 @@ static WILC_Sint32 Handle_Scan(void *drvHandler, tstrHostIFscanAttr *pstrHostIFs
        tstrWID strWIDList[5];
        WILC_Uint32 u32WidsCount = 0;
        WILC_Uint32 i;
-       WILC_Uint8 *pu8Buffer;
-       WILC_Uint8 valuesize = 0;
-       WILC_Uint8 *pu8HdnNtwrksWidVal = NULL;
+       u8 *pu8Buffer;
+       u8 valuesize = 0;
+       u8 *pu8HdnNtwrksWidVal = NULL;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
 
        PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
@@ -1299,7 +1299,7 @@ static WILC_Sint32 Handle_Scan(void *drvHandler, tstrHostIFscanAttr *pstrHostIFs
        }
        pu8HdnNtwrksWidVal = WILC_MALLOC(valuesize + 1);
        strWIDList[u32WidsCount].ps8WidVal = pu8HdnNtwrksWidVal;
-       if (strWIDList[u32WidsCount].ps8WidVal != WILC_NULL) {
+       if (strWIDList[u32WidsCount].ps8WidVal != NULL) {
                pu8Buffer = strWIDList[u32WidsCount].ps8WidVal;
 
                *pu8Buffer++ = pstrHostIFscanAttr->strHiddenNetwork.u8ssidnum;
@@ -1383,7 +1383,7 @@ static WILC_Sint32 Handle_Scan(void *drvHandler, tstrHostIFscanAttr *pstrHostIFs
 
        WILC_CATCH(s32Error)
        {
-               WILC_TimerStop(&(pstrWFIDrv->hScanTimer), WILC_NULL);
+               WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
                /*if there is an ongoing scan request*/
                Handle_ScanDone(drvHandler, SCAN_EVENT_ABORTED);
        }
@@ -1433,7 +1433,7 @@ static WILC_Sint32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent)
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
 
-       WILC_Uint8 u8abort_running_scan;
+       u8 u8abort_running_scan;
        tstrWID strWID;
 
 
@@ -1467,7 +1467,7 @@ static WILC_Sint32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent)
 
        /*if there is an ongoing scan request*/
        if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
-               pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(enuEvent, WILC_NULL,
+               pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(enuEvent, NULL,
                                                                pstrWFIDrv->strWILC_UsrScanReq.u32UserScanPvoid, NULL);
                /*delete current scan request*/
                pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult = NULL;
@@ -1485,7 +1485,7 @@ static WILC_Sint32 Handle_ScanDone(void *drvHandler, tenuScanEvent enuEvent)
  *  @date
  *  @version   1.0
  */
-WILC_Uint8 u8ConnectedSSID[6] = {0};
+u8 u8ConnectedSSID[6] = {0};
 static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFconnectAttr)
 {
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
@@ -1496,10 +1496,10 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
        #ifndef CONNECT_DIRECT
        WILC_Sint32 s32Err = WILC_SUCCESS;
        WILC_Uint32 i;
-       WILC_Uint8 u8bssDscListIndex;
-       wid_site_survey_reslts_s *pstrSurveyResults = WILC_NULL;
+       u8 u8bssDscListIndex;
+       wid_site_survey_reslts_s *pstrSurveyResults = NULL;
        #else
-       WILC_Uint8 *pu8CurrByte = WILC_NULL;
+       u8 *pu8CurrByte = NULL;
        /*Bug4218: Parsing Join Param*/
        #ifdef WILC_PARSE_SCAN_IN_HOST
        tstrJoinBssParam *ptstrJoinBssParam;
@@ -1576,13 +1576,13 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
                PRINT_INFO(HOSTINF_DBG, "Saving connection parameters in global structure\n");
 
                if (pstrHostIFconnectAttr->pu8bssid != NULL) {
-                       pstrWFIDrv->strWILC_UsrConnReq.pu8bssid = (WILC_Uint8 *)WILC_MALLOC(6);
+                       pstrWFIDrv->strWILC_UsrConnReq.pu8bssid = (u8 *)WILC_MALLOC(6);
                        WILC_memcpy(pstrWFIDrv->strWILC_UsrConnReq.pu8bssid, pstrHostIFconnectAttr->pu8bssid, 6);
                }
 
                pstrWFIDrv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssidLen;
                if (pstrHostIFconnectAttr->pu8ssid != NULL) {
-                       pstrWFIDrv->strWILC_UsrConnReq.pu8ssid = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFconnectAttr->ssidLen + 1);
+                       pstrWFIDrv->strWILC_UsrConnReq.pu8ssid = (u8 *)WILC_MALLOC(pstrHostIFconnectAttr->ssidLen + 1);
                        WILC_memcpy(pstrWFIDrv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->pu8ssid,
                                    pstrHostIFconnectAttr->ssidLen);
                        pstrWFIDrv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssidLen] = '\0';
@@ -1590,7 +1590,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
 
                pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen = pstrHostIFconnectAttr->IEsLen;
                if (pstrHostIFconnectAttr->pu8IEs != NULL) {
-                       pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFconnectAttr->IEsLen);
+                       pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs = (u8 *)WILC_MALLOC(pstrHostIFconnectAttr->IEsLen);
                        WILC_memcpy(pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs, pstrHostIFconnectAttr->pu8IEs,
                                    pstrHostIFconnectAttr->IEsLen);
                }
@@ -1696,13 +1696,13 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
 #endif
 
        if (pstrHostIFconnectAttr->pu8bssid != NULL) {
-               pstrWFIDrv->strWILC_UsrConnReq.pu8bssid = (WILC_Uint8 *)WILC_MALLOC(6);
+               pstrWFIDrv->strWILC_UsrConnReq.pu8bssid = (u8 *)WILC_MALLOC(6);
                WILC_memcpy(pstrWFIDrv->strWILC_UsrConnReq.pu8bssid, pstrHostIFconnectAttr->pu8bssid, 6);
        }
 
        pstrWFIDrv->strWILC_UsrConnReq.ssidLen = pstrHostIFconnectAttr->ssidLen;
        if (pstrHostIFconnectAttr->pu8ssid != NULL) {
-               pstrWFIDrv->strWILC_UsrConnReq.pu8ssid = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFconnectAttr->ssidLen + 1);
+               pstrWFIDrv->strWILC_UsrConnReq.pu8ssid = (u8 *)WILC_MALLOC(pstrHostIFconnectAttr->ssidLen + 1);
                WILC_memcpy(pstrWFIDrv->strWILC_UsrConnReq.pu8ssid, pstrHostIFconnectAttr->pu8ssid,
                            pstrHostIFconnectAttr->ssidLen);
                pstrWFIDrv->strWILC_UsrConnReq.pu8ssid[pstrHostIFconnectAttr->ssidLen] = '\0';
@@ -1710,7 +1710,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
 
        pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen = pstrHostIFconnectAttr->IEsLen;
        if (pstrHostIFconnectAttr->pu8IEs != NULL) {
-               pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFconnectAttr->IEsLen);
+               pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs = (u8 *)WILC_MALLOC(pstrHostIFconnectAttr->IEsLen);
                WILC_memcpy(pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs, pstrHostIFconnectAttr->pu8IEs,
                            pstrHostIFconnectAttr->IEsLen);
        }
@@ -1778,7 +1778,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
 
        /*BugID_5137*/
        if (WILC_memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))
-               gu8FlushedAuthType = (WILC_Uint8)pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type;
+               gu8FlushedAuthType = (u8)pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type;
 
        PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n", pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
        /*
@@ -1799,7 +1799,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
        strWIDList[u32WidsCount].s32ValueSize = MAX_SSID_LEN + 7;
        strWIDList[u32WidsCount].ps8WidVal = WILC_MALLOC(strWIDList[u32WidsCount].s32ValueSize);
 
-       if (strWIDList[u32WidsCount].ps8WidVal == WILC_NULL) {
+       if (strWIDList[u32WidsCount].ps8WidVal == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
        }
 
@@ -1838,7 +1838,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
                gu32FlushedJoinReqSize = strWIDList[u32WidsCount].s32ValueSize;
                gu8FlushedJoinReq = WILC_MALLOC(gu32FlushedJoinReqSize);
        }
-       if (strWIDList[u32WidsCount].ps8WidVal == WILC_NULL) {
+       if (strWIDList[u32WidsCount].ps8WidVal == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
        }
 
@@ -2004,7 +2004,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
        {
                tstrConnectInfo strConnectInfo;
 
-               WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), WILC_NULL);
+               WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), NULL);
 
                PRINT_D(HOSTINF_DBG, "could not start connecting to the required network\n");
 
@@ -2017,7 +2017,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
 
                        if (pstrHostIFconnectAttr->pu8IEs != NULL) {
                                strConnectInfo.ReqIEsLen = pstrHostIFconnectAttr->IEsLen;
-                               strConnectInfo.pu8ReqIEs = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFconnectAttr->IEsLen);
+                               strConnectInfo.pu8ReqIEs = (u8 *)WILC_MALLOC(pstrHostIFconnectAttr->IEsLen);
                                WILC_memcpy(strConnectInfo.pu8ReqIEs,
                                            pstrHostIFconnectAttr->pu8IEs,
                                            pstrHostIFconnectAttr->IEsLen);
@@ -2060,7 +2060,7 @@ static WILC_Sint32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrH
                pstrHostIFconnectAttr->pu8IEs = NULL;
        }
 
-       if (pu8CurrByte != WILC_NULL) {
+       if (pu8CurrByte != NULL) {
                WILC_FREE(pu8CurrByte);
        }
        return s32Error;
@@ -2082,7 +2082,7 @@ static WILC_Sint32 Handle_FlushConnect(void *drvHandler)
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWIDList[5];
        WILC_Uint32 u32WidsCount = 0;
-       WILC_Uint8 *pu8CurrByte = WILC_NULL;
+       u8 *pu8CurrByte = NULL;
 
 
        /* IEs to be inserted in Association Request */
@@ -2176,7 +2176,7 @@ static WILC_Sint32 Handle_ConnectTimeout(void *drvHandler)
 
                if (pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs != NULL) {
                        strConnectInfo.ReqIEsLen = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
-                       strConnectInfo.pu8ReqIEs = (WILC_Uint8 *)WILC_MALLOC(pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen);
+                       strConnectInfo.pu8ReqIEs = (u8 *)WILC_MALLOC(pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen);
                        WILC_memcpy(strConnectInfo.pu8ReqIEs,
                                    pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs,
                                    pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen);
@@ -2276,7 +2276,7 @@ static WILC_Sint32 Handle_RcvdNtwrkInfo(void *drvHandler, tstrRcvdNetworkInfo *p
                PRINT_D(HOSTINF_DBG, "State: Scanning, parsing network information received\n");
                ParseNetworkInfo(pstrRcvdNetworkInfo->pu8Buffer, &pstrNetworkInfo);
                if ((pstrNetworkInfo == NULL)
-                   || (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult == WILC_NULL)) {
+                   || (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult == NULL)) {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
 
@@ -2358,9 +2358,9 @@ done:
        }
 
        /*free structure allocated*/
-       if (pstrNetworkInfo != WILC_NULL) {
+       if (pstrNetworkInfo != NULL) {
                DeallocateNetworkInfo(pstrNetworkInfo);
-               pstrNetworkInfo = WILC_NULL;
+               pstrNetworkInfo = NULL;
        }
 
        return s32Error;
@@ -2380,14 +2380,14 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
        /* TODO: mostafa: till now, this function just handles only the received mac status msg, */
        /*                               which carries only 1 WID which have WID ID = WID_STATUS */
        WILC_Sint32 s32Error = WILC_SUCCESS;
-       WILC_Uint8 u8MsgType = 0;
-       WILC_Uint8 u8MsgID = 0;
+       u8 u8MsgType = 0;
+       u8 u8MsgID = 0;
        WILC_Uint16 u16MsgLen = 0;
        WILC_Uint16 u16WidID = (WILC_Uint16)WID_NIL;
-       WILC_Uint8 u8WidLen  = 0;
-       WILC_Uint8 u8MacStatus;
-       WILC_Uint8 u8MacStatusReasonCode;
-       WILC_Uint8 u8MacStatusAdditionalInfo;
+       u8 u8WidLen  = 0;
+       u8 u8MacStatus;
+       u8 u8MacStatusReasonCode;
+       u8 u8MacStatusAdditionalInfo;
        tstrConnectInfo strConnectInfo;
        tstrDisconnectNotifInfo strDisconnectNotifInfo;
        WILC_Sint32 s32Err = WILC_SUCCESS;
@@ -2402,7 +2402,7 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
            (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTED) ||
            pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
                if ((pstrRcvdGnrlAsyncInfo->pu8Buffer == NULL) ||
-                   (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult == WILC_NULL)) {
+                   (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult == NULL)) {
                        WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
                }
 
@@ -2467,7 +2467,7 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
                                                                strConnectInfo.u16RespIEsLen = pstrConnectRespInfo->u16RespIEsLen;
 
 
-                                                               strConnectInfo.pu8RespIEs = (WILC_Uint8 *)WILC_MALLOC(pstrConnectRespInfo->u16RespIEsLen);
+                                                               strConnectInfo.pu8RespIEs = (u8 *)WILC_MALLOC(pstrConnectRespInfo->u16RespIEsLen);
                                                                WILC_memcpy(strConnectInfo.pu8RespIEs, pstrConnectRespInfo->pu8RespIEs,
                                                                            pstrConnectRespInfo->u16RespIEsLen);
                                                        }
@@ -2511,14 +2511,14 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
 
                        if (pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs != NULL) {
                                strConnectInfo.ReqIEsLen = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;
-                               strConnectInfo.pu8ReqIEs = (WILC_Uint8 *)WILC_MALLOC(pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen);
+                               strConnectInfo.pu8ReqIEs = (u8 *)WILC_MALLOC(pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen);
                                WILC_memcpy(strConnectInfo.pu8ReqIEs,
                                            pstrWFIDrv->strWILC_UsrConnReq.pu8ConnReqIEs,
                                            pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen);
                        }
 
 
-                       WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), WILC_NULL);
+                       WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), NULL);
                        pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
                                                                           &strConnectInfo,
                                                                           u8MacStatus,
@@ -2542,7 +2542,7 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
                                #ifdef DISABLE_PWRSAVE_AND_SCAN_DURING_IP
                                PRINT_D(GENERIC_DBG, "Obtaining an IP, Disable Scan\n");
                                g_obtainingIP = WILC_TRUE;
-                               WILC_TimerStart(&hDuringIpTimer, 10000, WILC_NULL, WILC_NULL);
+                               WILC_TimerStart(&hDuringIpTimer, 10000, NULL, NULL);
                                #endif
 
                                #ifdef WILC_PARSE_SCAN_IN_HOST
@@ -2597,7 +2597,7 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
 
                        if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
                                PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running OBSS Scan >> \n\n");
-                               WILC_TimerStop(&(pstrWFIDrv->hScanTimer), WILC_NULL);
+                               WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
                                Handle_ScanDone((void *)pstrWFIDrv, SCAN_EVENT_ABORTED);
                        }
 
@@ -2674,7 +2674,7 @@ static WILC_Sint32 Handle_RcvdGnrlAsyncInfo(void *drvHandler, tstrRcvdGnrlAsyncI
                        PRINT_D(HOSTINF_DBG, "Received MAC_DISCONNECTED from the FW while scanning\n");
                        PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running Scan >> \n\n");
                        /*Abort the running scan*/
-                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), WILC_NULL);
+                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
                        if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
                                Handle_ScanDone((void *)pstrWFIDrv, SCAN_EVENT_ABORTED);
 
@@ -2713,8 +2713,8 @@ static int Handle_Key(void *drvHandler, tstrHostIFkeyAttr *pstrHostIFkeyAttr)
        #ifdef WILC_AP_EXTERNAL_MLME
        tstrWID strWIDList[5];
        #endif
-       WILC_Uint8 i;
-       WILC_Uint8 *pu8keybuf;
+       u8 i;
+       u8 *pu8keybuf;
        WILC_Sint8 s8idxarray[1];
        WILC_Sint8 ret = 0;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
@@ -2747,7 +2747,7 @@ static int Handle_Key(void *drvHandler, tstrHostIFkeyAttr *pstrHostIFkeyAttr)
                        strWIDList[2].s32ValueSize = sizeof(WILC_Char);
 
 
-                       pu8keybuf = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen);
+                       pu8keybuf = (u8 *)WILC_MALLOC(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen);
 
 
                        if (pu8keybuf == NULL) {
@@ -2776,7 +2776,7 @@ static int Handle_Key(void *drvHandler, tstrHostIFkeyAttr *pstrHostIFkeyAttr)
 
                if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY) {
                        PRINT_D(HOSTINF_DBG, "Handling WEP key\n");
-                       pu8keybuf = (WILC_Uint8 *)WILC_MALLOC(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2);
+                       pu8keybuf = (u8 *)WILC_MALLOC(pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFwepAttr.u8WepKeylen + 2);
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send Key\n");
                                return -1;
@@ -2824,7 +2824,7 @@ static int Handle_Key(void *drvHandler, tstrHostIFkeyAttr *pstrHostIFkeyAttr)
        case WPARxGtk:
                        #ifdef WILC_AP_EXTERNAL_MLME
                if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY_AP) {
-                       pu8keybuf = (WILC_Uint8 *)WILC_MALLOC(RX_MIC_KEY_MSG_LEN);
+                       pu8keybuf = (u8 *)WILC_MALLOC(RX_MIC_KEY_MSG_LEN);
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send RxGTK Key\n");
                                ret = -1;
@@ -2875,7 +2875,7 @@ static int Handle_Key(void *drvHandler, tstrHostIFkeyAttr *pstrHostIFkeyAttr)
                if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY) {
                        PRINT_D(HOSTINF_DBG, "Handling group key(Rx) function\n");
 
-                       pu8keybuf = (WILC_Uint8 *)WILC_MALLOC(RX_MIC_KEY_MSG_LEN);
+                       pu8keybuf = (u8 *)WILC_MALLOC(RX_MIC_KEY_MSG_LEN);
                        if (pu8keybuf == NULL) {
                                PRINT_ER("No buffer to send RxGTK Key\n");
                                ret = -1;
@@ -2930,7 +2930,7 @@ _WPARxGtk_end_case_:
                if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY_AP) {
 
 
-                       pu8keybuf = (WILC_Uint8 *)WILC_MALLOC(PTK_KEY_MSG_LEN + 1);
+                       pu8keybuf = (u8 *)WILC_MALLOC(PTK_KEY_MSG_LEN + 1);
 
 
 
@@ -2977,7 +2977,7 @@ _WPARxGtk_end_case_:
                if (pstrHostIFkeyAttr->u8KeyAction & ADDKEY) {
 
 
-                       pu8keybuf = (WILC_Uint8 *)WILC_MALLOC(PTK_KEY_MSG_LEN);
+                       pu8keybuf = (u8 *)WILC_MALLOC(PTK_KEY_MSG_LEN);
 
 
 
@@ -3027,7 +3027,7 @@ _WPAPtk_end_case_:
 
                PRINT_D(HOSTINF_DBG, "Handling PMKSA key\n");
 
-               pu8keybuf = (WILC_Uint8 *)WILC_MALLOC((pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1);
+               pu8keybuf = (u8 *)WILC_MALLOC((pstrHostIFkeyAttr->uniHostIFkeyAttr.strHostIFpmkidAttr.numpmkid * PMKSA_KEY_LEN) + 1);
                if (pu8keybuf == NULL) {
                        PRINT_ER("No buffer to send PMKSA Key\n");
                        return -1;
@@ -3110,11 +3110,11 @@ static void Handle_Disconnect(void *drvHandler)
                strDisconnectNotifInfo.ie_len = 0;
 
                if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
-                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), WILC_NULL);
-                       pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, WILC_NULL,
+                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
+                       pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, NULL,
                                                                        pstrWFIDrv->strWILC_UsrScanReq.u32UserScanPvoid, NULL);
 
-                       pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult = WILC_NULL;
+                       pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult = NULL;
                }
 
                if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult != NULL) {
@@ -3123,7 +3123,7 @@ static void Handle_Disconnect(void *drvHandler)
                        /*Stop connect timer, if connection in progress*/
                        if (pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) {
                                PRINT_D(HOSTINF_DBG, "Upper layer requested termination of connection\n");
-                               WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), WILC_NULL);
+                               WILC_TimerStop(&(pstrWFIDrv->hConnectTimer), NULL);
                        }
 
                        pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult(CONN_DISCONN_EVENT_DISCONN_NOTIF, NULL,
@@ -3187,7 +3187,7 @@ void resolve_disconnect_aberration(void *drvHandler)
        tstrWILC_WFIDrv *pstrWFIDrv;
 
        pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
-       if (pstrWFIDrv  == WILC_NULL)
+       if (pstrWFIDrv  == NULL)
                return;
        if ((pstrWFIDrv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) || (pstrWFIDrv->enuHostIFstate == HOST_IF_CONNECTING)) {
                PRINT_D(HOSTINF_DBG, "\n\n<< correcting Supplicant state machine >>\n\n");
@@ -3407,7 +3407,7 @@ static WILC_Sint32 Handle_Get_InActiveTime(void *drvHandler, tstrHostIfStaInacti
 {
 
        WILC_Sint32 s32Error = WILC_SUCCESS;
-       WILC_Uint8 *stamac;
+       u8 *stamac;
        tstrWID strWID;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
@@ -3415,7 +3415,7 @@ static WILC_Sint32 Handle_Get_InActiveTime(void *drvHandler, tstrHostIfStaInacti
        strWID.u16WIDid = (WILC_Uint16)WID_SET_STA_MAC_INACTIVE_TIME;
        strWID.enuWIDtype = WID_STR;
        strWID.s32ValueSize = ETH_ALEN;
-       strWID.ps8WidVal = (WILC_Uint8 *)WILC_MALLOC(strWID.s32ValueSize);
+       strWID.ps8WidVal = (u8 *)WILC_MALLOC(strWID.s32ValueSize);
 
 
        stamac = strWID.ps8WidVal;
@@ -3476,7 +3476,7 @@ static void Handle_AddBeacon(void *drvHandler, tstrHostIFSetBeacon *pstrSetBeaco
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
        PRINT_D(HOSTINF_DBG, "Adding BEACON\n");
 
@@ -3548,7 +3548,7 @@ static void Handle_DelBeacon(void *drvHandler, tstrHostIFDelBeacon *pstrDelBeaco
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
        strWID.u16WIDid = (WILC_Uint16)WID_DEL_BEACON;
        strWID.enuWIDtype = WID_CHAR;
@@ -3581,15 +3581,15 @@ static void Handle_DelBeacon(void *drvHandler, tstrHostIFDelBeacon *pstrDelBeaco
 /**
  *  @brief WILC_HostIf_PackStaParam
  *  @details       Handling packing of the station params in a buffer
- *  @param[in]   WILC_Uint8* pu8Buffer, tstrWILC_AddStaParam* pstrStationParam
+ *  @param[in]   u8* pu8Buffer, tstrWILC_AddStaParam* pstrStationParam
  *  @return         NONE
  *  @author
  *  @date
  *  @version   1.0
  */
-static WILC_Uint32 WILC_HostIf_PackStaParam(WILC_Uint8 *pu8Buffer, tstrWILC_AddStaParam *pstrStationParam)
+static WILC_Uint32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrStationParam)
 {
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
 
        pu8CurrByte = pu8Buffer;
 
@@ -3646,7 +3646,7 @@ static void Handle_AddStation(void *drvHandler, tstrWILC_AddStaParam *pstrStatio
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
        PRINT_D(HOSTINF_DBG, "Handling add station\n");
        strWID.u16WIDid = (WILC_Uint16)WID_ADD_STA;
@@ -3689,9 +3689,9 @@ static void Handle_DelAllSta(void *drvHandler, tstrHostIFDelAllSta *pstrDelAllSt
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
-       WILC_Uint8 i;
+       u8 i;
        UWORD8 au8Zero_Buff[6] = {0};
        strWID.u16WIDid = (WILC_Uint16)WID_DEL_ALL_STA;
        strWID.enuWIDtype = WID_STR;
@@ -3747,7 +3747,7 @@ static void Handle_DelStation(void *drvHandler, tstrHostIFDelSta *pstrDelStaPara
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
        strWID.u16WIDid = (WILC_Uint16)WID_REMOVE_STA;
@@ -3793,7 +3793,7 @@ static void Handle_EditStation(void *drvHandler, tstrWILC_AddStaParam *pstrStati
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
        strWID.u16WIDid = (WILC_Uint16)WID_EDIT_STA;
@@ -3838,7 +3838,7 @@ static void Handle_EditStation(void *drvHandler, tstrWILC_AddStaParam *pstrStati
 static int Handle_RemainOnChan(void *drvHandler, tstrHostIfRemainOnChan *pstrHostIfRemainOnChan)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
-       WILC_Uint8 u8remain_on_chan_flag;
+       u8 u8remain_on_chan_flag;
        tstrWID strWID;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
 
@@ -3879,7 +3879,7 @@ static int Handle_RemainOnChan(void *drvHandler, tstrHostIfRemainOnChan *pstrHos
        strWID.s32ValueSize = 2;
        strWID.ps8WidVal = (WILC_Sint8 *)WILC_MALLOC(strWID.s32ValueSize);
 
-       if (strWID.ps8WidVal == WILC_NULL) {
+       if (strWID.ps8WidVal == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
        }
 
@@ -3895,7 +3895,7 @@ static int Handle_RemainOnChan(void *drvHandler, tstrHostIfRemainOnChan *pstrHos
        WILC_CATCH(-1)
        {
                P2P_LISTEN_STATE = 1;
-               WILC_TimerStart(&(pstrWFIDrv->hRemainOnChannel), pstrHostIfRemainOnChan->u32duration, (void *)pstrWFIDrv, WILC_NULL);
+               WILC_TimerStart(&(pstrWFIDrv->hRemainOnChannel), pstrHostIfRemainOnChan->u32duration, (void *)pstrWFIDrv, NULL);
 
                /*Calling CFG ready_on_channel*/
                if (pstrWFIDrv->strHostIfRemainOnChan.pRemainOnChanReady) {
@@ -3921,7 +3921,7 @@ static int Handle_RegisterFrame(void *drvHandler, tstrHostIfRegisterFrame *pstrH
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
        PRINT_D(HOSTINF_DBG, "Handling frame register Flag : %d FrameType: %d\n", pstrHostIfRegisterFrame->bReg, pstrHostIfRegisterFrame->u16FrameType);
@@ -3972,7 +3972,7 @@ static int Handle_RegisterFrame(void *drvHandler, tstrHostIfRegisterFrame *pstrH
 #define FALSE_FRMWR_CHANNEL 100
 static WILC_Uint32 Handle_ListenStateExpired(void *drvHandler, tstrHostIfRemainOnChan *pstrHostIfRemainOnChan)
 {
-       WILC_Uint8 u8remain_on_chan_flag;
+       u8 u8remain_on_chan_flag;
        tstrWID strWID;
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *) drvHandler;
@@ -3989,7 +3989,7 @@ static WILC_Uint32 Handle_ListenStateExpired(void *drvHandler, tstrHostIfRemainO
                strWID.s32ValueSize = 2;
                strWID.ps8WidVal = WILC_MALLOC(strWID.s32ValueSize);
 
-               if (strWID.ps8WidVal == WILC_NULL) {
+               if (strWID.ps8WidVal == NULL) {
                        PRINT_ER("Failed to allocate memory\n");
                }
 
@@ -4033,7 +4033,7 @@ static void ListenTimerCB(void *pvArg)
        tstrHostIFmsg strHostIFmsg;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)pvArg;
        /*Stopping remain-on-channel timer*/
-       WILC_TimerStop(&(pstrWFIDrv->hRemainOnChannel), WILC_NULL);
+       WILC_TimerStop(&(pstrWFIDrv->hRemainOnChannel), NULL);
 
        /* prepare the Timer Callback message */
        WILC_memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
@@ -4042,7 +4042,7 @@ static void ListenTimerCB(void *pvArg)
        strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = pstrWFIDrv->strHostIfRemainOnChan.u32ListenSessionID;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -4108,7 +4108,7 @@ static void Handle_SetMulticastFilter(void *drvHandler, tstrHostIFSetMulti *strH
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
-       WILC_Uint8 *pu8CurrByte;
+       u8 *pu8CurrByte;
 
        PRINT_D(HOSTINF_DBG, "Setup Multicast Filter\n");
 
@@ -4177,7 +4177,7 @@ static WILC_Sint32 Handle_AddBASession(void *drvHandler, tstrHostIfBASessionInfo
 
        strWID.u16WIDid = (WILC_Uint16)WID_11E_P_ACTION_REQ;
        strWID.enuWIDtype = WID_STR;
-       strWID.ps8WidVal = (WILC_Uint8 *)WILC_MALLOC(BLOCK_ACK_REQ_SIZE);
+       strWID.ps8WidVal = (u8 *)WILC_MALLOC(BLOCK_ACK_REQ_SIZE);
        strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE;
        ptr = strWID.ps8WidVal;
        /* *ptr++ = 0x14; */
@@ -4262,7 +4262,7 @@ static WILC_Sint32 Handle_DelBASession(void *drvHandler, tstrHostIfBASessionInfo
 
        strWID.u16WIDid = (WILC_Uint16)WID_11E_P_ACTION_REQ;
        strWID.enuWIDtype = WID_STR;
-       strWID.ps8WidVal = (WILC_Uint8 *)WILC_MALLOC(BLOCK_ACK_REQ_SIZE);
+       strWID.ps8WidVal = (u8 *)WILC_MALLOC(BLOCK_ACK_REQ_SIZE);
        strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE;
        ptr = strWID.ps8WidVal;
        /* *ptr++ = 0x14; */
@@ -4332,7 +4332,7 @@ static WILC_Sint32 Handle_DelAllRxBASessions(void *drvHandler, tstrHostIfBASessi
 
        strWID.u16WIDid = (WILC_Uint16)WID_DEL_ALL_RX_BA;
        strWID.enuWIDtype = WID_STR;
-       strWID.ps8WidVal = (WILC_Uint8 *)WILC_MALLOC(BLOCK_ACK_REQ_SIZE);
+       strWID.ps8WidVal = (u8 *)WILC_MALLOC(BLOCK_ACK_REQ_SIZE);
        strWID.s32ValueSize = BLOCK_ACK_REQ_SIZE;
        ptr = strWID.ps8WidVal;
        *ptr++ = 0x14;
@@ -4379,7 +4379,7 @@ static int hostIFthread(void *pvArg)
        WILC_memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
 
        while (1) {
-               WILC_MsgQueueRecv(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), &u32Ret, WILC_NULL);
+               WILC_MsgQueueRecv(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), &u32Ret, NULL);
                pstrWFIDrv = (tstrWILC_WFIDrv *)strHostIFmsg.drvHandler;
                if (strHostIFmsg.u16MsgId == HOST_IF_MSG_EXIT) {
                        PRINT_D(GENERIC_DBG, "THREAD: Exiting HostIfThread\n");
@@ -4391,13 +4391,13 @@ static int hostIFthread(void *pvArg)
                if ((!g_wilc_initialized)) {
                        PRINT_D(GENERIC_DBG, "--WAIT--");
                        WILC_Sleep(200);
-                       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+                       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
                        continue;
                }
 
                if (strHostIFmsg.u16MsgId == HOST_IF_MSG_CONNECT && pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult != NULL) {
                        PRINT_D(HOSTINF_DBG, "Requeue connect request till scan done received\n");
-                       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+                       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
                        WILC_Sleep(2);
                        continue;
                }
@@ -4446,7 +4446,7 @@ static int hostIFthread(void *pvArg)
                        break;
 
                case HOST_IF_MSG_RCVD_SCAN_COMPLETE:
-                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), WILC_NULL);
+                       WILC_TimerStop(&(pstrWFIDrv->hScanTimer), NULL);
                        PRINT_D(HOSTINF_DBG, "scan completed successfully\n");
 
                        /*BugID_5213*/
@@ -4604,7 +4604,7 @@ static void TimerCB_Scan(void *pvArg)
        strHostIFmsg.u16MsgId = HOST_IF_MSG_SCAN_TIMER_FIRED;
 
        /* send the message */
-       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
 }
 
 static void TimerCB_Connect(void *pvArg)
@@ -4617,7 +4617,7 @@ static void TimerCB_Connect(void *pvArg)
        strHostIFmsg.u16MsgId = HOST_IF_MSG_CONNECT_TIMER_FIRED;
 
        /* send the message */
-       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
 }
 
 
@@ -4634,7 +4634,7 @@ static void TimerCB_Connect(void *pvArg)
  *  @version           1.0
  */
 /* Check implementation in core adding 9 bytes to the input! */
-WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8StaAddress)
+WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8StaAddress)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
@@ -4663,14 +4663,14 @@ WILC_Sint32 host_int_remove_key(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8keyIdx)
+WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, u8 u8keyIdx)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -4689,7 +4689,7 @@ WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8keyI
        uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8keyIdx;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Error in sending message queue : Request to remove WEP key \n");
        down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4713,14 +4713,14 @@ WILC_Sint32 host_int_remove_wep_key(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8keyI
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8Index)
+WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, u8 u8Index)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -4738,7 +4738,7 @@ WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u
        uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Index;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Error in sending message queue : Default key index\n");
        down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4770,14 +4770,14 @@ WILC_Sint32 host_int_set_WEPDefaultKeyID(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8WepKey, WILC_Uint8 u8WepKeylen, WILC_Uint8 u8Keyidx)
+WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx)
 {
 
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
 
        }
@@ -4793,7 +4793,7 @@ WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const WILC_U
 
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
-       uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = (WILC_Uint8 *)WILC_MALLOC(u8WepKeylen);
+       uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = (u8 *)WILC_MALLOC(u8WepKeylen);
 
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
                    pu8WepKey, u8WepKeylen);
@@ -4806,7 +4806,7 @@ WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const WILC_U
        uniHostIFkeyAttr.strHostIFwepAttr.u8Wepidx = u8Keyidx;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Error in sending message queue :WEP Key\n");
        down(&(pstrWFIDrv->hSemTestKeyBlock));
@@ -4836,15 +4836,15 @@ WILC_Sint32 host_int_add_wep_key_bss_sta(WILC_WFIDrvHandle hWFIDrv, const WILC_U
  *  @date              28 FEB 2013
  *  @version           1.0
  */
-WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Uint8 *pu8WepKey, WILC_Uint8 u8WepKeylen, WILC_Uint8 u8Keyidx, WILC_Uint8 u8mode, AUTHTYPE_T tenuAuth_type)
+WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8WepKey, u8 u8WepKeylen, u8 u8Keyidx, u8 u8mode, AUTHTYPE_T tenuAuth_type)
 {
 
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
-       WILC_Uint8 i;
+       u8 i;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
 
        }
@@ -4863,7 +4863,7 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Ui
 
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
-       uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = (WILC_Uint8 *)WILC_MALLOC((u8WepKeylen));
+       uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey = (u8 *)WILC_MALLOC((u8WepKeylen));
 
 
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwepAttr.pu8WepKey,
@@ -4882,7 +4882,7 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Ui
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
        uniHostIFkeyAttr.strHostIFwepAttr.tenuAuth_type = tenuAuth_type;
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
 
        if (s32Error)
                PRINT_ER("Error in sending message queue :WEP Key\n");
@@ -4912,15 +4912,15 @@ WILC_Sint32 host_int_add_wep_key_bss_ap(WILC_WFIDrvHandle hWFIDrv, const WILC_Ui
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, WILC_Uint8 u8PtkKeylen,
-                            const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, WILC_Uint8 mode, WILC_Uint8 u8Ciphermode, WILC_Uint8 u8Idx)
+WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen,
+                            const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
-       WILC_Uint8 u8KeyLen = u8PtkKeylen;
+       u8 u8KeyLen = u8PtkKeylen;
        WILC_Uint32 i;
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
        if (pu8RxMic != NULL) {
@@ -4948,7 +4948,7 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, WILC_U
 
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
-       uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = (WILC_Uint8 *)WILC_MALLOC(u8PtkKeylen);
+       uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = (u8 *)WILC_MALLOC(u8PtkKeylen);
 
 
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
@@ -4983,7 +4983,7 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, WILC_U
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
 
        if (s32Error)
                PRINT_ER("Error in sending message queue:  PTK Key\n");
@@ -5014,16 +5014,16 @@ WILC_Sint32 host_int_add_ptk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8Ptk, WILC_U
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, WILC_Uint8 u8GtkKeylen,
-                               WILC_Uint8 u8KeyIdx, WILC_Uint32 u32KeyRSClen, const u8 *KeyRSC,
-                               const u8 *pu8RxMic, const u8 *pu8TxMic, WILC_Uint8 mode, WILC_Uint8 u8Ciphermode)
+WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen,
+                               u8 u8KeyIdx, WILC_Uint32 u32KeyRSClen, const u8 *KeyRSC,
+                               const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
-       WILC_Uint8 u8KeyLen = u8GtkKeylen;
+       u8 u8KeyLen = u8GtkKeylen;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
        /* prepare the Key Message */
@@ -5038,7 +5038,7 @@ WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, W
        }
        if (KeyRSC != NULL) {
                strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
-               uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq = (WILC_Uint8 *)WILC_MALLOC(u32KeyRSClen);
+               uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq = (u8 *)WILC_MALLOC(u32KeyRSClen);
 
                WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8seq,
                            KeyRSC, u32KeyRSClen);
@@ -5060,7 +5060,7 @@ WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, W
 
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
-       uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = (WILC_Uint8 *)WILC_MALLOC(u8KeyLen);
+       uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = (u8 *)WILC_MALLOC(u8KeyLen);
 
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
                    pu8RxGtk, u8GtkKeylen);
@@ -5089,7 +5089,7 @@ WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, W
 
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Error in sending message queue:  RX GTK\n");
        /* ////////////// */
@@ -5120,13 +5120,13 @@ WILC_Sint32 host_int_add_rx_gtk(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8RxGtk, W
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8KeyLen, WILC_Uint8 *pu8TxGtk, WILC_Uint8 u8KeyIdx)
+WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -5138,7 +5138,7 @@ WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8KeyLen,
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.u8KeyAction = ADDKEY;
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.
-       uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = (WILC_Uint8 *)WILC_MALLOC(u8KeyLen);
+       uniHostIFkeyAttr.strHostIFwpaAttr.pu8key = (u8 *)WILC_MALLOC(u8KeyLen);
 
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.pu8key,
                    pu8TxGtk, u8KeyLen);
@@ -5146,7 +5146,7 @@ WILC_Sint32 host_int_add_tx_gtk(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8KeyLen,
        strHostIFmsg.uniHostIFmsgBody.strHostIFkeyAttr.uniHostIFkeyAttr.strHostIFwpaAttr.u8Keylen = u8KeyLen;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Error in sending message queue: TX GTK\n");
 
@@ -5190,7 +5190,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt
        WILC_Uint32 i;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -5212,7 +5212,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt
        }
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER(" Error in sending messagequeue: PMKID Info\n");
 
@@ -5245,7 +5245,7 @@ WILC_Sint32 host_int_set_pmkid_info(WILC_WFIDrvHandle hWFIDrv, tstrHostIFpmkidAt
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8PmkidInfoArray,
+WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PmkidInfoArray,
                                    WILC_Uint32 u32PmkidInfoLen)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -5274,14 +5274,14 @@ WILC_Sint32 host_int_get_pmkid_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Pm
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8PassPhrase,
-                                                WILC_Uint8 u8Psklength)
+WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, u8 *pu8PassPhrase,
+                                                u8 u8Psklength)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
        /* tstrWILC_WFIDrv * pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; */
 
-       /* WILC_Uint8 u8Psklength = WILC_strlen(pu8PassPhrase); */
+       /* u8 u8Psklength = WILC_strlen(pu8PassPhrase); */
        /*validating psk length*/
        if ((u8Psklength > 7) && (u8Psklength < 65)) {
                strWID.u16WIDid = (WILC_Uint16)WID_11I_PSK;
@@ -5303,7 +5303,7 @@ WILC_Sint32 host_int_set_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv, WILC
  *  @date              19 April 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8MacAddress)
+WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrHostIFmsg strHostIFmsg;
@@ -5316,7 +5316,7 @@ WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ma
        strHostIFmsg.uniHostIFmsgBody.strHostIfGetMacAddress.u8MacAddress = pu8MacAddress;
        strHostIFmsg.drvHandler = hWFIDrv;
        /* send the message */
-       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send get mac address\n");
                return WILC_FAIL;
@@ -5337,7 +5337,7 @@ WILC_Sint32 host_int_get_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ma
  *  @date              16 July 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8MacAddress)
+WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, u8 *pu8MacAddress)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrHostIFmsg strHostIFmsg;
@@ -5350,7 +5350,7 @@ WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ma
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIfSetMacAddress.u8MacAddress, pu8MacAddress, ETH_ALEN);
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send message queue: Set mac address\n");
                WILC_ERRORREPORT(s32Error, s32Error);
@@ -5379,7 +5379,7 @@ WILC_Sint32 host_int_set_MacAddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8Ma
  *  @version           1.0
  */
 WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,
-                                                WILC_Uint8 *pu8PassPhrase, WILC_Uint8 u8Psklength)
+                                                u8 *pu8PassPhrase, u8 u8Psklength)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
@@ -5426,7 +5426,7 @@ WILC_Sint32 host_int_get_RSNAConfigPSKPassPhrase(WILC_WFIDrvHandle hWFIDrv,
  */
 #ifndef CONNECT_DIRECT
 WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,
-                                            WILC_Uint8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
+                                            u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZE],
                                             WILC_Uint32 u32MaxSiteSrvyFragLen)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -5475,7 +5475,7 @@ WILC_Sint32 host_int_get_site_survey_results(WILC_WFIDrvHandle hWFIDrv,
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 scanSource)
+WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 scanSource)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
@@ -5505,7 +5505,7 @@ WILC_Sint32 host_int_set_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 sc
  *  @version           1.0
  */
 
-WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8ScanSource)
+WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ScanSource)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
@@ -5530,12 +5530,12 @@ WILC_Sint32 host_int_get_start_scan_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssid,
+WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, u8 *pu8bssid,
                                  const u8 *pu8ssid, size_t ssidLen,
-                                 const WILC_Uint8 *pu8IEs, size_t IEsLen,
+                                 const u8 *pu8IEs, size_t IEsLen,
                                  tWILCpfConnectResult pfConnectResult, void *pvUserArg,
-                                 WILC_Uint8 u8security, AUTHTYPE_T tenuAuth_type,
-                                 WILC_Uint8 u8channel,
+                                 u8 u8security, AUTHTYPE_T tenuAuth_type,
+                                 u8 u8channel,
                                  void *pJoinParams)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -5543,7 +5543,7 @@ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssi
        tstrHostIFmsg strHostIFmsg;
        tenuScanConnTimer enuScanConnTimer;
 
-       if (pstrWFIDrv == WILC_NULL || pfConnectResult == WILC_NULL) {
+       if (pstrWFIDrv == NULL || pfConnectResult == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -5578,14 +5578,14 @@ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssi
        strHostIFmsg.drvHandler = hWFIDrv;
 
        if (pu8bssid != NULL) {
-               strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid = (WILC_Uint8 *)WILC_MALLOC(6); /* will be deallocated by the receiving thread */
+               strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid = (u8 *)WILC_MALLOC(6); /* will be deallocated by the receiving thread */
                WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8bssid,
                            pu8bssid, 6);
        }
 
        if (pu8ssid != NULL) {
                strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.ssidLen = ssidLen;
-               strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid = (WILC_Uint8 *)WILC_MALLOC(ssidLen); /* will be deallocated by the receiving thread */
+               strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid = (u8 *)WILC_MALLOC(ssidLen); /* will be deallocated by the receiving thread */
                WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8ssid,
 
                            pu8ssid, ssidLen);
@@ -5593,7 +5593,7 @@ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssi
 
        if (pu8IEs != NULL) {
                strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.IEsLen = IEsLen;
-               strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs = (WILC_Uint8 *)WILC_MALLOC(IEsLen); /* will be deallocated by the receiving thread */
+               strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs = (u8 *)WILC_MALLOC(IEsLen); /* will be deallocated by the receiving thread */
                WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFconnectAttr.pu8IEs,
                            pu8IEs, IEsLen);
        }
@@ -5603,14 +5603,14 @@ WILC_Sint32 host_int_set_join_req(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8bssi
                PRINT_D(GENERIC_DBG, "Don't set state to 'connecting' as state is %d\n", pstrWFIDrv->enuHostIFstate);
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send message queue: Set join request\n");
                WILC_ERRORREPORT(s32Error, WILC_FAIL);
        }
 
        enuScanConnTimer = CONNECT_TIMER;
-       WILC_TimerStart(&(pstrWFIDrv->hConnectTimer), HOST_IF_CONNECT_TIMEOUT, (void *) hWFIDrv, WILC_NULL);
+       WILC_TimerStart(&(pstrWFIDrv->hConnectTimer), HOST_IF_CONNECT_TIMEOUT, (void *) hWFIDrv, NULL);
 
        WILC_CATCH(s32Error)
        {
@@ -5643,7 +5643,7 @@ WILC_Sint32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv)
        }
 
 
-       if (hWFIDrv  == WILC_NULL) {
+       if (hWFIDrv  == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -5652,7 +5652,7 @@ WILC_Sint32 host_int_flush_join_req(WILC_WFIDrvHandle hWFIDrv)
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send message queue: Flush join request\n");
                WILC_ERRORREPORT(s32Error, WILC_FAIL);
@@ -5682,7 +5682,7 @@ WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Reason
        tstrHostIFmsg strHostIFmsg;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -5699,7 +5699,7 @@ WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Reason
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Failed to send message queue: disconnect\n");
        /* ////////////// */
@@ -5725,7 +5725,7 @@ WILC_Sint32 host_int_disconnect(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Reason
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 assoc_id)
+WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, u8 assoc_id)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
@@ -5765,7 +5765,7 @@ WILC_Sint32 host_int_disconnect_station(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 as
  *  @version           1.0
  */
 
-WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8AssocReqInfo,
+WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocReqInfo,
                                        WILC_Uint32 u32AssocReqInfoLen)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -5792,14 +5792,14 @@ WILC_Sint32 host_int_get_assoc_req_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8AssocRespInfo,
+WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, u8 *pu8AssocRespInfo,
                                        WILC_Uint32 u32MaxAssocRespInfoLen, WILC_Uint32 *pu32RcvdAssocRespInfoLen)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWID strWID;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -5842,7 +5842,7 @@ WILC_Sint32 host_int_get_assoc_res_info(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8RxPowerLevel,
+WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, u8 *pu8RxPowerLevel,
                                        WILC_Uint32 u32RxPowerLevelLen)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
@@ -5873,13 +5873,13 @@ WILC_Sint32 host_int_get_rx_power_level(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *p
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ChNum)
+WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 u8ChNum)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -5889,7 +5889,7 @@ WILC_Sint32 host_int_set_mac_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8Ch
        strHostIFmsg.uniHostIFmsgBody.strHostIFSetChan.u8SetChan = u8ChNum;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -5912,7 +5912,7 @@ WILC_Sint32 host_int_wait_msg_queue_idle(void)
 
        WILC_memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
        strHostIFmsg.u16MsgId = HOST_IF_MSG_Q_IDLE;
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -5942,7 +5942,7 @@ WILC_Sint32 host_int_set_wfi_drv_handler(WILC_Uint32 u32address)
        strHostIFmsg.uniHostIFmsgBody.strHostIfSetDrvHandler.u32Address = u32address;
        /* strHostIFmsg.drvHandler=hWFIDrv; */
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -5970,7 +5970,7 @@ WILC_Sint32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u
        strHostIFmsg.uniHostIFmsgBody.strHostIfSetOperationMode.u32Mode = u32mode;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -5997,13 +5997,13 @@ WILC_Sint32 host_int_set_operation_mode(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu8ChNo)
+WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, u8 *pu8ChNo)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -6015,7 +6015,7 @@ WILC_Sint32 host_int_get_host_chnl_num(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *pu
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Failed to send get host channel param's message queue ");
        down(&(pstrWFIDrv->hSemGetCHNL));
@@ -6050,7 +6050,7 @@ WILC_Sint32 host_int_test_set_int_wid(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -6096,7 +6096,7 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac,
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -6111,7 +6111,7 @@ WILC_Sint32 host_int_get_inactive_time(WILC_WFIDrvHandle hWFIDrv, const u8 *mac,
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error)
                PRINT_ER("Failed to send get host channel param's message queue ");
 
@@ -6144,7 +6144,7 @@ WILC_Sint32 host_int_test_get_int_wid(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 *pu
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -6199,7 +6199,7 @@ WILC_Sint32 host_int_get_rssi(WILC_WFIDrvHandle hWFIDrv, WILC_Sint8 *ps8Rssi)
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send get host channel param's message queue ");
                return WILC_FAIL;
@@ -6236,7 +6236,7 @@ WILC_Sint32 host_int_get_link_speed(WILC_WFIDrvHandle hWFIDrv, WILC_Sint8 *ps8ln
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /* send the message */
-       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send GET_LINKSPEED to message queue ");
                return WILC_FAIL;
@@ -6270,7 +6270,7 @@ WILC_Sint32 host_int_get_statistics(WILC_WFIDrvHandle hWFIDrv, tstrStatistics *p
        strHostIFmsg.uniHostIFmsgBody.pUserData = (WILC_Char *)pstrStatistics;
        strHostIFmsg.drvHandler = hWFIDrv;
        /* send the message */
-       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Failed to send get host channel param's message queue ");
                return WILC_FAIL;
@@ -6297,9 +6297,9 @@ WILC_Sint32 host_int_get_statistics(WILC_WFIDrvHandle hWFIDrv, tstrStatistics *p
  *  @date              8 March 2012
  *  @version           1.0
  */
-WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ScanSource,
-                         WILC_Uint8 u8ScanType, WILC_Uint8 *pu8ChnlFreqList,
-                         WILC_Uint8 u8ChnlListLen, const WILC_Uint8 *pu8IEs,
+WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, u8 u8ScanSource,
+                         u8 u8ScanType, u8 *pu8ChnlFreqList,
+                         u8 u8ChnlListLen, const u8 *pu8IEs,
                          size_t IEsLen, tWILCpfScanResult ScanResult,
                          void *pvUserArg, tstrHiddenNetwork  *pstrHiddenNetwork)
 {
@@ -6308,7 +6308,7 @@ WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ScanSource,
        tstrHostIFmsg strHostIFmsg;
        tenuScanConnTimer enuScanConnTimer;
 
-       if (pstrWFIDrv == WILC_NULL || ScanResult == WILC_NULL) {
+       if (pstrWFIDrv == NULL || ScanResult == NULL)   {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -6332,17 +6332,17 @@ WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ScanSource,
        strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pvUserArg = pvUserArg;
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.u8ChnlListLen = u8ChnlListLen;
-       strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList = (WILC_Uint8 *)WILC_MALLOC(u8ChnlListLen);        /* will be deallocated by the receiving thread */
+       strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList = (u8 *)WILC_MALLOC(u8ChnlListLen);        /* will be deallocated by the receiving thread */
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8ChnlFreqList,
                    pu8ChnlFreqList, u8ChnlListLen);
 
        strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.IEsLen = IEsLen;
-       strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs = (WILC_Uint8 *)WILC_MALLOC(IEsLen);        /* will be deallocated by the receiving thread */
+       strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs = (u8 *)WILC_MALLOC(IEsLen);        /* will be deallocated by the receiving thread */
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strHostIFscanAttr.pu8IEs,
                    pu8IEs, IEsLen);
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Error in sending message queue scanning parameters: Error(%d)\n", s32Error);
                WILC_ERRORREPORT(s32Error, WILC_FAIL);
@@ -6350,7 +6350,7 @@ WILC_Sint32 host_int_scan(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 u8ScanSource,
 
        enuScanConnTimer = SCAN_TIMER;
        PRINT_D(HOSTINF_DBG, ">> Starting the SCAN timer\n");
-       WILC_TimerStart(&(pstrWFIDrv->hScanTimer), HOST_IF_SCAN_TIMEOUT, (void *) hWFIDrv, WILC_NULL);
+       WILC_TimerStart(&(pstrWFIDrv->hScanTimer), HOST_IF_SCAN_TIMEOUT, (void *) hWFIDrv, NULL);
 
 
        WILC_CATCH(s32Error)
@@ -6380,7 +6380,7 @@ WILC_Sint32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParam
        tstrHostIFmsg strHostIFmsg;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
        /* prepare the WiphyParams Message */
@@ -6389,7 +6389,7 @@ WILC_Sint32 hif_set_cfg(WILC_WFIDrvHandle hWFIDrv, tstrCfgParamVal *pstrCfgParam
        strHostIFmsg.uniHostIFmsgBody.strHostIFCfgParamAttr.pstrCfgParamVal = *pstrCfgParamVal;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
 
        WILC_CATCH(s32Error)
        {
@@ -6420,7 +6420,7 @@ WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16WID, WILC_Uint
 
        down(&(pstrWFIDrv->gtOsCfgValuesSem));
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                PRINT_ER("Driver not initialized: pstrWFIDrv = NULL \n");
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
@@ -6531,7 +6531,7 @@ WILC_Sint32 hif_get_cfg(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16WID, WILC_Uint
  *  @version           1.0
  */
 void host_int_send_join_leave_info_to_host
-       (WILC_Uint16 assocId, WILC_Uint8 *stationAddr, WILC_Bool joining)
+       (WILC_Uint16 assocId, u8 *stationAddr, WILC_Bool joining)
 {
 }
 /**
@@ -6567,7 +6567,7 @@ void GetPeriodicRSSI(void *pvArg)
                strHostIFmsg.drvHandler = pstrWFIDrv;
 
                /* send the message */
-               s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+               s32Error =      WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
                if (s32Error) {
                        PRINT_ER("Failed to send get host channel param's message queue ");
                        return;
@@ -6578,7 +6578,7 @@ void GetPeriodicRSSI(void *pvArg)
 
 
 void host_int_send_network_info_to_host
-       (WILC_Uint8 *macStartAddress, WILC_Uint16 u16RxFrameLen, WILC_Sint8 s8Rssi)
+       (u8 *macStartAddress, WILC_Uint16 u16RxFrameLen, WILC_Sint8 s8Rssi)
 {
 }
 /**
@@ -6615,7 +6615,7 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)
 
        /*Allocate host interface private structure*/
        pstrWFIDrv  = (tstrWILC_WFIDrv *)WILC_MALLOC(sizeof(tstrWILC_WFIDrv));
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                /* WILC_ERRORREPORT(s32Error,WILC_NO_MEM); */
                s32Error = WILC_NO_MEM;
                PRINT_ER("Failed to allocate memory\n");
@@ -6655,7 +6655,7 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)
 
        if (clients_count == 0) {
 
-               s32Error = WILC_MsgQueueCreate(&gMsgQHostIF, WILC_NULL);
+               s32Error = WILC_MsgQueueCreate(&gMsgQHostIF, NULL);
 
 
                if (s32Error < 0) {
@@ -6669,7 +6669,7 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)
                        s32Error = WILC_FAIL;
                        goto _fail_mq_;
                }
-               s32Error = WILC_TimerCreate(&(g_hPeriodicRSSI), GetPeriodicRSSI, WILC_NULL);
+               s32Error = WILC_TimerCreate(&(g_hPeriodicRSSI), GetPeriodicRSSI, NULL);
                if (s32Error < 0) {
                        PRINT_ER("Failed to creat Timer\n");
                        goto _fail_timer_1;
@@ -6679,13 +6679,13 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)
        }
 
 
-       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hScanTimer), TimerCB_Scan, WILC_NULL);
+       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hScanTimer), TimerCB_Scan, NULL);
        if (s32Error < 0) {
                PRINT_ER("Failed to creat Timer\n");
                goto _fail_thread_;
        }
 
-       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hConnectTimer), TimerCB_Connect, WILC_NULL);
+       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hConnectTimer), TimerCB_Connect, NULL);
        if (s32Error < 0) {
                PRINT_ER("Failed to creat Timer\n");
                goto _fail_timer_1;
@@ -6694,7 +6694,7 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)
 
        #ifdef WILC_P2P
        /*Remain on channel timer*/
-       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hRemainOnChannel), ListenTimerCB, WILC_NULL);
+       s32Error = WILC_TimerCreate(&(pstrWFIDrv->hRemainOnChannel), ListenTimerCB, NULL);
        if (s32Error < 0) {
                PRINT_ER("Failed to creat Remain-on-channel Timer\n");
                goto _fail_timer_3;
@@ -6757,21 +6757,21 @@ WILC_Sint32 host_int_init(WILC_WFIDrvHandle *phWFIDrv)
 
 
 _fail_mem_:
-       if (pstrWFIDrv != WILC_NULL)
+       if (pstrWFIDrv != NULL)
                WILC_FREE(pstrWFIDrv);
 #ifdef WILC_P2P
 _fail_timer_3:
-       WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), WILC_NULL);
+       WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), NULL);
 #endif
 _fail_timer_2:
        up(&(pstrWFIDrv->gtOsCfgValuesSem));
-       WILC_TimerDestroy(&(pstrWFIDrv->hConnectTimer), WILC_NULL);
+       WILC_TimerDestroy(&(pstrWFIDrv->hConnectTimer), NULL);
 _fail_timer_1:
-       WILC_TimerDestroy(&(pstrWFIDrv->hScanTimer), WILC_NULL);
+       WILC_TimerDestroy(&(pstrWFIDrv->hScanTimer), NULL);
 _fail_thread_:
        kthread_stop(HostIFthreadHandler);
 _fail_mq_:
-       WILC_MsgQueueDestroy(&gMsgQHostIF, WILC_NULL);
+       WILC_MsgQueueDestroy(&gMsgQHostIF, NULL);
 _fail_:
        return s32Error;
 
@@ -6816,37 +6816,37 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)
        /*BugID_5348*/
        /*Destroy all timers before acquiring hSemDeinitDrvHandle*/
        /*to guarantee handling all messages befor proceeding*/
-       if (WILC_TimerDestroy(&(pstrWFIDrv->hScanTimer), WILC_NULL)) {
+       if (WILC_TimerDestroy(&(pstrWFIDrv->hScanTimer), NULL)) {
                PRINT_D(HOSTINF_DBG, ">> Scan timer is active \n");
                /* msleep(HOST_IF_SCAN_TIMEOUT+1000); */
        }
 
-       if (WILC_TimerDestroy(&(pstrWFIDrv->hConnectTimer), WILC_NULL)) {
+       if (WILC_TimerDestroy(&(pstrWFIDrv->hConnectTimer), NULL)) {
                PRINT_D(HOSTINF_DBG, ">> Connect timer is active \n");
                /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
        }
 
 
-       if (WILC_TimerDestroy(&(g_hPeriodicRSSI), WILC_NULL)) {
+       if (WILC_TimerDestroy(&(g_hPeriodicRSSI), NULL)) {
                PRINT_D(HOSTINF_DBG, ">> Connect timer is active \n");
                /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
        }
 
        #ifdef WILC_P2P
        /*Destroy Remain-onchannel Timer*/
-       WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), WILC_NULL);
+       WILC_TimerDestroy(&(pstrWFIDrv->hRemainOnChannel), NULL);
        #endif
 
-       host_int_set_wfi_drv_handler((WILC_Uint32)WILC_NULL);
+       host_int_set_wfi_drv_handler((WILC_Uint32)NULL);
        down(&hSemDeinitDrvHandle);
 
 
        /*Calling the CFG80211 scan done function with the abort flag set to true*/
        if (pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult) {
-               pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, WILC_NULL,
+               pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult(SCAN_EVENT_ABORTED, NULL,
                                                                pstrWFIDrv->strWILC_UsrScanReq.u32UserScanPvoid, NULL);
 
-               pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult = WILC_NULL;
+               pstrWFIDrv->strWILC_UsrScanReq.pfUserScanResult = NULL;
        }
        /*deinit configurator and simulator*/
 #ifdef SIMULATION
@@ -6864,7 +6864,7 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)
        WILC_memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
 
        if (clients_count == 1) {
-               if (WILC_TimerDestroy(&g_hPeriodicRSSI, WILC_NULL)) {
+               if (WILC_TimerDestroy(&g_hPeriodicRSSI, NULL)) {
                        PRINT_D(HOSTINF_DBG, ">> Connect timer is active \n");
                        /* msleep(HOST_IF_CONNECT_TIMEOUT+1000); */
                }
@@ -6872,7 +6872,7 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)
                strHostIFmsg.drvHandler = hWFIDrv;
 
 
-               s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+               s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
                if (s32Error != WILC_SUCCESS) {
                        PRINT_ER("Error in sending deinit's message queue message function: Error(%d)\n", s32Error);
                }
@@ -6881,7 +6881,7 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)
 
 
 
-               WILC_MsgQueueDestroy(&gMsgQHostIF, WILC_NULL);
+               WILC_MsgQueueDestroy(&gMsgQHostIF, NULL);
                msgQ_created = 0;
        }
 
@@ -6890,14 +6890,14 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)
        /*Setting the gloabl driver handler with NULL*/
        u32Intialized = 0;
        /* gWFiDrvHandle = NULL; */
-       if (pstrWFIDrv != WILC_NULL) {
+       if (pstrWFIDrv != NULL) {
                WILC_FREE(pstrWFIDrv);
-               /* pstrWFIDrv=WILC_NULL; */
+               /* pstrWFIDrv=NULL; */
 
        }
 
        clients_count--; /* Decrease number of created entities */
-       terminated_handle = WILC_NULL;
+       terminated_handle = NULL;
        up(&hSemHostIntDeinit);
        return s32Error;
 }
@@ -6914,12 +6914,12 @@ WILC_Sint32 host_int_deinit(WILC_WFIDrvHandle hWFIDrv)
  *  @date              1 Mar 2012
  *  @version           1.0
  */
-void NetworkInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
+void NetworkInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrHostIFmsg strHostIFmsg;
        WILC_Uint32 drvHandler;
-       tstrWILC_WFIDrv *pstrWFIDrv = WILC_NULL;
+       tstrWILC_WFIDrv *pstrWFIDrv = NULL;
 
        drvHandler = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
        pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
@@ -6927,7 +6927,7 @@ void NetworkInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
 
 
 
-       if (pstrWFIDrv == WILC_NULL || pstrWFIDrv == terminated_handle) {
+       if (pstrWFIDrv == NULL || pstrWFIDrv == terminated_handle)      {
                PRINT_ER("NetworkInfo received but driver not init[%x]\n", (WILC_Uint32)pstrWFIDrv);
                return;
        }
@@ -6939,12 +6939,12 @@ void NetworkInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
        strHostIFmsg.drvHandler = pstrWFIDrv;
 
        strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.u32Length = u32Length;
-       strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer = (WILC_Uint8 *)WILC_MALLOC(u32Length); /* will be deallocated by the receiving thread */
+       strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer = (u8 *)WILC_MALLOC(u32Length); /* will be deallocated by the receiving thread */
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strRcvdNetworkInfo.pu8Buffer,
                    pu8Buffer, u32Length);
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Error in sending network info message queue message parameters: Error(%d)\n", s32Error);
        }
@@ -6964,12 +6964,12 @@ void NetworkInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
  *  @date              15 Mar 2012
  *  @version           1.0
  */
-void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
+void GnrlAsyncInfoReceived(u8 *pu8Buffer, WILC_Uint32 u32Length)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrHostIFmsg strHostIFmsg;
        WILC_Uint32 drvHandler;
-       tstrWILC_WFIDrv *pstrWFIDrv = WILC_NULL;
+       tstrWILC_WFIDrv *pstrWFIDrv = NULL;
 
        /*BugID_5348*/
        down(&hSemHostIntDeinit);
@@ -6986,7 +6986,7 @@ void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
                return;
        }
 
-       if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult == WILC_NULL) {
+       if (pstrWFIDrv->strWILC_UsrConnReq.pfUserConnectResult == NULL) {
                /* received mac status is not needed when there is no current Connect Request */
                PRINT_ER("Received mac status is not needed when there is no current Connect Reques\n");
                /*BugID_5348*/
@@ -7003,12 +7003,12 @@ void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
 
 
        strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.u32Length = u32Length;
-       strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer = (WILC_Uint8 *)WILC_MALLOC(u32Length); /* will be deallocated by the receiving thread */
+       strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer = (u8 *)WILC_MALLOC(u32Length); /* will be deallocated by the receiving thread */
        WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strRcvdGnrlAsyncInfo.pu8Buffer,
                    pu8Buffer, u32Length);
 
        /* send the message */
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                PRINT_ER("Error in sending message queue asynchronous message info: Error(%d)\n", s32Error);
        }
@@ -7021,18 +7021,18 @@ void GnrlAsyncInfoReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
 /**
  *  @brief host_int_ScanCompleteReceived
  *  @details        Setting scan complete received notifcation in message queue
- *  @param[in]     WILC_Uint8* pu8Buffer, WILC_Uint32 u32Length
+ *  @param[in]     u8* pu8Buffer, WILC_Uint32 u32Length
  *  @return         Error code.
  *  @author
  *  @date
  *  @version   1.0
  */
-void host_int_ScanCompleteReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
+void host_int_ScanCompleteReceived(u8 *pu8Buffer, WILC_Uint32 u32Length)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrHostIFmsg strHostIFmsg;
        WILC_Uint32 drvHandler;
-       tstrWILC_WFIDrv *pstrWFIDrv = WILC_NULL;
+       tstrWILC_WFIDrv *pstrWFIDrv = NULL;
        drvHandler = ((pu8Buffer[u32Length - 4]) | (pu8Buffer[u32Length - 3] << 8) | (pu8Buffer[u32Length - 2] << 16) | (pu8Buffer[u32Length - 1] << 24));
        pstrWFIDrv = (tstrWILC_WFIDrv *)drvHandler;
 
@@ -7056,12 +7056,12 @@ void host_int_ScanCompleteReceived(WILC_Uint8 *pu8Buffer, WILC_Uint32 u32Length)
                /*no need to send message body*/
 
                /*strHostIFmsg.uniHostIFmsgBody.strScanComplete.u32Length = u32Length;
-                * strHostIFmsg.uniHostIFmsgBody.strScanComplete.pu8Buffer  = (WILC_Uint8*)WILC_MALLOC(u32Length);
+                * strHostIFmsg.uniHostIFmsgBody.strScanComplete.pu8Buffer  = (u8*)WILC_MALLOC(u32Length);
                 * WILC_memcpy(strHostIFmsg.uniHostIFmsgBody.strScanComplete.pu8Buffer,
                 *                        pu8Buffer, u32Length); */
 
                /* send the message */
-               s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+               s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
                if (s32Error) {
                        PRINT_ER("Error in sending message queue scan complete parameters: Error(%d)\n", s32Error);
                }
@@ -7093,7 +7093,7 @@ WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u3
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7110,7 +7110,7 @@ WILC_Sint32 host_int_remain_on_channel(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u3
        strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7142,12 +7142,12 @@ WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
        /*Stopping remain-on-channel timer*/
-       WILC_TimerStop(&(pstrWFIDrv->hRemainOnChannel), WILC_NULL);
+       WILC_TimerStop(&(pstrWFIDrv->hRemainOnChannel), NULL);
 
        /* prepare the timer fire Message */
        WILC_memset(&strHostIFmsg, 0, sizeof(tstrHostIFmsg));
@@ -7155,7 +7155,7 @@ WILC_Sint32 host_int_ListenStateExpired(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u
        strHostIFmsg.drvHandler = hWFIDrv;
        strHostIFmsg.uniHostIFmsgBody.strHostIfRemainOnChan.u32ListenSessionID = u32SessionID;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7180,7 +7180,7 @@ WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Fr
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7207,7 +7207,7 @@ WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Fr
        strHostIFmsg.uniHostIFmsgBody.strHostIfRegisterFrame.bReg = bReg;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7227,8 +7227,8 @@ WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Fr
  *  @brief host_int_add_beacon
  *  @details       Setting add beacon params in message queue
  *  @param[in]    WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interval,
- *                         WILC_Uint32 u32DTIMPeriod,WILC_Uint32 u32HeadLen, WILC_Uint8* pu8Head,
- *                         WILC_Uint32 u32TailLen, WILC_Uint8* pu8Tail
+ *                         WILC_Uint32 u32DTIMPeriod,WILC_Uint32 u32HeadLen, u8* pu8Head,
+ *                         WILC_Uint32 u32TailLen, u8* pu8Tail
  *  @return         Error code.
  *  @author
  *  @date
@@ -7236,15 +7236,15 @@ WILC_Sint32 host_int_frame_register(WILC_WFIDrvHandle hWFIDrv, WILC_Uint16 u16Fr
  */
 WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interval,
                                WILC_Uint32 u32DTIMPeriod,
-                               WILC_Uint32 u32HeadLen, WILC_Uint8 *pu8Head,
-                               WILC_Uint32 u32TailLen, WILC_Uint8 *pu8Tail)
+                               WILC_Uint32 u32HeadLen, u8 *pu8Head,
+                               WILC_Uint32 u32TailLen, u8 *pu8Tail)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
        tstrHostIFSetBeacon *pstrSetBeaconParam = &strHostIFmsg.uniHostIFmsgBody.strHostIFSetBeacon;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7259,7 +7259,7 @@ WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interv
        pstrSetBeaconParam->u32Interval = u32Interval;
        pstrSetBeaconParam->u32DTIMPeriod = u32DTIMPeriod;
        pstrSetBeaconParam->u32HeadLen = u32HeadLen;
-       pstrSetBeaconParam->pu8Head = (WILC_Uint8 *)WILC_MALLOC(u32HeadLen);
+       pstrSetBeaconParam->pu8Head = (u8 *)WILC_MALLOC(u32HeadLen);
        if (pstrSetBeaconParam->pu8Head == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
        }
@@ -7268,7 +7268,7 @@ WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interv
 
        /* Bug 4599 : if tail length = 0 skip allocating & copying */
        if (u32TailLen > 0) {
-               pstrSetBeaconParam->pu8Tail = (WILC_Uint8 *)WILC_MALLOC(u32TailLen);
+               pstrSetBeaconParam->pu8Tail = (u8 *)WILC_MALLOC(u32TailLen);
                if (pstrSetBeaconParam->pu8Tail == NULL) {
                        WILC_ERRORREPORT(s32Error, WILC_NO_MEM);
                }
@@ -7277,7 +7277,7 @@ WILC_Sint32 host_int_add_beacon(WILC_WFIDrvHandle hWFIDrv, WILC_Uint32 u32Interv
                pstrSetBeaconParam->pu8Tail = NULL;
        }
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7313,7 +7313,7 @@ WILC_Sint32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv)
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7322,7 +7322,7 @@ WILC_Sint32 host_int_del_beacon(WILC_WFIDrvHandle hWFIDrv)
        strHostIFmsg.drvHandler = hWFIDrv;
        PRINT_D(HOSTINF_DBG, "Setting deleting beacon message queue params\n");
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        WILC_ERRORCHECK(s32Error);
 
        WILC_CATCH(s32Error)
@@ -7349,7 +7349,7 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam
        tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7372,7 +7372,7 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam
        }
 
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7386,7 +7386,7 @@ WILC_Sint32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam
 /**
  *  @brief host_int_del_station
  *  @details       Setting delete station params in message queue
- *  @param[in]    WILC_WFIDrvHandle hWFIDrv, WILC_Uint8* pu8MacAddr
+ *  @param[in]    WILC_WFIDrvHandle hWFIDrv, u8* pu8MacAddr
  *  @return         Error code.
  *  @author
  *  @date
@@ -7399,7 +7399,7 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr
        tstrHostIFmsg strHostIFmsg;
        tstrHostIFDelSta *pstrDelStationMsg = &strHostIFmsg.uniHostIFmsgBody.strDelStaParam;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7414,12 +7414,12 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr
        strHostIFmsg.drvHandler = hWFIDrv;
 
        /*BugID_4795: Handling situation of deleting all stations*/
-       if (pu8MacAddr == WILC_NULL)
+       if (pu8MacAddr == NULL)
                WILC_memset(pstrDelStationMsg->au8MacAddr, 255, ETH_ALEN);
        else
                WILC_memcpy(pstrDelStationMsg->au8MacAddr, pu8MacAddr, ETH_ALEN);
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7432,7 +7432,7 @@ WILC_Sint32 host_int_del_station(WILC_WFIDrvHandle hWFIDrv, const u8 *pu8MacAddr
 /**
  *  @brief      host_int_del_allstation
  *  @details    Setting del station params in message queue
- *  @param[in]  WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 pu8MacAddr[][ETH_ALEN]s
+ *  @param[in]  WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][ETH_ALEN]s
  *  @return        Error code.
  *  @author
  *  @date
@@ -7444,12 +7444,12 @@ WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][E
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
        tstrHostIFDelAllSta *pstrDelAllStationMsg = &strHostIFmsg.uniHostIFmsgBody.strHostIFDelAllSta;
-       WILC_Uint8 au8Zero_Buff[ETH_ALEN] = {0};
+       u8 au8Zero_Buff[ETH_ALEN] = {0};
        WILC_Uint32 i;
-       WILC_Uint8 u8AssocNumb = 0;
+       u8 u8AssocNumb = 0;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7476,7 +7476,7 @@ WILC_Sint32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, u8 pu8MacAddr[][E
        }
 
        pstrDelAllStationMsg->u8Num_AssocSta = u8AssocNumb;
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
 
 
        if (s32Error) {
@@ -7509,7 +7509,7 @@ WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaPara
        tstrHostIFmsg strHostIFmsg;
        tstrWILC_AddStaParam *pstrAddStationMsg = &strHostIFmsg.uniHostIFmsgBody.strAddStaParam;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7530,7 +7530,7 @@ WILC_Sint32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaPara
                pstrAddStationMsg->pu8Rates = rates;
        }
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7551,7 +7551,7 @@ WILC_Sint32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnab
 
        PRINT_INFO(HOSTINF_DBG, "\n\n>> Setting PS to %d << \n\n", bIsEnabled);
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7568,7 +7568,7 @@ WILC_Sint32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, WILC_Bool bIsEnab
        pstrPowerMgmtParam->u32Timeout = u32Timeout;
 
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7587,7 +7587,7 @@ WILC_Sint32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_Bool
        tstrHostIFSetMulti *pstrMulticastFilterParam = &strHostIFmsg.uniHostIFmsgBody.strHostIfSetMulti;
 
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7603,7 +7603,7 @@ WILC_Sint32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_Bool
        pstrMulticastFilterParam->bIsEnabled = bIsEnabled;
        pstrMulticastFilterParam->u32count = u32count;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7630,17 +7630,17 @@ WILC_Sint32 host_int_setup_multicast_filter(WILC_WFIDrvHandle hWFIDrv, WILC_Bool
 static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
 {
        tstrJoinBssParam *pNewJoinBssParam = NULL;
-       WILC_Uint8 *pu8IEs;
+       u8 *pu8IEs;
        WILC_Uint16 u16IEsLen;
        WILC_Uint16 index = 0;
-       WILC_Uint8 suppRatesNo = 0;
-       WILC_Uint8 extSuppRatesNo;
+       u8 suppRatesNo = 0;
+       u8 extSuppRatesNo;
        WILC_Uint16 jumpOffset;
-       WILC_Uint8 pcipherCount;
-       WILC_Uint8 authCount;
-       WILC_Uint8 pcipherTotalCount = 0;
-       WILC_Uint8 authTotalCount = 0;
-       WILC_Uint8 i, j;
+       u8 pcipherCount;
+       u8 authCount;
+       u8 pcipherTotalCount = 0;
+       u8 authTotalCount = 0;
+       u8 i, j;
 
        pu8IEs = ptstrNetworkInfo->pu8IEs;
        u16IEsLen = ptstrNetworkInfo->u16IEsLen;
@@ -7654,7 +7654,7 @@ static void *host_int_ParseJoinBssParam(tstrNetworkInfo *ptstrNetworkInfo)
                WILC_memcpy(pNewJoinBssParam->au8bssid, ptstrNetworkInfo->au8bssid, 6);
                /*for(i=0; i<6;i++)
                 *      PRINT_D(HOSTINF_DBG,"%c",pNewJoinBssParam->au8bssid[i]);*/
-               WILC_memcpy((WILC_Uint8 *)pNewJoinBssParam->ssid, ptstrNetworkInfo->au8ssid, ptstrNetworkInfo->u8SsidLen + 1);
+               WILC_memcpy((u8 *)pNewJoinBssParam->ssid, ptstrNetworkInfo->au8ssid, ptstrNetworkInfo->u8SsidLen + 1);
                pNewJoinBssParam->ssidLen = ptstrNetworkInfo->u8SsidLen;
                WILC_memset(pNewJoinBssParam->rsn_pcip_policy, 0xFF, 3);
                WILC_memset(pNewJoinBssParam->rsn_auth_policy, 0xFF, 3);
@@ -7858,7 +7858,7 @@ static int host_int_addBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char T
        tstrHostIFmsg strHostIFmsg;
        tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7873,7 +7873,7 @@ static int host_int_addBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char T
        pBASessionInfo->u16SessionTimeout = SessionTimeout;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7893,7 +7893,7 @@ WILC_Sint32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char
        tstrHostIFmsg strHostIFmsg;
        tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7906,7 +7906,7 @@ WILC_Sint32 host_int_delBASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSID, char
        pBASessionInfo->u8Ted = TID;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7928,7 +7928,7 @@ WILC_Sint32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSI
        tstrHostIFmsg strHostIFmsg;
        tstrHostIfBASessionInfo *pBASessionInfo = &strHostIFmsg.uniHostIFmsgBody.strHostIfBASessionInfo;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7941,7 +7941,7 @@ WILC_Sint32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSI
        pBASessionInfo->u8Ted = TID;
        strHostIFmsg.drvHandler = hWFIDrv;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -7964,7 +7964,7 @@ WILC_Sint32 host_int_del_All_Rx_BASession(WILC_WFIDrvHandle hWFIDrv, char *pBSSI
  *  @author            Abdelrahman Sobhy
  *  @date
  *  @version           1.0*/
-WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *u16ipadd, WILC_Uint8 idx)
+WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *u16ipadd, u8 idx)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
@@ -7973,7 +7973,7 @@ WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *u16i
        /* TODO: Enable This feature on softap firmware */
        return 0;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -7986,7 +7986,7 @@ WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *u16i
        strHostIFmsg.drvHandler = hWFIDrv;
        strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx = idx;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }
@@ -8008,13 +8008,13 @@ WILC_Sint32 host_int_setup_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *u16i
  *  @author            Abdelrahman Sobhy
  *  @date
  *  @version           1.0*/
-WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *u16ipadd, WILC_Uint8 idx)
+WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, u8 *u16ipadd, u8 idx)
 {
        WILC_Sint32 s32Error = WILC_SUCCESS;
        tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
        tstrHostIFmsg strHostIFmsg;
 
-       if (pstrWFIDrv == WILC_NULL) {
+       if (pstrWFIDrv == NULL) {
                WILC_ERRORREPORT(s32Error, WILC_INVALID_ARGUMENT);
        }
 
@@ -8027,7 +8027,7 @@ WILC_Sint32 host_int_get_ipaddress(WILC_WFIDrvHandle hWFIDrv, WILC_Uint8 *u16ipa
        strHostIFmsg.drvHandler=hWFIDrv;
        strHostIFmsg.uniHostIFmsgBody.strHostIfSetIP.idx= idx;
 
-       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), WILC_NULL);
+       s32Error = WILC_MsgQueueSend(&gMsgQHostIF, &strHostIFmsg, sizeof(tstrHostIFmsg), NULL);
        if (s32Error) {
                WILC_ERRORREPORT(s32Error, s32Error);
        }