From: Sangeeta Vaidhyanathan <svaidhya@radisys.com>
Date: Tue, 5 Dec 2023 09:17:16 +0000 (+0000)
Subject: Merge "[Epic-ID: ODUHIGH-517][Task-ID: ODUHIGH-541] Shifting the Conversion of FreqDo... 
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;ds=sidebyside;h=a0b19d81aa8c12107f409b1d06a5e900614697c2;hp=-c;p=o-du%2Fl2.git

Merge "[Epic-ID: ODUHIGH-517][Task-ID: ODUHIGH-541] Shifting the Conversion of FreqDomainResource from FAPI to IAPI from SCH to LWR_MAC"
---

a0b19d81aa8c12107f409b1d06a5e900614697c2
diff --combined src/5gnrsch/sch.c
index 5e09bb362,9c6c11061..1043e6de3
--- a/src/5gnrsch/sch.c
+++ b/src/5gnrsch/sch.c
@@@ -595,7 -595,7 +595,7 @@@ uint8_t fillSchSib1Cfg(uint8_t mu, uint
     uint8_t mValue = 0;
     uint8_t firstSymbol = 0; /* need to calculate using formula mentioned in 38.213 */
     uint8_t slotIndex = 0;
-    uint8_t FreqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
+    uint8_t freqDomainResource[FREQ_DOM_RSRC_SIZE] = {0};
     uint16_t tbSize = 0;
     uint8_t ssbIdx = 0;
     PdcchCfg *pdcch;
@@@ -655,8 -655,8 +655,8 @@@
     pdcch->coresetCfg.durationSymbols = numSymbols;
     
     /* Fill Bitmap for PRBs in coreset */
-    fillCoresetFeqDomAllocMap(((offsetPointA-offset)/6), (numRbs/6), FreqDomainResource);
-    covertFreqDomRsrcMapToIAPIFormat(FreqDomainResource, pdcch->coresetCfg.freqDomainResource);
+    fillCoresetFeqDomAllocMap(((offsetPointA-offset)/6), (numRbs/6), freqDomainResource);
+    memcpy(pdcch->coresetCfg.freqDomainResource, freqDomainResource, FREQ_DOM_RSRC_SIZE);
  
     pdcch->coresetCfg.cceRegMappingType = 1; /* coreset0 is always interleaved */
     pdcch->coresetCfg.regBundleSize = 6;    /* spec-38.211 sec 7.3.2.2 */
@@@ -782,9 -782,8 +782,8 @@@ uint8_t SchProcCellCfgReq(Pst *pst, Sch
     offset = coresetIdxTable[coreset0Idx][3];
     fillCoresetFeqDomAllocMap(((cellCb->cellCfg.dlCfgCommon.schFreqInfoDlSib.offsetToPointA - offset)/6), \
                                    (numRbs/6), freqDomainResource);
-    covertFreqDomRsrcMapToIAPIFormat(freqDomainResource, \
-       cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc);
- 
+    memcpy(cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.pdcchCommon.commonSearchSpace.freqDomainRsrc,\
+                freqDomainResource,FREQ_DOM_RSRC_SIZE);
     /* Fill K0 - K1 table for common cfg*/ 
     BuildK0K1Table(cellCb, &cellCb->k0K1InfoTbl, true, cellCb->cellCfg.dlCfgCommon.schInitialDlBwp.pdschCommon,
                     pdschCfg, DEFAULT_UL_ACK_LIST_COUNT, defaultUlAckTbl);
@@@ -3272,7 -3271,7 +3271,7 @@@ uint8_t deleteStatsInfo(Inst inst, SchS
        {
           /* [Step-2] */
           if(deleteFromStatsGrpList(inst, statsGrpList, statsDeleteReq->subscriptionId,\
 -                  statsDeleteReq->statsGrpIdToBeDelList[statsGrpIdx], false) != ROK)
 +                  statsDeleteReq->statsGrpIdToBeDelList[statsGrpIdx], false) == ROK)
           {
              /* [Step-3]*/
              schStatsDeleteRsp->statsGrpDelInfo[statsGrpIdx].statsGrpDelRsp = RSP_OK;