X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=199ba76ada39025448d72106c1d2797f13be5a68;hb=6c530e3037c009f3c4ec76a14128e89c7a9db0a3;hp=305af8b07b86af538f0b81c7b706e2077699aea5;hpb=0fccb83e55b237d60cf451bab71a0c7242cc6e66;p=o-du%2Fl2.git

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 305af8b07..199ba76ad 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -17,10 +17,17 @@
 *******************************************************************************/
 
 /* This file contains message handling functionality for DU APP */
-
+#include "common_def.h"
+#include "lrg.h"
+#include "legtp.h"
+#include "lkw.h"
+#include "lrg.x"
+#include "lkw.x"
+#include "du_cfg.h"
 #include "du_mgr.h"
 #include "du_sctp.h"
 #include "du_f1ap_msg_hdl.h"
+#include "du_ue_mgr.h"
 #include "lsctp.h"
 #include "legtp.h"
 #include "lphy_stub.h"
@@ -38,7 +45,7 @@ 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 uint8_t BuildAndSendDUConfigUpdate();
 extern U16 getTransId();
 extern S16 cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg);
 
@@ -111,7 +118,7 @@ S16 duBuildRlcCfg(Inst inst)
    genCfg->lmPst.region    = (inst == RLC_UL_INST) ?
       RLC_UL_MEM_REGION:RLC_DL_MEM_REGION;
    genCfg->lmPst.pool      = RLC_POOL;
-   genCfg->lmPst.selector  = DU_SELECTOR_LC;
+   genCfg->lmPst.selector  = ODU_SELECTOR_LC;
 
     /* Fill Header */
    kwMngmt.hdr.msgType             = TCFG;
@@ -127,10 +134,10 @@ S16 duBuildRlcCfg(Inst inst)
    kwMngmt.hdr.response.mem.region = (inst == RLC_UL_INST) ?
       RLC_UL_MEM_REGION:RLC_DL_MEM_REGION;
    kwMngmt.hdr.response.mem.pool   = DU_POOL;
-   kwMngmt.hdr.response.selector   = DU_SELECTOR_LC;
+   kwMngmt.hdr.response.selector   = ODU_SELECTOR_LC;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstInst   = inst;
@@ -180,7 +187,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst)
    kwMngmt.hdr.response.mem.pool   = RLC_POOL;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstProcId = DU_PROC;
@@ -202,7 +209,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst)
       lSap->ent         = ENTRG;
       lSap->inst        = lsapInst;
       lSap->sapId       = lsapInst;      /* SapId will be stored as suId in MAC */
-      lSap->selector    = (inst == RLC_UL_INST) ? DU_SELECTOR_LWLC : DU_SELECTOR_TC;
+      lSap->selector    = (inst == RLC_UL_INST) ? ODU_SELECTOR_LWLC : ODU_SELECTOR_TC;
       kwMngmt.hdr.elmId.elmnt  = STRGUSAP;
       DU_LOG("\nDU_APP : RLC MAC Lower Sap Cfg Req sent for inst %d", inst);
 
@@ -214,7 +221,7 @@ S16 duBuildRlcLsapCfg(Ent ent, Inst inst, U8 lsapInst)
       lSap->inst      = (inst == RLC_UL_INST) ?
          RLC_DL_INST : RLC_UL_INST;
       lSap->sapId       = 0;
-      lSap->selector = DU_SELECTOR_LC;
+      lSap->selector = ODU_SELECTOR_LC;
       kwMngmt.hdr.elmId.elmnt  = STUDXSAP;
       DU_LOG("\nDU_APP : RLC DL/UL Lower Sap Cfg Req sent for inst %d", inst);
    }
@@ -249,7 +256,7 @@ S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst)
 
    uSap   = &(kwMngmt.t.cfg.s.sap);
 
-   uSap->selector   = DU_SELECTOR_LC;
+   uSap->selector   = ODU_SELECTOR_LC;
    uSap->mem.region = (inst == RLC_UL_INST) ?
       RLC_UL_MEM_REGION:RLC_DL_MEM_REGION;
    uSap->mem.pool = RLC_POOL;
@@ -275,7 +282,7 @@ S16 duBuildRlcUsapCfg(U8 elemId, Ent ent, Inst inst)
    kwMngmt.hdr.response.mem.pool   = RLC_POOL;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstProcId = DU_PROC;
