X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_sys_info_hdl.c;h=ecf04e73f18298cd677859197cd131db513ac9f3;hb=a1ddf631bdb142b7cb0c7daf61e6846652d463bf;hp=1d8a4cca1d17f1981d959b9ec40f62cebb542556;hpb=37f19c79962b15d20faa1c8eada1dea28bc5e2a4;p=o-du%2Fl2.git

diff --git a/src/du_app/du_sys_info_hdl.c b/src/du_app/du_sys_info_hdl.c
index 1d8a4cca1..ecf04e73f 100644
--- a/src/du_app/du_sys_info_hdl.c
+++ b/src/du_app/du_sys_info_hdl.c
@@ -337,8 +337,9 @@ uint8_t BuildCellIdentity(CellIdentity_t  *cellIdentity)
    {   
       DU_LOG("\nERROR  -->  DU APP: CellIdentity memory allocation failure");
       return RFAILED;
-   }   
-   *cellIdentity->buf = duCfgParam.sib1Params.cellIdentity;
+   }
+   memset(cellIdentity->buf, 0,  cellIdentity->size);
+   cellIdentity->buf[4] = duCfgParam.sib1Params.cellIdentity;
 
    return ROK;
 }
@@ -1797,7 +1798,7 @@ uint8_t BuildPuschCfgCommon(struct BWP_UplinkCommon__pusch_ConfigCommon *puschCf
 
    duPuschCfg = duCfgParam.sib1Params.srvCellCfgCommSib.ulCfg.puschCfg;
 
-   puschCfg->present = duPuschCfg.present;
+   puschCfg->present = duPuschCfg.puschCfgPresent;
    switch(puschCfg->present)
    {
       case BWP_UplinkCommon__pusch_ConfigCommon_PR_NOTHING:
@@ -1828,7 +1829,7 @@ uint8_t BuildPuschCfgCommon(struct BWP_UplinkCommon__pusch_ConfigCommon *puschCf
 	    DU_LOG("\nERROR  -->  DU APP : PUSCH Config memory alloc failed");
 	    return RFAILED;
 	 }
-	 elementCnt = ODU_VALUE_ONE;
+	 elementCnt = duPuschCfg.numTimeDomRsrcAlloc;
 	 setup->pusch_TimeDomainAllocationList->list.count = elementCnt;
 	 setup->pusch_TimeDomainAllocationList->list.size = \
 	 elementCnt * sizeof(PUSCH_TimeDomainResourceAllocation_t *);
@@ -1852,21 +1853,21 @@ uint8_t BuildPuschCfgCommon(struct BWP_UplinkCommon__pusch_ConfigCommon *puschCf
 	    }
 	 }
 
-	 idx = 0;
-	 timeDomRsrcAllocInfo = setup->pusch_TimeDomainAllocationList->list.array[idx];
-
-	 /* K2 */
-	 DU_ALLOC(timeDomRsrcAllocInfo->k2, sizeof(long));
-	 if(!timeDomRsrcAllocInfo->k2)
-	 {
-	    DU_LOG("\nERROR  -->  DU APP : PUSCH Config memory alloc failed");
-	    return RFAILED;
-	 }
-	 *timeDomRsrcAllocInfo->k2 = duPuschCfg.k2;
-
-	 timeDomRsrcAllocInfo->mappingType = duPuschCfg.mapType;
-	 timeDomRsrcAllocInfo->startSymbolAndLength = duPuschCfg.sliv;
+	 for(idx = 0; idx < elementCnt; idx++)
+    {
+       timeDomRsrcAllocInfo = setup->pusch_TimeDomainAllocationList->list.array[idx];
 
+       /* K2 */
+       DU_ALLOC(timeDomRsrcAllocInfo->k2, sizeof(long));
+       if(!timeDomRsrcAllocInfo->k2)
+       {
+          DU_LOG("\nERROR  -->  DU APP : PUSCH Config memory alloc failed");
+          return RFAILED;
+       }
+       *timeDomRsrcAllocInfo->k2 = duPuschCfg.timeDomAllocList[idx].k2;
+       timeDomRsrcAllocInfo->mappingType = duPuschCfg.timeDomAllocList[idx].mapType;
+       timeDomRsrcAllocInfo->startSymbolAndLength = duPuschCfg.timeDomAllocList[idx].sliv;
+    }
 	 /* Msg3 Delta Preamble */
 	 DU_ALLOC(setup->msg3_DeltaPreamble, sizeof(long));
 	 if(!setup->msg3_DeltaPreamble)