Configured cell list changes
[o-du/l2.git] / src / du_app / du_msg_hdl.c
index 910386a..7d27911 100644 (file)
@@ -18,6 +18,7 @@
 
 /* This file contains message handling functionality for DU cell management */
 
+#include "du_mgr.h"
 #include "du_sctp.h"
 #include "du_f1ap_msg_hdl.h"
 #include "lsctp.h"
@@ -31,17 +32,16 @@ U8 numRlcMacSaps = 0;
 U8 macCfg = 0;
 U8 macCfgInst = 0;
 
-extern DuCfgParams duCfgParam;;
-
+extern DuCfgParams duCfgParam;
 extern S16 cmPkLkwCfgReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLkwCntrlReq(Pst *pst, KwMngmt *cfg);
 extern S16 cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
 
-packMacCellCfgReq packMacCellCfgMt[] =
+packMacCellCfgReq packMacCellCfgOpts[] =
 {
-   packLcMacCellCfg, /* packing for loosely coupled */
-   packTcMacCellCfg, /* packing for tightly coupled */
-   packLwLcMacCellCfg, /* packing for light weight loosly coupled */
+   packMacCellCfg, /* packing for loosely coupled */
+   MacHdlCellCfgReq, /* packing for tightly coupled */
+   packMacCellCfg, /* packing for light weight loosly coupled */
 };
 
 /**************************************************************************
@@ -291,7 +291,7 @@ S16 duProcCfgComplete()
    S16 ret = ROK;
    static U16 cellId = 0;
    U16 idx;
-   for(idx=0; idx< DEFAULT_CELLS; idx++) //TODO: the length of this loop must be determined
+   for(idx=0; idx< DEFAULT_CELLS; idx++)
    {
       DuCellCb *cell;
       DU_ALLOC(cell, sizeof(DuCellCb))
@@ -302,25 +302,34 @@ S16 duProcCfgComplete()
       }
       else
       {
-         U16 nci;
-
+         U32 nci;
+         U8 idx;
+         
+         memset(cell, 0, sizeof(DuCellCb));
          cell->cellId = cellId++;
-         memcpy((void*)&cell->cellInfo, (void*)&duCfgParam.cellCfg[idx],\
-               sizeof(CellCfgParams));
-         cell->cellStatus = OOS;
-         nci = cell->cellInfo.nrEcgi.cellId;
-         ret = cmHashListInsert(&(duCb.cellLst), (PTR)(cell), 
-                     (U8 *)&(nci), (U16) sizeof(nci));
-
-         if(ret != ROK)
+         cell->cellInfo.nrEcgi.plmn.mcc[0] = PLMN_MCC0;
+         cell->cellInfo.nrEcgi.plmn.mcc[1] = PLMN_MCC1;
+         cell->cellInfo.nrEcgi.plmn.mcc[2] = PLMN_MCC2;
+         cell->cellInfo.nrEcgi.plmn.mnc[0] = PLMN_MNC0;
+         cell->cellInfo.nrEcgi.plmn.mnc[1] = PLMN_MNC1;
+         cell->cellInfo.nrEcgi.plmn.mnc[2] = PLMN_MNC2;
+         cell->cellInfo.nrEcgi.cellId = NR_CELL_ID;
+         cell->cellInfo.nrPci = NR_PCI; 
+         cell->cellInfo.fiveGsTac = DU_TAC;
+         for(idx=0; idx<MAX_PLMN; idx++)
          {
-            DU_LOG("\nDU_APP : HashListInsert into cellLst failed for [%d]", nci);
-            break;
-         }
-         else
-         {
-            DU_LOG("\nDU_APP : HashListInsert into cellLst successful for [%d]", nci);
-         }
+            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.maxUe = duCfgParam.maxUe;
+         cell->cellStatus = CELL_OUT_OF_SERVICE;
+         nci = (U16)cell->cellInfo.nrEcgi.cellId;
+         
+         duCb.cfgCellLst[nci-1] = cell;
       }
    }
    if(ret != RFAILED)
@@ -891,42 +900,6 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action)
 
    return ROK;
 }
-/*******************************************************************
- *
- * @brief  Function to start SCTP
- *
- * @details
- *
- *    Function : duSctpStartReq
- *
- *    Functionality:
- *       Function to start SCTP
- *
- * @params[in] 
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-S16 duSctpStartReq()
-{
-   Pst pst;
-
-   cmMemset((U8 *)&(pst), 0, sizeof(Pst));
-   pst.srcEnt = (Ent)ENTDUAPP;
-   pst.srcInst = (Inst)DU_INST;
-   pst.srcProcId = DU_PROC;
-   pst.dstEnt = (Ent)ENTSCTP;
-   pst.dstInst = (Inst)SCTP_INST;
-   pst.dstProcId = pst.srcProcId;
-   pst.event = EVTSCTPSTRT;
-   pst.selector = DU_SELECTOR_LC;
-   pst.pool= DU_POOL;
-
-   cmPkSctpAssocReq(&pst, duCfgParam.sctpParams);
-
-   RETVALUE(ROK);
-}
-
 /*******************************************************************
  *
  * @brief Handles SCTP notifications
@@ -957,7 +930,7 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
                {
                   DU_LOG("\nDU_APP : SCTP communication UP");
                   //Setup F1-C
-                  if(!duCb.f1Status)
+                  if(ntfy->u.assocChange.assocId == f1Params.assocId)
                   {
                      /* Build and send F1 Setup response */
                      if(BuildAndSendF1SetupReq() != ROK)
