Commit 440d517c authored by sumit's avatar sumit Committed by Thomas Schlichter

t_Reordering timer and the corresponding offset can now be put via cl

parent f423ba69
...@@ -102,12 +102,12 @@ extern "C" ...@@ -102,12 +102,12 @@ extern "C"
#define CONFIG_HLP_NFAPI "Change the nFAPI mode for NR\n" #define CONFIG_HLP_NFAPI "Change the nFAPI mode for NR\n"
#define CONFIG_L1_EMULATOR "Run in L1 emulated mode (disable PHY layer)\n" #define CONFIG_L1_EMULATOR "Run in L1 emulated mode (disable PHY layer)\n"
#define CONFIG_HLP_CONTINUOUS_TX "perform continuous transmission, even in TDD mode (to work around USRP issues)\n" #define CONFIG_HLP_CONTINUOUS_TX "perform continuous transmission, even in TDD mode (to work around USRP issues)\n"
#define CONFIG_HLP_STATS_DISABLE "disable globally the stats generation and persistence" #define CONFIG_HLP_STATS_DISABLE "disable globally the stats generation and persistence\n"
#define CONFIG_HLP_NTN_TRS "softmodem params for ntn t-Reassembly timer" #define CONFIG_HLP_NTN_TRS "softmodem params for ntn t-Reassembly timer\n"
#define CONFIG_HLP_NTN_TRS_OFFSET "softmodem params for ntn t-Reassembly timer offset in ms" #define CONFIG_HLP_NTN_TRS_OFFSET "softmodem params for ntn t-Reassembly timer offset in ms\n"
#define CONFIG_HLP_NTN_TRD "softmodem params for ntn t-Reordering timer" #define CONFIG_HLP_NTN_TRD "softmodem params for ntn t-Reordering timer\n"
#define CONFIG_HLP_NTN_TRD_OFFSET "softmodem params for ntn t-Reordering timer offset in ms" #define CONFIG_HLP_NTN_TRD_OFFSET "softmodem params for ntn t-Reordering timer offset in ms\n"
#define CONFIG_HLP_NTN_RTD "softmodem params for ntn round trip delay ms" #define CONFIG_HLP_NTN_RTD "softmodem params for ntn round trip delay ms\n"
/*-----------------------------------------------------------------------------------------------------------------------------------------------------*/ /*-----------------------------------------------------------------------------------------------------------------------------------------------------*/
/* command line parameters common to eNodeB and UE */ /* command line parameters common to eNodeB and UE */
...@@ -188,7 +188,7 @@ extern int usrp_tx_thread; ...@@ -188,7 +188,7 @@ extern int usrp_tx_thread;
{"disable-stats", CONFIG_HLP_STATS_DISABLE, PARAMFLAG_BOOL, iptr:&stats_disabled, defintval:0, TYPE_INT, 0}, \ {"disable-stats", CONFIG_HLP_STATS_DISABLE, PARAMFLAG_BOOL, iptr:&stats_disabled, defintval:0, TYPE_INT, 0}, \
{"ntn-trs", CONFIG_HLP_NTN_TRS, 0, u8ptr:&NTN_TRS, defintval:15, TYPE_UINT8, 0}, \ {"ntn-trs", CONFIG_HLP_NTN_TRS, 0, u8ptr:&NTN_TRS, defintval:15, TYPE_UINT8, 0}, \
{"ntn-trs-offset", CONFIG_HLP_NTN_TRS_OFFSET,0, u16ptr:&NTN_TRS_OFFSET, defintval:0, TYPE_UINT16, 0}, \ {"ntn-trs-offset", CONFIG_HLP_NTN_TRS_OFFSET,0, u16ptr:&NTN_TRS_OFFSET, defintval:0, TYPE_UINT16, 0}, \
{"ntn-trd", CONFIG_HLP_NTN_TRD, 0, u8ptr:&NTN_TRD, defintval:36, TYPE_UINT8, 0}, \ {"ntn-trd", CONFIG_HLP_NTN_TRD, 0, u8ptr:&NTN_TRD, defintval:35, TYPE_UINT8, 0}, \
{"ntn-trd-offset", CONFIG_HLP_NTN_TRD_OFFSET,0, u16ptr:&NTN_TRD_OFFSET, defintval:0, TYPE_UINT16, 0}, \ {"ntn-trd-offset", CONFIG_HLP_NTN_TRD_OFFSET,0, u16ptr:&NTN_TRD_OFFSET, defintval:0, TYPE_UINT16, 0}, \
{"ntn-rtd", CONFIG_HLP_NTN_RTD, 0, u16ptr:&NTN_RTD, defintval:0, TYPE_UINT16, 0}, \ {"ntn-rtd", CONFIG_HLP_NTN_RTD, 0, u16ptr:&NTN_RTD, defintval:0, TYPE_UINT16, 0}, \
} }
......
...@@ -882,12 +882,16 @@ static void add_srb(int is_gnb, int rnti, struct NR_SRB_ToAddMod *s, ...@@ -882,12 +882,16 @@ static void add_srb(int is_gnb, int rnti, struct NR_SRB_ToAddMod *s,
{ {
nr_pdcp_entity_t *pdcp_srb; nr_pdcp_entity_t *pdcp_srb;
nr_pdcp_ue_t *ue; nr_pdcp_ue_t *ue;
int t_Reordering=3000; int t_Reordering=3000; // it was already hardcoded ?
int srb_id = s->srb_Identity; int srb_id = s->srb_Identity;
if (s->pdcp_Config == NULL || if (s->pdcp_Config == NULL || s->pdcp_Config->t_Reordering == NULL) {
s->pdcp_Config->t_Reordering == NULL) t_Reordering = 3000; t_Reordering = 3000; //
else t_Reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering); //t_Reordering = decode_t_reordering(get_softmodem_params()->ntn_trd) + get_softmodem_params()->ntn_trd_offset; // #NTN
} else {
t_Reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering);
//t_Reordering = t_Reordering + get_softmodem_params()->ntn_trd_offset; // #NTN
}
nr_pdcp_manager_lock(nr_pdcp_ue_manager); nr_pdcp_manager_lock(nr_pdcp_ue_manager);
ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti); ue = nr_pdcp_manager_get_ue(nr_pdcp_ue_manager, rnti);
...@@ -931,6 +935,7 @@ static void add_drb_am(int is_gnb, int rnti, struct NR_DRB_ToAddMod *s, ...@@ -931,6 +935,7 @@ static void add_drb_am(int is_gnb, int rnti, struct NR_DRB_ToAddMod *s,
int t_reordering = -1; int t_reordering = -1;
if (s->pdcp_Config->t_Reordering != NULL) { if (s->pdcp_Config->t_Reordering != NULL) {
t_reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering); t_reordering = decode_t_reordering(*s->pdcp_Config->t_Reordering);
printf("\n\n\n\n Came to line 954 add_drb_am and t_reordering is %d\n\n\n\n", t_reordering);
} }
if (s->pdcp_Config->drb != NULL if (s->pdcp_Config->drb != NULL
...@@ -1142,7 +1147,7 @@ void nr_DRB_preconfiguration(uint16_t crnti) ...@@ -1142,7 +1147,7 @@ void nr_DRB_preconfiguration(uint16_t crnti)
drb_ToAddMod->pdcp_Config = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config)); drb_ToAddMod->pdcp_Config = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config));
drb_ToAddMod->pdcp_Config->drb = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb)); drb_ToAddMod->pdcp_Config->drb = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb));
drb_ToAddMod->pdcp_Config->drb->discardTimer = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb->discardTimer)); drb_ToAddMod->pdcp_Config->drb->discardTimer = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb->discardTimer));
*drb_ToAddMod->pdcp_Config->drb->discardTimer=NR_PDCP_Config__drb__discardTimer_infinity; *drb_ToAddMod->pdcp_Config->drb->discardTimer=NR_PDCP_Config__drb__discardTimer_infinity; //#NTN
drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeUL = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeUL)); drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeUL = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeUL));
*drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits; *drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeUL = NR_PDCP_Config__drb__pdcp_SN_SizeUL_len18bits;
drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeDL = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeDL)); drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeDL = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeDL));
...@@ -1156,7 +1161,8 @@ void nr_DRB_preconfiguration(uint16_t crnti) ...@@ -1156,7 +1161,8 @@ void nr_DRB_preconfiguration(uint16_t crnti)
drb_ToAddMod->pdcp_Config->moreThanOneRLC = NULL; drb_ToAddMod->pdcp_Config->moreThanOneRLC = NULL;
drb_ToAddMod->pdcp_Config->t_Reordering = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->t_Reordering)); drb_ToAddMod->pdcp_Config->t_Reordering = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->t_Reordering));
*drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms3000; //*drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms3000;
*drb_ToAddMod->pdcp_Config->t_Reordering = get_softmodem_params()->ntn_trd; // this will just provide the index of the enum
drb_ToAddMod->pdcp_Config->ext1 = NULL; drb_ToAddMod->pdcp_Config->ext1 = NULL;
ASN_SEQUENCE_ADD(&rbconfig->drb_ToAddModList->list,drb_ToAddMod); ASN_SEQUENCE_ADD(&rbconfig->drb_ToAddModList->list,drb_ToAddMod);
......
...@@ -873,7 +873,8 @@ rrc_gNB_generate_dedicatedRRCReconfiguration( ...@@ -873,7 +873,8 @@ rrc_gNB_generate_dedicatedRRCReconfiguration(
DRB_config->pdcp_Config->moreThanOneRLC = NULL; DRB_config->pdcp_Config->moreThanOneRLC = NULL;
DRB_config->pdcp_Config->t_Reordering = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering)); DRB_config->pdcp_Config->t_Reordering = calloc(1, sizeof(*DRB_config->pdcp_Config->t_Reordering));
*DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms3000; //*DRB_config->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms3000;
*DRB_config->pdcp_Config->t_Reordering = get_softmodem_params()->ntn_trd;
DRB_config->pdcp_Config->ext1 = NULL; DRB_config->pdcp_Config->ext1 = NULL;
if (rrc->security.do_drb_integrity) { if (rrc->security.do_drb_integrity) {
......
...@@ -882,7 +882,8 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig, ...@@ -882,7 +882,8 @@ void fill_default_rbconfig(NR_RadioBearerConfig_t *rbconfig,
drb_ToAddMod->pdcp_Config->moreThanOneRLC = NULL; drb_ToAddMod->pdcp_Config->moreThanOneRLC = NULL;
drb_ToAddMod->pdcp_Config->t_Reordering = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->t_Reordering)); drb_ToAddMod->pdcp_Config->t_Reordering = calloc(1,sizeof(*drb_ToAddMod->pdcp_Config->t_Reordering));
*drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms3000; //*drb_ToAddMod->pdcp_Config->t_Reordering = NR_PDCP_Config__t_Reordering_ms3000;
*drb_ToAddMod->pdcp_Config->t_Reordering = get_softmodem_params()->ntn_trd;
drb_ToAddMod->pdcp_Config->ext1 = NULL; drb_ToAddMod->pdcp_Config->ext1 = NULL;
ASN_SEQUENCE_ADD(&rbconfig->drb_ToAddModList->list,drb_ToAddMod); ASN_SEQUENCE_ADD(&rbconfig->drb_ToAddModList->list,drb_ToAddMod);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment