X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_msg_hdl.c;h=e5b2f79d87d27127dc3908243b8d8a3eab7e7802;hb=52ca0cf30806914e2f44054932cd2300f12aded8;hp=22eb763734662d6011534bda497c12b5c60dc3e4;hpb=cf67fe66c4ec86a0312a41437c0cd225350e5b0b;p=o-du%2Fl2.git

diff --git a/src/du_app/du_msg_hdl.c b/src/du_app/du_msg_hdl.c
index 22eb76373..e5b2f79d8 100644
--- a/src/du_app/du_msg_hdl.c
+++ b/src/du_app/du_msg_hdl.c
@@ -1579,27 +1579,27 @@ uint8_t duBuildAndSendMacCellStop(uint16_t cellId)
 {
    Pst pst;
    uint16_t cellIdx=0;
-   OduCellId *oduCellId = NULL;
-   
+   CellStopInfo *cellStop = NULL;
+
    DU_LOG("\nINFO   -->  DU APP : Building and Sending cell stop request to MAC");
 
    GET_CELL_IDX(cellId, cellIdx);
    if(duCb.actvCellLst[cellIdx] != NULLP)
    {
       /* Send Cell Stop Request to MAC */
-      DU_ALLOC_SHRABL_BUF(oduCellId, sizeof(OduCellId));
-      if(!oduCellId)
+      DU_ALLOC_SHRABL_BUF(cellStop, sizeof(CellStopInfo));
+      if(!cellStop)
       {
-         DU_LOG("\nERROR  -->  DU APP : duBuildAndSendMacCellStop():  Memory allocation failed ");
+         DU_LOG("\nERROR  -->  DU APP : Memory alloc failed while building cell stop request");
          return RFAILED;
       }
-      memset(oduCellId, 0, sizeof(OduCellId));
-      oduCellId->cellId = duCb.actvCellLst[cellIdx]->cellId;
+      memset(cellStop, 0, sizeof(CellStopInfo));
+      cellStop->cellId = duCb.actvCellLst[cellIdx]->cellId;
 
       /* Fill Pst */
       FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_CELL_STOP);
 
-      return (*packMacCellStopOpts[pst.selector])(&pst, oduCellId);
+      return (*packMacCellStopOpts[pst.selector])(&pst, cellStop);
    }
    else
    {
@@ -1861,80 +1861,6 @@ uint8_t DuProcRlcUlUserDataTrans(Pst *pst, RlcUlUserDatInfo *ulUserData)
    return ROK;
 }
 
-/*******************************************************************
- *
- * @brief Free tempSLiceCfg stored in duCfgParams
- *
- * @details
- *
- *    Function :  duFreeTempSliceCfg
- *
- *    Functionality: Free tempSLiceCfg stored in duCfgParams 
- *
- * @params[in] Post structure, 
- *             
- * @return Void
- *
- * ****************************************************************/
-
-void duFreeTempSliceCfg()
-{
-    uint8_t policyIdx = 0, memberListTdx =0;
-    CopyOfRecvdSliceCfg *tempSliceCfg = &duCfgParam.tempSliceCfg;
-    
-    if(tempSliceCfg->totalRrmPolicy)
-    {
-       for(policyIdx = 0; policyIdx<tempSliceCfg->totalRrmPolicy; policyIdx++)
-       {
-          if(tempSliceCfg->rrmPolicy[policyIdx]->numMemberList)
-          {
-             for(memberListTdx = 0; memberListTdx<tempSliceCfg->rrmPolicy[policyIdx]->numMemberList; memberListTdx++)
-             {
-                 DU_FREE(tempSliceCfg->rrmPolicy[policyIdx]->memberList[memberListTdx], sizeof(PolicyMemberList));
-             }
-             DU_FREE(tempSliceCfg->rrmPolicy[policyIdx]->memberList, (tempSliceCfg->rrmPolicy[policyIdx]->numMemberList) * sizeof(PolicyMemberList*));
-          }
-          DU_FREE(tempSliceCfg->rrmPolicy[policyIdx], sizeof(RrmPolicy));
-       }
-       DU_FREE(tempSliceCfg->rrmPolicy, tempSliceCfg->totalRrmPolicy* sizeof(RrmPolicy*));
-    }
-    memset(tempSliceCfg, 0, sizeof(CopyOfRecvdSliceCfg));
-}
-
-/*******************************************************************
- *
- * @brief  free the slice cfg rsp
- *
- * @details
- *
- *    Function : duFreeSliceCfgRsp 
- *
- *    Functionality: free the slice cfg rsp 
- *
- * @params[in] Post structure, MacSliceCfgRsp  *cfgRsp
- *             
- * @return ROK     - success
- *         RFAILED - failure
- *
- **********************************************************************/
-void duFreeSliceCfgRsp(Pst *pst,  MacSliceCfgRsp *cfgRsp) 
-{
-   uint8_t cfgIdx;
-
-   if(cfgRsp)
-   {
-      if(cfgRsp->numSliceCfgRsp)
-      {
-         for(cfgIdx = 0; cfgIdx<cfgRsp->numSliceCfgRsp; cfgIdx++)
-         {
-            DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp->listOfSliceCfgRsp[cfgIdx], sizeof(MacSliceRsp)); 
-         }
-         DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp->listOfSliceCfgRsp, cfgRsp->numSliceCfgRsp * sizeof(MacSliceRsp*)); 
-      }
-      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacSliceCfgRsp)); 
-   }
-}
-
 /*******************************************************************
  *
  * @brief process the slice cfg rsp received from MAC
@@ -1953,90 +1879,22 @@ void duFreeSliceCfgRsp(Pst *pst,  MacSliceCfgRsp *cfgRsp)
  **********************************************************************/
 uint8_t DuProcMacSliceCfgRsp(Pst *pst,  MacSliceCfgRsp *cfgRsp)
 {
-    uint8_t cfgIdx = 0;
-    
     if(cfgRsp)
     {
-        if(cfgRsp->listOfSliceCfgRsp)
-        {
-            for(cfgIdx = 0; cfgIdx<cfgRsp->numSliceCfgRsp; cfgIdx++)
-            {
-                if(cfgRsp->listOfSliceCfgRsp[cfgIdx]->rsp ==  MAC_DU_APP_RSP_OK)
-                {
-                    duCb.sliceState = SLICE_CONFIGURED;
-                }
-            }
-            DU_LOG("\nINFO  -->  DU_APP : Slice Configuration is done successfully ");
-        }
-        duFreeSliceCfgRsp(pst, cfgRsp);
+       if(cfgRsp->rsp ==  MAC_DU_APP_RSP_OK)
+       {
+          duCb.sliceState = SLICE_CONFIGURED;
+          DU_LOG("\nINFO  -->  DU_APP : Slice configured successfully ");
+       }
+       else
+       {
+          DU_LOG("\nERROR  -->  DU_APP : Slice not available");
+       }
+       DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, cfgRsp, sizeof(MacSliceCfgRsp));
     }
