wlan : To remove PAL memory API's
This is to replace the pal mem API's with voss mem API's
CRs-Fixed: 520321
Change-Id: Ie01c33514a870e4faae5ed9c6939cacbebe27aca
diff --git a/CORE/SYS/legacy/src/utils/src/parserApi.c b/CORE/SYS/legacy/src/utils/src/parserApi.c
index 2fe088e..add69af 100644
--- a/CORE/SYS/legacy/src/utils/src/parserApi.c
+++ b/CORE/SYS/legacy/src/utils/src/parserApi.c
@@ -359,7 +359,7 @@
CFG_GET_STR( nSirStatus, pMac, WNI_CFG_COUNTRY_CODE,
code, codelen, 3 );
- palCopyMemory( pMac->hHdd, pDot11f->country, code, codelen );
+ vos_mem_copy( pDot11f->country, code, codelen );
if(len > MAX_SIZE_OF_TRIPLETS_IN_COUNTRY_IE)
{
@@ -368,7 +368,7 @@
}
pDot11f->num_triplets = ( tANI_U8 ) ( len / 3 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )pDot11f->triplets, temp, len );
+ vos_mem_copy( ( tANI_U8* )pDot11f->triplets, temp, len );
pDot11f->present = 1;
}
@@ -509,7 +509,7 @@
if(psessionEntry != NULL)
{
nRates = psessionEntry->extRateSet.numRates;
- palCopyMemory(pMac->hHdd, rates, psessionEntry->extRateSet.rate,
+ vos_mem_copy( rates, psessionEntry->extRateSet.rate,
nRates);
}
else
@@ -527,7 +527,7 @@
if ( 0 != nRates )
{
pDot11f->num_rates = ( tANI_U8 )nRates;
- palCopyMemory( pMac->hHdd, pDot11f->rates, rates, nRates );
+ vos_mem_copy( pDot11f->rates, rates, nRates );
pDot11f->present = 1;
}
@@ -559,7 +559,7 @@
if ( 0 != nRates )
{
pDot11f->num_rates = ( tANI_U8 ) nRates;
- palCopyMemory( pMac->hHdd, pDot11f->rates, rates, nRates );
+ vos_mem_copy( pDot11f->rates, rates, nRates );
pDot11f->present = 1;
}
@@ -1269,7 +1269,7 @@
{
pDot11f->present = 1;
pDot11f->num_data = pRsnIe->rsnIEdata[ idx + 1 ];
- palCopyMemory( pMac->hHdd, pDot11f->data,
+ vos_mem_copy( pDot11f->data,
pRsnIe->rsnIEdata + idx + 2, // EID, len
pRsnIe->rsnIEdata[ idx + 1 ] );
}
@@ -1325,7 +1325,7 @@
{
pDot11f->present = 1;
pDot11f->num_data = pRsnIe->rsnIEdata[ idx + 1 ];
- palCopyMemory( pMac->hHdd, pDot11f->data,
+ vos_mem_copy ( pDot11f->data,
pRsnIe->rsnIEdata + idx + 2, // EID, len
pRsnIe->rsnIEdata[ idx + 1 ] );
}
@@ -1347,7 +1347,7 @@
pDot11f->num_ssid = pInternal->length;
if ( pInternal->length )
{
- palCopyMemory( pMac->hHdd, ( tANI_U8* )pDot11f->ssid, ( tANI_U8* )&pInternal->ssId,
+ vos_mem_copy( ( tANI_U8* )pDot11f->ssid, ( tANI_U8* )&pInternal->ssId,
pInternal->length );
}
} // End PopulateDot11fSSID.
@@ -1431,7 +1431,7 @@
if(psessionEntry != NULL)
{
nRates = psessionEntry->rateSet.numRates;
- palCopyMemory(pMac->hHdd, rates, psessionEntry->rateSet.rate,
+ vos_mem_copy( rates, psessionEntry->rateSet.rate,
nRates);
}
else
@@ -1454,7 +1454,7 @@
if ( 0 != nRates )
{
pDot11f->num_rates = ( tANI_U8 )nRates;
- palCopyMemory( pMac->hHdd, pDot11f->rates, rates, nRates );
+ vos_mem_copy( pDot11f->rates, rates, nRates );
pDot11f->present = 1;
}
@@ -1719,7 +1719,7 @@
{
pDot11f->present = 1;
pDot11f->num_data = pRsnIe->rsnIEdata[ idx + 1 ] - 4;
- palCopyMemory( pMac->hHdd, pDot11f->data,
+ vos_mem_copy( pDot11f->data,
pRsnIe->rsnIEdata + idx + 2 + 4, // EID, len, OUI
pRsnIe->rsnIEdata[ idx + 1 ] - 4 ); // OUI
}
@@ -1765,7 +1765,7 @@
tDot11fProbeRequest pr;
// Ok, zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, (tANI_U8*)pProbeReq, sizeof(tSirProbeReq));
+ vos_mem_set( (tANI_U8*)pProbeReq, sizeof(tSirProbeReq), 0);
// delegate to the framesc-generated code,
status = dot11fUnpackProbeRequest(pMac, pFrame, nFrame, &pr);
@@ -1813,7 +1813,7 @@
if ( pr.HTCaps.present )
{
- palCopyMemory( pMac, &pProbeReq->HTCaps, &pr.HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pProbeReq->HTCaps, &pr.HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( pr.WscProbeReq.present )
@@ -1824,7 +1824,7 @@
#ifdef WLAN_FEATURE_11AC
if ( pr.VHTCaps.present )
{
- palCopyMemory( pMac, &pProbeReq->VHTCaps, &pr.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ vos_mem_copy( &pProbeReq->VHTCaps, &pr.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
#endif
@@ -1847,16 +1847,20 @@
tDot11fProbeResponse *pr;
// Ok, zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pProbeResp, sizeof(tSirProbeRespBeacon) );
+ vos_mem_set( ( tANI_U8* )pProbeResp, sizeof(tSirProbeRespBeacon), 0 );
- status = palAllocateMemory(pMac->hHdd, (void **)&pr, sizeof(tDot11fProbeResponse));
- if(!HAL_STATUS_SUCCESS(status))
+ pr = vos_mem_malloc(sizeof(tDot11fProbeResponse));
+ if ( NULL == pr )
+ status = eHAL_STATUS_FAILURE;
+ else
+ status = eHAL_STATUS_SUCCESS;
+ if (!HAL_STATUS_SUCCESS(status))
{
limLog(pMac, LOGE, FL("Failed to allocate memory\n") );
return eSIR_FAILURE;
}
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pr, sizeof(tDot11fProbeResponse) );
+ vos_mem_set( ( tANI_U8* )pr, sizeof(tDot11fProbeResponse), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackProbeResponse( pMac, pFrame, nFrame, pr );
@@ -1865,7 +1869,7 @@
limLog(pMac, LOGE, FL("Failed to parse a Probe Response (0x%08x, %d bytes):\n"),
status, nFrame);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);)
- palFreeMemory(pMac->hHdd, pr);
+ vos_mem_free(pr);
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
@@ -1878,7 +1882,8 @@
// & "transliterate" from a 'tDot11fProbeResponse' to a 'tSirProbeRespBeacon'...
// Timestamp
- palCopyMemory( pMac->hHdd, ( tANI_U8* )pProbeResp->timeStamp, ( tANI_U8* )&pr->TimeStamp, sizeof(tSirMacTimeStamp) );
+ vos_mem_copy( ( tANI_U8* )pProbeResp->timeStamp, ( tANI_U8* )&pr->TimeStamp,
+ sizeof(tSirMacTimeStamp) );
// Beacon Interval
pProbeResp->beaconInterval = pr->BeaconInterval.interval;
@@ -1949,43 +1954,44 @@
if ( pr->ChanSwitchAnn.present )
{
pProbeResp->channelSwitchPresent = 1;
- palCopyMemory( pMac, &pProbeResp->channelSwitchIE, &pr->ChanSwitchAnn,
+ vos_mem_copy( &pProbeResp->channelSwitchIE, &pr->ChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn) );
}
if ( pr->ExtChanSwitchAnn.present )
{
pProbeResp->extChannelSwitchPresent = 1;
- palCopyMemory( pMac, &pProbeResp->extChannelSwitchIE, &pr->ExtChanSwitchAnn,
+ vos_mem_copy ( &pProbeResp->extChannelSwitchIE, &pr->ExtChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn) );
}
if( pr->TPCReport.present)
{
pProbeResp->tpcReportPresent = 1;
- palCopyMemory(pMac->hHdd, &pProbeResp->tpcReport, &pr->TPCReport, sizeof(tDot11fIETPCReport));
+ vos_mem_copy( &pProbeResp->tpcReport, &pr->TPCReport, sizeof(tDot11fIETPCReport));
}
if( pr->PowerConstraints.present)
{
pProbeResp->powerConstraintPresent = 1;
- palCopyMemory(pMac->hHdd, &pProbeResp->localPowerConstraint, &pr->PowerConstraints, sizeof(tDot11fIEPowerConstraints));
+ vos_mem_copy( &pProbeResp->localPowerConstraint, &pr->PowerConstraints,
+ sizeof(tDot11fIEPowerConstraints));
}
if ( pr->Quiet.present )
{
pProbeResp->quietIEPresent = 1;
- palCopyMemory( pMac, &pProbeResp->quietIE, &pr->Quiet, sizeof(tDot11fIEQuiet) );
+ vos_mem_copy( &pProbeResp->quietIE, &pr->Quiet, sizeof(tDot11fIEQuiet) );
}
if ( pr->HTCaps.present )
{
- palCopyMemory( pMac, &pProbeResp->HTCaps, &pr->HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pProbeResp->HTCaps, &pr->HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( pr->HTInfo.present )
{
- palCopyMemory( pMac, &pProbeResp->HTInfo, &pr->HTInfo, sizeof( tDot11fIEHTInfo ) );
+ vos_mem_copy( &pProbeResp->HTInfo, &pr->HTInfo, sizeof( tDot11fIEHTInfo ) );
}
if ( pr->DSParams.present )
@@ -2041,7 +2047,8 @@
{
// MobilityDomain
pProbeResp->mdiePresent = 1;
- palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pProbeResp->mdie[0]), (tANI_U8 *)&(pr->MobilityDomain.MDID), sizeof(tANI_U16) );
+ vos_mem_copy( (tANI_U8 *)&(pProbeResp->mdie[0]), (tANI_U8 *)&(pr->MobilityDomain.MDID),
+ sizeof(tANI_U16) );
pProbeResp->mdie[2] = ((pr->MobilityDomain.overDSCap << 0) | (pr->MobilityDomain.resourceReqCap << 1));
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
limLog(pMac, LOG2, FL("mdie=%02x%02x%02x\n"), (unsigned int)pProbeResp->mdie[0],
@@ -2053,29 +2060,29 @@
#if defined FEATURE_WLAN_CCX
if (pr->QBSSLoad.present)
{
- palCopyMemory(pMac->hHdd, &pProbeResp->QBSSLoad, &pr->QBSSLoad, sizeof(tDot11fIEQBSSLoad));
+ vos_mem_copy(&pProbeResp->QBSSLoad, &pr->QBSSLoad, sizeof(tDot11fIEQBSSLoad));
}
#endif
if (pr->P2PProbeRes.present)
{
- palCopyMemory( pMac, &pProbeResp->P2PProbeRes, &pr->P2PProbeRes,
+ vos_mem_copy( &pProbeResp->P2PProbeRes, &pr->P2PProbeRes,
sizeof(tDot11fIEP2PProbeRes) );
}
#ifdef WLAN_FEATURE_11AC
if ( pr->VHTCaps.present )
{
- palCopyMemory( pMac, &pProbeResp->VHTCaps, &pr->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ vos_mem_copy( &pProbeResp->VHTCaps, &pr->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
if ( pr->VHTOperation.present )
{
- palCopyMemory( pMac, &pProbeResp->VHTOperation, &pr->VHTOperation, sizeof( tDot11fIEVHTOperation) );
+ vos_mem_copy( &pProbeResp->VHTOperation, &pr->VHTOperation, sizeof( tDot11fIEVHTOperation) );
}
if ( pr->VHTExtBssLoad.present )
{
- palCopyMemory( pMac, &pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
+ vos_mem_copy( &pProbeResp->VHTExtBssLoad, &pr->VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
}
#endif
- palFreeMemory(pMac->hHdd, pr);
+ vos_mem_free(pr);
return eSIR_SUCCESS;
} // End sirConvertProbeFrame2Struct.
@@ -2089,15 +2096,19 @@
tDot11fAssocRequest *ar;
tANI_U32 status;
- status = palAllocateMemory(pMac->hHdd, (void **)&ar, sizeof(tDot11fAssocRequest));
- if(!HAL_STATUS_SUCCESS(status))
+ ar = vos_mem_malloc(sizeof(tDot11fAssocRequest));
+ if ( NULL == ar )
+ status = eHAL_STATUS_FAILURE;
+ else
+ status = eHAL_STATUS_SUCCESS;
+ if (!HAL_STATUS_SUCCESS(status))
{
limLog(pMac, LOGE, FL("Failed to allocate memory\n") );
return eSIR_FAILURE;
}
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pAssocReq, sizeof(tSirAssocReq) );
- palZeroMemory( pMac->hHdd, ( tANI_U8* )ar, sizeof( tDot11fAssocRequest ) );
+ vos_mem_set( ( tANI_U8* )pAssocReq, sizeof(tSirAssocReq), 0 );
+ vos_mem_set( ( tANI_U8* )ar, sizeof( tDot11fAssocRequest ), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackAssocRequest( pMac, pFrame, nFrame, ar );
@@ -2106,7 +2117,7 @@
limLog(pMac, LOGE, FL("Failed to parse an Association Request (0x%08x, %d bytes):\n"),
status, nFrame);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pFrame, nFrame);)
- palFreeMemory(pMac->hHdd, ar);
+ vos_mem_free(ar);
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
@@ -2221,13 +2232,14 @@
if ( ar->HTCaps.present )
{
- palCopyMemory( pMac, &pAssocReq->HTCaps, &ar->HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pAssocReq->HTCaps, &ar->HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( ar->WMMInfoStation.present )
{
pAssocReq->wmeInfoPresent = 1;
- palCopyMemory( pMac, &pAssocReq->WMMInfoStation, &ar->WMMInfoStation, sizeof( tDot11fIEWMMInfoStation ) );
+ vos_mem_copy( &pAssocReq->WMMInfoStation, &ar->WMMInfoStation,
+ sizeof( tDot11fIEWMMInfoStation ) );
}
@@ -2237,32 +2249,32 @@
if ( ! pAssocReq->ssidPresent )
{
PELOG2(limLog(pMac, LOG2, FL("Received Assoc without SSID IE.\n"));)
- palFreeMemory(pMac->hHdd, ar);
+ vos_mem_free(ar);
return eSIR_FAILURE;
}
if ( !pAssocReq->suppRatesPresent && !pAssocReq->extendedRatesPresent )
{
PELOG2(limLog(pMac, LOG2, FL("Received Assoc without supp rate IE.\n"));)
- palFreeMemory(pMac->hHdd, ar);
+ vos_mem_free(ar);
return eSIR_FAILURE;
}
#ifdef WLAN_FEATURE_11AC
if ( ar->VHTCaps.present )
{
- palCopyMemory( pMac, &pAssocReq->VHTCaps, &ar->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ vos_mem_copy( &pAssocReq->VHTCaps, &ar->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
limLog( pMac, LOGW, FL("Received Assoc Req with VHT Cap\n"));
limLogVHTCap( pMac, &pAssocReq->VHTCaps);
}
if ( ar->OperatingMode.present )
{
- palCopyMemory( pMac, &pAssocReq->operMode, &ar->OperatingMode, sizeof (tDot11fIEOperatingMode));
+ vos_mem_copy( &pAssocReq->operMode, &ar->OperatingMode, sizeof (tDot11fIEOperatingMode));
limLog( pMac, LOGW, FL("Received Assoc Req with Operating Mode IE\n"));
limLogOperatingMode( pMac, &pAssocReq->operMode);
}
#endif
- palFreeMemory(pMac->hHdd, ar);
+ vos_mem_free(ar);
return eSIR_SUCCESS;
} // End sirConvertAssocReqFrame2Struct.
@@ -2278,7 +2290,7 @@
tANI_U8 cnt =0;
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pAssocRsp, sizeof(tSirAssocRsp) );
+ vos_mem_set( ( tANI_U8* )pAssocRsp, sizeof(tSirAssocRsp), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackAssocResponse( pMac, pFrame, nFrame, &ar);
@@ -2353,12 +2365,12 @@
if ( ar.HTCaps.present )
{
- palCopyMemory( pMac, &pAssocRsp->HTCaps, &ar.HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pAssocRsp->HTCaps, &ar.HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( ar.HTInfo.present )
{
- palCopyMemory( pMac, &pAssocRsp->HTInfo, &ar.HTInfo, sizeof( tDot11fIEHTInfo ) );
+ vos_mem_copy( &pAssocRsp->HTInfo, &ar.HTInfo, sizeof( tDot11fIEHTInfo ) );
}
#ifdef WLAN_FEATURE_VOWIFI_11R
@@ -2366,7 +2378,8 @@
{
// MobilityDomain
pAssocRsp->mdiePresent = 1;
- palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pAssocRsp->mdie[0]), (tANI_U8 *)&(ar.MobilityDomain.MDID), sizeof(tANI_U16) );
+ vos_mem_copy( (tANI_U8 *)&(pAssocRsp->mdie[0]), (tANI_U8 *)&(ar.MobilityDomain.MDID),
+ sizeof(tANI_U16) );
pAssocRsp->mdie[2] = ((ar.MobilityDomain.overDSCap << 0) | (ar.MobilityDomain.resourceReqCap << 1));
#ifdef WLAN_FEATURE_VOWIFI_11R_DEBUG
limLog(pMac, LOG1, FL("new mdie=%02x%02x%02x"), (unsigned int)pAssocRsp->mdie[0],
@@ -2382,7 +2395,7 @@
ar.FTInfo.R1KH_ID.present);
#endif
pAssocRsp->ftinfoPresent = 1;
- palCopyMemory( pMac, &pAssocRsp->FTInfo, &ar.FTInfo, sizeof(tDot11fIEFTInfo) );
+ vos_mem_copy( &pAssocRsp->FTInfo, &ar.FTInfo, sizeof(tDot11fIEFTInfo) );
}
#endif
@@ -2390,7 +2403,8 @@
if (ar.num_RICDataDesc) {
for (cnt=0; cnt < ar.num_RICDataDesc; cnt++) {
if (ar.RICDataDesc[cnt].present) {
- palCopyMemory(pMac, &pAssocRsp->RICData[cnt], &ar.RICDataDesc[cnt], sizeof(tDot11fIERICDataDesc));
+ vos_mem_copy( &pAssocRsp->RICData[cnt], &ar.RICDataDesc[cnt],
+ sizeof(tDot11fIERICDataDesc));
}
}
pAssocRsp->num_RICData = ar.num_RICDataDesc;
@@ -2402,7 +2416,8 @@
if (ar.num_WMMTSPEC) {
pAssocRsp->num_tspecs = ar.num_WMMTSPEC;
for (cnt=0; cnt < ar.num_WMMTSPEC; cnt++) {
- palCopyMemory(pMac, &pAssocRsp->TSPECInfo[cnt], &ar.WMMTSPEC[cnt], (sizeof(tDot11fIEWMMTSPEC)*ar.num_WMMTSPEC));
+ vos_mem_copy( &pAssocRsp->TSPECInfo[cnt], &ar.WMMTSPEC[cnt],
+ (sizeof(tDot11fIEWMMTSPEC)*ar.num_WMMTSPEC));
}
pAssocRsp->tspecPresent = TRUE;
}
@@ -2410,7 +2425,7 @@
if(ar.CCXTrafStrmMet.present)
{
pAssocRsp->tsmPresent = 1;
- palCopyMemory(pMac->hHdd,&pAssocRsp->tsmIE.tsid,
+ vos_mem_copy(&pAssocRsp->tsmIE.tsid,
&ar.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE));
}
#endif
@@ -2418,13 +2433,13 @@
#ifdef WLAN_FEATURE_11AC
if ( ar.VHTCaps.present )
{
- palCopyMemory( pMac, &pAssocRsp->VHTCaps, &ar.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ vos_mem_copy( &pAssocRsp->VHTCaps, &ar.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
limLog( pMac, LOG1, FL("Received Assoc Response with VHT Cap"));
limLogVHTCap(pMac, &pAssocRsp->VHTCaps);
}
if ( ar.VHTOperation.present )
{
- palCopyMemory( pMac, &pAssocRsp->VHTOperation, &ar.VHTOperation, sizeof( tDot11fIEVHTOperation) );
+ vos_mem_copy( &pAssocRsp->VHTOperation, &ar.VHTOperation, sizeof( tDot11fIEVHTOperation) );
limLog( pMac, LOG1, FL("Received Assoc Response with VHT Operation"));
limLogVHTOperation(pMac, &pAssocRsp->VHTOperation);
}
@@ -2444,7 +2459,7 @@
tANI_U32 status;
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pAssocReq, sizeof(tSirAssocReq) );
+ vos_mem_set( ( tANI_U8* )pAssocReq, sizeof(tSirAssocReq), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackReAssocRequest( pMac, pFrame, nFrame, &ar );
@@ -2548,13 +2563,14 @@
if ( ar.HTCaps.present )
{
- palCopyMemory( pMac, &pAssocReq->HTCaps, &ar.HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pAssocReq->HTCaps, &ar.HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( ar.WMMInfoStation.present )
{
pAssocReq->wmeInfoPresent = 1;
- palCopyMemory( pMac, &pAssocReq->WMMInfoStation, &ar.WMMInfoStation, sizeof( tDot11fIEWMMInfoStation ) );
+ vos_mem_copy( &pAssocReq->WMMInfoStation, &ar.WMMInfoStation,
+ sizeof( tDot11fIEWMMInfoStation ) );
}
@@ -2599,11 +2615,11 @@
#ifdef WLAN_FEATURE_11AC
if ( ar.VHTCaps.present )
{
- palCopyMemory( pMac, &pAssocReq->VHTCaps, &ar.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ vos_mem_copy( &pAssocReq->VHTCaps, &ar.VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
if ( ar.OperatingMode.present )
{
- palCopyMemory( pMac, &pAssocReq->operMode, &ar.OperatingMode, sizeof( tDot11fIEOperatingMode ) );
+ vos_mem_copy( &pAssocReq->operMode, &ar.OperatingMode, sizeof( tDot11fIEOperatingMode ) );
limLog( pMac, LOGW, FL("Received Assoc Req with Operating Mode IE\n"));
limLogOperatingMode( pMac, &pAssocReq->operMode);
}
@@ -2622,10 +2638,14 @@
tANI_U32 status;
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pBeaconStruct, sizeof(tSirProbeRespBeacon) );
+ vos_mem_set( ( tANI_U8* )pBeaconStruct, sizeof(tSirProbeRespBeacon), 0 );
- status = palAllocateMemory(pMac->hHdd, (void **)&pBies, sizeof(tDot11fBeaconIEs));
- if(!HAL_STATUS_SUCCESS(status))
+ pBies = vos_mem_malloc(sizeof(tDot11fBeaconIEs));
+ if ( NULL == pBies )
+ status = eHAL_STATUS_FAILURE;
+ else
+ status = eHAL_STATUS_SUCCESS;
+ if (!HAL_STATUS_SUCCESS(status))
{
limLog(pMac, LOGE, FL("Failed to allocate memory\n") );
return eSIR_FAILURE;
@@ -2638,7 +2658,7 @@
limLog(pMac, LOGE, FL("Failed to parse Beacon IEs (0x%08x, %d bytes):\n"),
status, nPayload);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);)
- palFreeMemory(pMac->hHdd, pBies);
+ vos_mem_free(pBies);
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
@@ -2697,8 +2717,7 @@
if(pBies->TPCReport.present)
{
pBeaconStruct->tpcReportPresent = 1;
- palCopyMemory(pMac,
- &pBeaconStruct->tpcReport,
+ vos_mem_copy( &pBeaconStruct->tpcReport,
&pBies->TPCReport,
sizeof( tDot11fIETPCReport));
}
@@ -2706,8 +2725,7 @@
if(pBies->PowerConstraints.present)
{
pBeaconStruct->powerConstraintPresent = 1;
- palCopyMemory(pMac,
- &pBeaconStruct->localPowerConstraint,
+ vos_mem_copy( &pBeaconStruct->localPowerConstraint,
&pBies->PowerConstraints,
sizeof(tDot11fIEPowerConstraints));
}
@@ -2719,7 +2737,7 @@
}
if (pBies->QBSSLoad.present)
{
- palCopyMemory(pMac->hHdd, &pBeaconStruct->QBSSLoad, &pBies->QBSSLoad, sizeof(tDot11fIEQBSSLoad));
+ vos_mem_copy( &pBeaconStruct->QBSSLoad, &pBies->QBSSLoad, sizeof(tDot11fIEQBSSLoad));
}
#endif
@@ -2741,31 +2759,31 @@
if ( pBies->ChanSwitchAnn.present )
{
pBeaconStruct->channelSwitchPresent = 1;
- palCopyMemory(pMac->hHdd, &pBeaconStruct->channelSwitchIE, &pBies->ChanSwitchAnn,
+ vos_mem_copy( &pBeaconStruct->channelSwitchIE, &pBies->ChanSwitchAnn,
sizeof(tDot11fIEChanSwitchAnn));
}
if ( pBies->ExtChanSwitchAnn.present)
{
pBeaconStruct->extChannelSwitchPresent= 1;
- palCopyMemory(pMac->hHdd, &pBeaconStruct->extChannelSwitchIE, &pBies->ExtChanSwitchAnn,
+ vos_mem_copy( &pBeaconStruct->extChannelSwitchIE, &pBies->ExtChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn));
}
if ( pBies->Quiet.present )
{
pBeaconStruct->quietIEPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->quietIE, &pBies->Quiet, sizeof(tDot11fIEQuiet) );
+ vos_mem_copy( &pBeaconStruct->quietIE, &pBies->Quiet, sizeof(tDot11fIEQuiet) );
}
if ( pBies->HTCaps.present )
{
- palCopyMemory( pMac, &pBeaconStruct->HTCaps, &pBies->HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pBeaconStruct->HTCaps, &pBies->HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( pBies->HTInfo.present )
{
- palCopyMemory( pMac, &pBeaconStruct->HTInfo, &pBies->HTInfo, sizeof( tDot11fIEHTInfo ) );
+ vos_mem_copy( &pBeaconStruct->HTInfo, &pBies->HTInfo, sizeof( tDot11fIEHTInfo ) );
}
if ( pBies->DSParams.present )
@@ -2816,27 +2834,30 @@
#ifdef WLAN_FEATURE_11AC
if ( pBies->VHTCaps.present )
{
- pBeaconStruct->VHTCaps.present = 1;
- palCopyMemory( pMac, &pBeaconStruct->VHTCaps, &pBies->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ pBeaconStruct->VHTCaps.present = 1;
+ vos_mem_copy( &pBeaconStruct->VHTCaps, &pBies->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
if ( pBies->VHTOperation.present )
{
pBeaconStruct->VHTOperation.present = 1;
- palCopyMemory( pMac, &pBeaconStruct->VHTOperation, &pBies->VHTOperation, sizeof( tDot11fIEVHTOperation) );
+ vos_mem_copy( &pBeaconStruct->VHTOperation, &pBies->VHTOperation,
+ sizeof( tDot11fIEVHTOperation) );
}
if ( pBies->VHTExtBssLoad.present )
{
pBeaconStruct->VHTExtBssLoad.present = 1;
- palCopyMemory( pMac, &pBeaconStruct->VHTExtBssLoad, &pBies->VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
+ vos_mem_copy( &pBeaconStruct->VHTExtBssLoad, &pBies->VHTExtBssLoad,
+ sizeof( tDot11fIEVHTExtBssLoad) );
}
if( pBies->OperatingMode.present)
{
pBeaconStruct->OperatingMode.present = 1;
- palCopyMemory( pMac, &pBeaconStruct->OperatingMode, &pBies->OperatingMode, sizeof( tDot11fIEOperatingMode) );
+ vos_mem_copy( &pBeaconStruct->OperatingMode, &pBies->OperatingMode,
+ sizeof( tDot11fIEOperatingMode) );
}
#endif
- palFreeMemory(pMac->hHdd, pBies);
+ vos_mem_free(pBies);
return eSIR_SUCCESS;
@@ -2862,19 +2883,23 @@
rfBand = WDA_GET_RX_RFBAND( pFrame );
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pBeaconStruct, sizeof(tSirProbeRespBeacon) );
-
- status = palAllocateMemory(pMac->hHdd, (void **)&pBeacon, sizeof(tDot11fBeacon));
- if(!HAL_STATUS_SUCCESS(status))
+ vos_mem_set( ( tANI_U8* )pBeaconStruct, sizeof(tSirProbeRespBeacon), 0 );
+
+ pBeacon = vos_mem_malloc(sizeof(tDot11fBeacon));
+ if ( NULL == pBeacon )
+ status = eHAL_STATUS_FAILURE;
+ else
+ status = eHAL_STATUS_SUCCESS;
+ if (!HAL_STATUS_SUCCESS(status))
{
limLog(pMac, LOGE, FL("Failed to allocate memory\n") );
return eSIR_FAILURE;
}
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pBeacon, sizeof(tDot11fBeacon) );
+ vos_mem_set( ( tANI_U8* )pBeacon, sizeof(tDot11fBeacon), 0 );
// get the MAC address out of the BD,
- palCopyMemory( pMac->hHdd, pBeaconStruct->bssid, pHdr->sa, 6 );
+ vos_mem_copy( pBeaconStruct->bssid, pHdr->sa, 6 );
// delegate to the framesc-generated code,
status = dot11fUnpackBeacon( pMac, pPayload, nPayload, pBeacon );
@@ -2883,7 +2908,7 @@
limLog(pMac, LOGE, FL("Failed to parse Beacon IEs (0x%08x, %d bytes):\n"),
status, nPayload);
PELOG2(sirDumpBuf(pMac, SIR_DBG_MODULE_ID, LOG2, pPayload, nPayload);)
- palFreeMemory(pMac->hHdd, pBeacon);
+ vos_mem_free(pBeacon);
return eSIR_FAILURE;
}
else if ( DOT11F_WARNED( status ) )
@@ -2895,7 +2920,8 @@
// & "transliterate" from a 'tDot11fBeacon' to a 'tSirProbeRespBeacon'...
// Timestamp
- palCopyMemory( pMac->hHdd, ( tANI_U8* )pBeaconStruct->timeStamp, ( tANI_U8* )&pBeacon->TimeStamp, sizeof(tSirMacTimeStamp) );
+ vos_mem_copy( ( tANI_U8* )pBeaconStruct->timeStamp, ( tANI_U8* )&pBeacon->TimeStamp,
+ sizeof(tSirMacTimeStamp) );
// Beacon Interval
pBeaconStruct->beaconInterval = pBeacon->BeaconInterval.interval;
@@ -2979,45 +3005,45 @@
if ( pBeacon->ChanSwitchAnn.present )
{
pBeaconStruct->channelSwitchPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->channelSwitchIE, &pBeacon->ChanSwitchAnn,
+ vos_mem_copy( &pBeaconStruct->channelSwitchIE, &pBeacon->ChanSwitchAnn,
sizeof(tDot11fIEChanSwitchAnn) );
}
if ( pBeacon->ExtChanSwitchAnn.present )
{
pBeaconStruct->extChannelSwitchPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->extChannelSwitchIE, &pBeacon->ExtChanSwitchAnn,
+ vos_mem_copy( &pBeaconStruct->extChannelSwitchIE, &pBeacon->ExtChanSwitchAnn,
sizeof(tDot11fIEExtChanSwitchAnn) );
}
if( pBeacon->TPCReport.present)
{
pBeaconStruct->tpcReportPresent = 1;
- palCopyMemory(pMac->hHdd, &pBeaconStruct->tpcReport, &pBeacon->TPCReport,
+ vos_mem_copy( &pBeaconStruct->tpcReport, &pBeacon->TPCReport,
sizeof(tDot11fIETPCReport));
}
if( pBeacon->PowerConstraints.present)
{
pBeaconStruct->powerConstraintPresent = 1;
- palCopyMemory(pMac->hHdd, &pBeaconStruct->localPowerConstraint, &pBeacon->PowerConstraints,
+ vos_mem_copy( &pBeaconStruct->localPowerConstraint, &pBeacon->PowerConstraints,
sizeof(tDot11fIEPowerConstraints));
}
if ( pBeacon->Quiet.present )
{
pBeaconStruct->quietIEPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->quietIE, &pBeacon->Quiet, sizeof(tDot11fIEQuiet));
+ vos_mem_copy( &pBeaconStruct->quietIE, &pBeacon->Quiet, sizeof(tDot11fIEQuiet));
}
if ( pBeacon->HTCaps.present )
{
- palCopyMemory( pMac, &pBeaconStruct->HTCaps, &pBeacon->HTCaps, sizeof( tDot11fIEHTCaps ) );
+ vos_mem_copy( &pBeaconStruct->HTCaps, &pBeacon->HTCaps, sizeof( tDot11fIEHTCaps ) );
}
if ( pBeacon->HTInfo.present )
{
- palCopyMemory( pMac, &pBeaconStruct->HTInfo, &pBeacon->HTInfo, sizeof( tDot11fIEHTInfo) );
+ vos_mem_copy( &pBeaconStruct->HTInfo, &pBeacon->HTInfo, sizeof( tDot11fIEHTInfo) );
}
@@ -3091,7 +3117,8 @@
{
// MobilityDomain
pBeaconStruct->mdiePresent = 1;
- palCopyMemory( pMac->hHdd, (tANI_U8 *)&(pBeaconStruct->mdie[0]), (tANI_U8 *)&(pBeacon->MobilityDomain.MDID), sizeof(tANI_U16) );
+ vos_mem_copy( (tANI_U8 *)&(pBeaconStruct->mdie[0]),
+ (tANI_U8 *)&(pBeacon->MobilityDomain.MDID), sizeof(tANI_U16) );
pBeaconStruct->mdie[2] = ((pBeacon->MobilityDomain.overDSCap << 0) | (pBeacon->MobilityDomain.resourceReqCap << 1));
}
@@ -3100,28 +3127,32 @@
#ifdef WLAN_FEATURE_11AC
if ( pBeacon->VHTCaps.present )
{
- palCopyMemory( pMac, &pBeaconStruct->VHTCaps, &pBeacon->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
+ vos_mem_copy( &pBeaconStruct->VHTCaps, &pBeacon->VHTCaps, sizeof( tDot11fIEVHTCaps ) );
}
if ( pBeacon->VHTOperation.present )
{
- palCopyMemory( pMac, &pBeaconStruct->VHTOperation, &pBeacon->VHTOperation, sizeof( tDot11fIEVHTOperation) );
+ vos_mem_copy( &pBeaconStruct->VHTOperation, &pBeacon->VHTOperation,
+ sizeof( tDot11fIEVHTOperation) );
}
if ( pBeacon->VHTExtBssLoad.present )
{
- palCopyMemory( pMac, &pBeaconStruct->VHTExtBssLoad, &pBeacon->VHTExtBssLoad, sizeof( tDot11fIEVHTExtBssLoad) );
+ vos_mem_copy( &pBeaconStruct->VHTExtBssLoad, &pBeacon->VHTExtBssLoad,
+ sizeof( tDot11fIEVHTExtBssLoad) );
}
if(pBeacon->OperatingMode.present)
{
- palCopyMemory( pMac, &pBeaconStruct->OperatingMode, &pBeacon->OperatingMode, sizeof( tDot11fIEOperatingMode) );
+ vos_mem_copy( &pBeaconStruct->OperatingMode, &pBeacon->OperatingMode,
+ sizeof( tDot11fIEOperatingMode) );
}
if(pBeacon->WiderBWChanSwitchAnn.present)
{
pBeaconStruct->WiderBWChanSwitchAnnPresent = 1;
- palCopyMemory( pMac, &pBeaconStruct->WiderBWChanSwitchAnn, &pBeacon->WiderBWChanSwitchAnn, sizeof( tDot11fIEWiderBWChanSwitchAnn));
+ vos_mem_copy( &pBeaconStruct->WiderBWChanSwitchAnn, &pBeacon->WiderBWChanSwitchAnn,
+ sizeof( tDot11fIEWiderBWChanSwitchAnn));
}
#endif
- palFreeMemory(pMac->hHdd, pBeacon);
+ vos_mem_free(pBeacon);
return eSIR_SUCCESS;
} // End sirConvertBeaconFrame2Struct.
@@ -3136,7 +3167,7 @@
tANI_U32 status;
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pAuth, sizeof(tSirMacAuthFrameBody) );
+ vos_mem_set( ( tANI_U8* )pAuth, sizeof(tSirMacAuthFrameBody), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackAuthentication( pMac, pFrame, nFrame, &auth );
@@ -3163,7 +3194,7 @@
{
pAuth->type = SIR_MAC_CHALLENGE_TEXT_EID;
pAuth->length = auth.ChallengeText.num_text;
- palCopyMemory( pMac->hHdd, pAuth->challengeText, auth.ChallengeText.text, auth.ChallengeText.num_text );
+ vos_mem_copy( pAuth->challengeText, auth.ChallengeText.text, auth.ChallengeText.num_text );
}
return eSIR_SUCCESS;
@@ -3192,7 +3223,7 @@
}
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pAddTs, sizeof(tSirAddtsReqInfo) );
+ vos_mem_set( ( tANI_U8* )pAddTs, sizeof(tSirAddtsReqInfo), 0 );
// delegate to the framesc-generated code,
switch ( *pFrame )
@@ -3340,9 +3371,9 @@
}
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pAddTs, sizeof(tSirAddtsRspInfo) );
- palZeroMemory( pMac->hHdd, ( tANI_U8* )&addts, sizeof(tDot11fAddTSResponse) );
- palZeroMemory( pMac->hHdd, ( tANI_U8* )&wmmaddts, sizeof(tDot11fWMMAddTSResponse) );
+ vos_mem_set( ( tANI_U8* )pAddTs, sizeof(tSirAddtsRspInfo), 0 );
+ vos_mem_set( ( tANI_U8* )&addts, sizeof(tDot11fAddTSResponse), 0 );
+ vos_mem_set( ( tANI_U8* )&wmmaddts, sizeof(tDot11fWMMAddTSResponse), 0 );
// delegate to the framesc-generated code,
@@ -3430,7 +3461,7 @@
if(addts.CCXTrafStrmMet.present)
{
pAddTs->tsmPresent = 1;
- palCopyMemory(pMac->hHdd,&pAddTs->tsmIE.tsid,
+ vos_mem_copy(&pAddTs->tsmIE.tsid,
&addts.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE));
}
#endif
@@ -3500,7 +3531,7 @@
if(wmmaddts.CCXTrafStrmMet.present)
{
pAddTs->tsmPresent = 1;
- palCopyMemory(pMac->hHdd,&pAddTs->tsmIE.tsid,
+ vos_mem_copy(&pAddTs->tsmIE.tsid,
&wmmaddts.CCXTrafStrmMet.tsid,sizeof(tSirMacCCXTSMIE));
}
#endif
@@ -3531,7 +3562,7 @@
}
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pDelTs, sizeof(tSirDeltsReqInfo) );
+ vos_mem_set( ( tANI_U8* )pDelTs, sizeof(tSirDeltsReqInfo), 0 );
// delegate to the framesc-generated code,
switch ( *pFrame )
@@ -3612,7 +3643,7 @@
tANI_U32 status;
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pTpcReqFrame, sizeof(tSirMacTpcReqActionFrame) );
+ vos_mem_set( ( tANI_U8* )pTpcReqFrame, sizeof(tSirMacTpcReqActionFrame), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackTPCRequest( pMac, pFrame, nFrame, &req );
@@ -3661,7 +3692,7 @@
tANI_U32 status;
// Zero-init our [out] parameter,
- palZeroMemory( pMac->hHdd, ( tANI_U8* )pMeasReqFrame, sizeof(tpSirMacMeasReqActionFrame) );
+ vos_mem_set( ( tANI_U8* )pMeasReqFrame, sizeof(tpSirMacMeasReqActionFrame), 0 );
// delegate to the framesc-generated code,
status = dot11fUnpackMeasurementRequest( pMac, pFrame, nFrame, &mr );
@@ -3706,7 +3737,7 @@
pMeasReqFrame->measReqIE.measReqField.channelNumber = mr.MeasurementRequest[0].channel_no;
- palCopyMemory( pMac->hHdd, pMeasReqFrame->measReqIE.measReqField.measStartTime,
+ vos_mem_copy( pMeasReqFrame->measReqIE.measReqField.measStartTime,
mr.MeasurementRequest[0].meas_start_time, 8 );
pMeasReqFrame->measReqIE.measReqField.measDuration = mr.MeasurementRequest[0].meas_duration;
@@ -3799,7 +3830,7 @@
tANI_U8 rate_length)
{
pDot11f->tsid = pOld->tsid;
- palCopyMemory(pMac->hHdd,pDot11f->tsrates, pOld->rates,rate_length);
+ vos_mem_copy(pDot11f->tsrates, pOld->rates,rate_length);
pDot11f->num_tsrates = rate_length;
pDot11f->present = 1;
}
@@ -3818,22 +3849,22 @@
switch ( pDot11f->classifier_type )
{
case SIR_MAC_TCLASTYPE_ETHERNET:
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.EthParams.source,
- ( tANI_U8* )&pOld->tclasParams.eth.srcAddr, 6 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.EthParams.dest,
- ( tANI_U8* )&pOld->tclasParams.eth.dstAddr, 6 );
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.EthParams.source,
+ ( tANI_U8* )&pOld->tclasParams.eth.srcAddr, 6 );
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.EthParams.dest,
+ ( tANI_U8* )&pOld->tclasParams.eth.dstAddr, 6 );
pDot11f->info.EthParams.type = pOld->tclasParams.eth.type;
break;
case SIR_MAC_TCLASTYPE_TCPUDPIP:
pDot11f->info.IpParams.version = pOld->version;
if ( SIR_MAC_TCLAS_IPV4 == pDot11f->info.IpParams.version )
{
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
- IpV4Params.source,
- ( tANI_U8* )pOld->tclasParams.ipv4.srcIpAddr, 4 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
- IpV4Params.dest,
- ( tANI_U8* )pOld->tclasParams.ipv4.dstIpAddr, 4 );
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
+ IpV4Params.source,
+ ( tANI_U8* )pOld->tclasParams.ipv4.srcIpAddr, 4 );
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
+ IpV4Params.dest,
+ ( tANI_U8* )pOld->tclasParams.ipv4.dstIpAddr, 4 );
pDot11f->info.IpParams.params.IpV4Params.src_port =
pOld->tclasParams.ipv4.srcPort;
pDot11f->info.IpParams.params.IpV4Params.dest_port =
@@ -3847,17 +3878,17 @@
}
else
{
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV6Params.source,
( tANI_U8* )pOld->tclasParams.ipv6.srcIpAddr, 16 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV6Params.dest,
( tANI_U8* )pOld->tclasParams.ipv6.dstIpAddr, 16 );
pDot11f->info.IpParams.params.IpV6Params.src_port =
pOld->tclasParams.ipv6.srcPort;
pDot11f->info.IpParams.params.IpV6Params.dest_port =
pOld->tclasParams.ipv6.dstPort;
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV6Params.flow_label,
( tANI_U8* )pOld->tclasParams.ipv6.flowLabel, 3 );
}
@@ -3890,9 +3921,9 @@
switch ( pDot11f->classifier_type )
{
case SIR_MAC_TCLASTYPE_ETHERNET:
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.EthParams.source,
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.EthParams.source,
( tANI_U8* )&pOld->tclasParams.eth.srcAddr, 6 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.EthParams.dest,
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.EthParams.dest,
( tANI_U8* )&pOld->tclasParams.eth.dstAddr, 6 );
pDot11f->info.EthParams.type = pOld->tclasParams.eth.type;
break;
@@ -3900,10 +3931,10 @@
pDot11f->info.IpParams.version = pOld->version;
if ( SIR_MAC_TCLAS_IPV4 == pDot11f->info.IpParams.version )
{
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV4Params.source,
( tANI_U8* )pOld->tclasParams.ipv4.srcIpAddr, 4 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV4Params.dest,
( tANI_U8* )pOld->tclasParams.ipv4.dstIpAddr, 4 );
pDot11f->info.IpParams.params.IpV4Params.src_port =
@@ -3919,17 +3950,17 @@
}
else
{
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV6Params.source,
( tANI_U8* )pOld->tclasParams.ipv6.srcIpAddr, 16 );
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV6Params.dest,
( tANI_U8* )pOld->tclasParams.ipv6.dstIpAddr, 16 );
pDot11f->info.IpParams.params.IpV6Params.src_port =
pOld->tclasParams.ipv6.srcPort;
pDot11f->info.IpParams.params.IpV6Params.dest_port =
pOld->tclasParams.ipv6.dstPort;
- palCopyMemory( pMac->hHdd, ( tANI_U8* )&pDot11f->info.IpParams.params.
+ vos_mem_copy( ( tANI_U8* )&pDot11f->info.IpParams.params.
IpV6Params.flow_label,
( tANI_U8* )pOld->tclasParams.ipv6.flowLabel, 3 );
}
@@ -4092,7 +4123,7 @@
if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_UUIDE_PRESENT)
{
pDot11f->UUID_E.present = 1;
- palCopyMemory(pMac->hHdd, pDot11f->UUID_E.uuid, pSirWPSProbeRspIE->UUID_E, WNI_CFG_WPS_UUID_LEN);
+ vos_mem_copy(pDot11f->UUID_E.uuid, pSirWPSProbeRspIE->UUID_E, WNI_CFG_WPS_UUID_LEN);
}
else
pDot11f->UUID_E.present = 0;
@@ -4101,7 +4132,8 @@
{
pDot11f->Manufacturer.present = 1;
pDot11f->Manufacturer.num_name = pSirWPSProbeRspIE->Manufacture.num_name;
- palCopyMemory(pMac->hHdd, pDot11f->Manufacturer.name, pSirWPSProbeRspIE->Manufacture.name, pSirWPSProbeRspIE->Manufacture.num_name);
+ vos_mem_copy(pDot11f->Manufacturer.name, pSirWPSProbeRspIE->Manufacture.name,
+ pSirWPSProbeRspIE->Manufacture.num_name);
}
else
pDot11f->Manufacturer.present = 0;
@@ -4110,7 +4142,8 @@
{
pDot11f->ModelName.present = 1;
pDot11f->ModelName.num_text = pSirWPSProbeRspIE->ModelName.num_text;
- palCopyMemory(pMac->hHdd, pDot11f->ModelName.text, pSirWPSProbeRspIE->ModelName.text, pDot11f->ModelName.num_text);
+ vos_mem_copy(pDot11f->ModelName.text, pSirWPSProbeRspIE->ModelName.text,
+ pDot11f->ModelName.num_text);
}
else
pDot11f->ModelName.present = 0;
@@ -4119,7 +4152,8 @@
{
pDot11f->ModelNumber.present = 1;
pDot11f->ModelNumber.num_text = pSirWPSProbeRspIE->ModelNumber.num_text;
- palCopyMemory(pMac->hHdd, pDot11f->ModelNumber.text, pSirWPSProbeRspIE->ModelNumber.text, pDot11f->ModelNumber.num_text);
+ vos_mem_copy(pDot11f->ModelNumber.text, pSirWPSProbeRspIE->ModelNumber.text,
+ pDot11f->ModelNumber.num_text);
}
else
pDot11f->ModelNumber.present = 0;
@@ -4128,7 +4162,8 @@
{
pDot11f->SerialNumber.present = 1;
pDot11f->SerialNumber.num_text = pSirWPSProbeRspIE->SerialNumber.num_text;
- palCopyMemory(pMac->hHdd, pDot11f->SerialNumber.text, pSirWPSProbeRspIE->SerialNumber.text, pDot11f->SerialNumber.num_text);
+ vos_mem_copy(pDot11f->SerialNumber.text, pSirWPSProbeRspIE->SerialNumber.text,
+ pDot11f->SerialNumber.num_text);
}
else
pDot11f->SerialNumber.present = 0;
@@ -4136,7 +4171,8 @@
if(pSirWPSProbeRspIE->FieldPresent & SIR_WPS_PROBRSP_PRIMARYDEVICETYPE_PRESENT)
{
pDot11f->PrimaryDeviceType.present = 1;
- palCopyMemory(pMac->hHdd, pDot11f->PrimaryDeviceType.oui, pSirWPSProbeRspIE->PrimaryDeviceOUI, sizeof(pSirWPSProbeRspIE->PrimaryDeviceOUI));
+ vos_mem_copy(pDot11f->PrimaryDeviceType.oui, pSirWPSProbeRspIE->PrimaryDeviceOUI,
+ sizeof(pSirWPSProbeRspIE->PrimaryDeviceOUI));
pDot11f->PrimaryDeviceType.primary_category = (tANI_U16)pSirWPSProbeRspIE->PrimaryDeviceCategory;
pDot11f->PrimaryDeviceType.sub_category = (tANI_U16)pSirWPSProbeRspIE->DeviceSubCategory;
}
@@ -4147,7 +4183,8 @@
{
pDot11f->DeviceName.present = 1;
pDot11f->DeviceName.num_text = pSirWPSProbeRspIE->DeviceName.num_text;
- palCopyMemory(pMac->hHdd, pDot11f->DeviceName.text, pSirWPSProbeRspIE->DeviceName.text, pDot11f->DeviceName.num_text);
+ vos_mem_copy(pDot11f->DeviceName.text, pSirWPSProbeRspIE->DeviceName.text,
+ pDot11f->DeviceName.num_text);
}
else
pDot11f->DeviceName.present = 0;
@@ -4266,7 +4303,7 @@
if(pSirWPSBeaconIE->FieldPresent & SIR_WPS_BEACON_UUIDE_PRESENT)
{
pDot11f->UUID_E.present = 1;
- palCopyMemory(pMac->hHdd, pDot11f->UUID_E.uuid, pSirWPSBeaconIE->UUID_E, WNI_CFG_WPS_UUID_LEN);
+ vos_mem_copy(pDot11f->UUID_E.uuid, pSirWPSBeaconIE->UUID_E, WNI_CFG_WPS_UUID_LEN);
}
else
pDot11f->UUID_E.present = 0;
@@ -4580,20 +4617,22 @@
pDot11f->report.Beacon.regClass = pBeaconReport->regClass;
pDot11f->report.Beacon.channel = pBeaconReport->channel;
- palCopyMemory( pMac->hHdd, pDot11f->report.Beacon.meas_start_time, pBeaconReport->measStartTime, sizeof(pDot11f->report.Beacon.meas_start_time) );
+ vos_mem_copy( pDot11f->report.Beacon.meas_start_time, pBeaconReport->measStartTime,
+ sizeof(pDot11f->report.Beacon.meas_start_time) );
pDot11f->report.Beacon.meas_duration = pBeaconReport->measDuration;
pDot11f->report.Beacon.condensed_PHY = pBeaconReport->phyType;
pDot11f->report.Beacon.reported_frame_type = !pBeaconReport->bcnProbeRsp;
pDot11f->report.Beacon.RCPI = pBeaconReport->rcpi;
pDot11f->report.Beacon.RSNI = pBeaconReport->rsni;
- palCopyMemory( pMac->hHdd, pDot11f->report.Beacon.BSSID, pBeaconReport->bssid, sizeof(tSirMacAddr));
+ vos_mem_copy( pDot11f->report.Beacon.BSSID, pBeaconReport->bssid, sizeof(tSirMacAddr));
pDot11f->report.Beacon.antenna_id = pBeaconReport->antennaId;
pDot11f->report.Beacon.parent_TSF = pBeaconReport->parentTSF;
if( pBeaconReport->numIes )
{
pDot11f->report.Beacon.BeaconReportFrmBody.present = 1;
- palCopyMemory( pMac->hHdd, pDot11f->report.Beacon.BeaconReportFrmBody.reportedFields, pBeaconReport->Ies, pBeaconReport->numIes );
+ vos_mem_copy( pDot11f->report.Beacon.BeaconReportFrmBody.reportedFields,
+ pBeaconReport->Ies, pBeaconReport->numIes );
pDot11f->report.Beacon.BeaconReportFrmBody.num_reportedFields = pBeaconReport->numIes;
}