NR RB configuration: Remove dependencies from LTE structures

-Remaining LTE dependency in RLC add_srb function (not used for NSA setup)
-Rename function for DRB static preconfiguration used in noS1 mode

executables/nr-uesoftmodem.c

@@ -642,7 +642,7 @@ void init_pdcp(void) {
 	  LOG_I(RLC, "Problem at RLC initiation \n");
   }
   pdcp_layer_init();
-  nr_ip_over_LTE_DRB_preconfiguration();*/
+  nr_DRB_preconfiguration();*/
   pdcp_module_init(pdcp_initmask);
   pdcp_set_rlc_data_req_func((send_rlc_data_req_func_t) rlc_data_req);
   pdcp_set_pdcp_data_ind_func((pdcp_data_ind_func_t) pdcp_data_ind);

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -123,7 +123,7 @@ int generate_dlsch_header(unsigned char *mac_header,
                           unsigned char *ue_cont_res_id,
                           unsigned char short_padding,
                           unsigned short post_padding){return 0;}
-void nr_ip_over_LTE_DRB_preconfiguration(void){}
+void nr_DRB_preconfiguration(void){}
 
 // needed for some functions
 openair0_config_t openair0_cfg[MAX_CARDS];

openair1/SIMULATION/NR_PHY/prachsim.c

@@ -76,7 +76,7 @@ boolean_t pdcp_data_ind(const protocol_ctxt_t *const ctxt_pP,
                         const sdu_size_t   sdu_buffer_sizeP,
                         mem_block_t *const sdu_buffer_pP) {return(false);}
 
-void nr_ip_over_LTE_DRB_preconfiguration(void){}
+void nr_DRB_preconfiguration(void){}
 void pdcp_layer_init(void) {}
 int8_t nr_mac_rrc_data_ind_ue(const module_id_t module_id, const int CC_id, const uint8_t gNB_index, const int8_t channel, const uint8_t* pduP, const sdu_size_t pdu_len) {return 0;}
 

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -98,7 +98,7 @@ boolean_t pdcp_data_ind(
 ) { return(false);}
 
 void pdcp_run (const protocol_ctxt_t *const  ctxt_pP) { return;}
-void nr_ip_over_LTE_DRB_preconfiguration(void){}
+void nr_DRB_preconfiguration(void){}
 int rrc_init_nr_global_param(void){return(0);}
 
 

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -39,6 +39,7 @@
 #include "PHY/defs_UE.h"
 #include "openair2/LAYER2/RLC/rlc.h"
 #include "openair2/LAYER2/PDCP_v10.1.0/pdcp.h"
+#include "openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h"
 #include "executables/softmodem-common.h"
 
 static NR_UE_MAC_INST_t *nr_ue_mac_inst; 
@@ -59,7 +60,7 @@ NR_UE_MAC_INST_t * nr_l2_init_ue(NR_UE_RRC_INST_t* rrc_inst)
 	  LOG_I(RLC, "Problem at RLC initiation \n");
     	}
     	pdcp_layer_init();
-    	nr_ip_over_LTE_DRB_preconfiguration();
+    	nr_DRB_preconfiguration();
       }
     }
     else LOG_I(MAC,"Running without RRC instance\n");

openair2/LAYER2/NR_MAC_gNB/main.c

@@ -35,6 +35,7 @@
 #include "assertions.h"
 
 #include "LAYER2/PDCP_v10.1.0/pdcp.h"
+#include "LAYER2/nr_pdcp/nr_pdcp_entity.h"
 #include "RRC/NR/nr_rrc_defs.h"
 #include "common/utils/LOG/log.h"
 //#include "RRC/L2_INTERFACE/openair_rrc_L2_interface.h"
@@ -89,7 +90,7 @@ void mac_top_init_gNB(void)
     pdcp_layer_init();
 
     if(IS_SOFTMODEM_NOS1)
