From 2aa3cc7f94edf59f4fdb04ad81c7a14322bde00e Mon Sep 17 00:00:00 2001 From: "lal.harshita" Date: Thu, 15 Sep 2022 12:04:10 +0530 Subject: [PATCH] Jira Id - ODUHIGH-473 Tdd mode related fixes Signed-off-by: lal.harshita Change-Id: I45e6b9346597ffb27f9f63ccb33479f0c8a70e21 --- src/5gnrmac/lwr_mac_fsm.c | 6 +++++- src/5gnrsch/sch_common.c | 12 +++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index e3d256f30..63a86c54c 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -2001,7 +2001,7 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) uint8_t slotIdx = 0; uint8_t symbolIdx =0; #endif - uint8_t index = 0; + uint16_t index = 0; uint16_t *cellId =NULLP; uint16_t cellIdx =0; uint32_t msgLen = 0; @@ -2062,7 +2062,11 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) configReq = (fapi_config_req_t *)(cfgReqQElem + 1); memset(configReq, 0, sizeof(fapi_config_req_t)); fillMsgHeader(&configReq->header, FAPI_CONFIG_REQUEST, sizeof(fapi_config_req_t)); +#ifdef NR_TDD + configReq->number_of_tlvs = 25 + 1 + MAX_TDD_PERIODICITY_SLOTS * MAX_SYMB_PER_SLOT; +#else configReq->number_of_tlvs = 25; +#endif msgLen = sizeof(configReq->number_of_tlvs); if(macCfgParams.dlCarrCfg.pres) diff --git a/src/5gnrsch/sch_common.c b/src/5gnrsch/sch_common.c index a16cda542..bc5ca0f15 100644 --- a/src/5gnrsch/sch_common.c +++ b/src/5gnrsch/sch_common.c @@ -1972,7 +1972,8 @@ uint8_t schCalculateUlTbs(SchUeCb *ueCb, SlotTimingInfo puschTime, uint8_t symbL *******************************************************************/ bool schProcessSrOrBsrReq(SchCellCb *cell, SlotTimingInfo currTime, uint8_t ueId, bool isRetx, SchUlHqProcCb **hqP) { - bool k2Found = FALSE, ret = RFAILED; + bool k2Found = FALSE; + uint8_t ret = RFAILED; uint8_t startSymb = 0, symbLen = 0; uint8_t k2TblIdx = 0, k2Index = 0, k2Val = 0; uint16_t startPrb = 0; @@ -2047,7 +2048,7 @@ bool schProcessSrOrBsrReq(SchCellCb *cell, SlotTimingInfo currTime, uint8_t ueId break; } } - + if(k2Found == true) { ret = schCalculateUlTbs(ueCb, puschTime, symbLen, &startPrb, &totDataReq, isRetx, *hqP); @@ -2097,7 +2098,12 @@ bool schProcessSrOrBsrReq(SchCellCb *cell, SlotTimingInfo currTime, uint8_t ueId updateBsrAndLcList(&((*hqP)->ulLcPrbEst.defLcList), ueCb->bsrInfo, RFAILED); } } - return (ret); + else + { + DU_LOG("\nERROR --> SCH : schProcessSrOrBsrReq(): K2 value is not found"); + return false; + } + return true; } -- 2.16.6