-    duFreeTempSliceCfg();
     return ROK;
 }
 
-/*******************************************************************
- *
- * @brief Fill the slice configration and rrm policy ratio 
- *    information received form O1
- *
- * @details
- *
- *    Function : fillSliceCfgReCfgInfo 
- *
- *    Functionality: Fill the slice configration and recfg info 
- *
- * @params[in] Post structure
- *             
- * @return ROK     - success
- *         RFAILED - failure
- *
- * ****************************************************************/
-
-uint8_t fillSliceCfgReCfgInfo(MacSliceRecfgReq *sliceRecfgReq, RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy, uint8_t totalSliceCount)
-{
-   uint8_t sliceIdx = 0, cfgIdx = 0, memberListIdx = 0;
-   
-   if(totalRrmPolicy)
-   {
-      DU_ALLOC_SHRABL_BUF(sliceRecfgReq->listOfSliceCfg, totalSliceCount*sizeof(MacSliceRrmPolicy*)); 
-      if(sliceRecfgReq->listOfSliceCfg == NULLP)
-      {
-         DU_LOG("\nERROR  -->  DU_APP : Memory allocation failed in fillSliceCfgReCfgInfo");
-         return RFAILED;
-      }
-
-      for(sliceIdx = 0; sliceIdx<totalRrmPolicy; sliceIdx++)
-      {
-         for(memberListIdx = 0; memberListIdx<rrmPolicy[sliceIdx]->numMemberList; memberListIdx++)
-         {
-            DU_ALLOC_SHRABL_BUF(sliceRecfgReq->listOfSliceCfg[cfgIdx], sizeof(MacSliceRrmPolicy));
-            if(sliceRecfgReq->listOfSliceCfg[cfgIdx] == NULLP)
-            { 
-               DU_LOG("\nERROR  -->  DU_APP : Memory allocation failed in fillSliceCfgReCfgInfo");
-               return RFAILED;
-            }
-
-
-            memcpy(&sliceRecfgReq->listOfSliceCfg[cfgIdx]->snssai, &rrmPolicy[sliceIdx]->memberList[memberListIdx]->snssai, sizeof(Snssai));
-
-            DU_ALLOC_SHRABL_BUF(sliceRecfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio, sizeof(RrmPolicyRatio));
-            if(sliceRecfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio == NULLP)
-            { 
-               DU_LOG("\nERROR  -->  DU_APP : Memory allocation failed in fillSliceCfgReCfgInfo");
-               return RFAILED;
-            }
-
-            sliceRecfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMaxRatio = rrmPolicy[sliceIdx]->policyMaxRatio;
-            sliceRecfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyMinRatio = rrmPolicy[sliceIdx]->policyMinRatio;
-            sliceRecfgReq->listOfSliceCfg[cfgIdx]->rrmPolicyRatio->policyDedicatedRatio = rrmPolicy[sliceIdx]->policyDedicatedRatio; 
-            sliceRecfgReq->numOfConfiguredSlice++;
-            cfgIdx++;
-         }
-      }
-   }
-   return ROK;
-}
-
 /*******************************************************************
  *
  * @brief Fill the slice configration and rrm policy related
@@ -2055,7 +1913,7 @@ uint8_t fillSliceCfgReCfgInfo(MacSliceRecfgReq *sliceRecfgReq, RrmPolicy *rrmPol
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendSliceConfigReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy, uint8_t totalSliceCnt)
+uint8_t BuildAndSendSliceConfigReq()
 {
    Pst pst;
    MacSliceCfgReq *sliceCfgReq;
@@ -2068,11 +1926,7 @@ uint8_t BuildAndSendSliceConfigReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolic
    }
    else
    {
-      if(fillSliceCfgReCfgInfo(sliceCfgReq, rrmPolicy, totalRrmPolicy, totalSliceCnt) != ROK)
-      {   
-         DU_LOG("\nERROR  -->  DU_APP : Failed to fill slice Configuration info in MacSliceCfgReq");
-         return RFAILED;
-      }
+      memcpy(sliceCfgReq,  &duCfgParam.tempSliceCfg, sizeof(MacSliceCfgReq));
       FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_SLICE_CFG_REQ);
 
       DU_LOG("\nDEBUG  -->  DU_APP : Sending Slice Cfg Request to MAC ");
@@ -2085,7 +1939,6 @@ uint8_t BuildAndSendSliceConfigReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolic
    return ROK;  
 }
 
-
 /*******************************************************************
  *
  * @brief Fill the slice configration and rrm policy related
@@ -2103,7 +1956,7 @@ uint8_t BuildAndSendSliceConfigReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolic
  *         RFAILED - failure
  *
  * ****************************************************************/
-uint8_t BuildAndSendSliceRecfgReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy, uint8_t totalSliceCount)
+uint8_t BuildAndSendSliceRecfgReq()
 {
    Pst pst;
    MacSliceRecfgReq *sliceRecfgReq = NULLP;
@@ -2118,11 +1971,8 @@ uint8_t BuildAndSendSliceRecfgReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy
    }
    else
    {
-      if(fillSliceCfgReCfgInfo(sliceRecfgReq, rrmPolicy, totalRrmPolicy, totalSliceCount) != ROK)
-      {
-         DU_LOG("\nERROR  -->  DU_APP: Failed to fill slice cfg request info");
-         return RFAILED;
-      }
+      memcpy(sliceRecfgReq,  &duCfgParam.tempSliceCfg, sizeof(MacSliceRecfgReq));
+      
       FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_SLICE_RECFG_REQ);
 
       DU_LOG("\nDEBUG  -->  DU_APP: Sending Slice ReCfg Request to MAC ");
@@ -2150,30 +2000,21 @@ uint8_t BuildAndSendSliceRecfgReq(RrmPolicy *rrmPolicy[], uint8_t totalRrmPolicy
  *         RFAILED - failure
  *
  **********************************************************************/
-uint8_t DuProcMacSliceRecfgRsp(Pst *pst,  MacSliceRecfgRsp *reCfgRsp)
+uint8_t DuProcMacSliceRecfgRsp(Pst *pst,  MacSliceRecfgRsp *recfgRsp)
 {
-   uint8_t cfgIdx = 0;
-
-   if(reCfgRsp)
+   if(recfgRsp)
    {
-      if(reCfgRsp->listOfSliceCfgRsp)
+      if(recfgRsp->rsp == MAC_DU_APP_RSP_OK)
       {
-         for(cfgIdx = 0; cfgIdx < reCfgRsp->numSliceCfgRsp; cfgIdx++)
-         {
-            if(reCfgRsp->listOfSliceCfgRsp[cfgIdx]->rsp == MAC_DU_APP_RSP_OK)
-            {
-               duCb.sliceState = SLICE_RECONFIGURED; 
-            }
-            else
-            {
-               DU_LOG("\nERROR  -->  DU_APP : Slice not available");
-            }
-         }
-         DU_LOG("\nINFO  --> DU_APP : Slice ReCOnfiguration response received");
+         duCb.sliceState = SLICE_RECONFIGURED; 
+          DU_LOG("\nINFO  -->  DU_APP : Slice Reconfigured successfully ");
+      }
+      else
+      {
+         DU_LOG("\nERROR  -->  DU_APP : Slice not available");
       }
-      duFreeSliceCfgRsp(pst, reCfgRsp);
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, recfgRsp, sizeof(MacSliceCfgRsp));
    }
-   duFreeTempSliceCfg();
    return ROK;
 }