wlan : To remove PAL memory wrapper in PE(2)
This is to remove PAL memory wrapper in PE and replace with vos calls
CRs-Fixed: 520321
Change-Id: I4d7f456bf81a9bac74fcedd267d710ab61899f60
diff --git a/CORE/MAC/src/pe/lim/limLogDump.c b/CORE/MAC/src/pe/lim/limLogDump.c
index 076f10b..3392a09 100644
--- a/CORE/MAC/src/pe/lim/limLogDump.c
+++ b/CORE/MAC/src/pe/lim/limLogDump.c
@@ -373,9 +373,10 @@
pScanReq = (tSirSmeScanReq *) &scanReq;
- if (palAllocateMemory(pMac->hHdd, (void **)&pScanReq, sizeof(tSirSmeScanReq)) != eHAL_STATUS_SUCCESS)
+ pScanReq = vos_mem_malloc(sizeof(tSirSmeScanReq));
+ if (NULL == pScanReq)
{
- p += log_sprintf( pMac,p,"sendSmeScanReq: palAllocateMemory() failed \n");
+ p += log_sprintf( pMac,p,"sendSmeScanReq: AllocateMemory() failed \n");
return p;
}
@@ -385,7 +386,7 @@
pScanReq->bssType = eSIR_INFRASTRUCTURE_MODE;
limGetMyMacAddr(pMac, pScanReq->bssId);
pScanReq->numSsid = 1;
- palCopyMemory(pMac->hHdd, (void *) &pScanReq->ssId[0].ssId, (void *)"Ivan", 4);
+ vos_mem_copy((void *) &pScanReq->ssId[0].ssId, (void *)"Ivan", 4);
pScanReq->ssId[0].length = 4;
pScanReq->scanType = eSIR_ACTIVE_SCAN;
pScanReq->returnAfterFirstMatch = 0;
@@ -436,9 +437,10 @@
return p;
}
- if (palAllocateMemory(pMac->hHdd, (void **)&pDisAssocReq, sizeof(tSirSmeDisassocReq)) != eHAL_STATUS_SUCCESS)
+ pDisAssocReq = vos_mem_malloc(sizeof(tSirSmeDisassocReq));
+ if (NULL == pDisAssocReq)
{
- p += log_sprintf( pMac,p,"sendSmeDisAssocReq: palAllocateMemory() failed \n");
+ p += log_sprintf( pMac,p,"sendSmeDisAssocReq: AllocateMemory() failed \n");
return p;
}
@@ -494,9 +496,10 @@
return p;
}
- if (palAllocateMemory(pMac->hHdd, (void **)&pStartBssReq, sizeof(tSirSmeStartBssReq)) != eHAL_STATUS_SUCCESS)
+ pStartBssReq = vos_mem_malloc(sizeof(tSirSmeStartBssReq));
+ if (NULL == pStartBssReq)
{
- p += log_sprintf( pMac,p,"sendSmeStartBssReq: palAllocateMemory() failed \n");
+ p += log_sprintf( pMac,p,"sendSmeStartBssReq: AllocateMemory() failed \n");
return p;
}
@@ -508,19 +511,19 @@
pStartBssReq->bssType = eSIR_BTAMP_STA_MODE;
pStartBssReq->ssId.length = 5;
- palCopyMemory(pMac->hHdd, (void *) &pStartBssReq->ssId.ssId, (void *)"BTSTA", 5);
+ vos_mem_copy((void *) &pStartBssReq->ssId.ssId, (void *)"BTSTA", 5);
}
else if(arg1 == 1) //BTAMP AP
{
pStartBssReq->bssType = eSIR_BTAMP_AP_MODE;
pStartBssReq->ssId.length = 4;
- palCopyMemory(pMac->hHdd, (void *) &pStartBssReq->ssId.ssId, (void *)"BTAP", 4);
+ vos_mem_copy((void *) &pStartBssReq->ssId.ssId, (void *)"BTAP", 4);
}
else //IBSS
{
pStartBssReq->bssType = eSIR_IBSS_MODE;
pStartBssReq->ssId.length = 4;
- palCopyMemory(pMac->hHdd, (void *) &pStartBssReq->ssId.ssId, (void *)"Ibss", 4);
+ vos_mem_copy((void *) &pStartBssReq->ssId.ssId, (void *)"Ibss", 4);
}
// Filling in channel ID 6
@@ -530,16 +533,16 @@
// Filling in CB mode
cbMode = PHY_SINGLE_CHANNEL_CENTERED;
- palCopyMemory( pMac->hHdd, pBuf, (tANI_U8 *)&cbMode, sizeof(ePhyChanBondState) );
+ vos_mem_copy(pBuf, (tANI_U8 *)&cbMode, sizeof(ePhyChanBondState));
pBuf += sizeof(ePhyChanBondState);
// Filling in RSN IE Length to zero
- palZeroMemory( pMac->hHdd, pBuf, sizeof(tANI_U16) ); //tSirRSNie->length
+ vos_mem_set(pBuf, sizeof(tANI_U16), 0); //tSirRSNie->length
pBuf += sizeof(tANI_U16);
// Filling in NW Type
nwType = eSIR_11G_NW_TYPE;
- palCopyMemory( pMac->hHdd, pBuf, (tANI_U8 *)&nwType, sizeof(tSirNwType) );
+ vos_mem_copy(pBuf, (tANI_U8 *)&nwType, sizeof(tSirNwType));
pBuf += sizeof(tSirNwType);
/* ---- To be filled by LIM later ----
@@ -579,9 +582,10 @@
p += log_sprintf( pMac,p, "sendSmeStopBssReq: Preparing eWNI_SME_STOP_BSS_REQ message\n");
pStopBssReq = (tSirSmeStopBssReq *) &stopBssReq;
- if (palAllocateMemory(pMac->hHdd, (void **)&pStopBssReq, sizeof(tSirSmeStopBssReq)) != eHAL_STATUS_SUCCESS)
+ pStopBssReq = vos_mem_malloc(sizeof(tSirSmeStopBssReq));
+ if (NULL == pStopBssReq)
{
- p += log_sprintf( pMac,p,"sendSmeStopBssReq: palAllocateMemory() failed \n");
+ p += log_sprintf( pMac,p,"sendSmeStopBssReq: AllocateMemory() failed \n");
return p;
}
@@ -591,7 +595,7 @@
pStopBssReq->reasonCode = eSIR_SME_SUCCESS;
msgLen += sizeof(tSirResultCodes);
- palCopyMemory(pMac->hHdd, (void *) &pStopBssReq->bssId, (void *)psessionEntry->bssId, 6);
+ vos_mem_copy((void *) &pStopBssReq->bssId, (void *)psessionEntry->bssId, 6);
msgLen += sizeof(tSirMacAddr);
pStopBssReq->sessionId = (tANI_U8)sessionId;
@@ -652,14 +656,15 @@
0x50, 0x10, 0x08, 0x00, 0x02, 0x01, 0x8E
};
- if (palAllocateMemory(pMac->hHdd, (void **)&pJoinReq, msgLen) != eHAL_STATUS_SUCCESS)
+ pJoinReq = vos_mem_malloc(msgLen);
+ if (NULL == pJoinReq)
{
- p += log_sprintf( pMac,p,"sendSmeJoinReq: palAllocateMemory() failed \n");
+ p += log_sprintf( pMac,p,"sendSmeJoinReq: AllocateMemory() failed \n");
return p;
}
pBuf = (unsigned char *)pJoinReq;
- palCopyMemory( pMac->hHdd, pBuf, (tANI_U8 *)msgDump, msgLen );
+ vos_mem_copy(pBuf, (tANI_U8 *)msgDump, msgLen);
msg.type = eWNI_SME_JOIN_REQ;
msg.bodyptr = pJoinReq;
@@ -1125,7 +1130,7 @@
pStaDs->mlmStaContext.disassocReason = (tSirMacReasonCodes) reasonCode;
// Issue Disassoc Indication to SME.
- palCopyMemory( pMac->hHdd, (tANI_U8 *) &mlmDisassocInd.peerMacAddr,
+ vos_mem_copy((tANI_U8 *) &mlmDisassocInd.peerMacAddr,
(tANI_U8 *) pStaDs->staAddr, sizeof(tSirMacAddr));
mlmDisassocInd.reasonCode = reasonCode;
mlmDisassocInd.disassocTrigger = eLIM_PEER_ENTITY_DISASSOC;
@@ -1215,7 +1220,7 @@
state = (tSirMacHTMIMOPowerSaveState) arg1;
- palAllocateMemory(pMac->hHdd, (void **)&pMBMsg, WNI_CFG_MB_HDR_LEN + sizeof(tSirMacHTMIMOPowerSaveState));
+ pMBMsg = vos_mem_malloc(WNI_CFG_MB_HDR_LEN + sizeof(tSirMacHTMIMOPowerSaveState));
if(NULL == pMBMsg)
{
p += log_sprintf( pMac,p, "pMBMsg is NULL\n");
@@ -1223,7 +1228,7 @@
}
pMBMsg->type = eWNI_PMC_SMPS_STATE_IND;
pMBMsg->msgLen = (tANI_U16)(WNI_CFG_MB_HDR_LEN + sizeof(tSirMacHTMIMOPowerSaveState));
- palCopyMemory(pMac->hHdd, pMBMsg->data, &state, sizeof(tSirMacHTMIMOPowerSaveState));
+ vos_mem_copy(pMBMsg->data, &state, sizeof(tSirMacHTMIMOPowerSaveState));
msg.type = eWNI_PMC_SMPS_STATE_IND;
msg.bodyptr = pMBMsg;
@@ -1232,7 +1237,7 @@
if (limPostMsgApi(pMac, &msg) != TX_SUCCESS)
{
p += log_sprintf( pMac,p, "Updating the SMPower Request has failed \n");
- palFreeMemory(pMac->hHdd, pMBMsg);
+ vos_mem_free(pMBMsg);
}
else
{
@@ -1501,7 +1506,6 @@
static char*
dump_lim_get_pe_statistics(tpAniSirGlobal pMac, tANI_U32 arg1, tANI_U32 arg2, tANI_U32 arg3, tANI_U32 arg4, char *p)
{
- eHalStatus status = eHAL_STATUS_SUCCESS;
tpAniGetPEStatsReq pReq;
tANI_U32 statsMask;
@@ -1529,14 +1533,14 @@
return p;
}
-
- if( eHAL_STATUS_SUCCESS != (status = palAllocateMemory (pMac->hHdd, (void**) &pReq, sizeof(tAniGetPEStatsReq))))
+ pReq = vos_mem_malloc(sizeof(tAniGetPEStatsReq));
+ if (NULL == pReq)
{
p += log_sprintf( pMac,p, "Error: Unable to allocate memory.\n");
return p;
}
- palZeroMemory( pMac, pReq, sizeof(*pReq));
+ vos_mem_set(pReq, sizeof(*pReq), 0);
pReq->msgType = eWNI_SME_GET_STATISTICS_REQ;
pReq->statsMask = statsMask;
@@ -1848,7 +1852,7 @@
neighbor.dialogToken = 2;
neighbor.ssid_present = (tANI_U8) arg4;
neighbor.ssid.length = 5;
- palCopyMemory( pMac->hHdd, neighbor.ssid.ssId, "abcde", 5);
+ vos_mem_copy(neighbor.ssid.ssId, "abcde", 5);
limSendNeighborReportRequestFrame( pMac, &neighbor, psessionEntry->bssId, psessionEntry );
@@ -2119,9 +2123,9 @@
auth_req_len = sizeof(tSirFTPreAuthReq);
pftPreAuthReq = vos_mem_malloc(auth_req_len);
- if (pftPreAuthReq == NULL)
+ if (NULL == pftPreAuthReq)
{
- p += log_sprintf( pMac,p,"Pre auth dump: palAllocateMemory() failed \n");
+ p += log_sprintf( pMac,p,"Pre auth dump: AllocateMemory() failed \n");
return p;
}
pftPreAuthReq->pbssDescription = vos_mem_malloc(sizeof(Profile.pBssDesc->length)+
@@ -2132,14 +2136,14 @@
Profile.pBssDesc->length;
pftPreAuthReq->preAuthchannelNum = 6;
- palCopyMemory(pMac->hHdd, (void *) &pftPreAuthReq->currbssId,
+ vos_mem_copy((void *) &pftPreAuthReq->currbssId,
(void *)psessionEntry->bssId, 6);
- palCopyMemory(pMac->hHdd, (void *) &pftPreAuthReq->preAuthbssId,
+ vos_mem_copy((void *) &pftPreAuthReq->preAuthbssId,
(void *)macAddr, 6);
pftPreAuthReq->ft_ies_length = (tANI_U16)pMac->ft.ftSmeContext.auth_ft_ies_length;
// Also setup the mac address in sme context.
- palCopyMemory(pMac->hHdd, pMac->ft.ftSmeContext.preAuthbssId, macAddr, 6);
+ vos_mem_copy(pMac->ft.ftSmeContext.preAuthbssId, macAddr, 6);
vos_mem_copy(pftPreAuthReq->ft_ies, pMac->ft.ftSmeContext.auth_ft_ies,
pMac->ft.ftSmeContext.auth_ft_ies_length);