Support to select a channel in the entire 5Ghz band

In the current ACS algorithm to select channel for SAP operation
there is no support to select any channel in the entire 5Ghz band
this commit adds support for that.

Change-Id: Iacb82800d3de5a041d12afa29947169e0f600eb3
CRs-fixed: 616591

4 files changed, 22 insertions, 12 deletions

diff --git a/CORE/SAP/src/sapApiLinkCntl.c b/CORE/SAP/src/sapApiLinkCntl.c
index 0dddb6d6d9cb..9c4d0f003353 100644
--- a/CORE/SAP/src/sapApiLinkCntl.c
+++ b/CORE/SAP/src/sapApiLinkCntl.c
@@ -194,7 +194,7 @@ WLANSAP_ScanCallback
                     the selected sub-band so select default channel in the
                     BAND(2.4GHz/5GHZ) */
                  ccmCfgGetInt( halHandle, WNI_CFG_SAP_CHANNEL_SELECT_OPERATING_BAND, &operatingBand);
-                 if(RF_SUBBAND_2_4_GHZ == operatingBand )
+                 if(eSAP_RF_SUBBAND_2_4_GHZ == operatingBand )
                      psapContext->channel = SAP_DEFAULT_CHANNEL;
                  else
                      psapContext->channel = SAP_DEFAULT_5GHZ_CHANNEL;
diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index fc5e19470c06..7a1c5380b9da 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -1685,7 +1685,7 @@ void sapComputeSpectWeight( tSapChSelSpectInfo* pSpectInfoParams,
                         break;
                     }
                 }
-                else if(operatingBand == RF_SUBBAND_2_4_GHZ)
+                else if(operatingBand == eSAP_RF_SUBBAND_2_4_GHZ)
                 {
                      sapInterferenceRssiCount(pSpectCh);
                 }
@@ -1892,7 +1892,7 @@ v_U8_t sapSelectChannel(tHalHandle halHandle, ptSapContext pSapCtx,  tScanResult
         case eCSR_BAND_24:
             startChannelNum = rfChannels[RF_CHAN_1].channelNum;
             endChannelNum = rfChannels[RF_CHAN_14].channelNum;
-            operatingBand = RF_SUBBAND_2_4_GHZ;
+            operatingBand = eSAP_RF_SUBBAND_2_4_GHZ;
             break;
 
         case eCSR_BAND_5G:
diff --git a/CORE/SAP/src/sapFsm.c b/CORE/SAP/src/sapFsm.c
index b24cb59343b9..4f5f1c0be286 100644
--- a/CORE/SAP/src/sapFsm.c
+++ b/CORE/SAP/src/sapFsm.c
@@ -1671,26 +1671,31 @@ static VOS_STATUS sapGetChannelList(ptSapContext sapContext,
 
         switch(operatingBand)
         {
-            case RF_SUBBAND_2_4_GHZ:
+            case eSAP_RF_SUBBAND_2_4_GHZ:
                bandStartChannel = RF_CHAN_1;
                bandEndChannel = RF_CHAN_14;
                break;
 
-            case RF_SUBBAND_5_LOW_GHZ:
+            case eSAP_RF_SUBBAND_5_LOW_GHZ:
                bandStartChannel = RF_CHAN_36;
                bandEndChannel = RF_CHAN_64;
                break;
 
-            case RF_SUBBAND_5_MID_GHZ:
+            case eSAP_RF_SUBBAND_5_MID_GHZ:
                bandStartChannel = RF_CHAN_100;
                bandEndChannel = RF_CHAN_140;
                break;
 
-            case RF_SUBBAND_5_HIGH_GHZ:
+            case eSAP_RF_SUBBAND_5_HIGH_GHZ:
                bandStartChannel = RF_CHAN_149;
                bandEndChannel = RF_CHAN_165;
                break;
 
+            case eSAP_RF_SUBBAND_5_ALL_GHZ:
+               bandStartChannel = RF_CHAN_36;
+               bandEndChannel = RF_CHAN_165;
+               break;
+
             default:
                VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
                  "sapGetChannelList:OperatingBand not valid ");
diff --git a/CORE/SAP/src/sapModule.c b/CORE/SAP/src/sapModule.c
index ad5f16cb488a..605a1686cad8 100644
--- a/CORE/SAP/src/sapModule.c
+++ b/CORE/SAP/src/sapModule.c
@@ -1328,7 +1328,7 @@ WLANSAP_DeauthSta
 ============================================================================*/
 VOS_STATUS
 WLANSAP_SetChannelRange(tHalHandle hHal,v_U8_t startChannel, v_U8_t endChannel,
-                              v_U8_t operatingBand)
+                              eSapOperatingBand operatingBand)
 {
 
     v_U8_t    validChannelFlag =0;
@@ -1367,26 +1367,31 @@ WLANSAP_SetChannelRange(tHalHandle hHal,v_U8_t startChannel, v_U8_t endChannel,
     }
     switch(operatingBand)
     {
-       case RF_SUBBAND_2_4_GHZ:
+       case eSAP_RF_SUBBAND_2_4_GHZ:
           bandStartChannel = RF_CHAN_1;
           bandEndChannel = RF_CHAN_14;
           break;
 
-       case RF_SUBBAND_5_LOW_GHZ:
+       case eSAP_RF_SUBBAND_5_LOW_GHZ:
           bandStartChannel = RF_CHAN_36;
           bandEndChannel = RF_CHAN_64;
           break;
 
-       case RF_SUBBAND_5_MID_GHZ:
+       case eSAP_RF_SUBBAND_5_MID_GHZ:
           bandStartChannel = RF_CHAN_100;
           bandEndChannel = RF_CHAN_140;
           break;
 
-       case RF_SUBBAND_5_HIGH_GHZ:
+       case eSAP_RF_SUBBAND_5_HIGH_GHZ:
           bandStartChannel = RF_CHAN_149;
           bandEndChannel = RF_CHAN_165;
           break;
 
+       case eSAP_RF_SUBBAND_5_ALL_GHZ:
+          bandStartChannel = RF_CHAN_36;
+          bandEndChannel = RF_CHAN_165;
+          break;
+
        default:
           VOS_TRACE( VOS_MODULE_ID_SAP, VOS_TRACE_LEVEL_ERROR,
                    "Invalid operatingBand value on WLANSAP_SetChannelRange");