X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=068b7282f95dea19453e46cc0dc58231b57937a9;hb=8d9ebf64c8a64bf1346685833fe79970c4ef3d14;hp=2f77a76d95f4e7946190e09ac2e080057aaa4093;hpb=e550b2091fb29289d12a5722b189acbede7862f0;p=o-du%2Fl2.git

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 2f77a76d9..068b7282f 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -36,6 +36,11 @@ extern DuCfgParams duCfgParam;
 extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
+extern S16 BuildAndSendE2SetupReq();
+extern S16 egtpHdlDatInd(EgtpMsg egtpMsg);
+extern S16 BuildAndSendDUConfigUpdate();
+extern U16 getTransId();
+extern S16 cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg);
 
 packMacCellCfgReq packMacCellCfgOpts[] =
 {
@@ -317,8 +322,7 @@ S16 duProcCfgComplete()
       else
       {
          U32 nci;
-         U8 idx;
-         
+         U8 idx1; 
          memset(cell, 0, sizeof(DuCellCb));
          cell->cellId = cellId++;
          cell->cellInfo.nrEcgi.plmn.mcc[0] = PLMN_MCC0;
@@ -330,15 +334,15 @@ S16 duProcCfgComplete()
          cell->cellInfo.nrEcgi.cellId = NR_CELL_ID;
          cell->cellInfo.nrPci = NR_PCI; 
          cell->cellInfo.fiveGsTac = DU_TAC;
-         for(idx=0; idx<MAX_PLMN; idx++)
+         for(idx1=0; idx1<MAX_PLMN; idx1++)
          {
-            cell->cellInfo.plmn[idx].mcc[0] = PLMN_MCC0;
-            cell->cellInfo.plmn[idx].mcc[1] = PLMN_MCC1;
-            cell->cellInfo.plmn[idx].mcc[2] = PLMN_MCC2;
-            cell->cellInfo.plmn[idx].mnc[0] = PLMN_MNC0;
-            cell->cellInfo.plmn[idx].mnc[1] = PLMN_MNC1;
-            cell->cellInfo.plmn[idx].mnc[2] = PLMN_MNC2;
-			}
+            cell->cellInfo.plmn[idx1].mcc[0] = PLMN_MCC0;
+            cell->cellInfo.plmn[idx1].mcc[1] = PLMN_MCC1;
+            cell->cellInfo.plmn[idx1].mcc[2] = PLMN_MCC2;
+            cell->cellInfo.plmn[idx1].mnc[0] = PLMN_MNC0;
+            cell->cellInfo.plmn[idx1].mnc[1] = PLMN_MNC1;
+            cell->cellInfo.plmn[idx1].mnc[2] = PLMN_MNC2;
+	 }
          cell->cellInfo.maxUe = duCfgParam.maxUe;
          cell->cellStatus = CELL_OUT_OF_SERVICE;
          nci = (U16)cell->cellInfo.nrEcgi.cellId;
@@ -1591,6 +1595,7 @@ uint16_t duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 		if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
 		{
 			/* free the memory allocated during sending macCellCfg request */
+			DU_FREE(duCb.duMacCellCfg->sib1Cfg.sib1Pdu, duCfgParam.srvdCellLst[0].duSysInfo.sib1Len);
 			DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
 			duCb.duMacCellCfg = NULLP;
 
@@ -1599,7 +1604,7 @@ uint16_t duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 
          /* TODO: Trigger cell start req once cell up slot ind is received*/
 			/* Build and Send Cell Start Req to MAC */
-			//ret = duBuildAndSendMacCellStartReq();
+			ret = duBuildAndSendMacCellStartReq();
 
 		}
 		else
@@ -1639,6 +1644,23 @@ uint16_t duHandleSlotInd(Pst *pst, SlotInfo *slotInfo)
    
    DU_LOG("\nDU APP : Slot Indication received");
 
+   if(slotInfo->cellId <=0 || slotInfo->cellId > DU_MAX_CELLS)
+   {
+      DU_LOG("\nDU APP : Invalid Cell Id %d", slotInfo->cellId);
+   }
+   if(!duCb.actvCellLst[slotInfo->cellId-1]->firstSlotIndRcvd)
+   {
+      duCb.actvCellLst[slotInfo->cellId-1]->firstSlotIndRcvd = true;
+      if((duCb.actvCellLst[slotInfo->cellId-1] != NULL) && \
+         (duCb.actvCellLst[slotInfo->cellId-1]->cellStatus == \
+         ACTIVATION_IN_PROGRESS))
+      {
+         DU_LOG("\nDU APP : Cell Id %d is ACTIVE", slotInfo->cellId);
+         duCb.actvCellLst[slotInfo->cellId-1]->cellStatus = ACTIVATED;
+      }
+      
+   }
+
    /* TODO : Slot Indication to be moved out of EGTP_TEST when
     * data path is established */
 #ifdef EGTP_TEST
@@ -1683,6 +1705,7 @@ uint16_t duBuildAndSendMacCellStartReq()
    {
       if(duCb.actvCellLst[id])
       {
+         duCb.actvCellLst[id]->firstSlotIndRcvd = FALSE;
          cellStartInfo->cellId = duCb.actvCellLst[id]->cellInfo.nrEcgi.cellId;
  
          /* Fill Pst */