-      nr_ip_over_LTE_DRB_preconfiguration();
+      nr_DRB_preconfiguration();
 
     rrc_init_nr_global_param();
 

openair2/LAYER2/PDCP_v10.1.0/pdcp.c

@@ -2361,101 +2361,6 @@ void pdcp_module_cleanup (void)
 {
 }
 
-void nr_ip_over_LTE_DRB_preconfiguration(void){
-
-	  // Addition for the use-case of 4G stack on top of 5G-NR.
-	  // We need to configure pdcp and rlc instances without having an actual
-	  // UE RRC Connection. In order to be able to test the NR PHY with some injected traffic
-	  // on top of the LTE stack.
-	  protocol_ctxt_t ctxt;
-	  LTE_DRB_ToAddModList_t*                DRB_configList=NULL;
-	  DRB_configList = CALLOC(1, sizeof(LTE_DRB_ToAddModList_t));
-	  struct LTE_LogicalChannelConfig        *DRB_lchan_config                                 = NULL;
-	  struct LTE_RLC_Config                  *DRB_rlc_config                   = NULL;
-	  struct LTE_PDCP_Config                 *DRB_pdcp_config                  = NULL;
-	  struct LTE_PDCP_Config__rlc_UM         *PDCP_rlc_UM                      = NULL;
-
-	  struct LTE_DRB_ToAddMod                *DRB_config                       = NULL;
-	  struct LTE_LogicalChannelConfig__ul_SpecificParameters *DRB_ul_SpecificParameters        = NULL;
-	  long  *logicalchannelgroup_drb;
-
-
-	  //Static preconfiguration of DRB
-	  DRB_config = CALLOC(1, sizeof(*DRB_config));
-
-	  DRB_config->eps_BearerIdentity = CALLOC(1, sizeof(long));
-	  // allowed value 5..15, value : x+4
-	  *(DRB_config->eps_BearerIdentity) = 1; //ue_context_pP->ue_context.e_rab[i].param.e_rab_id;//+ 4; // especial case generation
-	  //   DRB_config->drb_Identity =  1 + drb_identity_index + e_rab_done;// + i ;// (DRB_Identity_t) ue_context_pP->ue_context.e_rab[i].param.e_rab_id;
-	  // 1 + drb_identiy_index;
-	  DRB_config->drb_Identity = 1;
-	  DRB_config->logicalChannelIdentity = CALLOC(1, sizeof(long));
-	  *(DRB_config->logicalChannelIdentity) = DRB_config->drb_Identity + 2; //(long) (ue_context_pP->ue_context.e_rab[i].param.e_rab_id + 2); // value : x+2
-
-	  DRB_rlc_config = CALLOC(1, sizeof(*DRB_rlc_config));
-	  DRB_config->rlc_Config = DRB_rlc_config;
-
-	  DRB_pdcp_config = CALLOC(1, sizeof(*DRB_pdcp_config));
-	  DRB_config->pdcp_Config = DRB_pdcp_config;
-	  DRB_pdcp_config->discardTimer = CALLOC(1, sizeof(long));
-	  *DRB_pdcp_config->discardTimer = LTE_PDCP_Config__discardTimer_infinity;
-	  DRB_pdcp_config->rlc_AM = NULL;
-	  DRB_pdcp_config->rlc_UM = NULL;
-
-	  DRB_rlc_config->present = LTE_RLC_Config_PR_um_Bi_Directional;
-	  DRB_rlc_config->choice.um_Bi_Directional.ul_UM_RLC.sn_FieldLength = LTE_SN_FieldLength_size10;
-	  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.sn_FieldLength = LTE_SN_FieldLength_size10;
-	  DRB_rlc_config->choice.um_Bi_Directional.dl_UM_RLC.t_Reordering = LTE_T_Reordering_ms35;
-	  // PDCP
-	  PDCP_rlc_UM = CALLOC(1, sizeof(*PDCP_rlc_UM));
-	  DRB_pdcp_config->rlc_UM = PDCP_rlc_UM;
-	  PDCP_rlc_UM->pdcp_SN_Size = LTE_PDCP_Config__rlc_UM__pdcp_SN_Size_len12bits;
-
-	  DRB_pdcp_config->headerCompression.present = LTE_PDCP_Config__headerCompression_PR_notUsed;
-
-	  DRB_lchan_config = CALLOC(1, sizeof(*DRB_lchan_config));
-	  DRB_config->logicalChannelConfig = DRB_lchan_config;
-	  DRB_ul_SpecificParameters = CALLOC(1, sizeof(*DRB_ul_SpecificParameters));
-	  DRB_lchan_config->ul_SpecificParameters = DRB_ul_SpecificParameters;
-
-	  DRB_ul_SpecificParameters->priority= 4;
-
-	  DRB_ul_SpecificParameters->prioritisedBitRate = LTE_LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_kBps8;
-	  //LogicalChannelConfig__ul_SpecificParameters__prioritisedBitRate_infinity;
-	  DRB_ul_SpecificParameters->bucketSizeDuration =
-	  LTE_LogicalChannelConfig__ul_SpecificParameters__bucketSizeDuration_ms50;
-
-	  logicalchannelgroup_drb = CALLOC(1, sizeof(long));
-	  *logicalchannelgroup_drb = 1;//(i+1) % 3;
-	  DRB_ul_SpecificParameters->logicalChannelGroup = logicalchannelgroup_drb;
-
-	  ASN_SEQUENCE_ADD(&DRB_configList->list,DRB_config);
-
-	  if (ENB_NAS_USE_TUN){
-		  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_YES, 0x1234, 0, 0,0);
-	  }
-	  else{
-		  PROTOCOL_CTXT_SET_BY_MODULE_ID(&ctxt, 0, ENB_FLAG_NO, 0x1234, 0, 0,0);
-	  }
-
-	  rrc_pdcp_config_asn1_req(&ctxt,
-	               (LTE_SRB_ToAddModList_t *) NULL,
-	               DRB_configList,
-	               (LTE_DRB_ToReleaseList_t *) NULL,
-	               0xff, NULL, NULL, NULL
-	               , (LTE_PMCH_InfoList_r9_t *) NULL,
-	               &DRB_config->drb_Identity);
-
-	rrc_rlc_config_asn1_req(&ctxt,
-	               (LTE_SRB_ToAddModList_t*)NULL,
-	               DRB_configList,
-	               (LTE_DRB_ToReleaseList_t*)NULL
-	//#if (RRC_VERSION >= MAKE_VERSION(10, 0, 0))
-	               ,(LTE_PMCH_InfoList_r9_t *)NULL
-	               , 0, 0
-	//#endif
-	         );
-}
 //-----------------------------------------------------------------------------
 void pdcp_layer_init(void)
 //-----------------------------------------------------------------------------