@@ -312,7 +319,7 @@ S16 duProcCfgComplete()
    U16 idx;
    for(idx=0; idx< DEFAULT_CELLS; idx++)
    {
-      DuCellCb *cell;
+      DuCellCb *cell = NULLP;
       DU_ALLOC(cell, sizeof(DuCellCb))
       if(cell == NULLP)
       {
@@ -324,7 +331,7 @@ S16 duProcCfgComplete()
          U32 nci;
          U8 idx1; 
          memset(cell, 0, sizeof(DuCellCb));
-         cell->cellId = cellId++;
+         cell->cellId = ++cellId;
          cell->cellInfo.nrEcgi.plmn.mcc[0] = PLMN_MCC0;
          cell->cellInfo.nrEcgi.plmn.mcc[1] = PLMN_MCC1;
          cell->cellInfo.nrEcgi.plmn.mcc[2] = PLMN_MCC2;
@@ -701,7 +708,7 @@ S16 duBuildMacGenCfg()
    genCfg->lmPst.route     = RTESPEC;
    genCfg->lmPst.region    = MAC_MEM_REGION;
    genCfg->lmPst.pool      = RG_POOL;
-   genCfg->lmPst.selector  = DU_SELECTOR_LC;
+   genCfg->lmPst.selector  = ODU_SELECTOR_LC;
 
     /* Fill Header */
    rgMngmt.hdr.msgType             = TCFG;
@@ -717,10 +724,10 @@ S16 duBuildMacGenCfg()
    rgMngmt.hdr.response.route      = RTESPEC;
    rgMngmt.hdr.response.mem.region = MAC_MEM_REGION;
    rgMngmt.hdr.response.mem.pool   = RG_POOL;
-   rgMngmt.hdr.response.selector   = DU_SELECTOR_LC;
+   rgMngmt.hdr.response.selector   = ODU_SELECTOR_LC;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = macCfgInst;
@@ -771,7 +778,7 @@ S16 duBuildMacUsapCfg(SpId sapId)
    uSap->inst       = sapId;
    uSap->prior      = PRIOR0;
    uSap->route      = RTESPEC;
-   uSap->selector   = DU_SELECTOR_LC ;
+   uSap->selector   = ODU_SELECTOR_LC ;
 
    /* fill header */
    rgMngmt.hdr.msgType             = TCFG;
@@ -782,7 +789,7 @@ S16 duBuildMacUsapCfg(SpId sapId)
    rgMngmt.hdr.response.mem.pool   = RG_POOL;
    
    /* fill pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = macCfgInst;
@@ -906,7 +913,7 @@ S16 duBindUnbindRlcToMacSap(U8 inst, U8 action)
    kwMngmt.hdr.response.mem.pool   = RLC_POOL;
 
    /* Fill pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTKW;
    pst.dstProcId = DU_PROC;
@@ -987,7 +994,7 @@ S16 duFillEgtpPst(Pst *pst, Event event)
    pst->dstInst = (Inst)EGTP_INST;
    pst->dstProcId = pst->srcProcId;
    pst->event = event;
-   pst->selector = DU_SELECTOR_LC;
+   pst->selector = ODU_SELECTOR_LC;
    pst->pool= DU_POOL;
   
    RETVALUE(ROK);
@@ -1386,7 +1393,7 @@ S16 duSendSchCfg()
    cfg->genCfg.lmPst.route     = RTESPEC;
    cfg->genCfg.lmPst.region    = MAC_MEM_REGION;
    cfg->genCfg.lmPst.pool      = RG_POOL;
-   cfg->genCfg.lmPst.selector  = DU_SELECTOR_LC;
+   cfg->genCfg.lmPst.selector  = ODU_SELECTOR_LC;
 
    /* Fill Header */
    rgMngmt.hdr.msgType             = TCFG;
@@ -1397,7 +1404,7 @@ S16 duSendSchCfg()
    rgMngmt.hdr.response.mem.pool   = RG_POOL;
 
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LC;
+   pst.selector  = ODU_SELECTOR_LC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstProcId = DU_PROC;
@@ -1557,7 +1564,7 @@ S16 duBuildAndSendMacCellCfg()
    duMacCellCfg->transId = getTransId(); /* transaction ID */
    
    /* Fill Pst */
-   pst.selector  = DU_SELECTOR_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = 0;
@@ -1667,7 +1674,7 @@ uint16_t duHandleSlotInd(Pst *pst, SlotInfo *slotInfo)
    duSendEgtpSlotInd();    
 #endif
 
-   if((pst->selector == DU_SELECTOR_LWLC) || (pst->selector == DU_SELECTOR_TC)) 
+   if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC)) 
       DU_FREE_SHRABL_BUF(MAC_MEM_REGION, pst->pool, slotInfo, sizeof(SlotInfo));
 
    return ROK;
@@ -1712,7 +1719,7 @@ uint16_t duBuildAndSendMacCellStartReq()
          cellStartInfo->cellId = duCb.actvCellLst[id]->cellInfo.nrEcgi.cellId;
  
          /* Fill Pst */
-         pst.selector  = DU_MAC_LWLC;
+         pst.selector  = ODU_SELECTOR_LWLC;
          pst.srcEnt    = ENTDUAPP;
          pst.dstEnt    = ENTRG;
          pst.dstInst   = 0;
@@ -1762,7 +1769,7 @@ uint16_t duBuildAndSendMacCellStopReq()
    cellStopInfo->cellId = duCb.actvCellLst[0]->cellId;
  
    /* Fill Pst */
-   pst.selector  = DU_MAC_LWLC;
+   pst.selector  = ODU_SELECTOR_LWLC;
    pst.srcEnt    = ENTDUAPP;
    pst.dstEnt    = ENTRG;
    pst.dstInst   = 0;
@@ -1811,11 +1818,38 @@ uint16_t duHandleStopInd(Pst *pst, MacCellStopInfo *cellStopId)
          }
       }
 	}
-   if((pst->selector == DU_SELECTOR_LWLC) || (pst->selector == DU_SELECTOR_TC))
+   if((pst->selector == ODU_SELECTOR_LWLC) || (pst->selector == ODU_SELECTOR_TC))
       DU_FREE_SHRABL_BUF(MAC_MEM_REGION, pst->pool, cellStopId, sizeof(MacCellStopInfo));
 
    return ROK;
 }
+
+/*******************************************************************
+ *
+ * @brief Handles slot indication from MAC
+ *
+ * @details
+ *
+ *    Function : duHandleUlCcchInd
+ *
+ *    Functionality:
+ *      Handles UL CCCH indication from MAC
+ *
+ * @params[in] Post structure pointer
+ *             UL CCCH Ind pointer
+ * @return ROK     - success
+ *         RFAILED - failure
+ *
+ * ****************************************************************/
+uint16_t duHandleUlCcchInd(Pst *pst, UlCcchIndInfo *ulCcchIndInfo)
+{
+   
+   DU_LOG("\nDU APP : UL CCCH Indication received");
+
+   return (duProcUlCcchInd(ulCcchIndInfo));
+}
+
+
 /**********************************************************************
   End of file
  **********************************************************************/