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

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 7d279112d..2f77a76d9 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -16,7 +16,7 @@
 ################################################################################
 *******************************************************************************/
 
-/* This file contains message handling functionality for DU cell management */
+/* This file contains message handling functionality for DU APP */
 
 #include "du_mgr.h"
 #include "du_sctp.h"
@@ -44,6 +44,20 @@ packMacCellCfgReq packMacCellCfgOpts[] =
    packMacCellCfg, /* packing for light weight loosly coupled */
 };
 
+DuMacCellStartReq packMacCellStartReqOpts[] =
+{
+   packMacCellStartReq,   /* Loose coupling */
+   MacHdlCellStartReq,    /* TIght coupling */
+   packMacCellStartReq    /* Light weight-loose coupling */
+};
+
+DuMacCellStopReq packMacCellStopReqOpts[] =
+{
+   packMacCellStopReq,   /* Loose coupling */
+   MacHdlCellStopReq,    /* TIght coupling */
+   packMacCellStopReq    /* Light weight-loose coupling */
+};
+
 /**************************************************************************
  * @brief Function to fill configs required by RLC
  *
@@ -921,39 +935,26 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action)
 
 S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
 {
-   switch(ntfy->header.nType)
+   if(f1Params.assocId == ntfy->u.assocChange.assocId)
    {
-      case CM_INET_SCTP_ASSOC_CHANGE:
-         switch(ntfy->u.assocChange.state)
-         {
-            case CM_INET_SCTP_COMM_UP:
-               {
-                  DU_LOG("\nDU_APP : SCTP communication UP");
-                  //Setup F1-C
-                  if(ntfy->u.assocChange.assocId == f1Params.assocId)
-                  {
-                     /* Build and send F1 Setup response */
-                     if(BuildAndSendF1SetupReq() != ROK)
-                     {
-                        RETVALUE(RFAILED);
-                     }
-                  }
-                  //Setup E2
-                  if(ntfy->u.assocChange.assocId == ricParams.assocId)
-                  {
-                     /* Build and send F1 Setup response */
-                     if(BuildAndSendE2SetupReq() != ROK)
-                     {
-                        RETVALUE(RFAILED);
-                     }
-                  }
-
-                  break;
-               }
-         }
-         break;
+      if(BuildAndSendF1SetupReq() != ROK)
+      {
+         return RFAILED;
+      }
    }
-   RETVALUE(ROK);
+   else if(ricParams.assocId == ntfy->u.assocChange.assocId)
+   {
+      if(BuildAndSendE2SetupReq() != ROK)
+      {
+         return RFAILED;
+      }
+   }
+   else
+	{
+      DU_LOG("\nDU_APP : Invalid assocId %d received", ntfy->u.assocChange.assocId);
+		return RFAILED;
+	}
+   return ROK;
 }
 
 /*******************************************************************
@@ -1017,7 +1018,7 @@ S16 duBuildEgtpCfgReq()
     cmMemcpy((U8 *)&egtpCfg, (U8 *)&duCfgParam.egtpParams, (PTR)sizeof(EgtpConfig));
     
     duFillEgtpPst(&pst, EVTCFGREQ);
-    cmPkEgtpCfgReq(&pst, egtpCfg);
+    packEgtpCfgReq(&pst, egtpCfg);
  
     RETVALUE(ROK);
 }
@@ -1082,7 +1083,7 @@ S16 duSendEgtpSrvOpenReq()
    DU_LOG("\nDU_APP : Sending EGTP server open request");
 
    duFillEgtpPst(&pst, EVTSRVOPENREQ);
-   cmPkEgtpSrvOpenReq(&pst);
+   packEgtpSrvOpenReq(&pst);
 
    RETVALUE(ROK);
 }
@@ -1155,7 +1156,7 @@ S16 duSendEgtpTnlMgmtReq(U8 action, U32 lclTeid, U32 remTeid)
    DU_LOG("\nDU_APP : Sending EGTP tunnel management request");
     
    duFillEgtpPst(&pst, EVTTNLMGMTREQ);
-   cmPkEgtpTnlMgmtReq(&pst, tnlEvt);
+   packEgtpTnlMgmtReq(&pst, tnlEvt);
     
    RETVALUE(ROK);
 }
@@ -1188,9 +1189,6 @@ S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm)
       duSendUeCreateReqToRlc();
 
       duSendEgtpTestData();
-      
-      /* For testing purpose. TTI thread should actually be in L1 */
-      duStartTtiThread();
 #endif      
    }
    else
@@ -1442,7 +1440,7 @@ S16 duLayerConfigComplete()
       DU_LOG("\nDU_APP : Failed configuring Sctp Params");
       ret = RFAILED;
    }
-	if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
+   if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
    {
       DU_LOG("\nDU_APP : Failed to send AssocReq F1");
       ret = RFAILED;
@@ -1494,26 +1492,26 @@ S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm)
 
 /*******************************************************************
  *
- * @brief Handles TTI indication 
+ * @brief Sends Slot indication to EGTP
  *
  * @details
  *
- *    Function : duSendEgtpTTIInd
+ *    Function : duSendEgtpSlotInd
  *
  *    Functionality:
- *     Handles TTI indication received from PHY
+ *     Sends Slot indication to EGTP
  *
  * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 duSendEgtpTTIInd()
+S16 duSendEgtpSlotInd()
 {
    Pst pst;
 
-   duFillEgtpPst(&pst, EVTTTIIND);
-   cmPkEgtpTTIInd(&pst);
+   duFillEgtpPst(&pst, EVTSLOTIND);
+   packEgtpSlotInd(&pst);
    
    RETVALUE(ROK);
    
@@ -1584,29 +1582,175 @@ S16 duBuildAndSendMacCellCfg()
  *         RFAILED - failure
  *
  ***************************************************************************/
