X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fdu_app%2Fdu_cfg.c;h=d5b87759f5fd1878e4110c42530ca0b812a7b46f;hb=6636207100c598cd70537d177670ef131e263931;hp=8c08491423ad27e14efb44595cc405b5534635f4;hpb=051044374d0ed16423e2ef98c70395fde934f0ce;p=o-du%2Fl2.git

diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c
index 8c0849142..d5b87759f 100644
--- a/src/du_app/du_cfg.c
+++ b/src/du_app/du_cfg.c
@@ -418,27 +418,6 @@ uint8_t readMacCfg()
   
 #endif
 
-#ifdef NR_DRX
-   /* Storing the DRX configuration */
-   memset(&duCfgParam.macCellCfg.drxInfo, 0, sizeof(DrxInfo));
-   duCfgParam.macCellCfg.drxInfo.drxOnDurationTimer.onDurationTimerValInMs = DRX_ONDURATION_TIMER_VALUE_PRESENT_IN_MS;
-   if(!duCfgParam.macCellCfg.drxInfo.drxOnDurationTimer.onDurationTimerValInMs)
-      duCfgParam.macCellCfg.drxInfo.drxOnDurationTimer.onDurationtimerValue.subMilliSeconds = \
-      DRX_ONDURATION_TIMER_VALUE_IN_SUBMS;
-   else
-      duCfgParam.macCellCfg.drxInfo.drxOnDurationTimer.onDurationtimerValue.milliSeconds = \
-      DRX_ONDURATION_TIMER_VALUE_IN_MS;
-   duCfgParam.macCellCfg.drxInfo.drxInactivityTimer = DRX_INACTIVITY_TIMER;
-   duCfgParam.macCellCfg.drxInfo.drxHarqRttTimerDl = DRX_HARQ_RTT_TIMER_DL;
-   duCfgParam.macCellCfg.drxInfo.drxHarqRttTimerUl = DRX_HARQ_RTT_TIMER_UL;
-   duCfgParam.macCellCfg.drxInfo.drxRetransmissionTimerDl = DRX_RETRANSMISSION_TIMER_DL;
-   duCfgParam.macCellCfg.drxInfo.drxRetransmissionTimerUl = DRX_RETRANSMISSION_TIMER_UL;
-   duCfgParam.macCellCfg.drxInfo.drxLongCycleStartOffset.drxLongCycleStartOffsetChoice = DRX_LONG_CYCLE_START_OFFSET_CHOICE;
-   duCfgParam.macCellCfg.drxInfo.drxLongCycleStartOffset.drxLongCycleStartOffsetVal = DRX_LONG_CYCLE_START_OFFSET_VAL;
-   duCfgParam.macCellCfg.drxInfo.shortDrx.drxShortCycle = DRX_SHORT_CYCLE;
-   duCfgParam.macCellCfg.drxInfo.shortDrx.drxShortCycleTimer = DRX_SHORT_CYCLE_TIMER;
-   duCfgParam.macCellCfg.drxInfo.drxSlotOffset = DRX_SLOT_OFFSET;
-#endif
    return ROK;
 }
 
@@ -465,8 +444,8 @@ uint8_t fillDuPort(uint16_t *duPort)
    duPort[F1_INTERFACE]   = g_cfg.DU_Port;
    duPort[E2_INTERFACE]   = g_cfg.RIC_Port;
 #else
-   duPort[F1_INTERFACE]   = DU_PORT;     /* DU Port idx  0 38472 */
-   duPort[E2_INTERFACE]   = RIC_PORT;    /* RIC Port idx 1 38482 */
+   duPort[F1_INTERFACE]   = F1_SCTP_PORT;     /* DU Port idx  0 38472 */
+   duPort[E2_INTERFACE]   = E2_SCTP_PORT;    /* RIC Port idx 1 38482 */
 #endif
    return ROK;
 }
@@ -720,8 +699,8 @@ uint8_t readCfg()
    cmInetAddr((S8*)CU_IP_V4_ADDR, &ipv4_cu);
    cmInetAddr((S8*)RIC_IP_V4_ADDR, &ipv4_ric);
 
-   duCfgParam.sctpParams.cuPort = CU_PORT;
-   duCfgParam.sctpParams.ricPort = RIC_PORT;
+   duCfgParam.sctpParams.cuPort = F1_SCTP_PORT;
+   duCfgParam.sctpParams.ricPort = E2_SCTP_PORT;
 #endif
 
    fillDuPort(duCfgParam.sctpParams.duPort);
@@ -738,10 +717,10 @@ uint8_t readCfg()
    /* EGTP Parameters */
    duCfgParam.egtpParams.localIp.ipV4Pres = TRUE;
    duCfgParam.egtpParams.localIp.ipV4Addr = ipv4_du;
-   duCfgParam.egtpParams.localPort = DU_EGTP_PORT;
+   duCfgParam.egtpParams.localPort = F1_EGTP_PORT;
    duCfgParam.egtpParams.destIp.ipV4Pres = TRUE;
    duCfgParam.egtpParams.destIp.ipV4Addr = ipv4_cu;
-   duCfgParam.egtpParams.destPort = CU_EGTP_PORT;
+   duCfgParam.egtpParams.destPort = F1_EGTP_PORT;
    duCfgParam.egtpParams.minTunnelId = MIN_TEID;
    duCfgParam.egtpParams.maxTunnelId = MAX_TEID;