X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=src%2Fdu_app%2Fdu_ue_mgr.c;h=71e87091404deba2d3329ba2d156947aa846dd77;hb=051044374d0ed16423e2ef98c70395fde934f0ce;hp=b2c4344367a6e9d16076fd15e7e7b39ea498ff89;hpb=c946e9243610d6fb122e34674eeab874f7d2f7a4;p=o-du%2Fl2.git

diff --git a/src/du_app/du_ue_mgr.c b/src/du_app/du_ue_mgr.c
index b2c434436..71e870914 100644
--- a/src/du_app/du_ue_mgr.c
+++ b/src/du_app/du_ue_mgr.c
@@ -95,6 +95,13 @@ DuRlcDlUserDataToRlcFunc duSendRlcDlUserDataToRlcOpts[] =
    packRlcDlUserDataToRlc      /* Light weight-loose coupling */
 };
 
+DuMacRachRsrcRel packMacRachRsrcRelOpts[] = 
+{
+   packDuMacRachRsrcRel,      /* Loose coupling */
+   MacProcRachRsrcRel,        /* Tight coupling */
+   packDuMacRachRsrcRel       /* Light weight-loose coupling */
+};
+
 DuMacUeDeleteReq packMacUeDeleteReqOpts[] =
 {
    packDuMacUeDeleteReq,       /* Loose coupling */
@@ -2465,13 +2472,12 @@ uint8_t DuProcMacUeCfgRsp(Pst *pst, MacUeCfgRsp *cfgRsp)
          {
             DU_LOG("\nINFO   -->  DU APP : MAC UE Create Response : SUCCESS [DU UE F1AP ID : %d]", cfgRsp->ueId);
 
-            if(duCb.actvCellLst[cellIdx] && 
-                  (duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].gnbDuUeF1apId == cfgRsp->ueId))
+            if(duCb.actvCellLst[cellIdx] && (duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].gnbDuUeF1apId == cfgRsp->ueId))
             {
                duCb.actvCellLst[cellIdx]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState = UE_CREATE_COMPLETE;
 
-               if((duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].ueState == UE_HANDIN_IN_PROGRESS) && 
-                     (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState == UE_CREATE_COMPLETE) &&
+              if((duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].ueState == UE_HANDIN_IN_PROGRESS) && 
+                    (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].macUeCfg.macUeCfgState == UE_CREATE_COMPLETE) &&
                      (duCb.actvCellLst[cfgRsp->cellId -1]->ueCb[cfgRsp->ueId -1].rlcUeCfg.rlcUeCfgState == UE_CREATE_COMPLETE))
                {
                   if((ret = duUpdateDuUeCbCfg(cfgRsp->ueId, cfgRsp->cellId)) == ROK)
@@ -3085,25 +3091,50 @@ uint8_t duProcUeContextModReq(DuUeCb *ueCb)
 
 /*******************************************************************
 *
-* @brief Function to delete Pdsch ServCellCfg
+* @brief Build and send dedicated RACH resource release request to MAC
 *
 * @details
 *
-*    Function : deletePdschServCellCfg
+*    Function : duBuildAndSendRachRsrcRelToMac
 *
-*    Functionality: Function to delete Pdsch ServCellCfg
+*    Functionality: Function to Build and send dedicated RACH resource 
+*    release request to MAC
 *
-* @params[in] PdschServCellCfg *pdschServCellCfg
-* @return void
+* @params[in] Cell ID
+*             UE CB
+* @return ROK - Success
+*         RFAILED - Failure
 *
 * ****************************************************************/
-
-void deletePdschServCellCfg(PdschServCellCfg *pdschServCellCfg)
+uint8_t duBuildAndSendRachRsrcRelToMac(uint16_t cellId, DuUeCb *ueCb)
 {
-   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->maxMimoLayers, sizeof(uint8_t));
-   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->maxCodeBlkGrpPerTb, sizeof(MaxCodeBlkGrpPerTB));
-   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->codeBlkGrpFlushInd, sizeof(bool));
-   DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL,pdschServCellCfg->xOverhead, sizeof(PdschXOverhead));
+   Pst pst;
+   MacRachRsrcRel *rachRsrcRel = NULLP;
+
+   DU_ALLOC_SHRABL_BUF(rachRsrcRel, sizeof(MacRachRsrcRel));
+   if(!rachRsrcRel)
+   {
+      DU_LOG("\nERROR  -->  DU APP : Failed to allocate memory for RACH Resource Release in \
+            duBuildAndSendRachRsrcRelToMac()");
+      return RFAILED;
+   }
+
+   rachRsrcRel->cellId = cellId;
+   rachRsrcRel->ueId = ueCb->gnbDuUeF1apId;
+   rachRsrcRel->crnti = ueCb->crnti;
+
+   /* Fill Pst */
+   FILL_PST_DUAPP_TO_MAC(pst, EVENT_MAC_RACH_RESOURCE_REL);
+
+   if(((*packMacRachRsrcRelOpts[pst.selector])(&pst, rachRsrcRel)) != ROK)
+   {
+      DU_LOG("\nERROR  -->  DU_APP : Failure in sending RACH Resource Release to MAC at \
+            duBuildAndSendRachRsrcRelToMac()");
+      DU_FREE_SHRABL_BUF(DU_APP_MEM_REGION, DU_POOL, rachRsrcRel, sizeof(MacRachRsrcRel));
+      return RFAILED;
+   }
+
+   return ROK;
 }
 
 /*******************************************************************
@@ -3224,7 +3255,7 @@ uint8_t DuProcMacUeDeleteRsp(Pst *pst, MacUeDeleteRsp *deleteRsp)
    
    if(deleteRsp)
    {
-      if(deleteRsp->result == SUCCESS)
+      if(deleteRsp->result == DEL_SUCCESSFUL)
       {
          DU_LOG("\nINFO   -->  DU APP : MAC UE Delete Response : SUCCESS [UE IDX : %d]", deleteRsp->ueId);
          GET_CELL_IDX(deleteRsp->cellId, cellIdx);