wlan: LDPC support for FTM and NV version support

LDPC, NV version, NV table updates

Change-Id: I2ad66897c34806072a797fa8c11b85b9762b2b23
CR-Fixed: 427414, 432766

Conflicts:
	prima/riva/inc/wlan_nv.h
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index 214cc1f..036d957 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -1672,6 +1672,7 @@
    v_SIZE_t            nvSize;
    sHalNv             *nvContents = NULL;
 
+
    if (NULL == pHddCtx)
    {
       VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
@@ -1728,9 +1729,14 @@
             pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.rssiChanOffsets[0];
             break;
 
-         case NV_TABLE_RF_CAL_VALUES:
-            pHddCtx->ftm.targetNVTableSize = sizeof(nvContents->tables.rFCalValues);
-            pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.rFCalValues;
+         case NV_TABLE_HW_CAL_VALUES:
+            pHddCtx->ftm.targetNVTableSize = sizeof(nvContents->tables.hwCalValues);
+            pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.hwCalValues;
+            break;
+
+         case NV_TABLE_FW_CONFIG:
+            pHddCtx->ftm.targetNVTableSize = sizeof(nvContents->tables.fwConfig);
+            pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.fwConfig;
             break;
 
          case NV_TABLE_ANTENNA_PATH_LOSS:
@@ -1754,7 +1760,9 @@
       {
          /* Invalid table size, discard and initialize data */
          VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
-                    "Invalid Table Size %d", nvTable->tableSize);
+                    "Invalid Table Size %d for Table %d"
+                    " expected size %d\n", nvTable->tableSize, nvTable->nvTable,
+                    pHddCtx->ftm.targetNVTableSize);
          pHddCtx->ftm.processingNVTable    = NV_MAX_TABLE;
          pHddCtx->ftm.targetNVTableSize    = 0;
          pHddCtx->ftm.processedNVTableSize = 0;
@@ -1883,9 +1891,14 @@
             pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.rssiChanOffsets[0];
             break;
 
-         case NV_TABLE_RF_CAL_VALUES:
-            pHddCtx->ftm.targetNVTableSize    = sizeof(nvContents->tables.rFCalValues);
-            pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.rFCalValues;
+         case NV_TABLE_HW_CAL_VALUES:
+            pHddCtx->ftm.targetNVTableSize    = sizeof(nvContents->tables.hwCalValues);
+            pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.hwCalValues;
+            break;
+
+         case NV_TABLE_FW_CONFIG:
+            pHddCtx->ftm.targetNVTableSize    = sizeof(nvContents->tables.fwConfig);
+            pHddCtx->ftm.targetNVTablePointer = (v_U8_t *)&nvContents->tables.fwConfig;
             break;
 
          case NV_TABLE_ANTENNA_PATH_LOSS:
@@ -2014,9 +2027,9 @@
           &nvDefaults.tables.rssiChanOffsets[0],
           itemSize);
 
-   itemSize = sizeof(nvContents->tables.rFCalValues);
-   memcpy(&nvContents->tables.rFCalValues,
-          &nvDefaults.tables.rFCalValues,
+   itemSize = sizeof(nvContents->tables.hwCalValues);
+   memcpy(&nvContents->tables.hwCalValues,
+          &nvDefaults.tables.hwCalValues,
           itemSize);
 
    itemSize = sizeof(nvContents->tables.antennaPathLoss);
@@ -2114,10 +2127,17 @@
                 itemSize);
          break;
 
-      case NV_TABLE_RF_CAL_VALUES:
-         itemSize = sizeof(nvContents->tables.rFCalValues);
-         memcpy(&nvContents->tables.rFCalValues,
-                &nvDefaults.tables.rFCalValues,
+      case NV_TABLE_HW_CAL_VALUES:
+         itemSize = sizeof(nvContents->tables.hwCalValues);
+         memcpy(&nvContents->tables.hwCalValues,
+                &nvDefaults.tables.hwCalValues,
+                itemSize);
+         break;
+
+      case NV_TABLE_FW_CONFIG:
+         itemSize = sizeof(nvContents->tables.fwConfig);
+         memcpy(&nvContents->tables.fwConfig,
+                &nvDefaults.tables.fwConfig,
                 itemSize);
          break;
 
@@ -2215,12 +2235,24 @@
              NV_FIELD_MFG_SN_SIZE);
          break;
 
+      case NV_COMMON_WLAN_NV_REV_ID:
+         memcpy((void *)&nvField->fieldData,
+             &nvFieldDataBuffer.wlanNvRevId,
+             sizeof(nvFieldDataBuffer.wlanNvRevId));
+         break;
+
       case NV_COMMON_COUPLER_TYPE:
          memcpy((void *)&nvField->fieldData,
                 &nvFieldDataBuffer.couplerType,
                 sizeof(nvFieldDataBuffer.couplerType));
          break;
 
+      case NV_COMMON_NV_VERSION:
+         memcpy((void *)&nvField->fieldData,
+                &nvFieldDataBuffer.nvVersion,
+                sizeof(nvFieldDataBuffer.nvVersion));
+         break;
+
       default:
          VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
                     "Not Valid NV field %d", nvField->nvField);
@@ -2256,6 +2288,7 @@
    v_U8_t            *pNVMac;
    v_U8_t             lastByteMAC;
 
+   
    nvStatus = vos_nv_getNVBuffer((void **)&nvContents, &nvSize);
    if((VOS_STATUS_SUCCESS != nvStatus) || (NULL == nvContents))
    {
@@ -2320,12 +2353,24 @@
              NV_FIELD_MFG_SN_SIZE);
          break;
 
+     case NV_COMMON_WLAN_NV_REV_ID:
+        memcpy(&nvContents->fields.wlanNvRevId,
+               &nvField->fieldData,
+               sizeof(nvContents->fields.wlanNvRevId));
+        break;
+
       case NV_COMMON_COUPLER_TYPE:
          memcpy(&nvContents->fields.couplerType,
                 &nvField->fieldData,
                 sizeof(nvContents->fields.couplerType));
          break;
 
+      case NV_COMMON_NV_VERSION:
+         VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                    "Cannot modify NV version field %d", nvField->nvField);
+         return -EIO;
+         break;
+
       default:
          VOS_TRACE( VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
                     "Not Valid NV field %d", nvField->nvField);
@@ -2420,12 +2465,18 @@
          tableVNVType = VNV_RSSI_CHANNEL_OFFSETS;
          break;
 
-      case NV_TABLE_RF_CAL_VALUES:
-         tablePtr     = (void *)&nvContents->tables.rFCalValues;
-         tableSize    = sizeof(nvContents->tables.rFCalValues);
-         tableVNVType = VNV_RF_CAL_VALUES;
+      case NV_TABLE_HW_CAL_VALUES:
+         tablePtr     = (void *)&nvContents->tables.hwCalValues;
+         tableSize    = sizeof(nvContents->tables.hwCalValues);
+         tableVNVType = VNV_HW_CAL_VALUES;
          break;
 
+      case NV_TABLE_FW_CONFIG:
+         tablePtr     = (void *)&nvContents->tables.fwConfig;
+         tableSize    = sizeof(nvContents->tables.fwConfig);
+         tableVNVType = VNV_FW_CONFIG;
+         break;         
+
       case NV_TABLE_ANTENNA_PATH_LOSS:
          tablePtr     = (void *)&nvContents->tables.antennaPathLoss[0];
          tableSize    = sizeof(nvContents->tables.antennaPathLoss);
diff --git a/CORE/VOSS/inc/vos_nvitem.h b/CORE/VOSS/inc/vos_nvitem.h
index 81b43cb..c1d9bba 100644
--- a/CORE/VOSS/inc/vos_nvitem.h
+++ b/CORE/VOSS/inc/vos_nvitem.h
@@ -107,9 +107,9 @@
 ADD_VNV_ITEM( VNV_RX_SENSITIVITY, 1, MAC_RATE_COUNT, NV_WLAN_RX_SENSITIVITY_I)\
 ADD_VNV_ITEM( VNV_NETWORK_TYPE, 1, 1, NV_WLAN_NETWORK_TYPE_I ) \
 ADD_VNV_ITEM( VNV_CAL_MEMORY, 1, 3460, NV_WLAN_CAL_MEMORY_I ) \
-ADD_VNV_ITEM( VNV_CAL_STATUS, 1, 32, NV_WLAN_CAL_STATUS_I ) \
+ADD_VNV_ITEM( VNV_FW_CONFIG, 1, 32, NV_WLAN_FW_CONFIG_I ) \
 ADD_VNV_ITEM( VNV_RSSI_CHANNEL_OFFSETS, 2, 56, NV_WLAN_RSSI_CHANNEL_OFFSETS_I ) \
-ADD_VNV_ITEM( VNV_RF_CAL_VALUES, 1, 48, NV_WLAN_RF_CAL_VALUES_I ) \
+ADD_VNV_ITEM( VNV_HW_CAL_VALUES, 1, 48, NV_WLAN_HW_CAL_VALUES_I ) \
 ADD_VNV_ITEM( VNV_ANTENNA_PATH_LOSS, 14, 2, NV_WLAN_ANTENNA_PATH_LOSS_I ) \
 ADD_VNV_ITEM( VNV_PACKET_TYPE_POWER_LIMITS, 42, 2, NV_WLAN_PACKET_TYPE_POWER_LIMITS_I ) \
 ADD_VNV_ITEM( VNV_OFDM_CMD_PWR_OFFSET, 1, 2, NV_WLAN_OFDM_CMD_PWR_OFFSET_I ) \
diff --git a/CORE/VOSS/src/vos_nvitem.c b/CORE/VOSS/src/vos_nvitem.c
index 1c68a99..b76b3b8 100644
--- a/CORE/VOSS/src/vos_nvitem.c
+++ b/CORE/VOSS/src/vos_nvitem.c
@@ -518,6 +518,10 @@
          return VOS_STATUS_E_RESOURCES;
     }
 
+     VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+           "INFO: NV binary file version=%d Driver default NV version=%d, continue...\n",
+           gnvEFSTable->halnv.fields.nvVersion, WLAN_NV_VERSION);
+
      /* Copying the read nv data to the globa NV EFS table */
     {
         /* Allocate memory to global NV table */
@@ -531,16 +535,37 @@
 
         /*Copying the NV defaults */
         vos_mem_copy(&(pnvEFSTable->halnv),&nvDefaults,sizeof(sHalNv));
-       
+
+        /* Size mismatch */
         if ( nvReadBufSize != bufSize)
         {
             pnvEFSTable->nvValidityBitmap = DEFAULT_NV_VALIDITY_BITMAP;
             VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_FATAL,
                       "!!!WARNING: INVALID NV FILE, DRIVER IS USING DEFAULT CAL VALUES %d %d!!!",
                       nvReadBufSize, bufSize);
-            goto error;
+            return VOS_STATUS_SUCCESS;
         }
 
+       /* Version mismatch */
+       if (gnvEFSTable->halnv.fields.nvVersion != WLAN_NV_VERSION)
+       {
+           if ((WLAN_NV_VERSION == NV_VERSION_11N_11AC_FW_CONFIG) &&
+               (gnvEFSTable->halnv.fields.nvVersion == NV_VERSION_11N_11AC_COUPER_TYPE))
+           {
+               VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                     "!!!WARNING: Using Coupler Type field instead of Fw Config table,\n"
+                     "Make sure that this is intented or may impact performance!!!\n");
+           }
+           else
+           {
+               VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                     "!!!WARNING: NV binary file version doesn't match with Driver default NV version\n"
+                     "Driver NV defaults will be used, may impact performance!!!\n");
+
+               return VOS_STATUS_SUCCESS;
+           }
+       }
+
        pnvEFSTable->nvValidityBitmap = gnvEFSTable->nvValidityBitmap;
         /* Copy the valid fields to the NV Global structure */ 
         if (vos_nv_getValidity(VNV_FIELD_IMAGE, &itemIsValid) == 
@@ -626,13 +651,24 @@
             }
         }
     
-        if (vos_nv_getValidity(VNV_RF_CAL_VALUES, &itemIsValid) == 
+        if (vos_nv_getValidity(VNV_HW_CAL_VALUES, &itemIsValid) == 
          VOS_STATUS_SUCCESS)
         {
             if (itemIsValid == VOS_TRUE)
             {
-                if(vos_nv_read( VNV_RF_CAL_VALUES, (v_VOID_t *)&pnvEFSTable->halnv
-    .tables.rFCalValues, NULL, sizeof(sRFCalValues) ) != VOS_STATUS_SUCCESS)
+                if(vos_nv_read( VNV_HW_CAL_VALUES, (v_VOID_t *)&pnvEFSTable->halnv
+    .tables.hwCalValues, NULL, sizeof(sHwCalValues) ) != VOS_STATUS_SUCCESS)
+                    goto error;
+            }
+        }
+
+        if (vos_nv_getValidity(VNV_FW_CONFIG, &itemIsValid) == 
+         VOS_STATUS_SUCCESS)
+        {
+            if (itemIsValid == VOS_TRUE)
+            {
+                if(vos_nv_read( VNV_FW_CONFIG, (v_VOID_t *)&pnvEFSTable->halnv
+    .tables.fwConfig, NULL, sizeof(sFwConfig) ) != VOS_STATUS_SUCCESS)
                     goto error;
             }
         }
@@ -1216,9 +1252,9 @@
                memcpy(outputVoidBuffer,&gnvEFSTable->halnv.tables.rssiChanOffsets[0],bufferSize);
            }
            break;
-       case VNV_RF_CAL_VALUES:
+       case VNV_HW_CAL_VALUES:
 
-           itemSize = sizeof(gnvEFSTable->halnv.tables.rFCalValues);
+           itemSize = sizeof(gnvEFSTable->halnv.tables.hwCalValues);
 
            if(bufferSize != itemSize) {
 
@@ -1228,7 +1264,22 @@
                status = VOS_STATUS_E_INVAL;
            }
            else {
-               memcpy(outputVoidBuffer,&gnvEFSTable->halnv.tables.rFCalValues,bufferSize);
+               memcpy(outputVoidBuffer,&gnvEFSTable->halnv.tables.hwCalValues,bufferSize);
+           }
+           break;
+       case VNV_FW_CONFIG:
+       
+           itemSize = sizeof(gnvEFSTable->halnv.tables.fwConfig);
+       
+           if(bufferSize != itemSize) {
+       
+               VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize,
+                 itemSize);
+               status = VOS_STATUS_E_INVAL;
+           }
+           else {
+               memcpy(outputVoidBuffer,&gnvEFSTable->halnv.tables.fwConfig,bufferSize);
            }
            break;
        case VNV_ANTENNA_PATH_LOSS:
@@ -1443,9 +1494,9 @@
                 memcpy(&gnvEFSTable->halnv.tables.rssiChanOffsets[0],inputVoidBuffer,bufferSize);
             }
             break;
-         case VNV_RF_CAL_VALUES:
+         case VNV_HW_CAL_VALUES:
 
-            itemSize = sizeof(gnvEFSTable->halnv.tables.rFCalValues);
+            itemSize = sizeof(gnvEFSTable->halnv.tables.hwCalValues);
 
             if(bufferSize != itemSize) {
 
@@ -1455,9 +1506,24 @@
                 status = VOS_STATUS_E_INVAL;
             }
             else {
-                memcpy(&gnvEFSTable->halnv.tables.rFCalValues,inputVoidBuffer,bufferSize);
+                memcpy(&gnvEFSTable->halnv.tables.hwCalValues,inputVoidBuffer,bufferSize);
             }
             break;
