diff options
| author | Sushant Kaushik <skaushik@qti.qualcomm.com> | 2015-06-18 15:58:21 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-07-13 07:09:01 -0700 |
| commit | f1874d53bfeb9639a5ffc8018f896e6ecabc978b (patch) | |
| tree | 740092bc8ef029f7439a1362e85ddb9c8e9785f4 | |
| parent | 6e7dc36544f603900e0143ee8882c8305a2e7344 (diff) | |
wlan: Changes in Protocol Stack logs from numerical values to string.
prima to qcacld-2.0 propagation
As a part of logging enhancement,to make logs more
interactive, changed pmcstate,scanType etc from
numerical values to human readable string in
Protocol stack.
Change-Id: I589088c2c5fd0afa106a1d0773a2ff525b0dd083
CRs-Fixed: 638916
| -rw-r--r-- | CORE/MAC/inc/sirApi.h | 4 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessBeaconFrame.c | 3 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c | 10 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limRoamingAlgo.c | 4 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limSmeReqUtils.c | 4 | ||||
| -rw-r--r-- | CORE/MAC/src/pe/lim/limUtils.c | 53 | ||||
| -rw-r--r-- | CORE/SME/inc/sme_Api.h | 2 | ||||
| -rw-r--r-- | CORE/SME/src/QoS/sme_Qos.c | 9 | ||||
| -rw-r--r-- | CORE/SME/src/csr/csrApiRoam.c | 22 | ||||
| -rw-r--r-- | CORE/SME/src/csr/csrApiScan.c | 36 | ||||
| -rw-r--r-- | CORE/SME/src/csr/csrUtil.c | 22 | ||||
| -rw-r--r-- | CORE/SME/src/pmc/pmc.c | 57 | ||||
| -rw-r--r-- | CORE/VOSS/inc/vos_nvitem.h | 1 | ||||
| -rw-r--r-- | CORE/VOSS/src/vos_nvitem.c | 23 |
14 files changed, 218 insertions, 32 deletions
diff --git a/CORE/MAC/inc/sirApi.h b/CORE/MAC/inc/sirApi.h index 788865382e54..22938e751701 100644 --- a/CORE/MAC/inc/sirApi.h +++ b/CORE/MAC/inc/sirApi.h @@ -375,6 +375,10 @@ typedef enum eStaRateMode { #define IERATE_RATE_MASK 0x7f #define IERATE_IS_BASICRATE(x) ((x) & IERATE_BASICRATE_MASK) +const char * lim_BssTypetoString(const v_U8_t bssType); +const char * lim_ScanTypetoString(const v_U8_t scanType); +const char * lim_BackgroundScanModetoString(const v_U8_t mode); + typedef struct sSirSupportedRates { /* * For Self STA Entry: this represents Self Mode. diff --git a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c index 43c591eeb57c..bdc4ddf51a85 100644 --- a/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c +++ b/CORE/MAC/src/pe/lim/limProcessBeaconFrame.c @@ -295,7 +295,8 @@ limProcessBeaconFrameNoSession(tpAniSirGlobal pMac, tANI_U8 *pRxPacketInfo) } // end of (eLIM_MLM_WT_PROBE_RESP_STATE) || (eLIM_MLM_PASSIVE_SCAN_STATE) else { - limLog(pMac, LOG1, FL("Rcvd Beacon in unexpected MLM state %d"), pMac->lim.gLimMlmState); + limLog(pMac, LOG1, FL("Rcvd Beacon in unexpected MLM state %s (%d)"), + limMlmStateStr(pMac->lim.gLimMlmState), pMac->lim.gLimMlmState); limPrintMlmState(pMac, LOG1, pMac->lim.gLimMlmState); #ifdef WLAN_DEBUG pMac->lim.gLimUnexpBcnCnt++; diff --git a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c index 8741c193ecb1..782815c44ecf 100644 --- a/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c +++ b/CORE/MAC/src/pe/lim/limProcessSmeReqMessages.c @@ -1323,7 +1323,9 @@ __limProcessSmeScanReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) #endif pScanReq = (tpSirSmeScanReq) pMsgBuf; - limLog(pMac, LOG1, FL("SME SCAN REQ numChan %d min %d max %d IELen %d first %d fresh %d unique %d type %d mode %d rsp %d"), + limLog(pMac, LOG1,FL("SME SCAN REQ numChan %d min %d max %d IELen %d" + "first %d fresh %d unique %d type %s (%d)" + " mode %s (%d)rsp %d"), pScanReq->channelList.numChannels, pScanReq->minChannelTime, pScanReq->maxChannelTime, @@ -1331,9 +1333,11 @@ __limProcessSmeScanReq(tpAniSirGlobal pMac, tANI_U32 *pMsgBuf) pScanReq->returnAfterFirstMatch, pScanReq->returnFreshResults, pScanReq->returnUniqueResults, + lim_ScanTypetoString(pScanReq->scanType), pScanReq->scanType, - pScanReq->backgroundScanMode, - pMac->lim.gLimRspReqd ? 1 : 0); + lim_BackgroundScanModetoString(pScanReq->backgroundScanMode), + pScanReq->backgroundScanMode, pMac->lim.gLimRspReqd ? 1 : 0); + /* Since scan req always requires a response, we will overwrite response required here. * This is added esp to take care of the condition where in p2p go case, we hold the scan req and diff --git a/CORE/MAC/src/pe/lim/limRoamingAlgo.c b/CORE/MAC/src/pe/lim/limRoamingAlgo.c index 045d5c544d70..b44504681ce6 100644 --- a/CORE/MAC/src/pe/lim/limRoamingAlgo.c +++ b/CORE/MAC/src/pe/lim/limRoamingAlgo.c @@ -268,7 +268,9 @@ void limTriggerBackgroundScan(tpAniSirGlobal pMac) smeScanReq.uIEFieldOffset = sizeof(tSirSmeScanReq); backgroundScan = limSelectsBackgroundScanMode(pMac); - PELOG1(limLog(pMac, LOG1, FL("Performing (mode %d) Background Scan "), backgroundScan);) + PELOG1(limLog(pMac, LOG1, FL("Performing (mode %s (%d)) Background Scan"), + lim_BackgroundScanModetoString(backgroundScan), + backgroundScan);) smeScanReq.backgroundScanMode = backgroundScan; //determine whether to send the results or not, If so, notify the BG scan results to SME diff --git a/CORE/MAC/src/pe/lim/limSmeReqUtils.c b/CORE/MAC/src/pe/lim/limSmeReqUtils.c index 2d2ce7f8f255..9bace4478822 100644 --- a/CORE/MAC/src/pe/lim/limSmeReqUtils.c +++ b/CORE/MAC/src/pe/lim/limSmeReqUtils.c @@ -495,7 +495,9 @@ limIsSmeStartBssReqValid(tpAniSirGlobal pMac, tANI_U8 valid = true; PELOG1(limLog(pMac, LOG1, - FL("Parsed START_BSS_REQ fields are bssType=%d, channelId=%d, SSID len=%d, rsnIE len=%d, nwType=%d, rateset len=%d"), + FL("Parsed START_BSS_REQ fields are bssType=%s (%d), channelId=%d," + " SSID len=%d, rsnIE len=%d, nwType=%d, rateset len=%d"), + lim_BssTypetoString(pStartBssReq->bssType), pStartBssReq->bssType, pStartBssReq->channelId, pStartBssReq->ssId.length, diff --git a/CORE/MAC/src/pe/lim/limUtils.c b/CORE/MAC/src/pe/lim/limUtils.c index cf1fb4f6bf4d..c020da4a35fc 100644 --- a/CORE/MAC/src/pe/lim/limUtils.c +++ b/CORE/MAC/src/pe/lim/limUtils.c @@ -6929,6 +6929,59 @@ void limProcessAddStaSelfRsp(tpAniSirGlobal pMac,tpSirMsgQ limMsgQ) } +/** + * lim_ScanTypetoString(): converts scan type enum to string. + * @scanType: enum value of scanType. + */ +const char * lim_ScanTypetoString(const v_U8_t scanType) +{ + switch (scanType) + { + CASE_RETURN_STRING( eSIR_PASSIVE_SCAN ); + CASE_RETURN_STRING( eSIR_ACTIVE_SCAN ); + CASE_RETURN_STRING( eSIR_BEACON_TABLE ); + default: + return "Unknown ScanType"; + } +} + +/** + * lim_BssTypetoString(): converts bss type enum to string. + * @bssType: enum value of bssType. + */ + +const char * lim_BssTypetoString(const v_U8_t bssType) +{ + switch (bssType) + { + CASE_RETURN_STRING( eSIR_INFRASTRUCTURE_MODE ); + CASE_RETURN_STRING( eSIR_INFRA_AP_MODE ); + CASE_RETURN_STRING( eSIR_IBSS_MODE ); + CASE_RETURN_STRING( eSIR_BTAMP_STA_MODE ); + CASE_RETURN_STRING( eSIR_BTAMP_AP_MODE ); + CASE_RETURN_STRING( eSIR_AUTO_MODE ); + default: + return "Unknown BssType"; + } +} + +/** + * lim_BackgroundScanModetoString():converts BG scan type to string. + * @mode: enum value of BG scan type. + */ + +const char *lim_BackgroundScanModetoString(const v_U8_t mode) +{ + switch (mode) + { + CASE_RETURN_STRING( eSIR_AGGRESSIVE_BACKGROUND_SCAN ); + CASE_RETURN_STRING( eSIR_NORMAL_BACKGROUND_SCAN ); + CASE_RETURN_STRING( eSIR_ROAMING_SCAN ); + default: + return "Unknown BgScanMode"; + } +} + void limProcessDelStaSelfRsp(tpAniSirGlobal pMac,tpSirMsgQ limMsgQ) { diff --git a/CORE/SME/inc/sme_Api.h b/CORE/SME/inc/sme_Api.h index c26f07eccb93..9b82d954f07d 100644 --- a/CORE/SME/inc/sme_Api.h +++ b/CORE/SME/inc/sme_Api.h @@ -3782,6 +3782,8 @@ eHalStatus sme_UpdateAddIE(tHalHandle hHal, eUpdateIEsType updateType); eHalStatus sme_UpdateConnectDebug(tHalHandle hHal, tANI_U32 set_value); +const char * sme_requestTypetoString(const v_U8_t requestType); +const char * sme_PmcStatetoString(const v_U8_t pmcState); eHalStatus sme_ApDisableIntraBssFwd(tHalHandle hHal, tANI_U8 sessionId, tANI_BOOLEAN disablefwd); tANI_U32 sme_GetChannelBondingMode5G(tHalHandle hHal); diff --git a/CORE/SME/src/QoS/sme_Qos.c b/CORE/SME/src/QoS/sme_Qos.c index 24e4fc375b25..55709a20193e 100644 --- a/CORE/SME/src/QoS/sme_Qos.c +++ b/CORE/SME/src/QoS/sme_Qos.c @@ -7757,16 +7757,17 @@ void sme_QosPmcDeviceStateUpdateInd(void *callbackContext, tPmcState pmcState) default: status = eHAL_STATUS_SUCCESS; VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_ERROR, - "%s: %d: nothing to process in PMC state %d", + "%s: %d: nothing to process in PMC state %s (%d)", __func__, __LINE__, - pmcState); + sme_PmcStatetoString(pmcState), pmcState); + } if(!HAL_STATUS_SUCCESS(status)) { VOS_TRACE(VOS_MODULE_ID_SME, VOS_TRACE_LEVEL_INFO_HIGH, - "%s: %d: ignoring Device(PMC) state change to %d", + "%s: %d: ignoring Device(PMC) state change to %s (%d)", __func__, __LINE__, - pmcState); + sme_PmcStatetoString(pmcState), pmcState); } } diff --git a/CORE/SME/src/csr/csrApiRoam.c b/CORE/SME/src/csr/csrApiRoam.c index 978b1bef95e6..fbbbcd0d7a11 100644 --- a/CORE/SME/src/csr/csrApiRoam.c +++ b/CORE/SME/src/csr/csrApiRoam.c @@ -7000,8 +7000,13 @@ eHalStatus csrRoamConnect(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi } /* Initialize the bssid count before proceeding with the Join requests */ pSession->join_bssid_count = 0; - smsLog(pMac, LOG1, FL("called BSSType = %d authtype = %d encryType = %d"), - pProfile->BSSType, pProfile->AuthType.authType[0], pProfile->EncryptionType.encryptionType[0]); + smsLog(pMac, LOG1, FL("called BSSType = %s (%d) authtype = %d " + "encryType = %d"), + lim_BssTypetoString(pProfile->BSSType), + pProfile->BSSType, + pProfile->AuthType.authType[0], + pProfile->EncryptionType.encryptionType[0]); + if( CSR_IS_WDS( pProfile ) && !HAL_STATUS_SUCCESS( status = csrIsBTAMPAllowed( pMac, pProfile->operationChannel ) ) ) { @@ -7174,8 +7179,13 @@ eHalStatus csrRoamReassoc(tpAniSirGlobal pMac, tANI_U32 sessionId, tCsrRoamProfi smsLog(pMac, LOGP, FL("No profile specified")); return eHAL_STATUS_FAILURE; } - smsLog(pMac, LOG1, FL("called BSSType = %d authtype = %d encryType = %d"), pProfile->BSSType, pProfile->AuthType.authType[0], pProfile->EncryptionType.encryptionType[0]); - csrRoamCancelRoaming(pMac, sessionId); + smsLog(pMac, LOG1, FL("called BSSType = %s (%d) authtype = %d " + "encryType = %d"), + lim_BssTypetoString(pProfile->BSSType), + pProfile->BSSType, + pProfile->AuthType.authType[0], + pProfile->EncryptionType.encryptionType[0]); + csrScanRemoveFreshScanCommand(pMac, sessionId); csrScanCancelIdleScan(pMac); csrScanAbortMacScanNotForConnect(pMac, sessionId); @@ -17798,7 +17808,9 @@ eHalStatus csrIsFullPowerNeeded( tpAniSirGlobal pMac, tSmeCmd *pCommand, case STANDBY: case LOW_POWER: //We are not supposed to do anything - smsLog( pMac, LOGE, FL( " cannot process because PMC is in stopped/standby state %d" ), pmcState ); + smsLog( pMac, LOGE, FL( "cannot process because PMC is in" + " stopped/standby state %s (%d)" ), + sme_PmcStatetoString(pmcState), pmcState ); status = eHAL_STATUS_FAILURE; break; case FULL_POWER: diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c index 1e103a605eac..427c2ec219ce 100644 --- a/CORE/SME/src/csr/csrApiScan.c +++ b/CORE/SME/src/csr/csrApiScan.c @@ -5870,9 +5870,17 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, } }while(0); - smsLog(pMac, LOG1, FL("domainIdCurrent %d scanType %d bssType %d requestType %d numChannels %d "), - pMac->scan.domainIdCurrent, pMsg->scanType, pMsg->bssType, - pScanReq->requestType, pMsg->channelList.numChannels); + smsLog(pMac, LOG1, FL("domainIdCurrent %s (%d) scanType %s (%d)" + "bssType %s (%d), requestType %s(%d)" + "numChannels %d"), + voss_DomainIdtoString(pMac->scan.domainIdCurrent), + pMac->scan.domainIdCurrent, + lim_ScanTypetoString(pMsg->scanType), pMsg->scanType, + lim_BssTypetoString(pMsg->bssType), pMsg->bssType, + sme_requestTypetoString(pScanReq->requestType), + pScanReq->requestType, + pMsg->channelList.numChannels); + for(i = 0; i < pMsg->channelList.numChannels; i++) { @@ -5900,12 +5908,19 @@ eHalStatus csrSendMBScanReq( tpAniSirGlobal pMac, tANI_U16 sessionId, sessionId, pScanReqParam->bReturnAfter1stMatch, pScanReqParam->fUniqueResult, pScanReqParam->freshScan, pScanReqParam->hiddenSsid ); - smsLog( pMac, LOG1, FL("scanType = %u BSSType = %u numOfSSIDs = %d" - " numOfChannels = %d requestType = %d p2pSearch = %d\n"), - pScanReq->scanType, pScanReq->BSSType, - pScanReq->SSIDs.numOfSSIDs, - pScanReq->ChannelInfo.numOfChannels, pScanReq->requestType, - pScanReq->p2pSearch ); + smsLog( pMac, LOG1, FL("scanType = %s (%d) BSSType = %s (%d) " + "numOfSSIDs = %d numOfChannels = %d requestType = %s (%d)" + " p2pSearch = %d\n"), + lim_ScanTypetoString(pScanReq->scanType), + pScanReq->scanType, + lim_BssTypetoString(pScanReq->BSSType), + pScanReq->BSSType, + pScanReq->SSIDs.numOfSSIDs, + pScanReq->ChannelInfo.numOfChannels, + sme_requestTypetoString(pScanReq->requestType), + pScanReq->requestType, + pScanReq->p2pSearch ); + } return( status ); @@ -6429,8 +6444,9 @@ eHalStatus csrScanCopyRequest(tpAniSirGlobal pMac, tCsrScanRequest *pDstReq, tCs { #ifdef FEATURE_WLAN_LFR smsLog(pMac, LOG2, - FL(" reqType=%d, numOfChannels=%d," + FL(" reqType= %s (%d), numOfChannels=%d," " ignoring DFS channel %d"), + sme_requestTypetoString(pSrcReq->requestType), pSrcReq->requestType, pSrcReq->ChannelInfo.numOfChannels, pSrcReq->ChannelInfo.ChannelList[index]); diff --git a/CORE/SME/src/csr/csrUtil.c b/CORE/SME/src/csr/csrUtil.c index f3e45b71e08c..523792ff1f18 100644 --- a/CORE/SME/src/csr/csrUtil.c +++ b/CORE/SME/src/csr/csrUtil.c @@ -5925,6 +5925,28 @@ tANI_BOOLEAN csrIsChannelPresentInList( return FALSE; } +/** + * sme_requestTypetoString(): converts scan request enum to string. + * @requestType: scan request type enum. + */ +const char * sme_requestTypetoString(const v_U8_t requestType) +{ + switch (requestType) + { + CASE_RETURN_STRING( eCSR_SCAN_REQUEST_11D_SCAN ); + CASE_RETURN_STRING( eCSR_SCAN_REQUEST_FULL_SCAN ); + CASE_RETURN_STRING( eCSR_SCAN_IDLE_MODE_SCAN ); + CASE_RETURN_STRING( eCSR_SCAN_HO_BG_SCAN ); + CASE_RETURN_STRING( eCSR_SCAN_HO_PROBE_SCAN ); + CASE_RETURN_STRING( eCSR_SCAN_HO_NT_BG_SCAN ); + CASE_RETURN_STRING( eCSR_SCAN_P2P_DISCOVERY ); + CASE_RETURN_STRING( eCSR_SCAN_SOFTAP_CHANNEL_RANGE ); + CASE_RETURN_STRING( eCSR_SCAN_P2P_FIND_PEER ); + default: + return "Unknown Scan Request Type"; + } +} + VOS_STATUS csrAddToChannelListFront( tANI_U8 *pChannelList, int numChannels, diff --git a/CORE/SME/src/pmc/pmc.c b/CORE/SME/src/pmc/pmc.c index 81f911197547..391b0ba7f723 100644 --- a/CORE/SME/src/pmc/pmc.c +++ b/CORE/SME/src/pmc/pmc.c @@ -259,7 +259,10 @@ eHalStatus pmcEnterRequestFullPowerState (tHalHandle hHal, tRequestFullPowerReas case REQUEST_ENTER_WOWL: case REQUEST_EXIT_WOWL: pmcLog(pMac, LOGW, FL("Request for full power is being buffered. " - "Current state is %d"), pMac->pmc.pmcState); + "Current state is %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), + pMac->pmc.pmcState); + //Ignore the new reason if request for full power is already pending if( !pMac->pmc.requestFullPowerPending ) { @@ -332,7 +335,10 @@ eHalStatus pmcEnterRequestFullPowerState (tHalHandle hHal, tRequestFullPowerReas /* Cannot go directly to Request Full Power State from these states. */ default: pmcLog(pMac, LOGE, - FL("Trying to enter Request Full Power State from state %d"), pMac->pmc.pmcState); + FL("Trying to enter Request Full Power State from state %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), + pMac->pmc.pmcState); + PMC_ABORT; return eHAL_STATUS_FAILURE; } @@ -363,7 +369,8 @@ eHalStatus pmcEnterRequestImpsState (tHalHandle hHal) /* Can enter Request IMPS State only from Full Power State. */ if (pMac->pmc.pmcState != FULL_POWER) { - pmcLog(pMac, LOGE, FL("Trying to enter Request IMPS State from state %d"), pMac->pmc.pmcState); + pmcLog(pMac, LOGE, FL("Trying to enter Request IMPS State from state %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), pMac->pmc.pmcState); return eHAL_STATUS_FAILURE; } @@ -411,7 +418,9 @@ eHalStatus pmcEnterImpsState (tHalHandle hHal) /* Can enter IMPS State only from Request IMPS State. */ if (pMac->pmc.pmcState != REQUEST_IMPS) { - pmcLog(pMac, LOGE, FL("Trying to enter IMPS State from state %d"), pMac->pmc.pmcState); + pmcLog(pMac, LOGE, FL("Trying to enter IMPS State from state %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), pMac->pmc.pmcState); + return eHAL_STATUS_FAILURE; } @@ -480,7 +489,9 @@ eHalStatus pmcEnterRequestBmpsState (tHalHandle hHal) if (pMac->pmc.pmcState != FULL_POWER) { pmcLog(pMac, LOGE, - FL("Trying to enter Request BMPS State from state %d"), pMac->pmc.pmcState); + FL("Trying to enter Request BMPS State from state %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), pMac->pmc.pmcState); + return eHAL_STATUS_FAILURE; } @@ -929,7 +940,9 @@ void pmcImpsTimerExpired (tHalHandle hHal) /* If timer expires and we are in a state other than IMPS State then something is wrong. */ if (pMac->pmc.pmcState != IMPS) { - pmcLog(pMac, LOGE, FL("Got IMPS timer expiration in state %d"), pMac->pmc.pmcState); + pmcLog(pMac, LOGE, FL("Got IMPS timer expiration in state %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), pMac->pmc.pmcState); + PMC_ABORT; return; } @@ -964,7 +977,9 @@ void pmcTrafficTimerExpired (tHalHandle hHal) /* If timer expires and we are in a state other than Full Power State then something is wrong. */ if (pMac->pmc.pmcState != FULL_POWER) { - pmcLog(pMac, LOGE, FL("Got traffic timer expiration in state %d"), pMac->pmc.pmcState); + pmcLog(pMac, LOGE, FL("Got traffic timer expiration in state %s (%d)"), + sme_PmcStatetoString(pMac->pmc.pmcState), pMac->pmc.pmcState); + return; } @@ -2574,6 +2589,34 @@ tANI_BOOLEAN pmcShouldBmpsTimerRun( tpAniSirGlobal pMac ) return eANI_BOOLEAN_TRUE; } +/** + * sme_PmcStatetoString(): converts PMC state enum to string. + * @pmcState: PMC state enum. + */ +const char * sme_PmcStatetoString(const v_U8_t pmcState) +{ switch (pmcState) + { + CASE_RETURN_STRING( STOPPED ); + CASE_RETURN_STRING( FULL_POWER ); + CASE_RETURN_STRING( LOW_POWER); + CASE_RETURN_STRING( REQUEST_IMPS ); + CASE_RETURN_STRING( IMPS ); + CASE_RETURN_STRING( REQUEST_BMPS ); + CASE_RETURN_STRING( BMPS ); + CASE_RETURN_STRING( REQUEST_FULL_POWER ); + CASE_RETURN_STRING( REQUEST_START_UAPSD ); + CASE_RETURN_STRING( REQUEST_STOP_UAPSD ); + CASE_RETURN_STRING( UAPSD ); + CASE_RETURN_STRING( REQUEST_STANDBY ); + CASE_RETURN_STRING( STANDBY ); + CASE_RETURN_STRING( REQUEST_ENTER_WOWL ); + CASE_RETURN_STRING( REQUEST_EXIT_WOWL ); + CASE_RETURN_STRING( WOWL ); + default: + return "Invalid pmcState"; + } +} + void pmcOffloadClosePowerSaveCheckList(tpAniSirGlobal pMac, tANI_U32 sessionId) { tListElem *pEntry; diff --git a/CORE/VOSS/inc/vos_nvitem.h b/CORE/VOSS/inc/vos_nvitem.h index 319c960a9432..cbb202b8b08c 100644 --- a/CORE/VOSS/inc/vos_nvitem.h +++ b/CORE/VOSS/inc/vos_nvitem.h @@ -251,5 +251,6 @@ VOS_STATUS vos_nv_set_dfs_region(uint8_t dfs_region); NV_CHANNEL_DFS) VOS_STATUS vos_init_wiphy_from_nv_bin(void); +const char * voss_DomainIdtoString(const v_U8_t domainIdCurrent); VOS_STATUS vos_init_wiphy_from_eeprom(void); #endif // __VOS_NVITEM_H diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c index 125050073771..9ae7aebf4ffb 100644 --- a/CORE/VOSS/src/vos_nvitem.c +++ b/CORE/VOSS/src/vos_nvitem.c @@ -487,6 +487,29 @@ static const struct ieee80211_regdomain *vos_custom_world_regdomain(void) return &vos_world_regdom_60_61_62; } +/** + * voss_DomainIdtoString(): converts Reg domain enum to string. + * @domainIdCurrent: Reg domain enum value. + */ +const char * voss_DomainIdtoString(v_U8_t domainIdCurrent) +{ + switch (domainIdCurrent) + { + CASE_RETURN_STRING( REGDOMAIN_FCC ); + CASE_RETURN_STRING( REGDOMAIN_ETSI ); + CASE_RETURN_STRING( REGDOMAIN_JAPAN ); + CASE_RETURN_STRING( REGDOMAIN_WORLD ); + CASE_RETURN_STRING( REGDOMAIN_N_AMER_EXC_FCC ); + CASE_RETURN_STRING( REGDOMAIN_APAC ); + CASE_RETURN_STRING( REGDOMAIN_KOREA ); + CASE_RETURN_STRING( REGDOMAIN_HI_5GHZ ); + CASE_RETURN_STRING( REGDOMAIN_NO_5GHZ ); + CASE_RETURN_STRING( REGDOMAIN_COUNT ); + default: + return "Regulation Domain Unknown"; + } +} + static const struct ieee80211_regdomain *vos_world_regdomain(struct regulatory *reg) { |
