From 4f07df03da118854f5aaefda30aae04b2aee2a41 Mon Sep 17 00:00:00 2001 From: sphoorthi Date: Mon, 1 Feb 2021 13:18:08 +0530 Subject: [PATCH] JIRA ID- ODUHIGH-280 Configuring the TDD Table Change-Id: I262c0d3d01043e5d93928013e0b163d655ec9259 Signed-off-by: sphoorthi --- src/5gnrmac/lwr_mac_fsm.c | 25 ++++++++++++++++++------- src/du_app/du_cfg.h | 6 ++++++ 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index 4ae21ccc0..168d96c10 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -1975,10 +1975,13 @@ uint8_t lwr_mac_procIqSamplesReqEvt(void *msg) uint8_t lwr_mac_procConfigReqEvt(void *msg) { #ifdef INTEL_FAPI - //uint8_t idx = 0; +#ifdef NR_TDD + uint8_t slotIdx = 0; + uint8_t symbolIdx =0; +#endif uint8_t index = 0; - uint16_t *cellId; - uint16_t cellIdx; + uint16_t *cellId =NULLP; + uint16_t cellIdx =0; uint32_t msgLen = 0; uint32_t mib = 0; MacCellCfg macCfgParams; @@ -2140,12 +2143,20 @@ uint8_t lwr_mac_procConfigReqEvt(void *msg) //fillTlvs(&configReq->tlvs[index++], FAPI_MULTIPLE_CELLS_SS_PBCH_IN_A_CARRIER_TAG, \ sizeof(uint8_t), macCfgParams.ssbCfg.multCellCarr, &msgLen); +#ifdef NR_TDD /* fill TDD table */ - //fillTlvs(&configReq->tlvs[index++], FAPI_TDD_PERIOD_TAG, \ + fillTlvs(&configReq->tlvs[index++], FAPI_TDD_PERIOD_TAG, \ sizeof(uint8_t), macCfgParams.tddCfg.tddPeriod, &msgLen); - //fillTlvs(&configReq->tlvs[index++], FAPI_SLOT_CONFIG_TAG, \ - sizeof(uint8_t), macCfgParams.tddCfg.slotCfg[0][0], &msgLen); - + for(slotIdx =0 ;slotIdx< MAXIMUM_TDD_PERIODICITY; slotIdx++) + { + for(symbolIdx = 0; symbolIdx< MAX_SYMB_PER_SLOT; symbolIdx++) + { + fillTlvs(&configReq->tlvs[index++], FAPI_SLOT_CONFIG_TAG, \ + sizeof(uint8_t), macCfgParams.tddCfg.slotCfg[slotIdx][symbolIdx], &msgLen); + } + } +#endif + /* fill measurement config */ //fillTlvs(&configReq->tlvs[index++], FAPI_RSSI_MEASUREMENT_TAG, \ sizeof(uint8_t), macCfgParams.rssiUnit, &msgLen); diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 668074f0e..51954a7f4 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -33,9 +33,15 @@ #define NR_PCI 1 #define NR_CELL_ID 1 #define NR_NUMEROLOGY 0 + #define DU_NAME "ORAN_OAM_DU" #define CELL_TYPE SMALL #define DUPLEX_MODE DUP_MODE_FDD + +#ifdef NR_TDD +#define DUPLEX_MODE DUP_MODE_TDD +#endif + #define DU_TAC 1 #define PLMN_MCC0 3 #define PLMN_MCC1 1 -- 2.16.6