[Epic-ID: ODUHIGH-462][Task-ID: ODUHIGH-471] Storing drx configuration in cell

[o-du/l2.git] / src / 5gnrmac / mac_cfg_hdl.c

diff --git a/src/5gnrmac/mac_cfg_hdl.c b/src/5gnrmac/mac_cfg_hdl.c
index fae0233..c36c72e 100644 (file)
--- a/src/5gnrmac/mac_cfg_hdl.c
+++ b/src/5gnrmac/mac_cfg_hdl.c
@@ -387,6 +387,28 @@ uint8_t MacSchCellCfgReq(Pst *pst, MacCellCfg *macCellCfg)
          }
       }
    }
+#ifdef NR_DRX
+   /* Drx configuration */
+
+   schCellCfg.drxInfo.drxOnDurationTimer.onDurationTimerValInMs = macCellCfg->drxInfo.drxOnDurationTimer.onDurationTimerValInMs;
+   if(!macCellCfg->drxInfo.drxOnDurationTimer.onDurationTimerValInMs)
+      schCellCfg.drxInfo.drxOnDurationTimer.onDurationtimerValue.subMilliSeconds = \
+      macCellCfg->drxInfo.drxOnDurationTimer.onDurationtimerValue.subMilliSeconds;
+   else
+      schCellCfg.drxInfo.drxOnDurationTimer.onDurationtimerValue.milliSeconds = \
+      macCellCfg->drxInfo.drxOnDurationTimer.onDurationtimerValue.milliSeconds;
+   schCellCfg.drxInfo.drxInactivityTimer = macCellCfg->drxInfo.drxInactivityTimer;
+   schCellCfg.drxInfo.drxHarqRttTimerDl = macCellCfg->drxInfo.drxHarqRttTimerDl;
+   schCellCfg.drxInfo.drxHarqRttTimerUl = macCellCfg->drxInfo.drxHarqRttTimerUl;
+   schCellCfg.drxInfo.drxRetransmissionTimerDl = macCellCfg->drxInfo.drxRetransmissionTimerDl;
+   schCellCfg.drxInfo.drxRetransmissionTimerUl = macCellCfg->drxInfo.drxRetransmissionTimerUl;
+   schCellCfg.drxInfo.drxLongCycleStartOffset.drxLongCycleStartOffsetChoice = macCellCfg->drxInfo.drxLongCycleStartOffset.\
+                                                                              drxLongCycleStartOffsetChoice;
+   schCellCfg.drxInfo.drxLongCycleStartOffset.drxLongCycleStartOffsetVal = macCellCfg->drxInfo.drxLongCycleStartOffset.drxLongCycleStartOffsetVal;
+   schCellCfg.drxInfo.shortDrx.drxShortCycle = macCellCfg->drxInfo.shortDrx.drxShortCycle;
+   schCellCfg.drxInfo.shortDrx.drxShortCycleTimer = macCellCfg->drxInfo.shortDrx.drxShortCycleTimer;
+   schCellCfg.drxInfo.drxSlotOffset = macCellCfg->drxInfo.drxSlotOffset;
+#endif
 
 #ifdef NR_TDD
    memcpy(&schCellCfg.tddCfg, &macCellCfg->tddCfg, sizeof(TDDCfg));
@@ -987,7 +1009,7 @@ uint8_t MacProcDlPcchInd(Pst *pst, MacPcchInd *pcchInd)
 
    if(pcchInd)
    {
-      DU_LOG("\nINFO  -->  MAC : Recived pcch request from DU_APP for cellId[%d]", pcchInd->cellId);
+      DU_LOG("\nINFO   -->  MAC : Received DL PCCH IND from DU_APP for cellId[%d]", pcchInd->cellId);
       
       GET_CELL_IDX(pcchInd->cellId, cellIdx);
 
@@ -1025,7 +1047,6 @@ uint8_t MacProcDlPcchInd(Pst *pst, MacPcchInd *pcchInd)
                {
                   memcpy(schPageInd->pagePdu, pcchInd->pcchPdu, pcchInd->pduLen);
 
-                  DU_LOG("\nINFO -->  MAC : Sending paging indication to SCH");
                   FILL_PST_MAC_TO_SCH(schPst, EVENT_PAGING_IND_TO_SCH);
                   ret = (*macSchPagingIndOpts[schPst.selector])(&schPst, schPageInd);
                }