qcacld:sap: Add support of channel 12-14 in ACS

Current ACS does not consider channel 12 -14 when calculate
channel weightage. Added support for channel 12-14.

Change-Id: Ia875194e710d732e00a62cd8fad759c51c69572f
CRs-fixed: 632243

2 files changed, 22 insertions, 16 deletions

diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c
index 7813323f60db..636a4778236d 100644
--- a/CORE/SAP/src/sapChSelect.c
+++ b/CORE/SAP/src/sapChSelect.c
@@ -963,6 +963,9 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
         case CHANNEL_5:
         case CHANNEL_6:
         case CHANNEL_7:
+        case CHANNEL_8:
+        case CHANNEL_9:
+        case CHANNEL_10:
             pExtSpectCh = (pSpectCh - 4);
             if (pExtSpectCh != NULL)
             {
@@ -1003,7 +1006,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh - 1);
-            if(pExtSpectCh != NULL)
+            if (pExtSpectCh != NULL)
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1016,7 +1019,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 1);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1029,7 +1032,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 2);
-            if(pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1042,7 +1045,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 3);
-            if(pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1055,7 +1058,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 4);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1069,7 +1072,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
             }
             break;
 
-        case CHANNEL_8:
+        case CHANNEL_11:
             pExtSpectCh = (pSpectCh - 4);
             if(pExtSpectCh != NULL)
             {
@@ -1124,7 +1127,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 1);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1137,7 +1140,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 2);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1150,7 +1153,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 3);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1164,7 +1167,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
             }
             break;
 
-        case CHANNEL_9:
+        case CHANNEL_12:
             pExtSpectCh = (pSpectCh - 4);
             if (pExtSpectCh != NULL)
             {
@@ -1219,7 +1222,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 1);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1232,7 +1235,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 2);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1246,7 +1249,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
             }
             break;
 
-        case CHANNEL_10:
+        case CHANNEL_13:
             pExtSpectCh = (pSpectCh - 4);
             if (pExtSpectCh != NULL)
             {
@@ -1301,7 +1304,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
                     pExtSpectCh->rssiAgr = SOFTAP_MIN_RSSI;
             }
             pExtSpectCh = (pSpectCh + 1);
-            if (pExtSpectCh != NULL)
+            if ((pExtSpectCh != NULL) && (pExtSpectCh->chNum <= CHANNEL_14))
             {
                 ++pExtSpectCh->bssCount;
                 rssi = pSpectCh->rssiAgr +
@@ -1315,7 +1318,7 @@ void sapInterferenceRssiCount(tSapSpectChInfo *pSpectCh)
             }
             break;
 
-        case CHANNEL_11:
+        case CHANNEL_14:
             pExtSpectCh = (pSpectCh - 1);
             if (pExtSpectCh != NULL)
             {
diff --git a/CORE/SAP/src/sapChSelect.h b/CORE/SAP/src/sapChSelect.h
index 35c4c8267b76..7648c7f7a75b 100644
--- a/CORE/SAP/src/sapChSelect.h
+++ b/CORE/SAP/src/sapChSelect.h
@@ -107,7 +107,10 @@ typedef enum
     CHANNEL_8,
     CHANNEL_9,
     CHANNEL_10,
-    CHANNEL_11
+    CHANNEL_11,
+    CHANNEL_12,
+    CHANNEL_13,
+    CHANNEL_14
 } tSapChannel;
 
 /**