From 22dec8bbab96f5bfad385f0a23cd33c95edb2e1f Mon Sep 17 00:00:00 2001 From: Balaji Shankaran Date: Fri, 3 Jul 2020 16:55:40 +0530 Subject: [PATCH] Added new parameter in FAPI Config request Change-Id: I6eeab19e4e27b2882ebc4df9e5a352ed62496230 Signed-off-by: Balaji Shankaran --- src/5gnrmac/lwr_mac_fsm.c | 4 ++++ src/cm/du_app_mac_inf.h | 1 + src/du_app/du_cfg.c | 4 +++- src/du_app/du_cfg.h | 7 ++++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/5gnrmac/lwr_mac_fsm.c b/src/5gnrmac/lwr_mac_fsm.c index 04a6c9c92..56224e16f 100644 --- a/src/5gnrmac/lwr_mac_fsm.c +++ b/src/5gnrmac/lwr_mac_fsm.c @@ -2031,6 +2031,10 @@ S16 lwr_mac_handleConfigReqEvt(void *msg) fillTlvs(&configReq->tlvs[index++], FAPI_RSSI_MESUREMENT_TAG, \ sizeof(uint8_t), macCfgParams.rssiUnit, &msgLen); + /* fill DMRS Type A Pos */ + fillTlvs(&configReq->tlvs[index++], FAPI_DMRS_TYPE_A_POS_TAG, \ + sizeof(uint8_t), macCfgParams.dmrsTypeAPos, &msgLen); + fillMsgHeader(&configReq->header, FAPI_CONFIG_REQUEST, msgLen); DU_LOG("\nLWR_MAC: Sending Config Request to Phy"); diff --git a/src/cm/du_app_mac_inf.h b/src/cm/du_app_mac_inf.h index e43872547..ef4eea0c1 100644 --- a/src/cm/du_app_mac_inf.h +++ b/src/cm/du_app_mac_inf.h @@ -288,6 +288,7 @@ typedef struct macCellCfg Sib1CellCfg sib1Cfg; /* SIB1 config */ BwpDlConfig initialDlBwp; /* Initial DL BWP */ BwpUlConfig initialUlBwp; /* Initial UL BWP */ + uint8_t dmrsTypeAPos; /* DMRS Type A position */ }MacCellCfg; typedef struct macCellCfgCfm diff --git a/src/du_app/du_cfg.c b/src/du_app/du_cfg.c index 3afa2c772..30939597b 100644 --- a/src/du_app/du_cfg.c +++ b/src/du_app/du_cfg.c @@ -274,9 +274,11 @@ S16 readMacCfg() duCfgParam.macCellCfg.initialUlBwp.puschCommon.lengthSymbol = PUSCH_LENGTH_SYMBOL; + duCfgParam.macCellCfg.dmrsTypeAPos = DMRS_TYPE_A_POS; + /* This should be calculated based on (number of mandatory parameters) + (number of otional parameters being filled) */ - duCfgParam.macCellCfg.numTlv = 39; + duCfgParam.macCellCfg.numTlv = 40; RETVALUE(ROK); } diff --git a/src/du_app/du_cfg.h b/src/du_app/du_cfg.h index 4a52efba2..e6710e192 100644 --- a/src/du_app/du_cfg.h +++ b/src/du_app/du_cfg.h @@ -27,12 +27,12 @@ /* MACROS */ #define DU_INST 0 #define DU_ID 1 -#define DU_IP_V4_ADDR "10.0.2.20" +#define DU_IP_V4_ADDR "192.168.130.81" #define CU_IP_V4_ADDR "10.0.2.25" -#define RIC_IP_V4_ADDR "10.0.2.30" +#define RIC_IP_V4_ADDR "192.168.130.80" #define DU_PORT 38472 #define CU_PORT 38472 -#define RIC_PORT 38482 +#define RIC_PORT 36422 #define DU_EGTP_PORT 39001 #define CU_EGTP_PORT 39002 #define NR_PCI 1 @@ -73,6 +73,7 @@ #define FREQ_LOC_BW 1099 /* DL frequency location and bandwidth */ #define UL_P_MAX 23 #define BANDWIDTH 20 +#define DMRS_TYPE_A_POS 2 /* MACRO defines for PRACH Configuration */ #define PRACH_CONFIG_IDX 105 -- 2.16.6