openair2/LAYER2/nr_pdcp/nr_pdcp_entity.h

@@ -60,4 +60,6 @@ nr_pdcp_entity_t *new_nr_pdcp_entity_drb_am(
                         char *buf, int size, int sdu_id),
     void *deliver_pdu_data);
 
+void nr_DRB_preconfiguration(void);
+
 #endif /* _NR_PDCP_ENTITY_H_ */

openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c

@@ -541,7 +541,7 @@ void pdcp_run(const protocol_ctxt_t *const  ctxt_pP)
   }
 }
 
-static void add_srb(int rnti, struct LTE_SRB_ToAddMod *s)
+static void add_srb(int rnti, struct NR_SRB_ToAddMod *s)
 {
   TODO;
 }
@@ -655,6 +655,7 @@ boolean_t nr_rrc_pdcp_config_asn1_req(
   return 0;
 }
 
+/* Dummy function due to dependency from LTE libraries */
 boolean_t rrc_pdcp_config_asn1_req(
   const protocol_ctxt_t *const  ctxt_pP,
   LTE_SRB_ToAddModList_t  *const srb2add_list,
@@ -669,51 +670,10 @@ boolean_t rrc_pdcp_config_asn1_req(
 #endif
   ,rb_id_t                 *const defaultDRB)
 {
-  int rnti = ctxt_pP->rnti;
-  int i;
-
-  if (//ctxt_pP->enb_flag != 1 ||
-      ctxt_pP->module_id != 0 ||
-      ctxt_pP->instance != 0 ||
-      ctxt_pP->eNB_index != 0 ||
-      //ctxt_pP->configured != 2 ||
-      //srb2add_list == NULL ||
-      //drb2add_list != NULL ||
-      drb2release_list != NULL ||
-      security_modeP != 255 ||
-      //kRRCenc != NULL ||
-      //kRRCint != NULL ||
-      //kUPenc != NULL ||
-      pmch_InfoList_r9 != NULL /*||
-      defaultDRB != NULL */) {
-    TODO;
-  }
-
-  if (srb2add_list != NULL) {
-    for (i = 0; i < srb2add_list->list.count; i++) {
-      add_srb(rnti, srb2add_list->list.array[i]);
-    }
-  }
-
-  if (drb2add_list != NULL) {
-    for (i = 0; i < drb2add_list->list.count; i++) {
-      add_drb(rnti, drb2add_list->list.array[i], NULL);
-    }
-  }
-
-  /* update security */
-  if (kRRCint != NULL) {
-    /* todo */
-  }
-
-  free(kRRCenc);
-  free(kRRCint);
-  free(kUPenc);
-
   return 0;
 }
 
-void nr_ip_over_LTE_DRB_preconfiguration(void)
+void nr_DRB_preconfiguration(void)
 {
 
   NR_RadioBearerConfig_t             *rbconfig = NULL;
@@ -737,9 +697,9 @@ void nr_ip_over_LTE_DRB_preconfiguration(void)
   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_ms30;
   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_len12bits;
   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 = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len18bits;
+  *drb_ToAddMod->pdcp_Config->drb->pdcp_SN_SizeDL = NR_PDCP_Config__drb__pdcp_SN_SizeDL_len12bits;
   drb_ToAddMod->pdcp_Config->drb->headerCompression.present = NR_PDCP_Config__drb__headerCompression_PR_notUsed;
   drb_ToAddMod->pdcp_Config->drb->headerCompression.choice.notUsed = 0;
 
@@ -787,6 +747,21 @@ void nr_ip_over_LTE_DRB_preconfiguration(void)
   *RLC_BearerConfig->rlc_Config->choice.um_Bi_Directional->dl_UM_RLC.sn_FieldLength   =    NR_SN_FieldLengthUM_size12;
   RLC_BearerConfig->rlc_Config->choice.um_Bi_Directional->dl_UM_RLC.t_Reassembly = NR_T_Reassembly_ms15;
 
+  // RLC AM Bearer configuration
+  /*RLC_BearerConfig->rlc_Config->present = NR_RLC_Config_PR_am;
+  RLC_BearerConfig->rlc_Config->choice.am = calloc(1,sizeof(*RLC_BearerConfig->rlc_Config->choice.am));
+  RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.sn_FieldLength = calloc(1,sizeof(*RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.sn_FieldLength));
+  *RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.sn_FieldLength   =    NR_SN_FieldLengthAM_size18;
+  RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.t_PollRetransmit = NR_T_PollRetransmit_ms45;
+  RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.pollPDU          = NR_PollPDU_p64;
+  RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.pollByte         = NR_PollByte_kB500;
+  RLC_BearerConfig->rlc_Config->choice.am->ul_AM_RLC.maxRetxThreshold = NR_UL_AM_RLC__maxRetxThreshold_t32;
+
+  RLC_BearerConfig->rlc_Config->choice.am->dl_AM_RLC.sn_FieldLength = calloc(1,sizeof(*RLC_BearerConfig->rlc_Config->choice.am->dl_AM_RLC.sn_FieldLength));
+  *RLC_BearerConfig->rlc_Config->choice.am->dl_AM_RLC.sn_FieldLength = NR_SN_FieldLengthAM_size18;
+  RLC_BearerConfig->rlc_Config->choice.am->dl_AM_RLC.t_Reassembly   = NR_T_Reassembly_ms15;
+  RLC_BearerConfig->rlc_Config->choice.am->dl_AM_RLC.t_StatusProhibit = NR_T_StatusProhibit_ms15;*/
+
   RLC_BearerConfig->mac_LogicalChannelConfig = calloc(1,sizeof(*RLC_BearerConfig->mac_LogicalChannelConfig));
   RLC_BearerConfig->mac_LogicalChannelConfig->ul_SpecificParameters = calloc(1,sizeof(*RLC_BearerConfig->mac_LogicalChannelConfig->ul_SpecificParameters));
   RLC_BearerConfig->mac_LogicalChannelConfig->ul_SpecificParameters->priority            = 1;

openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c

@@ -821,7 +821,7 @@ __attribute__ ((unused)) static void add_drb(int rnti, struct NR_DRB_ToAddMod *s
   }
 }
 
-//#if 0
+/* Dummy function due to dependency from LTE libraries */
 rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt_pP,
     const LTE_SRB_ToAddModList_t   * const srb2add_listP,
     const LTE_DRB_ToAddModList_t   * const drb2add_listP,
@@ -830,46 +830,11 @@ rlc_op_status_t rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt_pP
     const uint32_t sourceL2Id,
     const uint32_t destinationL2Id)
 {
-  int rnti = ctxt_pP->rnti;
-  int i;
-
-  if (/*ctxt_pP->enb_flag != 1 ||*/ ctxt_pP->module_id != 0 /*||
-      ctxt_pP->instance != 0 || ctxt_pP->eNB_index != 0 ||
-      ctxt_pP->configured != 1 || ctxt_pP->brOption != 0 */) {
-    LOG_E(RLC, "%s: ctxt_pP not handled (%d %d %d %d %d %d)\n", __FUNCTION__,
-          ctxt_pP->enb_flag , ctxt_pP->module_id, ctxt_pP->instance,
-          ctxt_pP->eNB_index, ctxt_pP->configured, ctxt_pP->brOption);
-    exit(1);
-  }
-
-  if (pmch_InfoList_r9_pP != NULL) {
-    LOG_E(RLC, "%s: pmch_InfoList_r9_pP not handled\n", __FUNCTION__);
-    exit(1);
-  }
-
-  if (drb2release_listP != NULL) {
-    LOG_E(RLC, "%s:%d:%s: TODO\n", __FILE__, __LINE__, __FUNCTION__);
-    exit(1);
-  }
-
-  if (srb2add_listP != NULL) {
-    for (i = 0; i < srb2add_listP->list.count; i++) {
-      add_srb(rnti, srb2add_listP->list.array[i]);
-    }
-  }
-
-  if (drb2add_listP != NULL) {
-    for (i = 0; i < drb2add_listP->list.count; i++) {
-      add_drb(rnti, drb2add_listP->list.array[i], NULL);
-    }
-  }
-
-  return RLC_OP_STATUS_OK;
+  return 0;
 }
-//#endif
 
 rlc_op_status_t nr_rrc_rlc_config_asn1_req (const protocol_ctxt_t   * const ctxt_pP,
-    const NR_SRB_ToAddModList_t   * const srb2add_listP,
+    const LTE_SRB_ToAddModList_t   * const srb2add_listP,
     const NR_DRB_ToAddModList_t   * const drb2add_listP,
     const NR_DRB_ToReleaseList_t  * const drb2release_listP,
     const LTE_PMCH_InfoList_r9_t * const pmch_InfoList_r9_pP,