remove/replaced PRIVATE and EXTERN keywords

[o-du/l2.git] / src / du_app / du_msg_hdl.c

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 5075822..2a677d1 100644 (file)
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -46,15 +46,15 @@ uint8_t numRlcMacSaps = 0;
 uint8_t macCfg = 0;
 uint8_t macCfgInst = 0;
 
-extern DuCfgParams duCfgParam;
-extern uint8_t packRlcConfigReq(Pst *pst, RlcMngmt *cfg);
-extern uint8_t cmPkLkwCntrlReq(Pst *pst, RlcMngmt *cfg);
-extern uint8_t cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
-extern uint8_t BuildAndSendE2SetupReq();
-extern uint8_t egtpHdlDatInd(EgtpMsg egtpMsg);
-extern uint8_t BuildAndSendDUConfigUpdate();
-extern uint16_t getTransId();
-extern uint8_t cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg);
+DuCfgParams duCfgParam;
+uint8_t packRlcConfigReq(Pst *pst, RlcMngmt *cfg);
+uint8_t cmPkLkwCntrlReq(Pst *pst, RlcMngmt *cfg);
+uint8_t cmPkLrgCfgReq(Pst *pst, RgMngmt *cfg);
+uint8_t BuildAndSendE2SetupReq();
+uint8_t egtpHdlDatInd(EgtpMsg egtpMsg);
+uint8_t BuildAndSendDUConfigUpdate();
+uint16_t getTransId();
+uint8_t cmPkLrgSchCfgReq(Pst * pst,RgMngmt * cfg);
 
 packMacCellCfgReq packMacCellCfgOpts[] =
 {
@@ -178,8 +178,8 @@ uint8_t duBuildRlcCfg(Inst inst)
 uint8_t duBuildRlcLsapCfg(Ent ent, Inst inst, uint8_t lsapInst)
 {
 
-   RlcMngmt    rlcMngmt;
-   RlcSapCfg   *lSap = NULLP;
+   RlcMngmt   rlcMngmt;
+   RlcSapCfg  *lSap = NULLP;
    Pst        pst;
 
    DU_SET_ZERO(&rlcMngmt, sizeof(RlcMngmt));
@@ -254,8 +254,8 @@ uint8_t duBuildRlcLsapCfg(Ent ent, Inst inst, uint8_t lsapInst)
  ***************************************************************************/
 uint8_t duBuildRlcUsapCfg(uint8_t elemId, Ent ent, Inst inst)
 {
-   RlcMngmt    rlcMngmt;
-   RlcSapCfg   *uSap = NULLP;
+   RlcMngmt   rlcMngmt;
+   RlcSapCfg  *uSap = NULLP;
    Pst        pst;
 
    DU_SET_ZERO(&rlcMngmt, sizeof(RlcMngmt));
@@ -321,9 +321,9 @@ uint8_t duBuildRlcUsapCfg(uint8_t elemId, Ent ent, Inst inst)
  ***************************************************************************/
 uint8_t duProcCfgComplete()
 {
-   uint8_t ret = ROK;
+   uint8_t         ret = ROK;
    static uint16_t cellId = 0;
-   uint16_t idx;
+   uint16_t        idx;
    for(idx=0; idx< DEFAULT_CELLS; idx++)
    {
       DuCellCb *cell = NULLP;
@@ -889,7 +889,7 @@ uint8_t duBindUnbindRlcToMacSap(uint8_t inst, uint8_t action)
 {
    RlcCntrl  *cntrl = NULLP;
    RlcMngmt  rlcMngmt;
-   Pst       pst;
+   Pst      pst;
 
 
    DU_SET_ZERO(&rlcMngmt, sizeof(RlcMngmt));
@@ -1281,8 +1281,8 @@ uint8_t duSendEgtpTestData()
    ipv4Hdr.length = CM_IPV4_HDRLEN + mLen;
    ipv4Hdr.hdrVer = 0x45;
    ipv4Hdr.proto = 1;
-   ipv4Hdr.srcAddr = CM_INET_NTOH_U32(duCfgParam.egtpParams.localIp.ipV4Addr);
-   ipv4Hdr.destAddr = CM_INET_NTOH_U32(duCfgParam.egtpParams.destIp.ipV4Addr);
+   ipv4Hdr.srcAddr = CM_INET_NTOH_UINT32(duCfgParam.egtpParams.localIp.ipV4Addr);
+   ipv4Hdr.destAddr = CM_INET_NTOH_UINT32(duCfgParam.egtpParams.destIp.ipV4Addr);
 
    /* Packing IPv4 header into buffer */
    uint8_t          ret, cnt, idx;
@@ -1539,15 +1539,14 @@ uint8_t duSendEgtpSlotInd()
  *      Functionality:
  *           Initiates MAC Configs towards MAC
  *     
- * @param[in] void
+ * @param[in]cell id
  * @return ROK     - success
  *         RFAILED - failure
  *
  ***************************************************************************/
-uint8_t duBuildAndSendMacCellCfg()
+uint8_t duBuildAndSendMacCellCfg(uint16_t cellId)
 {
    Pst pst;
-   DU_SET_ZERO(&pst, sizeof(Pst));
    MacCellCfg *duMacCellCfg = NULLP;
 
    DU_ALLOC_SHRABL_BUF(duMacCellCfg, sizeof(MacCellCfg));
@@ -1556,8 +1555,8 @@ uint8_t duBuildAndSendMacCellCfg()
       return RFAILED;
    }
 
-   /* store the address in the duCb so that we can free on confirm msg */
-   duCb.duMacCellCfg = duMacCellCfg;
+   /* store the address in the duCellCb so that we can free on confirm msg */
+   duCb.actvCellLst[cellId-1]->duMacCellCfg = duMacCellCfg;
 
    /* copy the mac config structure from duCfgParams */
    memcpy(duMacCellCfg,&duCfgParam.macCellCfg,sizeof(MacCellCfg));
@@ -1589,29 +1588,30 @@ uint8_t  duHandleMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
    uint8_t actvCellIdx  = 0;
    uint8_t ret          = ROK;
 
-   if(macCellCfgCfm->rsp == ROK)  
+   for(actvCellIdx = 0; actvCellIdx < MAX_NUM_CELL; actvCellIdx++)
    {
-       for(actvCellIdx = 0 ; actvCellIdx <duCb.numActvCells ; actvCellIdx++)
-       {
-           if(macCellCfgCfm->cellId == duCb.actvCellLst[actvCellIdx]->cellId)
-           {
-               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
-    {
-       DU_LOG("\nMac cell cfg failed");
-       ret = RFAILED;
-    }
-    return ret;
+      if(macCellCfgCfm->cellId == duCb.actvCellLst[actvCellIdx]->cellId)
+      {
+        duCb.actvCellLst[actvCellIdx]->duMacCellCfg = NULLP;
+      }
+   }
+   if(macCellCfgCfm->rsp == ROK)
+   {
+      /* Build and send GNB-DU config update */
+      ret = BuildAndSendDUConfigUpdate();
+
+      /* Build and Send Cell Start Req to MAC */
+      ret = duBuildAndSendMacCellStartReq();
+   }
+   else
+   {
+      /* TODO : Action to be taken if cell configuration fails. 
+       * Should CU be informed? */
+
+      DU_LOG("\nMac cell cfg failed");
+      ret = RFAILED;
+   }
+   return ret;
 }
 
 /*******************************************************************
@@ -1633,15 +1633,15 @@ uint8_t  duHandleMacCellCfgCfm(Pst *pst, MacCellCfgCfm *macCellCfgCfm)
  * ****************************************************************/
 uint8_t duHandleSlotInd(Pst *pst, SlotIndInfo *slotInfo)
 {
-
-   DU_LOG("\nDU APP : Slot Indication received");
-
    if(slotInfo->cellId <=0 || slotInfo->cellId > MAX_NUM_CELL)
    {
       DU_LOG("\nDU APP : Invalid Cell Id %d", slotInfo->cellId);
    }
    if(!duCb.actvCellLst[slotInfo->cellId-1]->firstSlotIndRcvd)
    {
+#ifdef ODU_SLOT_IND_DEBUG_LOG
+   DU_LOG("\nDU APP : Slot Indication received");
+#endif
       duCb.actvCellLst[slotInfo->cellId-1]->firstSlotIndRcvd = true;
       if((duCb.actvCellLst[slotInfo->cellId-1] != NULL) && \
            (duCb.actvCellLst[slotInfo->cellId-1]->cellStatus == \