wlan : Replace PAL mem APIs with VOS APIs in SME
The existing SME code uses PAL APIs which in turn uses VOS mem
APIs. Replacing the PAL mem APIs with the VOS mem APIs so as to
optimize the code size by removing the extra PAL wrappers.
Change-Id: I2307c3875d63d58a582b33a1254d281d287c8731
CRs-Fixed: 576668
diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c
index 5e2c871..822ad98 100644
--- a/CORE/SME/src/csr/csrApiRoam.c
+++ b/CORE/SME/src/csr/csrApiRoam.c
@@ -1305,8 +1305,8 @@
outNumChannels,
tmpChannelList,
&outNumChannels);
- palCopyMemory(pMac->hHdd, ChannelList,
- tmpChannelList, outNumChannels);
+ vos_mem_copy(ChannelList,
+ tmpChannelList, outNumChannels);
}
/* Prepare final roam scan channel list */
@@ -1328,8 +1328,8 @@
currChannelListInfo->numOfChannels = 0;
return VOS_STATUS_E_RESOURCES;
}
- palCopyMemory(pMac->hHdd, currChannelListInfo->ChannelList,
- ChannelList, outNumChannels);
+ vos_mem_copy(currChannelListInfo->ChannelList,
+ ChannelList, outNumChannels);
}
return status;
}
@@ -3726,7 +3726,7 @@
{
//Let's also update the below to make sure we don't update CC while
//connected to an AP which is advertising some CC
- palCopyMemory(pMac->hHdd, pMac->scan.currentCountryBssid,
+ vos_mem_copy(pMac->scan.currentCountryBssid,
pBssDesc->bssId, sizeof(tSirMacAddr));
}
}
@@ -9373,7 +9373,7 @@
status = csrRoamGetSessionIdFromBSSID( pMac, (tCsrBssid *)pMicInd->bssId, &sessionId );
if( HAL_STATUS_SUCCESS( status ) )
{
- palZeroMemory(pMac->hHdd, &roamInfo, sizeof(tCsrRoamInfo));
+ vos_mem_set(&roamInfo, sizeof(tCsrRoamInfo), 0);
roamInfo.u.pMICFailureInfo = &pMicInd->info;
pRoamInfo = &roamInfo;
if(pMicInd->info.multicast)
@@ -11417,7 +11417,7 @@
pIes->ExtSuppRates.num_rates);
pIes->ExtSuppRates.num_rates = SIR_MAC_EXTENDED_RATE_EID_MAX;
}
- palCopyMemory(pMac->hHdd, pParam->extendedRateSet.rate,
+ vos_mem_copy(pParam->extendedRateSet.rate,
pIes->ExtSuppRates.rates,
sizeof(*pIes->ExtSuppRates.rates) * pIes->ExtSuppRates.num_rates);
}
@@ -11818,14 +11818,14 @@
{
smsLog(pMac, LOGW, "Delete PMKID for "
MAC_ADDRESS_STR, MAC_ADDR_ARRAY(pBSSId));
- if( palEqualMemory( pMac->hHdd, pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) )
+ if( vos_mem_compare( pBSSId, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tCsrBssid) ) )
{
fMatchFound = TRUE;
break;
}
}
if( !fMatchFound ) break;
- palZeroMemory( pMac->hHdd, pSession->PmkidCacheInfo[Index].BSSID, sizeof(tPmkidCacheInfo));
+ vos_mem_set(pSession->PmkidCacheInfo[Index].BSSID, sizeof(tPmkidCacheInfo), 0);
status = eHAL_STATUS_SUCCESS;
}
while( 0 );
@@ -16820,7 +16820,7 @@
smsLog(pMac, LOGE, FL(" session %d not found "), sessionId);
return eHAL_STATUS_FAILURE;
}
- palCopyMemory(pMac->hHdd, pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen);
+ vos_mem_copy(pSession->suppCckmIeInfo.cckmIe, pCckmIe, ccKmIeLen);
pSession->suppCckmIeInfo.cckmIeLen = ccKmIeLen;
return status;
}
@@ -16854,7 +16854,7 @@
UpdateCCKMTSF(&(timeStamp[0]), &(timeStamp[1]), &timer_diff);
- palCopyMemory(pMac->hHdd, pTimestamp, (void *) &timeStamp[0],
+ vos_mem_copy(pTimestamp, (void *) &timeStamp[0],
sizeof (tANI_U32) * 2);
return status;
}
diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c
index b5c7527..34f3b1b 100644
--- a/CORE/SME/src/csr/csrApiScan.c
+++ b/CORE/SME/src/csr/csrApiScan.c
@@ -2182,7 +2182,7 @@
fMatch = csrIsSecurityMatch( pMac, &pFilter->authType, &pFilter->EncryptionType, &pFilter->mcEncryptionType,
&pBssDesc->Result.BssDescriptor, pIes, NULL, NULL, NULL );
if ((pBssDesc->Result.pvIes == NULL) && pIes)
- palFreeMemory(pMac->hHdd, pIes);
+ vos_mem_free(pIes);
if (fMatch)
smsLog(pMac, LOG1, FL(" Security Matched"));
@@ -3107,7 +3107,7 @@
pBssDescription->Result.BssDescriptor.rssi * (-1),
pIesLocal->Country.country[0],pIesLocal->Country.country[1] );
//Getting BSSID for best AP in scan result.
- palCopyMemory(pMac->hHdd, bssid_temp,
+ vos_mem_copy(bssid_temp,
pBssDescription->Result.BssDescriptor.bssId, sizeof(tSirMacAddr));
}
@@ -3199,7 +3199,7 @@
//valid CC we can get during scan
if(( '0' != pMac->scan.countryCode11d[ 0 ] && '0' != pMac->scan.countryCode11d[ 1 ] ))
{
- palCopyMemory(pMac->hHdd, pMac->scan.currentCountryBssid,
+ vos_mem_copy(pMac->scan.currentCountryBssid,
bssid_temp, sizeof(tSirMacAddr));
}
break;
diff --git a/CORE/SME/src/csr/csrLogDump.c b/CORE/SME/src/csr/csrLogDump.c
index e83f7b4..cb06451 100644
--- a/CORE/SME/src/csr/csrLogDump.c
+++ b/CORE/SME/src/csr/csrLogDump.c
@@ -60,11 +60,11 @@
static tCsrRoamProfile x;
static tSirMacSSid ssid; //To be allocated for array of SSIDs
static tANI_U8 sessionId; // Defined for fixed session ID
- palZeroMemory(pMac->hHdd, (void*)&x, sizeof(x));
+ vos_mem_set((void*)&x, sizeof(x), 0);
x.SSIDs.numOfSSIDs=1 ;
x.SSIDs.SSIDList[0].SSID = ssid ;
ssid.length=6 ;
- palCopyMemory(pMac->hHdd, ssid.ssId, "AniNet", 6);
+ vos_mem_copy(ssid.ssId, "AniNet", 6);
if(HAL_STATUS_SUCCESS(sme_AcquireGlobalLock( &pMac->sme )))
{
(void)csrRoamConnect(pMac, sessionId, &x, NULL, NULL);
diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c
index 1f4e429..6ca9684 100644
--- a/CORE/SME/src/sme_common/sme_Api.c
+++ b/CORE/SME/src/sme_common/sme_Api.c
@@ -4916,19 +4916,17 @@
if ( HAL_STATUS_SUCCESS( status ) )
{
smsLog(pMac, LOG1, FL(" called"));
- status = palAllocateMemory(pMac->hHdd, (void **)&pMsg,
- sizeof(tAniGenericChangeCountryCodeReq));
-
- if (!HAL_STATUS_SUCCESS(status))
+ pMsg = vos_mem_malloc(sizeof(tAniGenericChangeCountryCodeReq));
+ if (NULL == pMsg)
{
smsLog(pMac, LOGE, " sme_GenericChangeCountryCode: failed to allocate mem for req");
sme_ReleaseGlobalLock( &pMac->sme );
- return status;
+ return eHAL_STATUS_FAILURE;
}
pMsg->msgType = pal_cpu_to_be16((tANI_U16)eWNI_SME_GENERIC_CHANGE_COUNTRY_CODE);
pMsg->msgLen = (tANI_U16)sizeof(tAniGenericChangeCountryCodeReq);
- palCopyMemory(pMac->hHdd, pMsg->countryCode, pCountry, 3);
+ vos_mem_copy(pMsg->countryCode, pCountry, 3);
pMsg->domain_index = reg_domain;
msg.type = eWNI_SME_GENERIC_CHANGE_COUNTRY_CODE;
@@ -4938,7 +4936,7 @@
if (VOS_STATUS_SUCCESS != vos_mq_post_message(VOS_MQ_ID_SME, &msg))
{
smsLog(pMac, LOGE, "sme_GenericChangeCountryCode failed to post msg to self");
- palFreeMemory(pMac->hHdd, (void *)pMsg);
+ vos_mem_free(pMsg);
status = eHAL_STATUS_FAILURE;
}
smsLog(pMac, LOG1, FL(" returned"));
@@ -7237,7 +7235,7 @@
pMac->roam.configParam.Is11dSupportEnabled = eANI_BOOLEAN_FALSE;
}
- palCopyMemory(pMac->hHdd, pMac->scan.countryCodeCurrent, pMsg->countryCode,
+ vos_mem_copy(pMac->scan.countryCodeCurrent, pMsg->countryCode,
WNI_CFG_COUNTRY_CODE_LEN);
status = WDA_SetRegDomain(pMac, reg_domain_id, eSIR_TRUE);
@@ -7245,7 +7243,7 @@
if (VOS_FALSE == is11dCountry )
{
/* overwrite the defualt country code */
- palCopyMemory(pMac->hHdd, pMac->scan.countryCodeDefault,
+ vos_mem_copy(pMac->scan.countryCodeDefault,
pMac->scan.countryCodeCurrent, WNI_CFG_COUNTRY_CODE_LEN);
/* set to default domain ID */
pMac->scan.domainIdDefault = pMac->scan.domainIdCurrent;
@@ -7320,9 +7318,9 @@
if (('0' == pMsg->countryCode[0]) && ('0' == pMsg->countryCode[1]))
{
smsLog( pMac, LOGW, FL("Setting countryCode11d & countryCodeCurrent to world CC"));
- palCopyMemory(pMac->hHdd, pMac->scan.countryCode11d, pMsg->countryCode,
+ vos_mem_copy(pMac->scan.countryCode11d, pMsg->countryCode,
WNI_CFG_COUNTRY_CODE_LEN);
- palCopyMemory(pMac->hHdd, pMac->scan.countryCodeCurrent, pMsg->countryCode,
+ vos_mem_copy(pMac->scan.countryCodeCurrent, pMsg->countryCode,
WNI_CFG_COUNTRY_CODE_LEN);
}