+        case VNV_FW_CONFIG:
+        
+           itemSize = sizeof(gnvEFSTable->halnv.tables.fwConfig);
+        
+           if(bufferSize != itemSize) {
+        
+               VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                ("type = %d buffer size=%d is less than data size=%d\r\n"),type, bufferSize,
+                 itemSize);
+               status = VOS_STATUS_E_INVAL;
+           }
+           else {
+               memcpy(&gnvEFSTable->halnv.tables.fwConfig,inputVoidBuffer,bufferSize);
+           }
+           break;
         case VNV_ANTENNA_PATH_LOSS:
             itemSize = sizeof(gnvEFSTable->halnv.tables.antennaPathLoss);
             if(bufferSize != itemSize) {
diff --git a/CORE/WDA/src/wlan_nv.c b/CORE/WDA/src/wlan_nv.c
index 010d704..bf62d6f 100644
--- a/CORE/WDA/src/wlan_nv.c
+++ b/CORE/WDA/src/wlan_nv.c
@@ -55,3769 +55,6 @@
 #ifndef WLAN_NV_C
 #define WLAN_NV_C
 
-#ifndef FEATURE_WLAN_INTEGRATED_SOC
-
-#include "wlan_nv.h"
-
-const sHalNv nvDefaults =
-{
-    {
-        0,                                                              // tANI_U16  productId;
-        0,                                                              // tANI_U8   productBands;
-        1,                                                              // tANI_U8   wlanNvRevId; //0: WCN1312, 1: WCN1314, 2: WCN3660
-        1,                                                              // tANI_U8   numOfTxChains;
-        2,                                                              // tANI_U8   numOfRxChains;
-        { 0x00, 0xDE, 0xAD, 0xBE, 0xEF, 0x00 },                         // tANI_U8   macAddr[NV_FIELD_MAC_ADDR_SIZE];
-        { "\0" }
-    }, //fields
-
-    {
-        // NV_TABLE_RATE_POWER_SETTINGS
-        {
-            // typedef tANI_S8 tPowerdBm;
-            //typedef tPowerdBm tRateGroupPwr[NUM_HAL_PHY_RATES];
-            //tRateGroupPwr       pwrOptimum[NUM_RF_SUBBANDS];
-            {
-                    //802.11b Rates
-                {2150},    // HAL_PHY_RATE_11B_LONG_1_MBPS,
-                {2150},    // HAL_PHY_RATE_11B_LONG_2_MBPS,
-                {2150},    // HAL_PHY_RATE_11B_LONG_5_5_MBPS,
-                {2150},    // HAL_PHY_RATE_11B_LONG_11_MBPS,
-                {2150},    // HAL_PHY_RATE_11B_SHORT_2_MBPS,
-                {2150},    // HAL_PHY_RATE_11B_SHORT_5_5_MBPS,
-                {2150},    // HAL_PHY_RATE_11B_SHORT_11_MBPS,
-
-                    //SLR Rates
-                {2150},    // HAL_PHY_RATE_SLR_0_25_MBPS,
-                {2150},    // HAL_PHY_RATE_SLR_0_5_MBPS,
-
-                    //11A 20MHz Rates
-                {1750},    // HAL_PHY_RATE_11A_6_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_9_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_12_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_18_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_24_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_36_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_48_MBPS,
-                {1750},    // HAL_PHY_RATE_11A_54_MBPS,
-
-                    //MCS Index #0-15 (20MHz)
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_19_5_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_26_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_39_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_52_MBPS,
-                {1650},    // HAL_PHY_RATE_MCS_1NSS_58_5_MBPS,
-                {1550},    // HAL_PHY_RATE_MCS_1NSS_65_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_7_2_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_14_4_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_21_7_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_28_9_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_43_3_MBPS,
-                {1750},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_57_8_MBPS,
-                {1650},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_65_MBPS,
-                {1550}     // HAL_PHY_RATE_MCS_1NSS_MM_SG_72_2_MBPS,
-            },  //    RF_SUBBAND_2_4_GHZ,
-        },
-
-
-        // NV_TABLE_REGULATORY_DOMAINS
-        {
-            // typedef struct
-            // {
-            //     tANI_BOOLEAN enabled;
-            //     tPowerdBm pwrLimit;
-            // }sRegulatoryChannel;
-
-            // typedef struct
-            // {
-            //     sRegulatoryChannel channels[NUM_RF_CHANNELS];
-            //     uAbsPwrPrecision antennaGain[NUM_RF_SUBBANDS];
-            //     uAbsPwrPrecision bRatePowerOffset[NUM_2_4GHZ_CHANNELS];
-            // }sRegulatoryDomains;
-
-            //sRegulatoryDomains  regDomains[NUM_REG_DOMAINS];
-
-
-            {   // REG_DOMAIN_FCC start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 23},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 22},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 22},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_FCC end
-
-            {   // REG_DOMAIN_ETSI start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_TRUE, 19},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_TRUE, 19},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_ETSI end
-
-            {   // REG_DOMAIN_JAPAN start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_TRUE, 20},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_TRUE, 18},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_JAPAN end
-
-            {   // REG_DOMAIN_WORLD start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_WORLD end
-
-            {   // REG_DOMAIN_N_AMER_EXC_FCC start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 16},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 30},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            },   // REG_DOMAIN_N_AMER_EXC_FCC end
-
-            {   // REG_DOMAIN_APAC start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_TRUE, 26},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_APAC end
-
-            {   // REG_DOMAIN_KOREA start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_TRUE, 15},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_KOREA end
-
-            {   // REG_DOMAIN_HI_5GHZ start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_TRUE, 14},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            }, // REG_DOMAIN_HI_5GHZ end
-
-            {   // REG_DOMAIN_NO_5GHZ start
-                { //sRegulatoryChannel start
-                    //enabled, pwrLimit
-                                       //2.4GHz Band
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_1,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_2,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_3,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_4,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_5,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_6,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_7,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_8,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_9,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_10,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_11,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_12,
-                    {eANI_BOOLEAN_TRUE, 12},           //RF_CHAN_13,
-                    {eANI_BOOLEAN_FALSE, 0},           //RF_CHAN_14,
-
-                }, //sRegulatoryChannel end
-                {
-                    { 0 },  // RF_SUBBAND_2_4_GHZ
-                },
-
-                { // bRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                }, // bRatePowerOffset end
-
-                { // gnRatePowerOffset start
-                    //2.4GHz Band
-                    { 0 },                       //RF_CHAN_1,
-                    { 0 },                       //RF_CHAN_2,
-                    { 0 },                       //RF_CHAN_3,
-                    { 0 },                       //RF_CHAN_4,
-                    { 0 },                       //RF_CHAN_5,
-                    { 0 },                       //RF_CHAN_6,
-                    { 0 },                       //RF_CHAN_7,
-                    { 0 },                       //RF_CHAN_8,
-                    { 0 },                       //RF_CHAN_9,
-                    { 0 },                       //RF_CHAN_10,
-                    { 0 },                       //RF_CHAN_11,
-                    { 0 },                       //RF_CHAN_12,
-                    { 0 },                       //RF_CHAN_13,
-                    { 0 },                       //RF_CHAN_14,
-                } // gnRatePowerOffset end
-            } // REG_DOMAIN_NO_5GHZ end
-        },
-
-        // NV_TABLE_DEFAULT_COUNTRY
-        {
-            // typedef struct
-            // {
-            //     tANI_U8 regDomain;                                      //from eRegDomainId
-            //     tANI_U8 countryCode[NV_FIELD_COUNTRY_CODE_SIZE];    // string identifier
-            // }sDefaultCountry;
-
-            0,                  // regDomain
-            { 'U', 'S', 'I' }   // countryCode
-        },
-
-        //NV_TABLE_TPC_POWER_TABLE
-        {
-            {
-                {
-                    0  , //0
-                    41 , //1
-                    43 , //2
-                    45 , //3
-                    47 , //4
-                    49 , //5
-                    51 , //6
-                    53 , //7
-                    55 , //8
-                    56 , //9
-                    58 , //10
-                    59 , //11
-                    60 , //12
-                    62 , //13
-                    63 , //14
-                    64 , //15
-                    65 , //16
-                    67 , //17
-                    68 , //18
-                    69 , //19
-                    70 , //20
-                    71 , //21
-                    72 , //22
-                    73 , //23
-                    74 , //24
-                    75 , //25
-                    75 , //26
-                    76 , //27
-                    77 , //28
-                    78 , //29
-                    78 , //30
-                    79 , //31
-                    80 , //32
-                    81 , //33
-                    82 , //34
-                    82 , //35
-                    83 , //36
-                    83 , //37
-                    84 , //38
-                    85 , //39
-                    86 , //40
-                    86 , //41
-                    87 , //42
-                    88 , //43
-                    89 , //44
-                    89 , //45
-                    90 , //46
-                    91 , //47
-                    91 , //48
-                    92 , //49
-                    92 , //50
-                    93 , //51
-                    93 , //52
-                    94 , //53
-                    94 , //54
-                    95 , //55
-                    95 , //56
-                    95 , //57
-                    96 , //58
-                    96 , //59
-                    97 , //60
-                    97 , //61
-                    98 , //62
-                    98 , //63
-                    98 , //64
-                    99 , //65
-                    99 , //66
-                    99 , //67
-                    100, //68
-                    100, //69
-                    100, //70
-                    101, //71
-                    101, //72
-                    102, //73
-                    102, //74
-                    102, //75
-                    102, //76
-                    103, //77
-                    103, //78
-                    103, //79
-                    103, //80
-                    104, //81
-                    104, //82
-                    104, //83
-                    104, //84
-                    105, //85
-                    105, //86
-                    105, //87
-                    105, //88
-                    105, //89
-                    106, //90
-                    106, //91
-                    106, //92
-                    106, //93
-                    106, //94
-                    106, //95
-                    106, //96
-                    106, //97
-                    106, //98
-                    106, //99
-                    106, //100
-                    106, //101
-                    106, //102
-                    106, //103
-                    106, //104
-                    106, //105
-                    107, //106
-                    107, //107
-                    107, //108
-                    107, //109
-                    107, //110
-                    107, //111
-                    107, //112
-                    107, //113
-                    107, //114
-                    107, //115
-                    107, //116
-                    107, //117
-                    107, //118
-                    107, //119
-                    107, //120
-                    107, //121
-                    107, //122
-                    107, //123
-                    107, //124
-                    107, //125
-                    107, //126
-                    107, //127
-                }
-            }, //RF_CHAN_1
-            {
-                {
-                    0  , //0
-                    41 , //1
-                    43 , //2
-                    45 , //3
-                    47 , //4
-                    49 , //5
-                    51 , //6
-                    52 , //7
-                    54 , //8
-                    56 , //9
-                    57 , //10
-                    59 , //11
-                    60 , //12
-                    61 , //13
-                    62 , //14
-                    64 , //15
-                    65 , //16
-                    66 , //17
-                    67 , //18
-                    68 , //19
-                    69 , //20
-                    70 , //21
-                    71 , //22
-                    72 , //23
-                    73 , //24
-                    74 , //25
-                    75 , //26
-                    75 , //27
-                    76 , //28
-                    77 , //29
-                    78 , //30
-                    79 , //31
-                    79 , //32
-                    80 , //33
-                    81 , //34
-                    82 , //35
-                    82 , //36
-                    83 , //37
-                    84 , //38
-                    85 , //39
-                    85 , //40
-                    86 , //41
-                    87 , //42
-                    88 , //43
-                    88 , //44
-                    89 , //45
-                    89 , //46
-                    90 , //47
-                    91 , //48
-                    91 , //49
-                    92 , //50
-                    92 , //51
-                    93 , //52
-                    93 , //53
-                    94 , //54
-                    94 , //55
-                    95 , //56
-                    95 , //57
-                    96 , //58
-                    96 , //59
-                    96 , //60
-                    97 , //61
-                    97 , //62
-                    98 , //63
-                    98 , //64
-                    98 , //65
-                    99 , //66
-                    99 , //67
-                    99 , //68
-                    100, //69
-                    100, //70
-                    101, //71
-                    101, //72
-                    101, //73
-                    101, //74
-                    102, //75
-                    102, //76
-                    102, //77
-                    103, //78
-                    103, //79
-                    103, //80
-                    104, //81
-                    104, //82
-                    104, //83
-                    104, //84
-                    105, //85
-                    105, //86
-                    105, //87
-                    105, //88
-                    105, //89
-                    106, //90
-                    106, //91
-                    106, //92
-                    106, //93
-                    106, //94
-                    106, //95
-                    106, //96
-                    106, //97
-                    106, //98
-                    106, //99
-                    106, //100
-                    106, //101
-                    106, //102
-                    107, //103
-                    107, //104
-                    107, //105
-                    107, //106
-                    107, //107
-                    107, //108
-                    107, //109
-                    107, //110
-                    107, //111
-                    107, //112
-                    107, //113
-                    107, //114
-                    107, //115
-                    107, //116
-                    107, //117
-                    107, //118
-                    107, //119
-                    107, //120
-                    107, //121
-                    107, //122
-                    107, //123
-                    107, //124
-                    107, //125
-                    107, //126
-                    107, //127
-                }
-            }, //RF_CHAN_2
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        43 , //2
-                        45 , //3
-                        47 , //4
-                        49 , //5
-                        51 , //6
-                        52 , //7
-                        54 , //8
-                        55 , //9
-                        57 , //10
-                        58 , //11
-                        60 , //12
-                        61 , //13
-                        62 , //14
-                        64 , //15
-                        65 , //16
-                        66 , //17
-                        67 , //18
-                        68 , //19
-                        69 , //20
-                        70 , //21
-                        71 , //22
-                        72 , //23
-                        73 , //24
-                        74 , //25
-                        75 , //26
-                        75 , //27
-                        76 , //28
-                        77 , //29
-                        78 , //30
-                        78 , //31
-                        79 , //32
-                        80 , //33
-                        81 , //34
-                        82 , //35
-                        82 , //36
-                        83 , //37
-                        84 , //38
-                        84 , //39
-                        85 , //40
-                        86 , //41
-                        87 , //42
-                        87 , //43
-                        88 , //44
-                        89 , //45
-                        89 , //46
-                        90 , //47
-                        90 , //48
-                        91 , //49
-                        91 , //50
-                        92 , //51
-                        93 , //52
-                        93 , //53
-                        94 , //54
-                        94 , //55
-                        94 , //56
-                        95 , //57
-                        95 , //58
-                        96 , //59
-                        96 , //60
-                        97 , //61
-                        97 , //62
-                        97 , //63
-                        98 , //64
-                        98 , //65
-                        99 , //66
-                        99 , //67
-                        99 , //68
-                        100, //69
-                        100, //70
-                        100, //71
-                        101, //72
-                        101, //73
-                        101, //74
-                        102, //75
-                        102, //76
-                        102, //77
-                        103, //78
-                        103, //79
-                        103, //80
-                        103, //81
-                        104, //82
-                        104, //83
-                        104, //84
-                        104, //85
-                        104, //86
-                        105, //87
-                        105, //88
-                        105, //89
-                        105, //90
-                        105, //91
-                        105, //92
-                        105, //93
-                        105, //94
-                        105, //95
-                        105, //96
-                        105, //97
-                        105, //98
-                        106, //99
-                        106, //100
-                        106, //101
-                        106, //102
-                        106, //103
-                        106, //104
-                        106, //105
-                        106, //106
-                        106, //107
-                        106, //108
-                        106, //109
-                        106, //110
-                        106, //111
-                        106, //112
-                        106, //113
-                        106, //114
-                        106, //115
-                        106, //116
-                        106, //117
-                        106, //118
-                        106, //119
-                        106, //120
-                        106, //121
-                        106, //122
-                        106, //123
-                        106, //124
-                        106, //125
-                        106, //126
-                        106, //127
-                    }
-                }, //RF_CHAN_3
-                {
-                    {
-                        0  , //0
-                        42 , //1
-                        44 , //2
-                        46 , //3
-                        48 , //4
-                        49 , //5
-                        51 , //6
-                        53 , //7
-                        55 , //8
-                        57 , //9
-                        58 , //10
-                        60 , //11
-                        61 , //12
-                        62 , //13
-                        63 , //14
-                        64 , //15
-                        66 , //16
-                        67 , //17
-                        68 , //18
-                        69 , //19
-                        70 , //20
-                        71 , //21
-                        72 , //22
-                        73 , //23
-                        74 , //24
-                        75 , //25
-                        75 , //26
-                        76 , //27
-                        77 , //28
-                        78 , //29
-                        78 , //30
-                        79 , //31
-                        80 , //32
-                        81 , //33
-                        82 , //34
-                        82 , //35
-                        83 , //36
-                        84 , //37
-                        84 , //38
-                        85 , //39
-                        86 , //40
-                        87 , //41
-                        87 , //42
-                        88 , //43
-                        88 , //44
-                        89 , //45
-                        90 , //46
-                        90 , //47
-                        91 , //48
-                        91 , //49
-                        92 , //50
-                        92 , //51
-                        93 , //52
-                        93 , //53
-                        94 , //54
-                        94 , //55
-                        95 , //56
-                        95 , //57
-                        95 , //58
-                        96 , //59
-                        96 , //60
-                        97 , //61
-                        97 , //62
-                        98 , //63
-                        98 , //64
-                        98 , //65
-                        99 , //66
-                        99 , //67
-                        99 , //68
-                        100, //69
-                        100, //70
-                        100, //71
-                        101, //72
-                        101, //73
-                        101, //74
-                        102, //75
-                        102, //76
-                        102, //77
-                        103, //78
-                        103, //79
-                        103, //80
-                        103, //81
-                        104, //82
-                        104, //83
-                        104, //84
-                        104, //85
-                        104, //86
-                        104, //87
-                        104, //88
-                        104, //89
-                        105, //90
-                        105, //91
-                        105, //92
-                        105, //93
-                        105, //94
-                        105, //95
-                        105, //96
-                        105, //97
-                        105, //98
-                        105, //99
-                        105, //100
-                        105, //101
-                        105, //102
-                        105, //103
-                        105, //104
-                        106, //105
-                        106, //106
-                        106, //107
-                        106, //108
-                        106, //109
-                        106, //110
-                        106, //111
-                        106, //112
-                        106, //113
-                        106, //114
-                        106, //115
-                        106, //116
-                        106, //117
-                        106, //118
-                        106, //119
-                        106, //120
-                        106, //121
-                        106, //122
-                        106, //123
-                        106, //124
-                        106, //125
-                        106, //126
-                        106, //127
-                    }
-                }, //RF_CHAN_4
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        43 , //2
-                        45 , //3
-                        47 , //4
-                        49 , //5
-                        51 , //6
-                        53 , //7
-                        54 , //8
-                        56 , //9
-                        57 , //10
-                        59 , //11
-                        60 , //12
-                        62 , //13
-                        63 , //14
-                        65 , //15
-                        66 , //16
-                        67 , //17
-                        68 , //18
-                        69 , //19
-                        69 , //20
-                        71 , //21
-                        72 , //22
-                        72 , //23
-                        73 , //24
-                        74 , //25
-                        75 , //26
-                        76 , //27
-                        77 , //28
-                        78 , //29
-                        79 , //30
-                        79 , //31
-                        80 , //32
-                        81 , //33
-                        82 , //34
-                        83 , //35
-                        83 , //36
-                        84 , //37
-                        85 , //38
-                        86 , //39
-                        87 , //40
-                        87 , //41
-                        88 , //42
-                        89 , //43
-                        89 , //44
-                        90 , //45
-                        91 , //46
-                        91 , //47
-                        92 , //48
-                        92 , //49
-                        93 , //50
-                        93 , //51
-                        94 , //52
-                        94 , //53
-                        95 , //54
-                        95 , //55
-                        96 , //56
-                        96 , //57
-                        96 , //58
-                        97 , //59
-                        97 , //60
-                        98 , //61
-                        98 , //62
-                        98 , //63
-                        99 , //64
-                        99 , //65
-                        100, //66
-                        100, //67
-                        100, //68
-                        101, //69
-                        101, //70
-                        101, //71
-                        102, //72
-                        102, //73
-                        102, //74
-                        103, //75
-                        103, //76
-                        103, //77
-                        103, //78
-                        104, //79
-                        104, //80
-                        104, //81
-                        104, //82
-                        105, //83
-                        105, //84
-                        105, //85
-                        105, //86
-                        105, //87
-                        105, //88
-                        105, //89
-                        105, //90
-                        105, //91
-                        106, //92
-                        106, //93
-                        106, //94
-                        106, //95
-                        106, //96
-                        106, //97
-                        106, //98
-                        106, //99
-                        106, //100
-                        106, //101
-                        106, //102
-                        106, //103
-                        106, //104
-                        106, //105
-                        106, //106
-                        106, //107
-                        106, //108
-                        106, //109
-                        106, //110
-                        106, //111
-                        106, //112
-                        106, //113
-                        106, //114
-                        106, //115
-                        106, //116
-                        106, //117
-                        106, //118
-                        106, //119
-                        106, //120
-                        106, //121
-                        106, //122
-                        106, //123
-                        106, //124
-                        106, //125
-                        106, //126
-                        106, //127
-                    }
-                }, //RF_CHAN_5
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        43 , //2
-                        45 , //3
-                        47 , //4
-                        49 , //5
-                        51 , //6
-                        53 , //7
-                        55 , //8
-                        56 , //9
-                        58 , //10
-                        59 , //11
-                        61 , //12
-                        62 , //13
-                        63 , //14
-                        64 , //15
-                        65 , //16
-                        66 , //17
-                        68 , //18
-                        69 , //19
-                        70 , //20
-                        71 , //21
-                        72 , //22
-                        73 , //23
-                        74 , //24
-                        75 , //25
-                        76 , //26
-                        77 , //27
-                        77 , //28
-                        78 , //29
-                        79 , //30
-                        80 , //31
-                        80 , //32
-                        81 , //33
-                        82 , //34
-                        83 , //35
-                        83 , //36
-                        84 , //37
-                        85 , //38
-                        86 , //39
-                        87 , //40
-                        87 , //41
-                        88 , //42
-                        89 , //43
-                        89 , //44
-                        90 , //45
-                        91 , //46
-                        91 , //47
-                        92 , //48
-                        92 , //49
-                        93 , //50
-                        93 , //51
-                        94 , //52
-                        94 , //53
-                        95 , //54
-                        95 , //55
-                        96 , //56
-                        96 , //57
-                        97 , //58
-                        97 , //59
-                        98 , //60
-                        98 , //61
-                        98 , //62
-                        99 , //63
-                        99 , //64
-                        100, //65
-                        100, //66
-                        100, //67
-                        101, //68
-                        101, //69
-                        101, //70
-                        102, //71
-                        102, //72
-                        102, //73
-                        103, //74
-                        103, //75
-                        103, //76
-                        103, //77
-                        104, //78
-                        104, //79
-                        104, //80
-                        104, //81
-                        104, //82
-                        105, //83
-                        105, //84
-                        105, //85
-                        105, //86
-                        105, //87
-                        105, //88
-                        105, //89
-                        106, //90
-                        106, //91
-                        106, //92
-                        106, //93
-                        106, //94
-                        106, //95
-                        106, //96
-                        106, //97
-                        106, //98
-                        106, //99
-                        106, //100
-                        106, //101
-                        106, //102
-                        106, //103
-                        106, //104
-                        106, //105
-                        106, //106
-                        106, //107
-                        106, //108
-                        106, //109
-                        106, //110
-                        107, //111
-                        107, //112
-                        107, //113
-                        107, //114
-                        107, //115
-                        107, //116
-                        107, //117
-                        107, //118
-                        107, //119
-                        107, //120
-                        107, //121
-                        107, //122
-                        107, //123
-                        107, //124
-                        107, //125
-                        107, //126
-                        107, //127
-                    }
-                }, //RF_CHAN_6
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        43 , //2
-                        45 , //3
-                        47 , //4
-                        49 , //5
-                        51 , //6
-                        53 , //7
-                        55 , //8
-                        56 , //9
-                        58 , //10
-                        60 , //11
-                        61 , //12
-                        62 , //13
-                        63 , //14
-                        64 , //15
-                        66 , //16
-                        67 , //17
-                        68 , //18
-                        69 , //19
-                        70 , //20
-                        71 , //21
-                        72 , //22
-                        73 , //23
-                        74 , //24
-                        75 , //25
-                        76 , //26
-                        77 , //27
-                        77 , //28
-                        78 , //29
-                        79 , //30
-                        80 , //31
-                        80 , //32
-                        81 , //33
-                        82 , //34
-                        83 , //35
-                        84 , //36
-                        84 , //37
-                        85 , //38
-                        86 , //39
-                        87 , //40
-                        87 , //41
-                        88 , //42
-                        88 , //43
-                        89 , //44
-                        90 , //45
-                        90 , //46
-                        91 , //47
-                        91 , //48
-                        92 , //49
-                        92 , //50
-                        93 , //51
-                        93 , //52
-                        94 , //53
-                        94 , //54
-                        95 , //55
-                        95 , //56
-                        96 , //57
-                        96 , //58
-                        97 , //59
-                        97 , //60
-                        97 , //61
-                        98 , //62
-                        98 , //63
-                        99 , //64
-                        99 , //65
-                        99 , //66
-                        100, //67
-                        100, //68
-                        100, //69
-                        101, //70
-                        101, //71
-                        101, //72
-                        102, //73
-                        102, //74
-                        102, //75
-                        103, //76
-                        103, //77
-                        103, //78
-                        103, //79
-                        104, //80
-                        104, //81
-                        104, //82
-                        104, //83
-                        104, //84
-                        104, //85
-                        105, //86
-                        105, //87
-                        105, //88
-                        105, //89
-                        105, //90
-                        105, //91
-                        105, //92
-                        105, //93
-                        105, //94
-                        105, //95
-                        105, //96
-                        105, //97
-                        106, //98
-                        106, //99
-                        106, //100
-                        106, //101
-                        106, //102
-                        106, //103
-                        106, //104
-                        106, //105
-                        106, //106
-                        106, //107
-                        106, //108
-                        106, //109
-                        106, //110
-                        106, //111
-                        106, //112
-                        106, //113
-                        106, //114
-                        106, //115
-                        106, //116
-                        106, //117
-                        106, //118
-                        106, //119
-                        106, //120
-                        106, //121
-                        106, //122
-                        106, //123
-                        106, //124
-                        106, //125
-                        106, //126
-                        106, //127
-                    }
-                }, //RF_CHAN_7
-                {
-                    {
-                        0  , //0
-                        40 , //1
-                        42 , //2
-                        45 , //3
-                        47 , //4
-                        49 , //5
-                        51 , //6
-                        52 , //7
-                        54 , //8
-                        56 , //9
-                        58 , //10
-                        59 , //11
-                        61 , //12
-                        62 , //13
-                        63 , //14
-                        65 , //15
-                        66 , //16
-                        67 , //17
-                        68 , //18
-                        69 , //19
-                        70 , //20
-                        71 , //21
-                        72 , //22
-                        73 , //23
-                        74 , //24
-                        75 , //25
-                        76 , //26
-                        77 , //27
-                        77 , //28
-                        78 , //29
-                        79 , //30
-                        80 , //31
-                        81 , //32
-                        81 , //33
-                        82 , //34
-                        83 , //35
-                        84 , //36
-                        85 , //37
-                        86 , //38
-                        86 , //39
-                        87 , //40
-                        88 , //41
-                        89 , //42
-                        89 , //43
-                        90 , //44
-                        91 , //45
-                        91 , //46
-                        92 , //47
-                        92 , //48
-                        93 , //49
-                        93 , //50
-                        94 , //51
-                        94 , //52
-                        95 , //53
-                        95 , //54
-                        96 , //55
-                        96 , //56
-                        97 , //57
-                        97 , //58
-                        97 , //59
-                        98 , //60
-                        98 , //61
-                        99 , //62
-                        99 , //63
-                        99 , //64
-                        100, //65
-                        100, //66
-                        100, //67
-                        101, //68
-                        101, //69
-                        102, //70
-                        102, //71
-                        102, //72
-                        103, //73
-                        103, //74
-                        103, //75
-                        104, //76
-                        104, //77
-                        104, //78
-                        104, //79
-                        105, //80
-                        105, //81
-                        105, //82
-                        105, //83
-                        105, //84
-                        105, //85
-                        105, //86
-                        105, //87
-                        106, //88
-                        106, //89
-                        106, //90
-                        106, //91
-                        106, //92
-                        106, //93
-                        106, //94
-                        106, //95
-                        106, //96
-                        106, //97
-                        106, //98
-                        106, //99
-                        106, //100
-                        106, //101
-                        106, //102
-                        106, //103
-                        106, //104
-                        107, //105
-                        107, //106
-                        107, //107
-                        107, //108
-                        107, //109
-                        107, //110
-                        107, //111
-                        107, //112
-                        107, //113
-                        107, //114
-                        107, //115
-                        107, //116
-                        107, //117
-                        107, //118
-                        107, //119
-                        107, //120
-                        107, //121
-                        107, //122
-                        107, //123
-                        107, //124
-                        107, //125
-                        107, //126
-                        107, //127
-                    }
-                }, //RF_CHAN_8
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        44 , //2
-                        46 , //3
-                        48 , //4
-                        50 , //5
-                        52 , //6
-                        54 , //7
-                        56 , //8
-                        58 , //9
-                        59 , //10
-                        60 , //11
-                        62 , //12
-                        63 , //13
-                        64 , //14
-                        66 , //15
-                        67 , //16
-                        68 , //17
-                        69 , //18
-                        70 , //19
-                        71 , //20
-                        72 , //21
-                        73 , //22
-                        74 , //23
-                        75 , //24
-                        76 , //25
-                        77 , //26
-                        78 , //27
-                        79 , //28
-                        79 , //29
-                        80 , //30
-                        81 , //31
-                        82 , //32
-                        83 , //33
-                        83 , //34
-                        84 , //35
-                        85 , //36
-                        86 , //37
-                        87 , //38
-                        87 , //39
-                        88 , //40
-                        89 , //41
-                        89 , //42
-                        90 , //43
-                        91 , //44
-                        91 , //45
-                        92 , //46
-                        92 , //47
-                        93 , //48
-                        93 , //49
-                        94 , //50
-                        94 , //51
-                        95 , //52
-                        95 , //53
-                        96 , //54
-                        96 , //55
-                        97 , //56
-                        97 , //57
-                        98 , //58
-                        98 , //59
-                        98 , //60
-                        99 , //61
-                        99 , //62
-                        100, //63
-                        100, //64
-                        100, //65
-                        101, //66
-                        101, //67
-                        101, //68
-                        102, //69
-                        102, //70
-                        103, //71
-                        103, //72
-                        103, //73
-                        104, //74
-                        104, //75
-                        104, //76
-                        104, //77
-                        105, //78
-                        105, //79
-                        105, //80
-                        105, //81
-                        105, //82
-                        105, //83
-                        106, //84
-                        106, //85
-                        106, //86
-                        106, //87
-                        106, //88
-                        106, //89
-                        106, //90
-                        106, //91
-                        106, //92
-                        106, //93
-                        106, //94
-                        106, //95
-                        106, //96
-                        106, //97
-                        106, //98
-                        107, //99
-                        107, //100
-                        107, //101
-                        107, //102
-                        107, //103
-                        107, //104
-                        107, //105
-                        107, //106
-                        107, //107
-                        107, //108
-                        107, //109
-                        107, //110
-                        107, //111
-                        107, //112
-                        107, //113
-                        107, //114
-                        107, //115
-                        107, //116
-                        107, //117
-                        107, //118
-                        107, //119
-                        107, //120
-                        107, //121
-                        107, //122
-                        107, //123
-                        107, //124
-                        107, //125
-                        107, //126
-                        107, //127
-                    }
-                }, //RF_CHAN_9
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        43 , //2
-                        47 , //3
-                        48 , //4
-                        50 , //5
-                        52 , //6
-                        53 , //7
-                        55 , //8
-                        57 , //9
-                        58 , //10
-                        60 , //11
-                        62 , //12
-                        63 , //13
-                        64 , //14
-                        65 , //15
-                        67 , //16
-                        68 , //17
-                        69 , //18
-                        70 , //19
-                        71 , //20
-                        72 , //21
-                        73 , //22
-                        74 , //23
-                        75 , //24
-                        76 , //25
-                        77 , //26
-                        77 , //27
-                        78 , //28
-                        79 , //29
-                        80 , //30
-                        81 , //31
-                        82 , //32
-                        83 , //33
-                        84 , //34
-                        85 , //35
-                        85 , //36
-                        86 , //37
-                        87 , //38
-                        88 , //39
-                        89 , //40
-                        89 , //41
-                        90 , //42
-                        90 , //43
-                        91 , //44
-                        92 , //45
-                        92 , //46
-                        93 , //47
-                        94 , //48
-                        94 , //49
-                        95 , //50
-                        95 , //51
-                        96 , //52
-                        96 , //53
-                        96 , //54
-                        97 , //55
-                        97 , //56
-                        98 , //57
-                        98 , //58
-                        99 , //59
-                        99 , //60
-                        99 , //61
-                        100, //62
-                        100, //63
-                        101, //64
-                        101, //65
-                        102, //66
-                        102, //67
-                        102, //68
-                        103, //69
-                        103, //70
-                        103, //71
-                        104, //72
-                        104, //73
-                        104, //74
-                        105, //75
-                        105, //76
-                        105, //77
-                        105, //78
-                        105, //79
-                        106, //80
-                        106, //81
-                        106, //82
-                        106, //83
-                        106, //84
-                        106, //85
-                        106, //86
-                        106, //87
-                        106, //88
-                        107, //89
-                        107, //90
-                        107, //91
-                        107, //92
-                        107, //93
-                        107, //94
-                        107, //95
-                        107, //96
-                        107, //97
-                        107, //98
-                        107, //99
-                        107, //100
-                        107, //101
-                        107, //102
-                        107, //103
-                        107, //104
-                        107, //105
-                        107, //106
-                        107, //107
-                        107, //108
-                        107, //109
-                        107, //110
-                        107, //111
-                        107, //112
-                        107, //113
-                        107, //114
-                        107, //115
-                        107, //116
-                        107, //117
-                        107, //118
-                        107, //119
-                        107, //120
-                        107, //121
-                        107, //122
-                        107, //123
-                        107, //124
-                        107, //125
-                        107, //126
-                        107, //127
-                    }
-                }, //RF_CHAN_10
-                {
-                    {
-                        0  , //0
-                        42 , //1
-                        44 , //2
-                        47 , //3
-                        49 , //4
-                        51 , //5
-                        52 , //6
-                        54 , //7
-                        55 , //8
-                        57 , //9
-                        58 , //10
-                        60 , //11
-                        61 , //12
-                        63 , //13
-                        64 , //14
-                        65 , //15
-                        66 , //16
-                        67 , //17
-                        69 , //18
-                        70 , //19
-                        71 , //20
-                        72 , //21
-                        73 , //22
-                        74 , //23
-                        75 , //24
-                        76 , //25
-                        77 , //26
-                        77 , //27
-                        78 , //28
-                        79 , //29
-                        80 , //30
-                        81 , //31
-                        82 , //32
-                        82 , //33
-                        83 , //34
-                        84 , //35
-                        85 , //36
-                        86 , //37
-                        86 , //38
-                        87 , //39
-                        88 , //40
-                        89 , //41
-                        90 , //42
-                        90 , //43
-                        91 , //44
-                        91 , //45
-                        92 , //46
-                        92 , //47
-                        93 , //48
-                        93 , //49
-                        94 , //50
-                        94 , //51
-                        95 , //52
-                        96 , //53
-                        96 , //54
-                        97 , //55
-                        97 , //56
-                        97 , //57
-                        98 , //58
-                        98 , //59
-                        99 , //60
-                        99 , //61
-                        100, //62
-                        100, //63
-                        100, //64
-                        101, //65
-                        101, //66
-                        101, //67
-                        102, //68
-                        102, //69
-                        102, //70
-                        103, //71
-                        103, //72
-                        103, //73
-                        103, //74
-                        103, //75
-                        103, //76
-                        104, //77
-                        104, //78
-                        104, //79
-                        104, //80
-                        104, //81
-                        104, //82
-                        104, //83
-                        104, //84
-                        104, //85
-                        104, //86
-                        104, //87
-                        105, //88
-                        105, //89
-                        105, //90
-                        105, //91
-                        105, //92
-                        105, //93
-                        105, //94
-                        105, //95
-                        105, //96
-                        105, //97
-                        105, //98
-                        105, //99
-                        105, //100
-                        105, //101
-                        105, //102
-                        105, //103
-                        105, //104
-                        105, //105
-                        105, //106
-                        105, //107
-                        105, //108
-                        105, //109
-                        105, //110
-                        105, //111
-                        105, //112
-                        105, //113
-                        105, //114
-                        105, //115
-                        105, //116
-                        105, //117
-                        105, //118
-                        105, //119
-                        105, //120
-                        105, //121
-                        105, //122
-                        105, //123
-                        105, //124
-                        105, //125
-                        105, //126
-                        105, //127
-                    }
-                }, //RF_CHAN_11
-                {
-                    {
-                        0  , //0
-                        41 , //1
-                        44 , //2
-                        46 , //3
-                        48 , //4
-                        50 , //5
-                        52 , //6
-                        54 , //7
-                        56 , //8
-                        57 , //9
-                        59 , //10
-                        60 , //11
-                        61 , //12
-                        63 , //13
-                        64 , //14
-                        65 , //15
-                        66 , //16
-                        67 , //17
-                        69 , //18
-                        70 , //19
-                        71 , //20
-                        72 , //21
-                        73 , //22
-                        74 , //23
-                        75 , //24
-                        76 , //25
-                        77 , //26
-                        77 , //27
-                        78 , //28
-                        79 , //29
-                        80 , //30
-                        80 , //31
-                        81 , //32
-                        82 , //33
-                        83 , //34
-                        83 , //35
-                        84 , //36
-                        85 , //37
-                        86 , //38
-                        86 , //39
-                        87 , //40
-                        88 , //41
-                        88 , //42
-                        89 , //43
-                        90 , //44
-                        90 , //45
-                        91 , //46
-                        92 , //47
-                        92 , //48
-                        93 , //49
-                        93 , //50
-                        94 , //51
-                        94 , //52
-                        95 , //53
-                        95 , //54
-                        96 , //55
-                        96 , //56
-                        96 , //57
-                        97 , //58
-                        97 , //59
-                        98 , //60
-                        98 , //61
-                        99 , //62
-                        99 , //63
-                        99 , //64
-                        100, //65
-                        100, //66
-                        100, //67
-                        101, //68
-                        101, //69
-                        101, //70
-                        102, //71
-                        102, //72
-                        102, //73
-                        103, //74
-                        103, //75
-                        103, //76
-                        103, //77
-                        103, //78
-                        103, //79
-                        103, //80
-                        104, //81
-                        104, //82
-                        104, //83
-                        104, //84
-                        104, //85
-                        104, //86
-                        104, //87
-                        104, //88
-                        104, //89
-                        104, //90
-                        104, //91
-                        104, //92
-                        104, //93
-                        105, //94
-                        105, //95
-                        105, //96
-                        105, //97
-                        105, //98
-                        105, //99
-                        105, //100
-                        105, //101
-                        105, //102
-                        105, //103
-                        105, //104
-                        105, //105
-                        105, //106
-                        105, //107
-                        105, //108
-                        105, //109
-                        105, //110
-                        105, //111
-                        105, //112
-                        105, //113
-                        105, //114
-                        105, //115
-                        105, //116
-                        105, //117
-                        105, //118
-                        105, //119
-                        105, //120
-                        105, //121
-                        105, //122
-                        105, //123
-                        105, //124
-                        105, //125
-                        105, //126
-                        105, //127
-                    }
-                }, //RF_CHAN_12
-                {
-                    {
-                        0  , //0
-                        42 , //1
-                        44 , //2
-                        46 , //3
-                        48 , //4
-                        50 , //5
-                        52 , //6
-                        54 , //7
-                        56 , //8
-                        58 , //9
-                        59 , //10
-                        60 , //11
-                        61 , //12
-                        63 , //13
-                        64 , //14
-                        65 , //15
-                        66 , //16
-                        68 , //17
-                        69 , //18
-                        70 , //19
-                        71 , //20
-                        72 , //21
-                        73 , //22
-                        74 , //23
-                        75 , //24
-                        75 , //25
-                        76 , //26
-                        77 , //27
-                        78 , //28
-                        79 , //29
-                        80 , //30
-                        80 , //31
-                        81 , //32
-                        82 , //33
-                        83 , //34
-                        83 , //35
-                        84 , //36
-                        85 , //37
-                        86 , //38
-                        86 , //39
-                        87 , //40
-                        88 , //41
-                        89 , //42
-                        89 , //43
-                        90 , //44
-                        91 , //45
-                        91 , //46
-                        92 , //47
-                        93 , //48
-                        93 , //49
-                        94 , //50
-                        94 , //51
-                        95 , //52
-                        95 , //53
-                        96 , //54
-                        96 , //55
-                        97 , //56
-                        97 , //57
-                        97 , //58
-                        98 , //59
-                        98 , //60
-                        99 , //61
-                        99 , //62
-                        100, //63
-                        100, //64
-                        100, //65
-                        101, //66
-                        101, //67
-                        101, //68
-                        102, //69
-                        102, //70
-                        102, //71
-                        103, //72
-                        103, //73
-                        103, //74
-                        103, //75
-                        103, //76
-                        103, //77
-                        104, //78
-                        104, //79
-                        104, //80
-                        104, //81
-                        104, //82
-                        104, //83
-                        104, //84
-                        104, //85
-                        104, //86
-                        104, //87
-                        104, //88
-                        104, //89
-                        105, //90
-                        105, //91
-                        105, //92
-                        105, //93
-                        105, //94
-                        105, //95
-                        105, //96
-                        105, //97
-                        105, //98
-                        105, //99
-                        105, //100
-                        105, //101
-                        105, //102
-                        105, //103
-                        105, //104
-                        105, //105
-                        105, //106
-                        105, //107
-                        105, //108
-                        105, //109
-                        105, //110
-                        105, //111
-                        105, //112
-                        105, //113
-                        105, //114
-                        105, //115
-                        105, //116
-                        105, //117
-                        105, //118
-                        105, //119
-                        105, //120
-                        105, //121
-                        105, //122
-                        105, //123
-                        105, //124
-                        105, //125
-                        105, //126
-                        105, //127
-                    }
-                }, //RF_CHAN_13
-                {
-                    {
-                       0,  //0
-                       40,  //1
-                       43,  //2
-                       45,  //3
-                       47,  //4
-                       49,  //5
-                       50,  //6
-                       52,  //7
-                       54,  //8
-                       56,  //9
-                       57,  //10
-                       58,  //11
-                       59,  //12
-                       60,  //13
-                       62,  //14
-                       63,  //15
-                       64,  //16
-                       65,  //17
-                       66,  //18
-                       67,  //19
-                       68,  //20
-                       69,  //21
-                       70,  //22
-                       71,  //23
-                       72,  //24
-                       73,  //25
-                       74,  //26
-                       74,  //27
-                       75,  //28
-                       76,  //29
-                       77,  //30
-                       78,  //31
-                       78,  //32
-                       79,  //33
-                       80,  //34
-                       81,  //35
-                       82,  //36
-                       83,  //37
-                       83,  //38
-                       84,  //39
-                       85,  //40
-                       85,  //41
-                       86,  //42
-                       87,  //43
-                       87,  //44
-                       88,  //45
-                       89,  //46
-                       89,  //47
-                       90,  //48
-                       90,  //49
-                       91,  //50
-                       91,  //51
-                       92,  //52
-                       92,  //53
-                       93,  //54
-                       93,  //55
-                       94,  //56
-                       94,  //57
-                       95,  //58
-                       95,  //59
-                       96,  //60
-                       96,  //61
-                       96,  //62
-                       97,  //63
-                       97,  //64
-                       97,  //65
-                       98,  //66
-                       98,  //67
-                       98,  //68
-                       98,  //69
-                       99,  //70
-                       99,  //71
-                       99,  //72
-                       99,  //73
-                       99,  //74
-                       99,  //75
-                       99,  //76
-                       99,  //77
-                       99,  //78
-                       99,  //79
-                       100,  //80
-                       100,  //81
-                       100,  //82
-                       100,  //83
-                       100,  //84
-                       100,  //85
-                       100,  //86
-                       100,  //87
-                       100,  //88
-                       100,  //89
-                       100,  //90
-                       100,  //91
-                       100,  //92
-                       100,  //93
-                       100,  //94
-                       100,  //95
-                       100,  //96
-                       100,  //97
-                       100, //98
-                       100, //99
-                       100, //100
-                       100, //101
-                       100, //102
-                       100, //103
-                       100, //104
-                       100, //105
-                       100, //106
-                       100, //107
-                       100, //108
-                       100, //109
-                       100, //110
-                       100, //111
-                       100, //112
-                       100, //113
-                       100, //114
-                       100, //115
-                       100, //116
-                       100, //117
-                       100, //118
-                       100, //119
-                       100, //120
-                       100, //121
-                       100, //122
-                       100, //123
-                       100, //124
-                       100, //125
-                       100, //126
-                       100, //127
-                    }
-                }, //RF_CHAN_14
-        },
-
-        //NV_TABLE_TPC_PDADC_OFFSETS
-        {
-            98,  // RF_CHAN_1
-            101,  // RF_CHAN_2
-            101,  // RF_CHAN_3
-            100,  // RF_CHAN_4
-            98,  // RF_CHAN_5
-            97,  // RF_CHAN_6
-            94,  // RF_CHAN_7
-            94,  // RF_CHAN_8
-            92,  // RF_CHAN_9
-            90,  // RF_CHAN_10
-            94,  // RF_CHAN_11
-            95,  // RF_CHAN_12
-            97,  // RF_CHAN_13
-            104   // RF_CHAN_14
-        },
-#if 0
-        //NV_TABLE_CAL_MEMORY
-        {
-            0x7FFF,      // tANI_U16    process_monitor;
-            0x00,        // tANI_U8     hdet_cal_code;
-            0x00,        // tANI_U8     rxfe_gm_2;
-
-            0x00,        // tANI_U8     tx_bbf_rtune;
-            0x00,        // tANI_U8     pa_rtune_reg;
-            0x00,        // tANI_U8     rt_code;
-            0x00,        // tANI_U8     bias_rtune;
-
-            0x00,        // tANI_U8     bb_bw1;
-            0x00,        // tANI_U8     bb_bw2;
-            { 0x00, 0x00 },        // tANI_U8     reserved[2];
-
-            0x00,        // tANI_U8     bb_bw3;
-            0x00,        // tANI_U8     bb_bw4;
-            0x00,        // tANI_U8     bb_bw5;
-            0x00,        // tANI_U8     bb_bw6;
-
-            0x7FFF,      // tANI_U16    rcMeasured;
-            0x00,        // tANI_U8     tx_bbf_ct;
-            0x00,        // tANI_U8     tx_bbf_ctr;
-
-            0x00,        // tANI_U8     csh_maxgain_reg;
-            0x00,        // tANI_U8     csh_0db_reg;
-            0x00,        // tANI_U8     csh_m3db_reg;
-            0x00,        // tANI_U8     csh_m6db_reg;
-
-            0x00,        // tANI_U8     cff_0db_reg;
-            0x00,        // tANI_U8     cff_m3db_reg;
-            0x00,        // tANI_U8     cff_m6db_reg;
-            0x00,        // tANI_U8     rxfe_gpio_ctl_1;
-
-            0x00,        // tANI_U8     mix_bal_cnt_2;
-            0x00,        // tANI_S8     rxfe_lna_highgain_bias_ctl_delta;
-            0x00,        // tANI_U8     rxfe_lna_load_ctune;
-            0x00,        // tANI_U8     rxfe_lna_ngm_rtune;
-
-            0x00,        // tANI_U8     rx_im2_i_cfg0;
-            0x00,        // tANI_U8     rx_im2_i_cfg1;
-            0x00,        // tANI_U8     rx_im2_q_cfg0;
-            0x00,        // tANI_U8     rx_im2_q_cfg1;
-
-            0x00,        // tANI_U8     pll_vfc_reg3_b0;
-            0x00,        // tANI_U8     pll_vfc_reg3_b1;
-            0x00,        // tANI_U8     pll_vfc_reg3_b2;
-            0x00,        // tANI_U8     pll_vfc_reg3_b3;
-
-            0x7FFF,        // tANI_U16    tempStart;
-            0x7FFF,        // tANI_U16    tempFinish;
-
-            { //txLoCorrections
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_1
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_2
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_3
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_4
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_5
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_6
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_7
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_8
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_9
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_10
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_11
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_12
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_13
-                {
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_0
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_1
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_2
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_3
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_4
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_5
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_6
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_7
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_8
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_9
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_10
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_11
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_12
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_13
-                    { 0x00, 0x00 }, // TX_GAIN_STEP_14
-                    { 0x00, 0x00 }  // TX_GAIN_STEP_15
-                }  //RF_CHAN_14
-            },        // tTxLoCorrections    txLoValues;
-
-            { //sTxIQChannel
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_1
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_2
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_3
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_4
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_5
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_6
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_7
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_8
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_9
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_10
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_11
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_12
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }, //RF_CHAN_13
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // TX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // TX_GAIN_STEP_15
-                }  //RF_CHAN_14
-            },        // sTxIQChannel        txIqValues;
-
-            { //sRxIQChannel
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_1
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_2
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_3
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_4
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_5
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_6
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_7
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_8
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_9
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_10
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_11
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_12
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }, //RF_CHAN_13
-                {
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_0
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_1
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_2
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_3
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_4
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_5
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_6
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_7
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_8
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_9
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_10
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_11
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_12
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_13
-                    { 0x0000, 0x0000, 0x0000 }, // RX_GAIN_STEP_14
-                    { 0x0000, 0x0000, 0x0000 }  // RX_GAIN_STEP_15
-                }  //RF_CHAN_14
-            },        // sRxIQChannel        rxIqValues;
-
-            { // tTpcConfig          clpcData[MAX_TPC_CHANNELS]
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_1
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_2
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_3
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_4
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_5
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_6
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_7
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_8
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_9
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_10
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_11
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }, // RF_CHAN_12
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                },  // RF_CHAN_13
-                {
-                    {
-                        {
-                            { 0x00, 0x00 }, //CAL_POINT_0
-                            { 0x00, 0x00 }, //CAL_POINT_1
-                            { 0x00, 0x00 }, //CAL_POINT_2
-                            { 0x00, 0x00 }, //CAL_POINT_3
-                            { 0x00, 0x00 }, //CAL_POINT_4
-                            { 0x00, 0x00 }, //CAL_POINT_5
-                            { 0x00, 0x00 }, //CAL_POINT_6
-                            { 0x00, 0x00 }  //CAL_POINT_7
-                        } // PHY_TX_CHAIN_0
-                    } // empirical
-                }  // RF_CHAN_14
-            },        // tTpcConfig          clpcData[MAX_TPC_CHANNELS];
-
-            {
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_1: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_2: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_3: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_4: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_5: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_6: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_7: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_8: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_9: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_10: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_11: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_12: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }, // RF_CHAN_13: pdadc_offset, reserved[2]
-                { 0x0000, { 0x00, 0x00 } }  // RF_CHAN_14: pdadc_offset, reserved[2]
-            }        // tTpcParams          clpcParams[MAX_TPC_CHANNELS];
-
-        }, //NV_TABLE_CAL_MEMORY
-
-        //NV_TABLE_CAL_STATUS
-        {
-            0xFF,        // tANI_U8     overall;
-            0xFF,        // tANI_U8     fwInit;
-            0xFF,        // tANI_U8     hdet_dco;
-            0xFF,        // tANI_U8     rtuner;
-            0xFF,        // tANI_U8     ctuner;
-            0xFF,        // tANI_U8     insitu;
-            0xFF,        // tANI_U8     process_monitor;
-            0xFF,        // tANI_U8     pllVcoLinearity;
-            0xFF,        // tANI_U8     txIQ;
-            0xFF,        // tANI_U8     rxIQ;
-            0xFF,        // tANI_U8     rxDco;
-            0xFF,        // tANI_U8     txLo;
-            0xFF,        // tANI_U8     lnaBias;
-            0xFF,        // tANI_U8     lnaBandTuning;
-            0xFF,        // tANI_U8     lnaGainAdjust;
-            0xFF,        // tANI_U8     im2UsingNoisePwr;
-            0xFF,        // tANI_U8     temperature;
-            0xFF,        // tANI_U8     clpc;
-            0xFF,        // tANI_U8     clpc_temp_adjust;
-            0xFF,        // tANI_U8     txDpd;
-            0xFF,        // tANI_U8     channelTune;
-            0xFF,        // tANI_U8     rxGmStageLinearity;
-            0xFF,        // tANI_U8     im2UsingToneGen;
-            {
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00
-            }        // tANI_U8     unused[9];
-        },
-#endif
-        //NV_TABLE_RSSI_CHANNEL_OFFSETS
-        {
-            //PHY_RX_CHAIN_0
-            {
-                //bRssiOffset
-                {300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300},
-
-                //gnRssiOffset
-                {300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300, 300}
-            },
-            //rsvd
-            {
-                //bRssiOffset
-                {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-
-                //gnRssiOffset
-                {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-            }
-        },
-
-        //NV_TABLE_RF_CAL_VALUES
-        {
-            //typedef struct
-            //{
-            //    tANI_U32 calStatus;  //use eNvCalID
-            //    sCalData calData;
-            //}sRFCalValues;
-
-            0,               //calStatus
-            {
-                0,           //process_monitor;
-                0,           //hdet_cal_code;
-                0,           //rxfe_gm_2;
-
-                0,           //tx_bbf_rtune;
-                0,           //pa_rtune_reg;
-                0,           //rt_code;
-                0,           //bias_rtune;
-
-                0,           //bb_bw1;
-                0,           //bb_bw2;
-                0,           //reserved0;
-                0,           //reserved11;
-
-                0,           //bb_bw3;
-                0,           //bb_bw4;
-                0,           //bb_bw5;
-                0,           //bb_bw6;
-
-                0,           //rcMeasured;
-                0,           //tx_bbf_ct;
-                0,           //tx_bbf_ctr;
-
-                0,           //csh_maxgain_reg;
-                0,           //csh_0db_reg;
-                0,           //csh_m3db_reg;
-                0,           //csh_m6db_reg;
-
-                0,           //cff_0db_reg;
-                0,           //cff_m3db_reg;
-                0,           //cff_m6db_reg;
-                0,           //rxfe_gpio_ctl_1;
-
-                0,           //mix_bal_cnt_2;
-                0,           //rxfe_lna_highgain_bias_ctl_delta;
-                0,           //rxfe_lna_load_ctune;
-                0,           //rxfe_lna_ngm_rtune;
-
-                0,           //rx_im2_spare0;
-                0,           //rx_im2_spare1;
-                0,           //hdet_dco
-
-                0,           //pll_vfc_reg3_b0;
-                0,           //pll_vfc_reg3_b1;
-                0,           //pll_vfc_reg3_b2;
-                0,           //pll_vfc_reg3_b3;
-
-                0,           //tempStart;
-                0,           //roomTemp;
-
-                0,           //ambientCalTemp;
-                0,           //ambientCalTempValid;
-                0            //reserved2;
-            }
-        },
-
-        //NV_TABLE_ANTENNA_PATH_LOSS
-        {
-            280,  // RF_CHAN_1
-            270,  // RF_CHAN_2
-            270,  // RF_CHAN_3
-            270,  // RF_CHAN_4
-            270,  // RF_CHAN_5
-            270,  // RF_CHAN_6
-            280,  // RF_CHAN_7
-            280,  // RF_CHAN_8
-            290,  // RF_CHAN_9
-            300,  // RF_CHAN_10
-            300,  // RF_CHAN_11
-            310,  // RF_CHAN_12
-            310,  // RF_CHAN_13
-            310   // RF_CHAN_14
-        },
-
-        //NV_TABLE_PACKET_TYPE_POWER_LIMITS
-        {
-            {
-                2150,  // RF_CHAN_1
-                2150,  // RF_CHAN_2
-                2150,  // RF_CHAN_3
-                2150,  // RF_CHAN_4
-                2150,  // RF_CHAN_5
-                2150,  // RF_CHAN_6
-                2150,  // RF_CHAN_7
-                2150,  // RF_CHAN_8
-                2150,  // RF_CHAN_9
-                2150,  // RF_CHAN_10
-                2150,  // RF_CHAN_11
-                2150,  // RF_CHAN_12
-                2150,  // RF_CHAN_13
-                2150   // RF_CHAN_14
-            },//MODE_802_11B
-
-            {
-                1850,  // RF_CHAN_1
-                1950,  // RF_CHAN_2
-                1950,  // RF_CHAN_3
-                1950,  // RF_CHAN_4
-                1950,  // RF_CHAN_5
-                1950,  // RF_CHAN_6
-                1950,  // RF_CHAN_7
-                1950,  // RF_CHAN_8
-                1950,  // RF_CHAN_9
-                1950,  // RF_CHAN_10
-                1750,  // RF_CHAN_11
-                1950,  // RF_CHAN_12
-                1950,  // RF_CHAN_13
-                1950   // RF_CHAN_14
-            },//MODE_802_11AG
-
-            {
-                1750,  // RF_CHAN_1
-                1750,  // RF_CHAN_2
-                1750,  // RF_CHAN_3
-                1750,  // RF_CHAN_4
-                1750,  // RF_CHAN_5
-                1750,  // RF_CHAN_6
-                1750,  // RF_CHAN_7
-                1750,  // RF_CHAN_8
-                1750,  // RF_CHAN_9
-                1750,  // RF_CHAN_10
-                1750,  // RF_CHAN_11
-                1750,  // RF_CHAN_12
-                1750,  // RF_CHAN_13
-                1750   // RF_CHAN_14
-            },//MODE_802_11AG
-        },
-
-        //NV_TABLE_OFDM_CMD_PWR_OFFSET
-        {
-            0, 0
-        },
-
-        //NV_TABLE_TX_BB_FILTER_MODE
-        {
-            0
-        }
-
-    } // tables
-};
-
-#else
-
 #include "palTypes.h"
 #include "wlan_nv.h"
 //#include "wlan_hal_msg.h"