-S16 duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
+uint16_t duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 {
    S16 ret = ROK;
 
-   if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
-   {
-      /* free the memory allocated during sending macCellCfg request */
-      DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
-      duCb.duMacCellCfg = NULLP;
+   if(macCellCfgCfm->rsp == ROK)  
+	{
+		if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
+		{
+			/* free the memory allocated during sending macCellCfg request */
+			DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
+			duCb.duMacCellCfg = NULLP;
+
+			/* Build and send GNB-DU config update */
+			ret = BuildAndSendDUConfigUpdate();
+
+         /* TODO: Trigger cell start req once cell up slot ind is received*/
+			/* Build and Send Cell Start Req to MAC */
+			//ret = duBuildAndSendMacCellStartReq();
+
+		}
+		else
+		{
+			/* transaction ID missmatch */
+			DU_LOG("\n transaction ID mismatch in macCellCfg");
+			ret = RFAILED;
+		}
+	}
+	else
+	{
+		DU_LOG("\nMac cell cfg failed");
+		ret = RFAILED;
+	}
+   return ret;
+}
+
+/*******************************************************************
+ *
+ * @brief Handles slot indication from MAC
+ *
+ * @details
+ *
+ *    Function : duHandleSlotInd
+ *
+ *    Functionality:
+ *      Handles slot indication from MAC
+ *
+ * @params[in] Post structure pointer
+ *             Slot Info pointer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint16_t duHandleSlotInd(Pst *pst, SlotInfo *slotInfo)
+{
+   
+   DU_LOG("\nDU APP : Slot Indication received");
+
+   /* TODO : Slot Indication to be moved out of EGTP_TEST when
+    * data path is established */
+#ifdef EGTP_TEST
+   duSendEgtpSlotInd();    
+#endif
+   DU_FREE_MEM(pst->region, pst->pool, slotInfo, sizeof(SlotInfo));
+   return ROK;
+}
+
+/*******************************************************************
+ *
+ * @brief Builds and sends cell start request to MAC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendMacCellStartReq
+ *
+ *    Functionality:
+ *       Builds and sends cell start request to MAC
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint16_t duBuildAndSendMacCellStartReq()
+{
+   Pst pst;
+   MacCellStartInfo *cellStartInfo = NULL;
+
+   DU_LOG("\nDU APP : Building and Sending cell start request to MAC");
 
-      /* Build and send GNB-DU config update */
-      ret = BuildAndSendDUConfigUpdate();
+   /* Send Cell Start Request to MAC */
+   DU_ALLOC(cellStartInfo, sizeof(MacCellStartInfo));
+   if(!cellStartInfo)
+   {
+      DU_LOG("\nDU APP : Memory alloc failed while building cell start request");
+      return RFAILED;
    }
-   else
+
+   for(uint8_t id = 0; id < DU_MAX_CELLS; id++) 
    {
-      /* transaction ID missmatch */
-      DU_LOG("\n transaction ID mismatch in macCellCfg");
-      ret = RFAILED;
+      if(duCb.actvCellLst[id])
+      {
+         cellStartInfo->cellId = duCb.actvCellLst[id]->cellInfo.nrEcgi.cellId;
+ 
+         /* Fill Pst */
+         pst.selector  = DU_MAC_LWLC;
+         pst.srcEnt    = ENTDUAPP;
+         pst.dstEnt    = ENTRG;
+         pst.dstInst   = 0;
+         pst.srcInst   = 0;
+         pst.dstProcId = DU_PROC;
+         pst.srcProcId = DU_PROC;
+         pst.region = DU_APP_MEM_REGION;
+         pst.pool = DU_POOL;
+         pst.event = EVENT_MAC_CELL_START_REQ;
+ 
+         return (*packMacCellStartReqOpts[pst.selector])(&pst, cellStartInfo);
+      }
    }
+   return ROK;
+}
 
-   return ret;
+/*******************************************************************
+ *
+ * @brief Builds and sends cell stop request to MAC
+ *
+ * @details
+ *
+ *    Function : duBuildAndSendMacCellStopReq 
+ *
+ *    Functionality:
+ *       Builds and sends cell stop request to MAC
+ *
+ * @params[in] 
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+S16 duBuildAndSendMacCellStopReq()
+{
+   Pst pst;
+   MacCellStopInfo *cellStopInfo = NULL;
+ 
+   DU_LOG("\nDU APP : Building and Sending cell stop request to MAC");
+
+   /* Send Cell Stop Request to MAC */
+   DU_ALLOC(cellStopInfo, sizeof(MacCellStopInfo));
+   if(!cellStopInfo)
+   {
+      DU_LOG("\nDU APP : Memory alloc failed while building cell stop request");
+      return RFAILED;
+   }
+   cellStopInfo->cellId = duCb.actvCellLst[0]->cellId;
+ 
+   /* Fill Pst */
+   pst.selector  = DU_MAC_LWLC;
+   pst.srcEnt    = ENTDUAPP;
+   pst.dstEnt    = ENTRG;
+   pst.dstInst   = 0;
+   pst.srcInst   = 0;
+   pst.dstProcId = DU_PROC;
+   pst.srcProcId = DU_PROC;
+   pst.region = DU_APP_MEM_REGION;
+   pst.pool = DU_POOL;
+   pst.event = EVENT_MAC_CELL_STOP_REQ;
+ 
+   return (*packMacCellStopReqOpts[pst.selector])(&pst, cellStopInfo);
 }
 
+
 /**********************************************************************
   End of file
  **********************************************************************/