Merge "[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-472] Handling of drx timer in SCH...

[o-du/l2.git] / src / cu_stub / cu_f1ap_msg_hdl.c

diff --git a/src/cu_stub/cu_f1ap_msg_hdl.c b/src/cu_stub/cu_f1ap_msg_hdl.c
index 4920f8b..fc09825 100644 (file)
--- a/src/cu_stub/cu_f1ap_msg_hdl.c
+++ b/src/cu_stub/cu_f1ap_msg_hdl.c
@@ -24,7 +24,18 @@
 #include "ProtocolIE-Field.h"
 #include "ProtocolExtensionField.h"
 #include "ProtocolIE-SingleContainer.h"
+#include "F1SetupResponse.h"
+#include "SuccessfulOutcome.h"
+#include "InitiatingMessage.h"
+#include "NonDynamic5QIDescriptor.h"
+#include "AveragingWindow.h"
+#include "MaxDataBurstVolume.h"
+#include "Flows-Mapped-To-DRB-Item.h"
+#include "SliceSupportItem.h"
+#include "ServedPLMNs-Item.h"
 #include "F1AP-PDU.h"
+#include "ULUPTNLInformation-ToBeSetup-Item.h"
+#include "ULConfiguration.h"
 #include "ModulationOrder.h"
 #include "BandNR.h"
 #include "UE-CapabilityRAT-Container.h"
@@ -10938,7 +10949,7 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
       ueContextModifyReq =&f1apMsg->choice.initiatingMessage->value.choice.UEContextModificationRequest;
 
       if(action == MODIFY_UE)
-         elementCnt = 5;
+         elementCnt = 4;
       else if(action == QUERY_CONFIG)
          elementCnt = 3;
       else if(action == RRC_RECONFIG_COMPLETE_IND)
@@ -10947,7 +10958,7 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
          elementCnt = 5;
       
 #ifdef NR_DRX
-      if(DRX_TO_BE_RELEASE)
+      if(DRX_TO_BE_RELEASE && ueCb->drxCfgPresent)
          elementCnt++;
 #endif      
       ueContextModifyReq->protocolIEs.list.count = elementCnt;
@@ -11076,7 +11087,7 @@ uint8_t BuildAndSendUeContextModificationReq(uint32_t duId, void *cuUeCb, UeCtxt
       }
 
 #ifdef NR_DRX
-      if(DRX_TO_BE_RELEASE)
+      if(DRX_TO_BE_RELEASE && ueCb->drxCfgPresent)
       {
          /* DRX Configuration Indicator */
          ieIdx++;
@@ -11697,7 +11708,7 @@ uint8_t procServedCellPlmnList(ServedPLMNs_List_t *srvPlmn)
  * ****************************************************************/
 uint8_t procUeContextModificationResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
 {
-   uint8_t idx=0, duIdx=0, countiX =1;
+   uint8_t idx=0, duIdx=0;
    uint8_t duUeF1apId = 0, cuUeF1apId = 0;
    DuDb *duDb = NULLP;
    CuUeCb *ueCb = NULLP;
@@ -11783,14 +11794,7 @@ uint8_t procUeContextModificationResponse(uint32_t duId, F1AP_PDU_t *f1apMsg)
          }
       }
    }
-#ifdef NR_DRX
-   if(countiX == 1)
-   {
-      countiX++;
-      DU_LOG("\nPBORLA INFO  -->  F1AP: Sending UE Context Modification Request to MODIFY_UE");
-      //BuildAndSendUeContextModificationReq(duId, ueCb, MODIFY_UE);
-   }
-#endif
+   
    return ROK;
 }