@@ -3835,18 +72,19 @@
         { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },                         // tANI_U8   macAddr[NV_FIELD_MAC_ADDR_SIZE];
         { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 },                         // tANI_U8   macAddr[NV_FIELD_MAC_ADDR_SIZE];
         { "\0" },
-        0,                                                              // tANI_U8   0 : Internal coupler, 1 : External coupler
-        0                                                               // Reserved Byte to make alignment
+        0,                                                              // tANI_U8   couplerType;
+        WLAN_NV_VERSION,                                                // tANI_U8   nvVersion;
     }, //fields
 
     {
         // NV_TABLE_RATE_POWER_SETTINGS
         {
-            // typedef tANI_S8 tPowerdBm;
+            // typedef tANI_S16 tPowerdBm;
             //typedef tPowerdBm tRateGroupPwr[NUM_HAL_PHY_RATES];
             //tRateGroupPwr       pwrOptimum[NUM_RF_SUBBANDS];
+            //2.4G
             {
-                    //802.11b Rates
+                //802.11b Rates
                 {1900},    // HAL_PHY_RATE_11B_LONG_1_MBPS,
                 {1900},    // HAL_PHY_RATE_11B_LONG_2_MBPS,
                 {1900},    // HAL_PHY_RATE_11B_LONG_5_5_MBPS,
@@ -3874,7 +112,7 @@
                 {1550},    // HAL_PHY_RATE_11A_DUP_36_MBPS,
                 {1550},    // HAL_PHY_RATE_11A_DUP_48_MBPS,
                 {1500},    // HAL_PHY_RATE_11A_DUP_54_MBPS,
-
+                
                 //MCS Index #0-7(20/40MHz)
                 {1700},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
                 {1700},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
@@ -3909,7 +147,8 @@
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_90_MBPS,
                 {1500},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_120_MBPS,
                 {1400},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_135_MBPS,
-                {1350},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_150_MBPS,
+                {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_150_MBPS,
+
 #ifdef WLAN_FEATURE_11AC
                 //11AC rates
                //11A duplicate 80MHz Rates
@@ -3932,6 +171,9 @@
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_65_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+#ifdef WCN_PRONTO
+                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_86_5_MBPS,
+#endif
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_7_2_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_14_4_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_21_6_MBPS,
@@ -3941,7 +183,9 @@
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_72_2_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
-
+#ifdef WCN_PRONTO
+                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_96_1_MBPS,
+#endif
 
                //11ac 40MHZ NG, SG
                 {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS,
@@ -3965,7 +209,6 @@
                 {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
 
-
                //11ac 80MHZ NG, SG
                 {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_29_3_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
@@ -3987,10 +230,10 @@
                 {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_325_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
                 {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
-#endif //WLAN_FEATURE_11AC
-                },  //    RF_SUBBAND_2_4_GHZ
-
-                {
+#endif
+            },  //    RF_SUBBAND_2_4_GHZ
+            // 5G Low
+            {
                 //802.11b Rates
                 {0},    // HAL_PHY_RATE_11B_LONG_1_MBPS,
                 {0},    // HAL_PHY_RATE_11B_LONG_2_MBPS,
@@ -4000,7 +243,7 @@
                 {0},    // HAL_PHY_RATE_11B_SHORT_5_5_MBPS,
                 {0},    // HAL_PHY_RATE_11B_SHORT_11_MBPS,
 
-                //11A 20MHz Rates
+                ///11A 20MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_12_MBPS,
@@ -4010,7 +253,7 @@
                 {1400},    // HAL_PHY_RATE_11A_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_54_MBPS,
 
-                //DUP 11A 40MHz Rates
+                ///DUP 11A 40MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_DUP_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_12_MBPS,
@@ -4020,7 +263,7 @@
                 {1400},    // HAL_PHY_RATE_11A_DUP_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_DUP_54_MBPS,
 
-                //MCS Index #0-7(20/40MHz)
+                ///MCS Index #0-7(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_19_5_MBPS,
@@ -4038,7 +281,7 @@
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_65_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_72_2_MBPS,
 
-                //MCS Index #8-15(20/40MHz)
+                ///MCS Index #8-15(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_13_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_27_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_CB_40_5_MBPS,
@@ -4055,9 +298,10 @@
                 {1400},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_120_MBPS,
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_135_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_150_MBPS,
-#ifdef WLAN_FEATURE_11AC
-                //11AC rates
-               //11A duplicate 80MHz Rates
+
+#ifdef WLAN_FEATUURE_11AC
+                ///11AC rates
+               ///11A duplicate 80MHz Rates
                 {1700},    // HAL_PHY_RATE_11AC_DUP_6_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_9_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_12_MBPS,
@@ -4067,16 +311,19 @@
                 {1550},    // HAL_PHY_RATE_11AC_DUP_48_MBPS,
                 {1500},    // HAL_PHY_RATE_11AC_DUP_54_MBPS,
 
-               //11ac 20MHZ NG, SG
+               ///11ac 20MHZ NG, SG
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_6_5_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_13_MBPS,
                 {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_19_5_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_26_MBPS,
                 {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_39_MBPS,
-                {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
+                {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_65_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+                {1000,    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_65_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_86_5_MBPS,
+#endif
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_7_2_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_14_4_MBPS,
                 {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_21_6_MBPS,
@@ -4085,9 +332,10 @@
                 {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_57_7_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_72_2_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
-
-
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_96_1_MBPS,
+#endif
                //11ac 40MHZ NG, SG
                 {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_27_MBPS,
@@ -4097,18 +345,18 @@
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_108_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_121_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_135_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_15_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_30_MBPS,
                 {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_45_MBPS,
-                {1100},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_90_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_120_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_135_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_150_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
 
 
                //11ac 80MHZ NG, SG
@@ -4120,8 +368,8 @@
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_234_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_263_3_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_292_5_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_32_5_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_97_5_MBPS,
@@ -4130,13 +378,12 @@
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_260_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_292_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_325_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
-#endif //WLAN_FEATURE_11AC
-                },  //    RF_SUBBAND_5_LOW_GHZ
-
-                // 5G Mid
-                {
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
+#endif
+            },  //    RF_SUBBAND_5_LOW_GHZ
+            // 5G Mid
+            {
                 //802.11b Rates
                 {0},    // HAL_PHY_RATE_11B_LONG_1_MBPS,
                 {0},    // HAL_PHY_RATE_11B_LONG_2_MBPS,
@@ -4146,7 +393,7 @@
                 {0},    // HAL_PHY_RATE_11B_SHORT_5_5_MBPS,
                 {0},    // HAL_PHY_RATE_11B_SHORT_11_MBPS,
 
-                //11A 20MHz Rates
+                ///11A 20MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_12_MBPS,
@@ -4156,7 +403,7 @@
                 {1400},    // HAL_PHY_RATE_11A_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_54_MBPS,
 
-                //DUP 11A 40MHz Rates
+                ///DU P 11A 40MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_DUP_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_12_MBPS,
@@ -4166,7 +413,7 @@
                 {1400},    // HAL_PHY_RATE_11A_DUP_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_DUP_54_MBPS,
 
-                //MCS Index #0-7(20/40MHz)
+                ///MCSS Index #0-7(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_19_5_MBPS,
@@ -4184,7 +431,7 @@
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_65_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_72_2_MBPS,
 
-                //MCS Index #8-15(20/40MHz)
+                ///MCSS Index #8-15(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_13_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_27_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_CB_40_5_MBPS,
@@ -4201,9 +448,10 @@
                 {1400},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_120_MBPS,
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_135_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_150_MBPS,
-#ifdef WLAN_FEATURE_11AC
-                //11AC rates
-               //11A duplicate 80MHz Rates
+
+#ifdef WLAN_FEATUURE_111AC
+                ///11CAC rates
+               ///11Ad duplicate 80MHz Rates
                 {1700},    // HAL_PHY_RATE_11AC_DUP_6_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_9_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_12_MBPS,
@@ -4213,16 +461,19 @@
                 {1550},    // HAL_PHY_RATE_11AC_DUP_48_MBPS,
                 {1500},    // HAL_PHY_RATE_11AC_DUP_54_MBPS,
 
-               //11ac 20MHZ NG, SG
+               ///11a c 20MHZ NG, SG
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_6_5_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_13_MBPS,
                 {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_19_5_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_26_MBPS,
                 {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_39_MBPS,
-                {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
+                {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_65_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_86_5_MBPS,
+#endif
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_7_2_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_14_4_MBPS,
                 {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_21_6_MBPS,
@@ -4231,9 +482,10 @@
                 {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_57_7_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_72_2_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
-
-
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_96_1_MBPS,
+#endif
                //11ac 40MHZ NG, SG
                 {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_27_MBPS,
@@ -4243,21 +495,21 @@
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_108_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_121_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_135_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_15_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_30_MBPS,
                 {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_45_MBPS,
-                {1100},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_90_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_120_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_135_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_150_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
 
 
-               //11ac 80MHZ NG, SG
+               ///11a c 80MHZ NG, SG
                 {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_29_3_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_87_8_MBPS,
@@ -4266,8 +518,8 @@
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_234_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_263_3_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_292_5_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_32_5_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_97_5_MBPS,
@@ -4276,12 +528,12 @@
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_260_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_292_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_325_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
-#endif //WLAN_FEATURE_11AC
-                },  //    //     RF_SUBBAND_5_MID_GHZ
-                // 5G High
-                {
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
+#endif
+            },  //    //     RF_SUBBAND_5_MID_GHZ
+            // 5G High
+            {
                 //802.11b Rates
                 {0},    // HAL_PHY_RATE_11B_LONG_1_MBPS,
                 {0},    // HAL_PHY_RATE_11B_LONG_2_MBPS,
@@ -4291,7 +543,7 @@
                 {0},    // HAL_PHY_RATE_11B_SHORT_5_5_MBPS,
                 {0},    // HAL_PHY_RATE_11B_SHORT_11_MBPS,
 
-                //11A 20MHz Rates
+                ///11A 20MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_12_MBPS,
@@ -4301,7 +553,7 @@
                 {1400},    // HAL_PHY_RATE_11A_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_54_MBPS,
 
-                //DUP 11A 40MHz Rates
+                ///DU P 11A 40MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_DUP_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_12_MBPS,
@@ -4311,7 +563,7 @@
                 {1400},    // HAL_PHY_RATE_11A_DUP_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_DUP_54_MBPS,
 
-                //MCS Index #0-7(20/40MHz)
+                ///MCSS Index #0-7(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_19_5_MBPS,
@@ -4329,7 +581,7 @@
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_65_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_72_2_MBPS,
 
-                //MCS Index #8-15(20/40MHz)
+                ///MCSS Index #8-15(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_13_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_27_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_CB_40_5_MBPS,
@@ -4346,9 +598,10 @@
                 {1400},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_120_MBPS,
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_135_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_150_MBPS,
-#ifdef WLAN_FEATURE_11AC
-                //11AC rates
-               //11A duplicate 80MHz Rates
+
+#ifdef WLAN_FEATUURE_11AC
+                ///11CAC rates
+               ///11Ad duplicate 80MHz Rates
                 {1700},    // HAL_PHY_RATE_11AC_DUP_6_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_9_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_12_MBPS,
@@ -4358,16 +611,19 @@
                 {1550},    // HAL_PHY_RATE_11AC_DUP_48_MBPS,
                 {1500},    // HAL_PHY_RATE_11AC_DUP_54_MBPS,
 
-               //11ac 20MHZ NG, SG
+               ///11a c 20MHZ NG, SG
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_6_5_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_13_MBPS,
                 {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_19_5_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_26_MBPS,
                 {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_39_MBPS,
-                {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
+                {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_65_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_86_5_MBPS,
+#endif
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_7_2_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_14_4_MBPS,
                 {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_21_6_MBPS,
@@ -4376,9 +632,10 @@
                 {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_57_7_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_72_2_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
-
-
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_96_1_MBPS,
+#endif
                //11ac 40MHZ NG, SG
                 {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_27_MBPS,
@@ -4388,21 +645,21 @@
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_108_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_121_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_135_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
                 {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_15_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_30_MBPS,
                 {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_45_MBPS,
-                {1100},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_90_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_120_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_135_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_150_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
 
 
-               //11ac 80MHZ NG, SG
+               ///11a c 80MHZ NG, SG
                 {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_29_3_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_87_8_MBPS,
@@ -4411,8 +668,8 @@
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_234_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_263_3_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_292_5_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
                 {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_32_5_MBPS,
                 {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_65_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_97_5_MBPS,
@@ -4421,13 +678,13 @@
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_260_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_292_5_MBPS,
                 {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_325_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
-                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
-#endif //WLAN_FEATURE_11AC
-                },  //    RF_SUBBAND_5_HIGH_GHZ,
-                // 4.9G
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
+#endif
+            },  //    RF_SUBBAND_5_HIGH_GHZ,
+            // 4.9G
 
-                {
+            {
                 //802.11b Rates
                 {0},    // HAL_PHY_RATE_11B_LONG_1_MBPS,
                 {0},    // HAL_PHY_RATE_11B_LONG_2_MBPS,
@@ -4437,7 +694,7 @@
                 {0},    // HAL_PHY_RATE_11B_SHORT_5_5_MBPS,
                 {0},    // HAL_PHY_RATE_11B_SHORT_11_MBPS,
 
-                //11A 20MHz Rates
+                ///11A 20MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_12_MBPS,
@@ -4447,7 +704,7 @@
                 {1400},    // HAL_PHY_RATE_11A_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_54_MBPS,
 
-                //DUP 11A 40MHz Rates
+                ///DU P 11A 40MHz Rates
                 {1600},    // HAL_PHY_RATE_11A_DUP_6_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_9_MBPS,
                 {1600},    // HAL_PHY_RATE_11A_DUP_12_MBPS,
@@ -4457,7 +714,7 @@
                 {1400},    // HAL_PHY_RATE_11A_DUP_48_MBPS,
                 {1400},    // HAL_PHY_RATE_11A_DUP_54_MBPS,
 
-                //MCS Index #0-7(20/40MHz)
+                ///MCSS Index #0-7(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_6_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_13_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_19_5_MBPS,
@@ -4475,7 +732,7 @@
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_65_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_72_2_MBPS,
 
-                //MCS Index #8-15(20/40MHz)
+                ///MCSS Index #8-15(20/40MHz)
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_13_5_MBPS,
                 {1600},    // HAL_PHY_RATE_MCS_1NSS_CB_27_MBPS,
                 {1550},    // HAL_PHY_RATE_MCS_1NSS_CB_40_5_MBPS,
@@ -4492,9 +749,10 @@
                 {1400},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_120_MBPS,
                 {1300},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_135_MBPS,
                 {1200},    // HAL_PHY_RATE_MCS_1NSS_MM_SG_CB_150_MBPS,
-#ifdef WLAN_FEATURE_11AC
-                //11AC rates
-               //11A duplicate 80MHz Rates
+
+#ifdef WLAN_FEATUURE_11AC
+                ///11CAC rates
+               ///11Ad duplicate 80MHz Rates
                 {1700},    // HAL_PHY_RATE_11AC_DUP_6_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_9_MBPS,
                 {1700},    // HAL_PHY_RATE_11AC_DUP_12_MBPS,
@@ -4502,75 +760,79 @@
                 {1600},    // HAL_PHY_RATE_11AC_DUP_24_MBPS,
                 {1550},    // HAL_PHY_RATE_11AC_DUP_36_MBPS,
                 {1550},    // HAL_PHY_RATE_11AC_DUP_48_MBPS,
-                {1500},    // HAL_PHY_RATE_11AC_DUP_54_MBPS,
+                {1500,,    // HAL_PHY_RATE_11AC_DUP_54_MBPS,
 
-               //11ac 20MHZ NG, SG
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_6_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_13_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_19_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_26_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_39_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_52_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_58_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_65_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_78_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_7_2_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_14_4_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_21_6_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_28_8_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_43_3_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_57_7_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_65_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_72_2_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_86_6_MBPS,
-
-
+               ///11a c 20MHZ NG, SG
+                {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_6_5_MBPS,
+                {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_13_MBPS,
+                {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_19_5_MBPS,
+                {1300},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_26_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_39_MBPS,
+                {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_52_MBPS,
+                {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_65_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_NGI_78_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_86_5_MBPS,
+#endif
+                {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_7_2_MBPS,
+                {1400},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_14_4_MBPS,
+                {1350},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_21_6_MBPS,
+                {1300},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_28_8_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_43_3_MBPS,
+                {1200},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_57_7_MBPS,
+                {1100},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_65_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_72_2_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_CB_SGI_86_6_MBPS,
+#ifdef WCN_PRONTO
+                { 800},     // HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_96_1_MBPS,
+#endif
                //11ac 40MHZ NG, SG
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_27_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_40_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_54_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_81_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_108_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_121_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_135_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_15_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_30_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_45_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_90_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_120_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_135_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_150_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
+                {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS,
+                {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_27_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_40_5_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_54_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_81_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_108_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_121_5_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_135_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_162_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_180_MBPS,
+                {1400},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_15_MBPS,
+                {1300},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_30_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_45_MBPS,
+                {1250},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_60_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_90_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_120_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_135_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_150_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_180_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_SGI_200_MBPS,
 
 
-               //11ac 80MHZ NG, SG
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_29_3_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_87_8_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_117_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_175_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_234_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_263_3_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_292_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_32_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_65_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_97_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_130_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_195_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_260_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_292_5_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_325_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
-                {0000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
-#endif //WLAN_FEATURE_11AC
-                },  //    RF_SUBBAND_4_9_GHZ
+               ///11a c 80MHZ NG, SG
+                {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_29_3_MBPS,
+                {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_58_5_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_87_8_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_117_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_175_5_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_234_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_263_3_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_292_5_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_351_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_NGI_390_MBPS,
+                {1300},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_32_5_MBPS,
+                {1100},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_65_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_97_5_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_130_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_195_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_260_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_292_5_MBPS,
+                {1000},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_325_MBPS,
+                { 900},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_390_MBPS,
+                { 800},    // HAL_PHY_RATE_VHT_80MHZ_MCS_1NSS_CB_SGI_433_3_MBPS,
+#endif
+            },  //    RF_SUBBAND_4_9_GHZ
         },
 
         // NV_TABLE_REGULATORY_DOMAINS
@@ -8939,44 +5201,39 @@
 
         }, //NV_TABLE_CAL_MEMORY
 #endif
-        //NV_TABLE_CAL_STATUS
+        //NV_TABLE_FW_CONFIG
         {
-            0xFF,        // tANI_U8     overall;
-            0xFF,        // tANI_U8     fwInit;
-            0xFF,        // tANI_U8     hdet_dco;
-            0xFF,        // tANI_U8     rtuner;
-            0xFF,        // tANI_U8     ctuner;
-            0xFF,        // tANI_U8     insitu;
-            0xFF,        // tANI_U8     process_monitor;
-            0xFF,        // tANI_U8     pllVcoLinearity;
-            0xFF,        // tANI_U8     txIQ;
-            0xFF,        // tANI_U8     rxIQ;
-            0xFF,        // tANI_U8     rxDco;
-            0xFF,        // tANI_U8     txLo;
-            0xFF,        // tANI_U8     lnaBias;
-            0xFF,        // tANI_U8     lnaBandTuning;
-            0xFF,        // tANI_U8     lnaGainAdjust;
-            0xFF,        // tANI_U8     im2UsingNoisePwr;
-            0xFF,        // tANI_U8     temperature;
-            0xFF,        // tANI_U8     clpc;
-            0xFF,        // tANI_U8     clpc_temp_adjust;
-            0xFF,        // tANI_U8     txDpd;
-            0xFF,        // tANI_U8     channelTune;
-            0xFF,        // tANI_U8     rxGmStageLinearity;
-            0xFF,        // tANI_U8     im2UsingToneGen;
-            0xFF,        // tANI_U8     rxBbfTuning
-            0xFF,        // tANI_U8     txBbfTuning
-            0xFF,        // tANI_U8     paCTuning
-            {
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00,
-                0x00
-            }        // tANI_U8     unused[9];
+            0,   //skuID
+            0,   //tpcMode2G
+            0,   //tpcMode5G
+            0,   //reserved1
+
+            0,   //xPA2G
+            0,   //xPA5G;
+            0,   //paPolarityTx;
+            0,   //paPolarityRx;
+                
+            0,   //xLNA2G;
+            0,   //xLNA5G;
+            0,   //xCoupler2G;
+            0,   //xCoupler5G;
+                
+            0,   //xPdet2G;
+            0,   //xPdet5G;
+            0,   //enableDPD2G;
+            1,   //enableDPD5G;
+                
+            1,   //pdadcSelect2G;
+            1,   //pdadcSelect5GLow;
+            1,   //pdadcSelect5GMid;
+            1,   //pdadcSelect5GHigh;
+
+            0,   //reserved2
+            0,   //reserved3
+            0,   //reserved4
         },
 
+
         //NV_TABLE_RSSI_CHANNEL_OFFSETS
         {
             //PHY_RX_CHAIN_0
@@ -8997,73 +5254,34 @@
             }
         },
 
-        //NV_TABLE_RF_CAL_VALUES
+        //NV_TABLE_HW_CAL_VALUES
         {
-            //typedef struct
-            //{
-            //    tANI_U32 calStatus;  //use eNvCalID
-            //    sCalData calData;
-            //}sRFCalValues;
-
-            0,               //calStatus
+            0x0,             //validBmap
             {
-                0,           //process_monitor;
-                0,           //hdet_cal_code;
-                0,           //rxfe_gm_2;
+                1400,        //psSlpTimeOvrHd2G;
+                1400,        //psSlpTimeOvrHd5G;
+                
+                1600,        //psSlpTimeOvrHdxLNA5G;
+                0,           //nv_TxBBFSel9MHz 
+                0,           //hwParam1
+                0,           //hwParam2
 
-                0,           //tx_bbf_rtune;
-                0,           //pa_rtune_reg;
-                0,           //rt_code;
-                0,           //bias_rtune;
+                0x1B,        //custom_tcxo_reg8
+                0xFF,        //custom_tcxo_reg9
 
-                0,           //bb_bw1;
-                0,           //bb_bw2;
-                0,           //reserved0;
-                0,           //reserved11;
-
-                0,           //bb_bw3;
-                0,           //bb_bw4;
-                0,           //bb_bw5;
-                0,           //bb_bw6;
-
-                0,           //rcMeasured;
-                0,           //tx_bbf_ct;
-                0,           //tx_bbf_ctr;
-
-                0,           //csh_maxgain_reg;
-                0,           //csh_0db_reg;
-                0,           //csh_m3db_reg;
-                0,           //csh_m6db_reg;
-
-                0,           //cff_0db_reg;
-                0,           //cff_m3db_reg;
-                0,           //cff_m6db_reg;
-                0,           //rxfe_gpio_ctl_1;
-
-                0,           //mix_bal_cnt_2;
-                0,           //rxfe_lna_highgain_bias_ctl_delta;
-                0,           //rxfe_lna_load_ctune;
-                0,           //rxfe_lna_ngm_rtune;
-
-                0,           //rx_im2_spare0;
-                0,           //rx_im2_spare1;
-                0,           //hdet_dco
-
-                0,           //pll_vfc_reg3_b0;
-                0,           //pll_vfc_reg3_b1;
-                0,           //pll_vfc_reg3_b2;
-                0,           //pll_vfc_reg3_b3;
-
-                0,           //tempStart;
-                0,           //roomTemp;
-
-                0,           //ambientCalTemp;
-                0,           //ambientCalTempValid;
-                0            //reserved2;
-
+                0,           //hwParam3;
+                0,           //hwParam4;
+                0,           //hwParam5;
+                0,           //hwParam6;
+                0,           //hwParam7;
+                0,           //hwParam8;
+                0,           //hwParam9;
+                0,           //hwParam10;
+                0,           //hwParam11;
             }
         },
 
+
         //NV_TABLE_ANTENNA_PATH_LOSS
         {
             280,  // RF_CHAN_1
@@ -9170,6 +5388,5 @@
 };
 
 #endif
-#endif
 
 
diff --git a/firmware_bin/WCNSS_qcom_wlan_nv.bin b/firmware_bin/WCNSS_qcom_wlan_nv.bin
index e946dec..9ecfc08 100644
--- a/firmware_bin/WCNSS_qcom_wlan_nv.bin
+++ b/firmware_bin/WCNSS_qcom_wlan_nv.bin
Binary files differ
diff --git a/riva/inc/wlan_nv.h b/riva/inc/wlan_nv.h
old mode 100644
new mode 100755
index 4ffa207..cb29530
--- a/riva/inc/wlan_nv.h
+++ b/riva/inc/wlan_nv.h
@@ -1,43 +1,8 @@
 /*
- * Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-/*
- * Copyright (c) 2012, The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
+* Copyright (c) 2012 Qualcomm Atheros, Inc.
+* All Rights Reserved.
+* Qualcomm Atheros Confidential and Proprietary.
+*/
 
 /** ------------------------------------------------------------------------- *
     ------------------------------------------------------------------------- *
@@ -74,6 +39,8 @@
     NV_COMMON_MFG_SERIAL_NUMBER,        // 5
     NV_COMMON_WLAN_NV_REV_ID,           // 6
     NV_COMMON_COUPLER_TYPE,             // 7
+    NV_COMMON_NV_VERSION,               // 8
+    NV_COMMON_RESERVED,                 // 9
 
     NUM_NV_FIELDS,
     NV_MAX_FIELD = 0x7FFFFFFF  /* define as 4 bytes data */
@@ -93,54 +60,90 @@
     NUM_PRODUCT_BANDS_INVALID = 0x7FFFFFFF  /* define as 4 bytes data */
 }eNvProductBands;           //NV_COMMON_PRODUCT_BANDS
 
+#define EXTERNAL_PA         1
+#define INTERNAL_PA         0
+
+#define EXTERNAL_LNA        1
+#define INTERNAL_LNA        0
+
+#define EXTERNAL_COUPLER    1
+#define INTERNAL_COUPLER    0
+
+#define EXTERNAL_PDET       1
+#define INTERNAL_PDET       0
+
+#define DPD_ENABLED         1
+#define DPD_DISABLED        0
+
+#define TPC_MODE_OPEN_LOOP     0
+#define TPC_MODE_SCPC          1
+#define TPC_MODE_CLPC_MODE2    2
+#define TPC_MODE_CLPC_MODE3    3
+
+#define PA_POLARITY_TX_UNUSED   0
+#define PA_POLARITY_TX_POSITIVE 1
+#define PA_POLARITY_TX_NEGATIVE 2
+#define PA_POLARITY_RX_UNUSED   0
+#define PA_POLARITY_RX_POSITIVE 1
+#define PA_POLARITY_RX_NEGATIVE 2
+
+#define NV_VERSION_INVALID                 0xFF
+#define NV_VERSION_11N_11AC_COUPER_TYPE    0
+#define NV_VERSION_11N_11AC_FW_CONFIG      1
+#define NV_VERSION_LPDC_FW_CONFIG          2
+
+#ifdef WCN_PRONTO
+#define WLAN_NV_VERSION     NV_VERSION_LPDC_FW_CONFIG
+#else //WCN_PRONTO
+#define WLAN_NV_VERSION     NV_VERSION_11N_11AC_FW_CONFIG
+#endif //WCN_PRONTO
 
 typedef PACKED_PRE union PACKED_POST
 {
     //common NV fields
-    tANI_U16  productId;
-    tANI_U8   productBands;
-    tANI_U8   wlanNvRevId;
-    tANI_U8   numOfTxChains;
-    tANI_U8   numOfRxChains;
-    tANI_U8   macAddr[NV_FIELD_MAC_ADDR_SIZE];   /* Default, not change name for compatibility */
-    tANI_U8   macAddr2[NV_FIELD_MAC_ADDR_SIZE];
-    tANI_U8   macAddr3[NV_FIELD_MAC_ADDR_SIZE];
-    tANI_U8   macAddr4[NV_FIELD_MAC_ADDR_SIZE];
-    tANI_U8   mfgSN[NV_FIELD_MFG_SN_SIZE];
-    tANI_U8   couplerType;                       /* 0 : Internal coupler, 1 : External coupler */
-    tANI_U8   reserved;                          /* Make Byte alignment */
+    uint16  productId;
+    uint8   productBands;
+    uint8   wlanNvRevId;
+    uint8   numOfTxChains;
+    uint8   numOfRxChains;
+    uint8   macAddr[NV_FIELD_MAC_ADDR_SIZE];   /* Default, not change name for compatibility */
+    uint8   macAddr2[NV_FIELD_MAC_ADDR_SIZE];
+    uint8   macAddr3[NV_FIELD_MAC_ADDR_SIZE];
+    uint8   macAddr4[NV_FIELD_MAC_ADDR_SIZE];
+    uint8   mfgSN[NV_FIELD_MFG_SN_SIZE];
+    uint8   couplerType;
+    uint8   nvVersion;
 } uNvFields;
 
 
-
 //format of common part of nv
 typedef PACKED_PRE struct PACKED_POST
 {
     //always ensure fields are aligned to 32-bit boundaries
-    tANI_U16  productId;
-    tANI_U8   productBands;
-    tANI_U8   wlanNvRevId; //0: WCN1312, 1: WCN1314, 2: WCN3660
+    uint16  productId;
+    uint8   productBands;
+    uint8   wlanNvRevId; //0: WCN1312, 1: WCN1314, 2: WCN3660
 
-    tANI_U8   numOfTxChains;
-    tANI_U8   numOfRxChains;
-    tANI_U8   macAddr[NV_FIELD_MAC_ADDR_SIZE];   /* Default, not change name for compatibility */
-    tANI_U8   macAddr2[NV_FIELD_MAC_ADDR_SIZE];
-    tANI_U8   macAddr3[NV_FIELD_MAC_ADDR_SIZE];
-    tANI_U8   macAddr4[NV_FIELD_MAC_ADDR_SIZE];
-    tANI_U8   mfgSN[NV_FIELD_MFG_SN_SIZE];
-    tANI_U8   couplerType;                       /* 0 : Internal coupler, 1 : External coupler */
-    tANI_U8   reserved;                          /* Make Byte alignment */
+    uint8   numOfTxChains;
+    uint8   numOfRxChains;
+    uint8   macAddr[NV_FIELD_MAC_ADDR_SIZE];   /* Default, not change name for compatibility */
+    uint8   macAddr2[NV_FIELD_MAC_ADDR_SIZE];
+    uint8   macAddr3[NV_FIELD_MAC_ADDR_SIZE];
+    uint8   macAddr4[NV_FIELD_MAC_ADDR_SIZE];
+    uint8   mfgSN[NV_FIELD_MFG_SN_SIZE];
+    uint8   couplerType;
+    uint8   nvVersion;
 } sNvFields;
 
 
 //From wlanfw/inc/halPhyTypes.h
 
-typedef tANI_S8 tPowerdBm;   //power in signed 8-bit integer, no decimal places
+typedef int8 tPowerdBm;   //power in signed 8-bit integer, no decimal places
 
 typedef PACKED_PRE union PACKED_POST
 {
-    tANI_U32 measurement;      //measured values can be passed to pttApi, but are maintained to 2 decimal places internally
-    tANI_S16 reported;         //used internally only - reported values only maintain 2 decimals places
+    uint32 measurement;      //measured values can be passed to pttApi, but are maintained to 2 decimal places internally
+    int16  reported;         //used internally only - reported values only maintain 2 decimals places
 }uAbsPwrPrecision;
 
 typedef enum
@@ -326,7 +329,7 @@
    NV_CHANNEL_DFS,
    NV_CHANNEL_INVALID
 };
-typedef tANI_U8 eNVChannelEnabledType;
+typedef uint8 eNVChannelEnabledType;
 
 typedef PACKED_PRE struct PACKED_POST
 {
@@ -344,14 +347,14 @@
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_S16 bRssiOffset[NUM_RF_CHANNELS];
-    tANI_S16 gnRssiOffset[NUM_RF_CHANNELS];
+    int16 bRssiOffset[NUM_RF_CHANNELS];
+    int16 gnRssiOffset[NUM_RF_CHANNELS];
 }ALIGN_4 sRssiChannelOffsets;
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U16 targetFreq;           //number in MHz
-    tANI_U16 channelNum;           //channel number as in the eRfChannels enumeration
+    uint16 targetFreq;           //number in MHz
+    uint16 channelNum;           //channel number as in the eRfChannels enumeration
     eRfSubBand band;               //band that this channel belongs to
 }tRfChannelProps;
 
@@ -364,89 +367,69 @@
     MODE_802_11_INVALID = 0x7FFFFFFF  /* define as 4 bytes data */
 } e80211Modes;
 
+#define HW_CAL_VALUES_VALID_BMAP_UNUSED                             0   //Value
+//Bit mask
+#define HW_VAL_VALUES_VALID_BMAP_SLEEP_TIME_OVERHEAD_2G_MASK        0x1
+#define HW_VAL_VALUES_VALID_BMAP_SLEEP_TIME_OVERHEAD_5G_MASK        0x2
+#define HW_VAL_VALUES_VALID_BMAP_SLEEP_TIME_OVERHEAD_xLNA_5G_MASK   0x4
+#define HW_VAL_VALUES_VALID_TXBBF_SEL_9MHZ_MASK                     0x8
+#define HW_VAL_VALUES_VALID_CUSTOM_TCXO_REG8_MASK                   0x10
+#define HW_VAL_VALUES_VALID_CUSTOM_TCXO_REG9_MASK                   0x20
+
+
+#define HAL_PWR_SAVE_FW_BMPS_SLEEP_TIME_OVERHEADS_US                1400  //(2.4Ghz operation)
+#define HAL_PWR_SAVE_FW_BMPS_SLEEP_TIME_OVERHEADS_5GHZ_US           1400 //(5Ghz operation)
+#define HAL_PWR_SAVE_FW_BMPS_SLEEP_TIME_OVERHEADS_XPA_US            1600  //(xLNA operation)
+
 
 //From wlanfw/inc/halPhyCalMemory.h
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U16    process_monitor;
-    tANI_U8     hdet_cal_code;
-    tANI_U8     rxfe_gm_2;
+    uint16    psSlpTimeOvrHd2G;
+    uint16    psSlpTimeOvrHd5G;
 
-    tANI_U8     tx_bbf_rtune;
-    tANI_U8     pa_rtune_reg;
-    tANI_U8     rt_code;
-    tANI_U8     bias_rtune;
-
-    tANI_U8     bb_bw1;
-    tANI_U8     bb_bw2;
-    tANI_U8     pa_ctune_reg;
-    tANI_U8     reserved1;
-
-    tANI_U8     bb_bw3;
-    tANI_U8     bb_bw4;
-    tANI_U8     bb_bw5;
-    tANI_U8     bb_bw6;
-
-    tANI_U16    rcMeasured;
-    tANI_U8     tx_bbf_ct;
-    tANI_U8     tx_bbf_ctr;
-
-    tANI_U8     csh_maxgain_reg;
-    tANI_U8     csh_0db_reg;
-    tANI_U8     csh_m3db_reg;
-    tANI_U8     csh_m6db_reg;
-
-    tANI_U8     cff_0db_reg;
-    tANI_U8     cff_m3db_reg;
-    tANI_U8     cff_m6db_reg;
-    tANI_U8     rxfe_gpio_ctl_1;
-
-    tANI_U8     mix_bal_cnt_2;
-    tANI_S8     rxfe_lna_highgain_bias_ctl_delta;
-    tANI_U8     rxfe_lna_load_ctune;
-    tANI_U8     rxfe_lna_ngm_rtune;
-
-    tANI_U8     rx_im2_spare0;
-    tANI_U8     rx_im2_spare1;
-    tANI_U16    hdet_dco;
-
-    tANI_U8     pll_vfc_reg3_b0;
-    tANI_U8     pll_vfc_reg3_b1;
-    tANI_U8     pll_vfc_reg3_b2;
-    tANI_U8     pll_vfc_reg3_b3;
-
-    tANI_U16    tempStart;
-    tANI_U16    roomTemp;
-
-    tANI_S16    ambientCalTemp;
-    tANI_U8     ambientCalTempValid;
-    tANI_U8     reserved2;
-
+    uint16    psSlpTimeOvrHdxLNA5G;
+    uint8     nv_TxBBFSel9MHz       : 1;
+    uint8     hwParam1              : 7;
+    uint8     hwParam2;
+    
+    uint16    custom_tcxo_reg8;
+    uint16    custom_tcxo_reg9;
+    
+    uint32    hwParam3;
+    uint32    hwParam4;
+    uint32    hwParam5;
+    uint32    hwParam6;
+    uint32    hwParam7;
+    uint32    hwParam8;
+    uint32    hwParam9;
+    uint32    hwParam10;
+    uint32    hwParam11;
 }sCalData;
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U32 calStatus;  //use eNvCalID
+    uint32 validBmap;  //use eNvCalID
     sCalData calData;
-}sRFCalValues;
+}sHwCalValues;
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U32 txFirFilterMode;
+    uint32 txFirFilterMode;
 }sTxBbFilterMode;
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_S16 ofdmPwrOffset;
-    tANI_S16 rsvd;
+    int16 ofdmPwrOffset;
+    int16 rsvd;
 }sOfdmCmdPwrOffset;
 
 //From wlanfw/inc/halPhyCfg.h
-typedef tANI_U8 tTpcLutValue;
+typedef uint8 tTpcLutValue;
 
 #define MAX_TPC_CAL_POINTS      (8)
 
-typedef tANI_U8 tPowerDetect;        //7-bit power detect reading
+typedef uint8 tPowerDetect;        //7-bit power detect reading
 
 typedef PACKED_PRE struct PACKED_POST
 {
@@ -564,6 +547,9 @@
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_58_5_MBPS,
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_65_MBPS,
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_78_MBPS,
+#ifdef WCN_PRONTO
+    HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_NGI_86_5_MBPS,
+#endif
     
     /*11AC rate 20MHZ Shortl GI*/
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_7_2_MBPS,
@@ -575,6 +561,9 @@
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_65_MBPS,
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_72_2_MBPS,
     HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_86_6_MBPS,
+#ifdef WCN_PRONTO
+    HAL_PHY_RATE_VHT_20MHZ_MCS_1NSS_SGI_96_1_MBPS,
+#endif
     
     /*11AC rates 40MHZ normal GI*/
     HAL_PHY_RATE_VHT_40MHZ_MCS_1NSS_CB_NGI_13_5_MBPS ,
@@ -632,7 +621,6 @@
     HAL_PHY_RATE_INVALID_MAX_FIELD = 0x7FFFFFFF  /* define as 4 bytes data */
 }eHalPhyRates;
 
-
 #define NUM_RATE_POWER_GROUPS           NUM_HAL_PHY_RATES  //total number of rate power groups including the CB_RATE_POWER_OFFSET
 typedef uAbsPwrPrecision tRateGroupPwr[NUM_RATE_POWER_GROUPS];
 
@@ -640,46 +628,42 @@
 #define NV_FIELD_COUNTRY_CODE_SIZE  3
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U8 regDomain;                                  //from eRegDomainId
-    tANI_U8 countryCode[NV_FIELD_COUNTRY_CODE_SIZE];    // string identifier
+    uint8 regDomain;                                  //from eRegDomainId
+    uint8 countryCode[NV_FIELD_COUNTRY_CODE_SIZE];    // string identifier
 }sDefaultCountry;
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U8     overall;
-    tANI_U8     fwInit;
-    tANI_U8     hdet_dco;
-    tANI_U8     rtuner;
+    uint8 skuID; 
+    uint8 tpcMode2G;
+    uint8 tpcMode5G;
+    uint8 reserved1;
 
-    tANI_U8     ctuner;
-    tANI_U8     insitu;
-    tANI_U8     process_monitor;
-    tANI_U8     pllVcoLinearity;
+    uint8 xPA2G;
+    uint8 xPA5G;
+    uint8 paPolarityTx;
+    uint8 paPolarityRx;
 
-    tANI_U8     txIQ;
-    tANI_U8     rxIQ;
-    tANI_U8     rxDco;
-    tANI_U8     txLo;
+    uint8 xLNA2G;
+    uint8 xLNA5G;
+    uint8 xCoupler2G;
+    uint8 xCoupler5G;
 
-    tANI_U8     lnaBias;
-    tANI_U8     lnaBandTuning;
-    tANI_U8     lnaGainAdjust;
-    tANI_U8     im2UsingNoisePwr;
+    uint8 xPdet2G;
+    uint8 xPdet5G;
+    uint8 enableDPD2G;
+    uint8 enableDPD5G;
 
-    tANI_U8     temperature;
-    tANI_U8     clpc;
-    tANI_U8     clpc_temp_adjust;
-    tANI_U8     txDpd;
+    uint8 pdadcSelect2G;
+    uint8 pdadcSelect5GLow;
+    uint8 pdadcSelect5GMid;
+    uint8 pdadcSelect5GHigh;
 
-    tANI_U8     channelTune;
-    tANI_U8     rxGmStageLinearity;
-    tANI_U8     im2UsingToneGen;
-    tANI_U8     rxBbfTuning; // rx baseband filert tuning
+    uint32 reserved2;
+    uint32 resreved3;
+    uint32 resreved4;
+}sFwConfig;
 
-    tANI_U8     txBbfTuning; // tx baseband filter tuning
-    tANI_U8     paCTuning;   // PA adjustments baed on C-tuner
-    tANI_U8     unused[6];
-}sCalStatus;
 
 #define NUM_RF_VR_RATE   13
 typedef uAbsPwrPrecision tRateGroupPwrVR[NUM_RF_VR_RATE];
@@ -690,14 +674,13 @@
     sRegulatoryDomains   regDomains[NUM_REG_DOMAINS];                         // NV_TABLE_REGULATORY_DOMAINS
     sDefaultCountry      defaultCountryTable;                                 // NV_TABLE_DEFAULT_COUNTRY
     tTpcPowerTable       plutCharacterized[NUM_RF_CHANNELS];                  // NV_TABLE_TPC_POWER_TABLE
-    tANI_S16             plutPdadcOffset[NUM_RF_CHANNELS];                    // NV_TABLE_TPC_PDADC_OFFSETS
+    int16             plutPdadcOffset[NUM_RF_CHANNELS];                       // NV_TABLE_TPC_PDADC_OFFSETS
     tRateGroupPwrVR      pwrOptimum_virtualRate[NUM_RF_SUBBANDS];             // NV_TABLE_VIRTUAL_RATE
-    //sCalFlashMemory    calFlashMemory;                                      // NV_TABLE_CAL_MEMORY
-    sCalStatus           calStatus;                                           // NV_TABLE_CAL_STATUS
+    sFwConfig            fwConfig;                                             // NV_TABLE_FW_CONFIG
     sRssiChannelOffsets  rssiChanOffsets[2];                                  // NV_TABLE_RSSI_CHANNEL_OFFSETS
-    sRFCalValues         rFCalValues;                                         // NV_TABLE_RF_CAL_VALUES
-    tANI_S16             antennaPathLoss[NUM_RF_CHANNELS];                    // NV_TABLE_ANTENNA_PATH_LOSS
-    tANI_S16             pktTypePwrLimits[NUM_802_11_MODES][NUM_RF_CHANNELS]; // NV_TABLE_PACKET_TYPE_POWER_LIMITS
+    sHwCalValues         hwCalValues;                                         // NV_TABLE_HW_CAL_VALUES
+    int16             antennaPathLoss[NUM_RF_CHANNELS];                    // NV_TABLE_ANTENNA_PATH_LOSS
+    int16             pktTypePwrLimits[NUM_802_11_MODES][NUM_RF_CHANNELS]; // NV_TABLE_PACKET_TYPE_POWER_LIMITS
     sOfdmCmdPwrOffset    ofdmCmdPwrOffset;                                    // NV_TABLE_OFDM_CMD_PWR_OFFSET
     sTxBbFilterMode      txbbFilterMode;                                      // NV_TABLE_TX_BB_FILTER_MODE
 }ALIGN_4 uNvTables;
@@ -707,7 +690,7 @@
 
 typedef PACKED_PRE struct PACKED_POST
 {
-    tANI_U8 chanId;
+    uint8 chanId;
     tChannelPwrLimit pwr;
 } ALIGN_4 tChannelListWithPower;
 
@@ -721,10 +704,10 @@
     NV_TABLE_DEFAULT_COUNTRY        = 4,
     NV_TABLE_TPC_POWER_TABLE        = 5,
     NV_TABLE_TPC_PDADC_OFFSETS      = 6,
-    NV_TABLE_RF_CAL_VALUES          = 7,
+    NV_TABLE_HW_CAL_VALUES          = 7,
     NV_TABLE_RSSI_CHANNEL_OFFSETS   = 9,
     NV_TABLE_CAL_MEMORY             = 10,    //cal memory structure from halPhyCalMemory.h preceded by status
-    NV_TABLE_CAL_STATUS             = 11,
+    NV_TABLE_FW_CONFIG              = 11,
     NV_TABLE_ANTENNA_PATH_LOSS          = 12,
     NV_TABLE_PACKET_TYPE_POWER_LIMITS   = 13,
     NV_TABLE_OFDM_CMD_PWR_OFFSET        = 14,
@@ -743,14 +726,13 @@
     sRegulatoryDomains   regDomains[NUM_REG_DOMAINS];                         // NV_TABLE_REGULATORY_DOMAINS
     sDefaultCountry      defaultCountryTable;                                 // NV_TABLE_DEFAULT_COUNTRY
     tTpcPowerTable       plutCharacterized[NUM_RF_CHANNELS];                  // NV_TABLE_TPC_POWER_TABLE
-    tANI_S16             plutPdadcOffset[NUM_RF_CHANNELS];                    // NV_TABLE_TPC_PDADC_OFFSETS
+    int16             plutPdadcOffset[NUM_RF_CHANNELS];                    // NV_TABLE_TPC_PDADC_OFFSETS
     tRateGroupPwrVR      pwrOptimum_virtualRate[NUM_RF_SUBBANDS];             // NV_TABLE_VIRTUAL_RATE
-    //sCalFlashMemory    calFlashMemory;                                      // NV_TABLE_CAL_MEMORY
-    sCalStatus           calStatus;                                           // NV_TABLE_CAL_STATUS
+    sFwConfig           fwConfig;                                              // NV_TABLE_FW_CONFIG
     sRssiChannelOffsets  rssiChanOffsets[2];                                  // NV_TABLE_RSSI_CHANNEL_OFFSETS
-    sRFCalValues         rFCalValues;                                         // NV_TABLE_RF_CAL_VALUES
-    tANI_S16             antennaPathLoss[NUM_RF_CHANNELS];                    // NV_TABLE_ANTENNA_PATH_LOSS
-    tANI_S16             pktTypePwrLimits[NUM_802_11_MODES][NUM_RF_CHANNELS]; // NV_TABLE_PACKET_TYPE_POWER_LIMITS
+    sHwCalValues         hwCalValues;                                         // NV_TABLE_HW_CAL_VALUES
+    int16             antennaPathLoss[NUM_RF_CHANNELS];                    // NV_TABLE_ANTENNA_PATH_LOSS
+    int16             pktTypePwrLimits[NUM_802_11_MODES][NUM_RF_CHANNELS]; // NV_TABLE_PACKET_TYPE_POWER_LIMITS
     sOfdmCmdPwrOffset    ofdmCmdPwrOffset;                                    // NV_TABLE_OFDM_CMD_PWR_OFFSET
     sTxBbFilterMode      txbbFilterMode;                                      // NV_TABLE_TX_BB_FILTER_MODE
 }ALIGN_4 sNvTables;
diff --git a/riva/inc/wlan_phy.h b/riva/inc/wlan_phy.h
index 4cb8392..3eb5cce 100644
--- a/riva/inc/wlan_phy.h
+++ b/riva/inc/wlan_phy.h
@@ -104,7 +104,11 @@
    PHYDBG_PREAMBLE_GREENFIELD,
    PHYDBG_PREAMBLE_MIXED,
    PHYDBG_PREAMBLE_SHORTB,
-   PHYDBG_PREAMBLE_LONGB
+   PHYDBG_PREAMBLE_LONGB,
+
+   PHYDBG_LDPC_PREAMBLE_OFDM = 0x10,
+   PHYDBG_LDPC_PREAMBLE_GREENFIELD = 0x11,
+   PHYDBG_LDPC_PREAMBLE_MIXED = 0x12
 } ePhyDbgPreamble;