diff --git a/cc3200/simplelink/include/simplelink.h b/cc3200/simplelink/include/simplelink.h index 4467e3214c..412d6242cb 100644 --- a/cc3200/simplelink/include/simplelink.h +++ b/cc3200/simplelink/include/simplelink.h @@ -294,11 +294,7 @@ extern "C" #define SL_INC_NET_APP_PKG #define SL_INC_NET_CFG_PKG #define SL_INC_FS_PKG -#if defined(DEBUG) && !defined(BOOTLOADER) #define SL_INC_ARG_CHECK -#else -#undef SL_INC_ARG_CHECK -#endif #define SL_INC_WLAN_PKG #define SL_INC_SOCKET_PKG #define SL_INC_SOCK_CLIENT_SIDE_API @@ -352,7 +348,7 @@ typedef void (*_SlSpawnEntryFunc_t)(void* pValue); #define _u32 unsigned long #define _i32 signed long #define _volatile volatile - #define _const const + #define _const const #endif typedef _u16 _SlOpcode_t; diff --git a/cc3200/simplelink/source/device.c b/cc3200/simplelink/source/device.c index a77e8335ec..95907cf7f9 100644 --- a/cc3200/simplelink/source/device.c +++ b/cc3200/simplelink/source/device.c @@ -269,8 +269,8 @@ sl_EventMaskSet *****************************************************************************/ typedef union { - _DevMaskEventSetCommand_t Cmd; - _BasicResponse_t Rsp; + _DevMaskEventSetCommand_t Cmd; + _BasicResponse_t Rsp; }_SlEventMaskSetMsg_u; const _SlCmdCtrl_t _SlEventMaskSetCmdCtrl = @@ -299,7 +299,7 @@ sl_EventMaskGet ******************************************************************************/ typedef union { - _DevMaskEventGetCommand_t Cmd; + _DevMaskEventGetCommand_t Cmd; _DevMaskEventGetResponse_t Rsp; }_SlEventMaskGetMsg_u; @@ -332,8 +332,8 @@ sl_DevGet typedef union { - _DeviceSetGet_t Cmd; - _DeviceSetGet_t Rsp; + _DeviceSetGet_t Cmd; + _DeviceSetGet_t Rsp; }_SlDeviceMsgGet_u; const _SlCmdCtrl_t _SlDeviceGetCmdCtrl = @@ -471,7 +471,7 @@ sl_UartSetMode #ifdef SL_IF_TYPE_UART typedef union { - _DevUartSetModeCommand_t Cmd; + _DevUartSetModeCommand_t Cmd; _DevUartSetModeResponse_t Rsp; }_SlUartSetModeMsg_u; diff --git a/cc3200/simplelink/source/driver.c b/cc3200/simplelink/source/driver.c index fe6bf52520..62d0aa8f45 100644 --- a/cc3200/simplelink/source/driver.c +++ b/cc3200/simplelink/source/driver.c @@ -62,8 +62,8 @@ support backward sync pattern */ #define MATCH_WITH_SEQ_NUM(pBuf, TxSeqNum) ( BUF_SYNC_SPIM(pBuf) == (N2H_SYNC_SPIM_WITH_SEQ(TxSeqNum)) ) #define N2H_SYNC_PATTERN_MATCH(pBuf, TxSeqNum) \ ( \ - ( (*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WITH_SEQ_NUM(pBuf, TxSeqNum) ) ) || \ - ( !(*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WOUT_SEQ_NUM(pBuf ) ) ) \ + ( (*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WITH_SEQ_NUM(pBuf, TxSeqNum) ) ) || \ + ( !(*((_u32 *)pBuf) & N2H_SYNC_PATTERN_SEQ_NUM_EXISTS) && ( MATCH_WOUT_SEQ_NUM(pBuf ) ) ) \ ) #define OPCODE(_ptr) (((_SlResponseHeader_t *)(_ptr))->GenHeader.Opcode) @@ -116,12 +116,12 @@ _SlReturnVal_t _SlDrvRxHdrRead(_u8 *pBuf, _u8 *pAlignSize); void _SlDrvShiftDWord(_u8 *pBuf); void _SlDrvDriverCBInit(void); void _SlAsyncEventGenericHandler(void); -_i16 _SlDrvWaitForPoolObj(_u32 ActionID, _u8 SocketID); -void _SlDrvReleasePoolObj(_u8 pObj); -void _SlDrvObjInit(void); -void _SlDrvObjDeInit(void); -void _SlRemoveFromList(_u8* ListIndex, _u8 ItemIndex); -_SlReturnVal_t _SlFindAndSetActiveObj(_SlOpcode_t Opcode, _u8 Sd); +_i16 _SlDrvWaitForPoolObj(_u32 ActionID, _u8 SocketID); +void _SlDrvReleasePoolObj(_u8 pObj); +void _SlDrvObjInit(void); +void _SlDrvObjDeInit(void); +void _SlRemoveFromList(_u8* ListIndex, _u8 ItemIndex); +_SlReturnVal_t _SlFindAndSetActiveObj(_SlOpcode_t Opcode, _u8 Sd); /*****************************************************************************/ @@ -352,8 +352,8 @@ _SlReturnVal_t _SlDrvDataReadOp( OSI_RET_OK_CHECK( sl_LockObjUnlock(&g_pCB->FlowContCB.TxLockObj) ); /* send the message */ - g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode; - g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt); + g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode; + g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt); g_pCB->FunctionParams.pCmdCtrl = pCmdCtrl; g_pCB->FunctionParams.pTxRxDescBuff = (_u8 *)pTxRxDescBuff; g_pCB->FunctionParams.pCmdExt = pCmdExt; @@ -427,8 +427,8 @@ _SlReturnVal_t _SlDrvDataWriteOp( OSI_RET_OK_CHECK( sl_LockObjUnlock(&g_pCB->FlowContCB.TxLockObj) ); /* send the message */ - g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode; - g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt); + g_pCB->TempProtocolHeader.Opcode = pCmdCtrl->Opcode; + g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(pCmdCtrl,pCmdExt); g_pCB->FunctionParams.pCmdCtrl = pCmdCtrl; g_pCB->FunctionParams.pTxRxDescBuff = pTxRxDescBuff; @@ -447,8 +447,8 @@ _SlReturnVal_t _SlDrvMsgWrite(void) { VERIFY_PROTOCOL(NULL != g_pCB->FunctionParams.pCmdCtrl); - g_pCB->TempProtocolHeader.Opcode = g_pCB->FunctionParams.pCmdCtrl->Opcode; - g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(g_pCB->FunctionParams.pCmdCtrl, + g_pCB->TempProtocolHeader.Opcode = g_pCB->FunctionParams.pCmdCtrl->Opcode; + g_pCB->TempProtocolHeader.Len = _SL_PROTOCOL_CALC_LEN(g_pCB->FunctionParams.pCmdCtrl, g_pCB->FunctionParams.pCmdExt); /* */ if (g_pCB->RelayFlagsViaRxPayload == TRUE) @@ -628,7 +628,7 @@ _SlReturnVal_t _SlDrvMsgRead(void) VERIFY_RET_OK(_SlFindAndSetActiveObj(OPCODE(uBuf.TempBuf),SD(&uBuf.TempBuf[4]) & BSD_SOCKET_ID_MASK)); /* Verify data is waited on this socket. The pArgs should have been set by _SlDrvDataReadOp(). */ - VERIFY_SOCKET_CB(NULL != ((_SlArgsData_t *)(g_pCB->ObjPool[g_pCB->FunctionParams.AsyncExt.ActionIndex].pData))->pArgs); + VERIFY_SOCKET_CB(NULL != ((_SlArgsData_t *)(g_pCB->ObjPool[g_pCB->FunctionParams.AsyncExt.ActionIndex].pData))->pArgs); sl_Memcpy( ((_SlArgsData_t *)(g_pCB->ObjPool[g_pCB->FunctionParams.AsyncExt.ActionIndex].pRespArgs))->pArgs, &uBuf.TempBuf[4], RECV_ARGS_SIZE); @@ -800,7 +800,7 @@ void _SlAsyncEventGenericHandler(void) } case SL_OPCODE_WLAN_CONNECTION_FAILED: { - slWlanConnFailureAsyncResponse_t * pResp = (slWlanConnFailureAsyncResponse_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf); + slWlanConnFailureAsyncResponse_t * pResp = (slWlanConnFailureAsyncResponse_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf); wlanEvent.Event = SL_WLAN_CONNECTION_FAILED_EVENT; wlanEvent.EventData.P2PModewlanConnectionFailure.status = pResp->status; @@ -817,7 +817,7 @@ void _SlAsyncEventGenericHandler(void) wlanEvent.EventData.STAandP2PModeWlanConnected.connection_type = pWlanResp->connection_type; sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.bssid, pWlanResp->bssid, 6); sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.go_peer_device_name,pWlanResp->go_peer_device_name,pWlanResp->go_peer_device_name_len); - sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len); + sl_Memcpy(wlanEvent.EventData.STAandP2PModeWlanConnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len); wlanEvent.EventData.STAandP2PModeWlanConnected.ssid_len = pWlanResp->ssid_len; wlanEvent.EventData.STAandP2PModeWlanConnected.go_peer_device_name_len = pWlanResp->go_peer_device_name_len; @@ -832,7 +832,7 @@ void _SlAsyncEventGenericHandler(void) wlanEvent.EventData.STAandP2PModeDisconnected.connection_type = pWlanResp->connection_type; sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.bssid, pWlanResp->bssid, 6); sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.go_peer_device_name,pWlanResp->go_peer_device_name,pWlanResp->go_peer_device_name_len); - sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len); + sl_Memcpy(wlanEvent.EventData.STAandP2PModeDisconnected.ssid_name, pWlanResp->ssid_name, pWlanResp->ssid_len); wlanEvent.EventData.STAandP2PModeDisconnected.ssid_len = pWlanResp->ssid_len; wlanEvent.EventData.STAandP2PModeDisconnected.reason_code = pWlanResp->reason_code; wlanEvent.EventData.STAandP2PModeDisconnected.go_peer_device_name_len = pWlanResp->go_peer_device_name_len; @@ -884,7 +884,7 @@ void _SlAsyncEventGenericHandler(void) case SL_OPCODE_SOCKET_TXFAILEDASYNCRESPONSE: { - SlSockEventData_t *txfailparams = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf); + SlSockEventData_t *txfailparams = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf); sockAppEvent.Event = SL_SOCKET_TX_FAILED_EVENT; sl_Memcpy((void *)&sockAppEvent.EventData,(void *)txfailparams,sizeof(SlSockEventData_t)); g_pCB->FunctionParams.AsyncExt.AsyncEvtHandler(&sockAppEvent); @@ -893,7 +893,7 @@ void _SlAsyncEventGenericHandler(void) case SL_OPCODE_SOCKET_SOCKETASYNCEVENT: { - SlSockEventData_t *socketAsyncEvent = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf); + SlSockEventData_t *socketAsyncEvent = (SlSockEventData_t*)_SL_RESP_ARGS_START(g_pCB->FunctionParams.AsyncExt.pAsyncBuf); sockAppEvent.Event = SL_SOCKET_ASYNC_EVENT; sockAppEvent.EventData.socketAsyncEvent.sd = socketAsyncEvent->socketAsyncEvent.sd; sockAppEvent.EventData.socketAsyncEvent.type = socketAsyncEvent->socketAsyncEvent.type; /* one of the possible types of socket */ @@ -1176,12 +1176,12 @@ void _SlDrvClassifyRxMsg( } #endif } - /* else if (SL_OPCODE_SILO_NVMEM == (Opcode & SL_OPCODE_SILO_MASK)) */ - /* { */ - /* } */ - /* else if (SL_OPCODE_SILO_NETCFG == (Opcode & SL_OPCODE_SILO_MASK)) */ - /* { */ - /* } */ + /* else if (SL_OPCODE_SILO_NVMEM == (Opcode & SL_OPCODE_SILO_MASK)) */ + /* { */ + /* } */ + /* else if (SL_OPCODE_SILO_NETCFG == (Opcode & SL_OPCODE_SILO_MASK)) */ + /* { */ + /* } */ else { SL_ERROR_TRACE1(MSG_311, "ASSERT: _SlDrvClassifyRxMsg : invalid opcode = 0x%x", Opcode); @@ -1191,8 +1191,8 @@ void _SlDrvClassifyRxMsg( else { /* These may be Command responses only */ - g_pCB->FunctionParams.AsyncExt.RxMsgClass = CMD_RESP_CLASS; - } + g_pCB->FunctionParams.AsyncExt.RxMsgClass = CMD_RESP_CLASS; + } } @@ -1280,7 +1280,7 @@ _SlReturnVal_t _SlDrvRxHdrRead(_u8 *pBuf, _u8 *pAlignSize) /* ***************************************************************************** */ typedef union { - _BasicResponse_t Rsp; + _BasicResponse_t Rsp; }_SlBasicCmdMsg_u; _i16 _SlDrvBasicCmd(_SlOpcode_t Opcode) @@ -1357,7 +1357,7 @@ _i16 _SlDrvWaitForPoolObj(_u32 ActionID, _u8 SocketID) } /* move to active list */ g_pCB->ObjPool[CurrObjIndex].NextIndex = g_pCB->ActivePoolIdx; - g_pCB->ActivePoolIdx = CurrObjIndex; + g_pCB->ActivePoolIdx = CurrObjIndex; /* unlock */ OSI_RET_OK_CHECK(sl_LockObjUnlock(&g_pCB->ProtectionLockObj)); return CurrObjIndex; @@ -1398,7 +1398,7 @@ void _SlDrvReleasePoolObj(_u8 ObjIdx) { /* unset actionID */ g_pCB->ActiveActionsBitmap &= ~(1<ObjPool[ObjIdx].ActionID); - } + } /* delete old data */ g_pCB->ObjPool[ObjIdx].pRespArgs = NULL; @@ -1475,7 +1475,7 @@ void _SlRemoveFromList(_u8 *ListIndex, _u8 ItemIndex) g_pCB->ObjPool[Idx].NextIndex = g_pCB->ObjPool[ItemIndex].NextIndex; break; } - Idx = g_pCB->ObjPool[Idx].NextIndex; + Idx = g_pCB->ObjPool[Idx].NextIndex; } } } diff --git a/cc3200/simplelink/source/fs.c b/cc3200/simplelink/source/fs.c index cc44e262ea..cc65e219e9 100644 --- a/cc3200/simplelink/source/fs.c +++ b/cc3200/simplelink/source/fs.c @@ -97,8 +97,8 @@ _u32 _sl_GetCreateFsMode(_u32 maxSizeInBytes,_u32 accessFlags) /*****************************************************************************/ typedef union { - _FsOpenCommand_t Cmd; - _FsOpenResponse_t Rsp; + _FsOpenCommand_t Cmd; + _FsOpenResponse_t Rsp; }_SlFsOpenMsg_u; const _SlCmdCtrl_t _SlFsOpenCmdCtrl = @@ -122,27 +122,27 @@ _i32 sl_FsOpen(_u8 *pFileName,_u32 AccessModeAndMaxSize, _u32 *pToken,_i32 *pFil Msg.Cmd.Mode = AccessModeAndMaxSize; - if(pToken != NULL) - { + if(pToken != NULL) + { Msg.Cmd.Token = *pToken; - } + } else - { + { Msg.Cmd.Token = 0; - } + } RetVal = _SlDrvCmdOp((_SlCmdCtrl_t *)&_SlFsOpenCmdCtrl, &Msg, &CmdExt); *pFileHandle = Msg.Rsp.FileHandle; - if (pToken != NULL) - { + if (pToken != NULL) + { *pToken = Msg.Rsp.Token; - } + } - /* in case of an error, return the erros file handler as an error code */ - if( *pFileHandle < 0 ) - { - return *pFileHandle; - } + /* in case of an error, return the erros file handler as an error code */ + if( *pFileHandle < 0 ) + { + return *pFileHandle; + } return (_i32)RetVal; } #endif @@ -152,8 +152,8 @@ _i32 sl_FsOpen(_u8 *pFileName,_u32 AccessModeAndMaxSize, _u32 *pToken,_i32 *pFil /*****************************************************************************/ typedef union { - _FsCloseCommand_t Cmd; - _BasicResponse_t Rsp; + _FsCloseCommand_t Cmd; + _BasicResponse_t Rsp; }_SlFsCloseMsg_u; const _SlCmdCtrl_t _SlFsCloseCmdCtrl = @@ -198,8 +198,8 @@ _i16 sl_FsClose(_i32 FileHdl, _u8* pCeritificateFileName,_u8* pSignature ,_u32 /*****************************************************************************/ typedef union { - _FsReadCommand_t Cmd; - _FsReadResponse_t Rsp; + _FsReadCommand_t Cmd; + _FsReadResponse_t Rsp; }_SlFsReadMsg_u; const _SlCmdCtrl_t _SlFsReadCmdCtrl = @@ -269,8 +269,8 @@ _i32 sl_FsRead(_i32 FileHdl, _u32 Offset, _u8* pData, _u32 Len) /*****************************************************************************/ typedef union { - _FsWriteCommand_t Cmd; - _FsWriteResponse_t Rsp; + _FsWriteCommand_t Cmd; + _FsWriteResponse_t Rsp; }_SlFsWriteMsg_u; const _SlCmdCtrl_t _SlFsWriteCmdCtrl = @@ -343,8 +343,8 @@ _i32 sl_FsWrite(_i32 FileHdl, _u32 Offset, _u8* pData, _u32 Len) /*****************************************************************************/ typedef union { - _FsGetInfoCommand_t Cmd; - _FsGetInfoResponse_t Rsp; + _FsGetInfoCommand_t Cmd; + _FsGetInfoResponse_t Rsp; }_SlFsGetInfoMsg_u; const _SlCmdCtrl_t _SlFsGetInfoCmdCtrl = @@ -384,8 +384,8 @@ _i16 sl_FsGetInfo(_u8 *pFileName,_u32 Token,SlFsFileInfo_t* pFsFileInfo) /*****************************************************************************/ typedef union { - _FsDeleteCommand_t Cmd; - _FsDeleteResponse_t Rsp; + _FsDeleteCommand_t Cmd; + _FsDeleteResponse_t Rsp; }_SlFsDeleteMsg_u; const _SlCmdCtrl_t _SlFsDeleteCmdCtrl = diff --git a/cc3200/simplelink/source/wlan.c b/cc3200/simplelink/source/wlan.c index 648a624e1f..0cc825439f 100644 --- a/cc3200/simplelink/source/wlan.c +++ b/cc3200/simplelink/source/wlan.c @@ -66,7 +66,7 @@ typedef struct typedef union { _WlanConnectCmd_t Cmd; - _BasicResponse_t Rsp; + _BasicResponse_t Rsp; }_SlWlanConnectMsg_u; @@ -111,7 +111,7 @@ _i16 sl_WlanConnect(_i8* pName, _i16 NameLen, _u8 *pMacAddr, SlSecParams_t* pSe /* update key length */ Msg.Cmd.Args.Common.PasswordLen = pSecParams->KeyLen; ARG_CHECK_PTR(pSecParams->Key); - /* copy key */ + /* copy key */ sl_Memcpy(EAP_PASSWORD_STRING(&Msg), pSecParams->Key, pSecParams->KeyLen); CmdCtrl.TxDescLen += pSecParams->KeyLen; } @@ -159,7 +159,7 @@ _i16 sl_WlanConnect(_i8* pName, _i16 NameLen, _u8 *pMacAddr, SlSecParams_t* pSe CmdCtrl.Opcode = SL_OPCODE_WLAN_WLANCONNECTCOMMAND; CmdCtrl.TxDescLen += sizeof(_WlanConnectCommon_t); /* copy SSID */ - sl_Memcpy(SSID_STRING(&Msg), pName, NameLen); + sl_Memcpy(SSID_STRING(&Msg), pName, NameLen); CmdCtrl.TxDescLen += NameLen; /* Copy password if supplied */ if( NULL != pSecParams ) @@ -185,7 +185,7 @@ _i16 sl_WlanConnect(_i8* pName, _i16 NameLen, _u8 *pMacAddr, SlSecParams_t* pSe { Msg.Cmd.Args.Common.PasswordLen = 0; Msg.Cmd.Args.Common.SecType = SL_SEC_TYPE_OPEN; - } + } } /* If BSSID is not null, copy to buffer, otherwise set to 0 */ if(NULL != pMacAddr) @@ -220,7 +220,7 @@ _i16 sl_WlanDisconnect(void) typedef union { _WlanPoliciySetGet_t Cmd; - _BasicResponse_t Rsp; + _BasicResponse_t Rsp; }_SlPolicyMsg_u; const _SlCmdCtrl_t _SlPolicySetCmdCtrl = @@ -258,8 +258,8 @@ _i16 sl_WlanPolicySet(_u8 Type , const _u8 Policy, _u8 *pVal,_u8 ValLen) /******************************************************************************/ typedef union { - _WlanPoliciySetGet_t Cmd; - _WlanPoliciySetGet_t Rsp; + _WlanPoliciySetGet_t Cmd; + _WlanPoliciySetGet_t Rsp; }_SlPolicyGetMsg_u; const _SlCmdCtrl_t _SlPolicyGetCmdCtrl = @@ -316,14 +316,14 @@ _i16 sl_WlanPolicyGet(_u8 Type , _u8 Policy,_u8 *pVal,_u8 *pValLen) /*******************************************************************************/ typedef struct { - _WlanAddGetEapProfile_t Args; + _WlanAddGetEapProfile_t Args; _i8 Strings[MAX_SSID_LEN + MAX_KEY_LEN + MAX_USER_LEN + MAX_ANON_USER_LEN]; }_SlProfileParams_t; typedef union { - _SlProfileParams_t Cmd; - _BasicResponse_t Rsp; + _SlProfileParams_t Cmd; + _BasicResponse_t Rsp; }_SlProfileAddMsg_u; @@ -352,7 +352,7 @@ _i16 sl_WlanProfileAdd(_i8* pName, _i16 NameLen, _u8 *pMacAddr, SlSecParams_t* CmdCtrl.TxDescLen += sizeof(_WlanAddGetEapProfile_t); /* copy SSID */ - sl_Memcpy(EAP_PROFILE_SSID_STRING(&Msg), pName, NameLen); + sl_Memcpy(EAP_PROFILE_SSID_STRING(&Msg), pName, NameLen); CmdCtrl.TxDescLen += NameLen; /* Copy password if supplied */ @@ -373,7 +373,7 @@ _i16 sl_WlanProfileAdd(_i8* pName, _i16 NameLen, _u8 *pMacAddr, SlSecParams_t* } VERIFY_PROTOCOL(pSecParams->KeyLen <= MAX_KEY_LEN); /* update key length */ - Msg.Cmd.Args.Common.PasswordLen = pSecParams->KeyLen; + Msg.Cmd.Args.Common.PasswordLen = pSecParams->KeyLen; CmdCtrl.TxDescLen += pSecParams->KeyLen; ARG_CHECK_PTR(pSecParams->Key); /* copy key */ @@ -487,7 +487,7 @@ _i16 sl_WlanProfileAdd(_i8* pName, _i16 NameLen, _u8 *pMacAddr, SlSecParams_t* typedef union { _WlanProfileDelGetCommand_t Cmd; - _SlProfileParams_t Rsp; + _SlProfileParams_t Rsp; }_SlProfileGetMsg_u; const _SlCmdCtrl_t _SlProfileGetCmdCtrl = @@ -513,7 +513,7 @@ _i16 sl_WlanProfileGet(_i16 Index,_i8* pName, _i16 *pNameLen, _u8 *pMacAddr, Sl pEntParams->UserLen = Msg.Rsp.Args.UserLen; /* copy user name */ if (pEntParams->UserLen > 0) - { + { sl_Memcpy(pEntParams->User, EAP_PROFILE_USER_STRING(&Msg), pEntParams->UserLen); } pEntParams->AnonUserLen = Msg.Rsp.Args.AnonUserLen; @@ -543,8 +543,8 @@ _i16 sl_WlanProfileGet(_i16 Index,_i8* pName, _i16 *pNameLen, _u8 *pMacAddr, Sl /*******************************************************************************/ typedef union { - _WlanProfileDelGetCommand_t Cmd; - _BasicResponse_t Rsp; + _WlanProfileDelGetCommand_t Cmd; + _BasicResponse_t Rsp; }_SlProfileDelMsg_u; const _SlCmdCtrl_t _SlProfileDelCmdCtrl = @@ -622,7 +622,7 @@ _i16 sl_WlanGetNetworkList(_u8 Index, _u8 Count, Sl_WlanNetworkEntry_t *pEntries /* Set command */ typedef union { - _WlanRxFilterAddCommand_t Cmd; + _WlanRxFilterAddCommand_t Cmd; _WlanRxFilterAddCommandReponse_t Rsp; }_SlrxFilterAddMsg_u; @@ -637,7 +637,7 @@ const _SlCmdCtrl_t _SlRxFilterAddtCmdCtrl = /* Set command */ typedef union _SlRxFilterSetMsg_u { - _WlanRxFilterSetCommand_t Cmd; + _WlanRxFilterSetCommand_t Cmd; _WlanRxFilterSetCommandReponse_t Rsp; }_SlRxFilterSetMsg_u; @@ -652,7 +652,7 @@ const _SlCmdCtrl_t _SlRxFilterSetCmdCtrl = /* Get command */ typedef union _SlRxFilterGetMsg_u { - _WlanRxFilterGetCommand_t Cmd; + _WlanRxFilterGetCommand_t Cmd; _WlanRxFilterGetCommandReponse_t Rsp; }_SlRxFilterGetMsg_u; @@ -670,11 +670,11 @@ const _SlCmdCtrl_t _SlRxFilterGetCmdCtrl = /*******************************************************************************/ #if _SL_INCLUDE_FUNC(sl_WlanRxFilterAdd) -SlrxFilterID_t sl_WlanRxFilterAdd( SlrxFilterRuleType_t RuleType, - SlrxFilterFlags_t FilterFlags, - const SlrxFilterRule_t* const Rule, - const SlrxFilterTrigger_t* const Trigger, - const SlrxFilterAction_t* const Action, +SlrxFilterID_t sl_WlanRxFilterAdd( SlrxFilterRuleType_t RuleType, + SlrxFilterFlags_t FilterFlags, + const SlrxFilterRule_t* const Rule, + const SlrxFilterTrigger_t* const Trigger, + const SlrxFilterAction_t* const Action, SlrxFilterID_t* pFilterId) { @@ -807,14 +807,14 @@ _i16 sl_WlanSmartConfigStop(void) typedef struct { - _WlanSmartConfigStartCommand_t Args; + _WlanSmartConfigStartCommand_t Args; _i8 Strings[3 * MAX_SMART_CONFIG_KEY]; /* public key + groupId1 key + groupId2 key */ }_SlSmartConfigStart_t; typedef union { - _SlSmartConfigStart_t Cmd; - _BasicResponse_t Rsp; + _SlSmartConfigStart_t Cmd; + _BasicResponse_t Rsp; }_SlSmartConfigStartMsg_u; const _SlCmdCtrl_t _SlSmartConfigStartCmdCtrl = @@ -861,8 +861,8 @@ _i16 sl_WlanSmartConfigStart( const _u32 groupIdBitmask, /*******************************************************************************/ typedef union { - _WlanSetMode_t Cmd; - _BasicResponse_t Rsp; + _WlanSetMode_t Cmd; + _BasicResponse_t Rsp; }_SlwlanSetModeMsg_u; const _SlCmdCtrl_t _SlWlanSetModeCmdCtrl = @@ -899,8 +899,8 @@ _i16 sl_WlanSetMode(const _u8 mode) /* ******************************************************************************/ typedef union { - _WlanCfgSetGet_t Cmd; - _BasicResponse_t Rsp; + _WlanCfgSetGet_t Cmd; + _BasicResponse_t Rsp; }_SlWlanCfgSetMsg_u; const _SlCmdCtrl_t _SlWlanCfgSetCmdCtrl = @@ -939,8 +939,8 @@ _i16 sl_WlanSet(_u16 ConfigId ,_u16 ConfigOpt,_u16 ConfigLen, _u8 *pValues) /******************************************************************************/ typedef union { - _WlanCfgSetGet_t Cmd; - _WlanCfgSetGet_t Rsp; + _WlanCfgSetGet_t Cmd; + _WlanCfgSetGet_t Rsp; }_SlWlanCfgMsgGet_u; const _SlCmdCtrl_t _SlWlanCfgGetCmdCtrl =