@@ -965,11 +938,16 @@ S16 duSctpNtfyHdl(Buffer *mBuf, CmInetSctpNotification *ntfy)
                         RETVALUE(RFAILED);
                      }
                   }
-                  else
+                  //Setup E2
+                  if(ntfy->u.assocChange.assocId == ricParams.assocId)
                   {
-                     //Only SCTP is down, when SCTP comes up again, no need to
-                     //start from setting up F1 link
+                     /* Build and send F1 Setup response */
+                     if(BuildAndSendE2SetupReq() != ROK)
+                     {
+                        RETVALUE(RFAILED);
+                     }
                   }
+
                   break;
                }
          }
@@ -1207,7 +1185,9 @@ S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm)
       DU_LOG("\nDU_APP : Tunnel management confirm OK");
 
 #ifdef EGTP_TEST
-      duSendEgtpDatInd();
+      duSendUeCreateReqToRlc();
+
+      duSendEgtpTestData();
       
       /* For testing purpose. TTI thread should actually be in L1 */
       duStartTtiThread();
@@ -1222,38 +1202,52 @@ S16 duHdlEgtpTnlMgmtCfm(EgtpTnlEvt tnlEvtCfm)
    RETVALUE(ret);
 }
 
+S16 duSendEgtpDatInd(Buffer *mBuf)
+{
+   EgtpMsg  egtpMsg;
+
+   /* Fill EGTP header */
+   egtpMsg.msgHdr.msgType = EGTPU_MSG_GPDU;
+   egtpMsg.msgHdr.nPdu.pres = FALSE;
+   egtpMsg.msgHdr.seqNum.pres = FALSE;
+   egtpMsg.msgHdr.extHdr.udpPort.pres = FALSE;
+   egtpMsg.msgHdr.extHdr.pdcpNmb.pres = FALSE;
+   egtpMsg.msgHdr.teId = 1;
+   egtpMsg.msg = mBuf;
+   
+   egtpHdlDatInd(egtpMsg);
+
+   return ROK;
+
+}
+
 #ifdef EGTP_TEST
 /*******************************************************************
  *
- * @brief Simulate RLC to EGTP data indication 
+ * @brief Simulate UL Data for intial test
  *
  * @details
  *
- *    Function : duSendEgtpDatInd
+ *    Function : duSendEgtpTestData
  *
  *    Functionality:
- *      Simulate RLC to EGTP data indication
+ *      Simulate UL data for initial test
  *
  * @params[in] 
  * @return ROK     - success
  *         RFAILED - failure
  *
  * ****************************************************************/
