From: svaidhya Date: Tue, 15 Apr 2025 06:47:51 +0000 (+0000) Subject: [Epic-ID:ODUHIGH-557][Task-ID:ODUHIGH-638] RACH Fixes: num_rootSeq and Slot_Config... X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F14318%2F1;p=o-du%2Fl2.git [Epic-ID:ODUHIGH-557][Task-ID:ODUHIGH-638] RACH Fixes: num_rootSeq and Slot_Config fixes Change-Id: I6329b70018f926e6f64b7895b4fbb47bf031a7a4 Signed-off-by: svaidhya --- diff --git a/build/config/tdd_odu_config.xml b/build/config/tdd_odu_config.xml index 42a332905..4082c15da 100644 --- a/build/config/tdd_odu_config.xml +++ b/build/config/tdd_odu_config.xml @@ -563,10 +563,10 @@ 1 - 0 + 1 1 0 - 4 + 12 0 @@ -579,11 +579,11 @@ 10 - 6 - 7 - 12 - 2 - 1 + 5 + 3 + 6 + 1 + 4 1 diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index d11ca4f61..adb87e710 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -2806,8 +2806,8 @@ uint8_t buildAndSendOAIConfigReqToL1(void *msg) sizeof(uint8_t), macCfgParams.prachCfg.prachCfgIdx << TLV_ALIGN(8), &msgLen); fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_ROOT_SEQUENCE_INDEX_TAG, \ sizeof(uint16_t), macCfgParams.prachCfg.fdm[0].rootSeqIdx << TLV_ALIGN(16), &msgLen); - //fillTlvs(&configReq->tlvs[index++], FAPI_NUM_ROOT_SEQUENCES_TAG, \ - sizeof(uint8_t), macCfgParams.prachCfg.fdm[0].numRootSeq, &msgLen); + fillTlvs(&configReq->tlvs[index++], FAPI_NUM_ROOT_SEQUENCES_TAG, \ + sizeof(uint8_t), macCfgParams.prachCfg.fdm[0].numRootSeq << TLV_ALIGN(8), &msgLen); fillTlvs(&configReq->tlvs[index++], FAPI_K1_TAG, \ sizeof(uint16_t), macCfgParams.prachCfg.fdm[0].k1 << TLV_ALIGN(16), &msgLen); fillTlvs(&configReq->tlvs[index++], FAPI_PRACH_ZERO_CORR_CONF_TAG , \ diff --git a/src/5gnrsch/sch.c b/src/5gnrsch/sch.c index 1c1d31627..49db8f52d 100644 --- a/src/5gnrsch/sch.c +++ b/src/5gnrsch/sch.c @@ -300,7 +300,7 @@ void schFillSlotConfig(SchCellCb *cell, TDDCfg tddCfg) { uint8_t slotIdx = 0, symbolIdx = 0; - for(slotIdx =0 ;slotIdx < MAX_TDD_PERIODICITY_SLOTS; slotIdx++) + for(slotIdx =0 ;slotIdx < cell->numSlotsInPeriodicity; slotIdx++) { for(symbolIdx = 0; symbolIdx < MAX_SYMB_PER_SLOT; symbolIdx++) { @@ -312,8 +312,8 @@ void schFillSlotConfig(SchCellCb *cell, TDDCfg tddCfg) } /*Fill Full-FLEXI SLOT and as well as Flexi Symbols in 1 slot preceding FULL-UL slot*/ - else if(slotIdx < (MAX_TDD_PERIODICITY_SLOTS - tddCfg.nrOfUlSlots -1) || \ - (slotIdx == (MAX_TDD_PERIODICITY_SLOTS - tddCfg.nrOfUlSlots -1) && \ + else if(slotIdx < (cell->numSlotsInPeriodicity - tddCfg.nrOfUlSlots -1) || \ + (slotIdx == (cell->numSlotsInPeriodicity - tddCfg.nrOfUlSlots -1) && \ symbolIdx < (MAX_SYMB_PER_SLOT - tddCfg.nrOfUlSymbols))) { cell->slotCfg[slotIdx][symbolIdx] = FLEXI_SYMBOL; diff --git a/src/5gnrsch/sch_rach.c b/src/5gnrsch/sch_rach.c index 5b8b42cc1..3ce6c744f 100644 --- a/src/5gnrsch/sch_rach.c +++ b/src/5gnrsch/sch_rach.c @@ -89,6 +89,7 @@ bool schCheckPrachOcc(SchCellCb *cell, SlotTimingInfo prachOccasionTimingInfo) return FALSE; } #endif + DU_LOG("\nINFO --> SCH : PrachCfgIdx %d support UL slot:%d", prachCfgIdx,prachOccasionTimingInfo.slot); return TRUE; } }