Moved macCellCfg to duCellCb

[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 d7744cb..8d20c99 100644 (file)
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -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;
 }
 
 /*******************************************************************