-S16 duSendEgtpDatInd()
+S16 duSendEgtpTestData()
 {
    char data[30] = "This is EGTP data from DU";
    int datSize = 30;
 
    Buffer   *mBuf;
-   EgtpMsg  egtpMsg;
 
    if(SGetMsg(DU_APP_MEM_REGION, DU_POOL, &mBuf) == ROK)
    {
-      if(SAddPstMsgMult((Data *)data, datSize, mBuf) == ROK)
-      {
-         SPrntMsg(mBuf, 0,0);
-      }
-      else
+      if(SAddPstMsgMult((Data *)data, datSize, mBuf) != ROK)
       {
          DU_LOG("\nDU_APP : SAddPstMsgMult failed");
          SPutMsg(mBuf);
@@ -1334,19 +1328,8 @@ S16 duSendEgtpDatInd()
 
    /* this function automatically reverses revPkArray */
    ret = SAddPreMsgMult(revPkArray, (MsgLen)cnt, mBuf);
-
-
-   egtpMsg.msgHdr.msgType = EGTPU_MSG_GPDU;
-   egtpMsg.msgHdr.nPdu.pres = FALSE;
-   egtpMsg.msgHdr.seqNum.pres = FALSE;
-   egtpMsg.msgHdr.extHdr.udpPort.pres = FALSE;
-   egtpMsg.msgHdr.extHdr.pdcpNmb.pres = FALSE;
-   egtpMsg.msgHdr.teId = 1;
-   egtpMsg.msg = mBuf;
-
-   SPrntMsg(mBuf, 0, 0);
-
-   egtpHdlDatInd(egtpMsg);
+    
+   duSendEgtpDatInd(mBuf);
  
    RETVALUE(ROK);
 }
@@ -1430,6 +1413,49 @@ S16 duSendSchCfg()
    return ROK;
 }
 
+
+/**************************************************************************
+ * @brief Function to configure SCTP params and 
+ *  responsible for F1 and E2 interfaces
+ *
+ * @details
+ *
+ *      Function : duLayerConfigComplete
+ * 
+ *      Functionality:
+ *           Configures SCTP Params and responsible for handling
+ *           F1 and E2 interface.
+ *     
+ * @param[in]  void
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ ***************************************************************************/
+S16 duLayerConfigComplete()
+{
+   S16 ret = ROK;
+
+   DU_LOG("\nDU_APP : Configuring all Layer is complete");
+
+   if((ret = duSctpCfgReq(duCfgParam.sctpParams)) != ROK)
+   {
+      DU_LOG("\nDU_APP : Failed configuring Sctp Params");
+      ret = RFAILED;
+   }
+       if((ret = duSctpAssocReq(F1_INTERFACE)) != ROK)
+   {
+      DU_LOG("\nDU_APP : Failed to send AssocReq F1");
+      ret = RFAILED;
+   }
+   if((ret = duSctpAssocReq(E2_INTERFACE)) != ROK)
+   {
+      DU_LOG("\nDU_APP : Failed to send AssocReq E2");
+      ret = RFAILED;
+   }
+
+   RETVALUE(ret); 
+} 
+
 /**************************************************************************
  * @brief Function to handle  SCH Config Confirm from MAC
  *
@@ -1461,8 +1487,7 @@ S16 duHdlSchCfgComplete(Pst *pst, RgMngmt *cfm)
             break;
       }
    }
-   duSctpStartReq();
-
+   duLayerConfigComplete();
    duBuildEgtpCfgReq();
    return ROK;
 }
@@ -1513,21 +1538,21 @@ S16 duBuildAndSendMacCellCfg()
 {
    Pst pst;
    DU_SET_ZERO(&pst, sizeof(Pst));
-   MacCellCfg *pMacCellCfg = NULLP;
+   MacCellCfg *duMacCellCfg = NULLP;
 
-   DU_ALLOC(pMacCellCfg, sizeof(MacCellCfg));
-   if(pMacCellCfg == NULLP)
+   DU_ALLOC(duMacCellCfg, sizeof(MacCellCfg));
+   if(duMacCellCfg == NULLP)
    {
       return RFAILED;
    }
 
    /* store the address in the duCb so that we can free on confirm msg */
-   duCb.ptrMacCellCfg = pMacCellCfg;
+   duCb.duMacCellCfg = duMacCellCfg;
 
    /* copy the mac config structure from duCfgParams */
-   memcpy(pMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
+   memcpy(duMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
 
-   pMacCellCfg->transId = cmGetTransId(); /* transaction ID */
+   duMacCellCfg->transId = getTransId(); /* transaction ID */
    
    /* Fill Pst */
    pst.selector  = DU_SELECTOR_LWLC;
@@ -1541,7 +1566,7 @@ S16 duBuildAndSendMacCellCfg()
    pst.event = EVENT_MAC_CELL_CONFIG_REQ;
 
    /* Send MAC cell config to MAC */
-   return (*packMacCellCfgMt[pst.selector])(&pst, pMacCellCfg);
+   return (*packMacCellCfgOpts[pst.selector])(&pst, duMacCellCfg);
 }
 
 /**************************************************************************
@@ -1563,11 +1588,11 @@ S16 duHandleMacCellCfgCfm(MacCellCfgCfm *macCellCfgCfm)
 {
    S16 ret = ROK;
 
-   if(macCellCfgCfm->transId == duCb.ptrMacCellCfg->transId)
+   if(macCellCfgCfm->transId == duCb.duMacCellCfg->transId)
    {
       /* free the memory allocated during sending macCellCfg request */
-      DU_FREE(duCb.ptrMacCellCfg,sizeof(MacCellCfg));
-      duCb.ptrMacCellCfg = NULLP;
+      DU_FREE(duCb.duMacCellCfg,sizeof(MacCellCfg));
+      duCb.duMacCellCfg = NULLP;
 
       /* Build and send GNB-DU config update */
       ret = BuildAndSendDUConfigUpdate();