Upata the loss config

openair2/COMMON/rrc_messages_types.h

@@ -359,6 +359,7 @@ typedef struct NRRrcConfigurationReq_s {
   long                    UL_BWP_SubcarrierSpacing[MAX_NUM_CCs];
   lte_prefix_type_t       UL_BWP_prefix_type[MAX_NUM_CCs];
   long                    UL_timeAlignmentTimerCommon[MAX_NUM_CCs];
+  long                    ServingCellConfigCommon_n_TimingAdvanceOffset[MAX_NUM_CCs];
   long                    ServingCellConfigCommon_ssb_PositionsInBurst_PR[MAX_NUM_CCs];
   long                    ServingCellConfigCommon_ssb_periodicityServingCell[MAX_NUM_CCs]; //ServingCellConfigCommon
   long                    ServingCellConfigCommon_dmrs_TypeA_Position[MAX_NUM_CCs];        //ServingCellConfigCommon

openair2/GNB_APP/gnb_config.c

@@ -82,6 +82,7 @@ void RCconfig_nr_flexran()
             *DL_SCS_SubcarrierSpacing, *DL_BWP_SubcarrierSpacing, *DL_BWP_prefix_type,
             *UL_frequencyShift7p5khz, *UL_SCS_SubcarrierSpacing, *UL_BWP_SubcarrierSpacing,
             *UL_BWP_prefix_type, *UL_timeAlignmentTimerCommon, 
+            *ServingCellConfigCommon_n_TimingAdvanceOffset,
             *ServingCellConfigCommon_ssb_PositionsInBurst_PR,
             *NIA_SubcarrierSpacing, *referenceSubcarrierSpacing, *dl_UL_TransmissionPeriodicity,
             *rach_ssb_perRACH_OccasionAndCB_PreamblesPerSSB_choice,
@@ -126,6 +127,7 @@ void RCconfig_nr_flexran()
             PUSCH_TimeDomainResourceAllocation_k2,
             PUSCH_TimeDomainResourceAllocation_startSymbolAndLength,
             pucch_ResourceCommon, hoppingId, p0_nominal, PDSCH_TimeDomainResourceAllocation_k0,
+            PDSCH_TimeDomainResourceAllocation_startSymbolAndLength,
             rateMatchPatternId, periodicityAndPattern, RateMatchPattern_controlResourceSet,
             controlResourceSetZero, searchSpaceZero,
             searchSpaceSIB1, searchSpaceOtherSystemInformation, pagingSearchSpace,
@@ -397,7 +399,7 @@ void RCconfig_nr_macrlc() {
 
 }
 
-int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
+void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
 
   int                    num_gnbs                                                      = 0;
   int                    num_component_carriers                                        = 0;
@@ -461,7 +463,7 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
   char*                  UL_BWP_prefix_type                                            = NULL; 
   char*                  UL_timeAlignmentTimerCommon                                   = 0;
   
-  int32_t                ServingCellConfigCommon_n_TimingAdvanceOffset                 = 0;
+  char*                  ServingCellConfigCommon_n_TimingAdvanceOffset                 = 0;
   char*                  ServingCellConfigCommon_ssb_PositionsInBurst_PR               = 0;
   int32_t                ServingCellConfigCommon_ssb_periodicityServingCell            = 0;
   int32_t                ServingCellConfigCommon_dmrs_TypeA_Position                   = 0;
@@ -591,14 +593,14 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
   int32_t                RateMatchPatternLTE_CRS_radioframeAllocationPeriod            = 0;
   int32_t                RateMatchPatternLTE_CRS_radioframeAllocationOffset            = 0;
   char*                  RateMatchPatternLTE_CRS_subframeAllocation_choice             = NULL;
-
+/*
   int32_t                srb1_timer_poll_retransmit    = 0;
   int32_t                srb1_timer_reordering         = 0;
   int32_t                srb1_timer_status_prohibit    = 0;
   int32_t                srb1_poll_pdu                 = 0;
   int32_t                srb1_poll_byte                = 0;
   int32_t                srb1_max_retx_threshold       = 0;
-
+*/
   //int32_t             my_int;
 
   paramdef_t GNBSParams[] = GNBSPARAMS_DESC;
@@ -610,7 +612,12 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
   paramdef_t CCsParams[] = NRCCPARAMS_DESC;
   paramlist_def_t CCsParamList = {GNB_CONFIG_STRING_COMPONENT_CARRIERS,NULL,0};
   
-  paramdef_t SRB1Params[] = SRB1PARAMS_DESC;  
+  //paramdef_t SRB1Params[] = SRB1PARAMS_DESC;  
+
+  /* map parameter checking array instances to parameter definition array instances */
+  for (int I = 0; I < (sizeof(CCsParams) / sizeof(paramdef_t)); I++) {
+    CCsParams[I].chkPptr = &(config_check_CCparams[I]);
+  }
 
   /* get global parameters, defined outside any section in the config file */
  
@@ -1058,6 +1065,17 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
                            RC.config_file_name, i, UL_timeAlignmentTimerCommon);
             }
 
+            if (strcmp(ServingCellConfigCommon_n_TimingAdvanceOffset,"n0")==0) {
+              NRRRC_CONFIGURATION_REQ (msg_p).ServingCellConfigCommon_n_TimingAdvanceOffset[j] = NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n0;
+            }else if (strcmp(ServingCellConfigCommon_n_TimingAdvanceOffset,"n25600")==0) {
+              NRRRC_CONFIGURATION_REQ (msg_p).ServingCellConfigCommon_n_TimingAdvanceOffset[j] = NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n25600;
+            }else if (strcmp(ServingCellConfigCommon_n_TimingAdvanceOffset,"n39936")==0) {
+              NRRRC_CONFIGURATION_REQ (msg_p).ServingCellConfigCommon_n_TimingAdvanceOffset[j] = NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n39936;
+            }else { 
+              AssertFatal (0,"Failed to parse gNB configuration file %s, gnb %d unknown value \"%s\" for ServingCellConfigCommon_n_TimingAdvanceOffset choice n0,n25600,n39936!\n",
+                           RC.config_file_name, i, ServingCellConfigCommon_n_TimingAdvanceOffset);
+            }        
+
             if (strcmp(ServingCellConfigCommon_ssb_PositionsInBurst_PR,"shortBitmap")==0) {
               NRRRC_CONFIGURATION_REQ (msg_p).ServingCellConfigCommon_ssb_PositionsInBurst_PR[j] = NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_shortBitmap;
             }else if (strcmp(ServingCellConfigCommon_ssb_PositionsInBurst_PR,"mediumBitmap")==0) {
@@ -1865,6 +1883,12 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
                            RC.config_file_name, i, PDSCH_TimeDomainResourceAllocation_mappingType);
             }
 
+            NRRRC_CONFIGURATION_REQ (msg_p).PDSCH_TimeDomainResourceAllocation_startSymbolAndLength[j] = PDSCH_TimeDomainResourceAllocation_startSymbolAndLength;
+            if ((PDSCH_TimeDomainResourceAllocation_startSymbolAndLength <0) || (PDSCH_TimeDomainResourceAllocation_startSymbolAndLength>127)){
+              AssertFatal (0,"Failed to parse gNB configuration file %s, gnb %d unknown value \"%d\" for PDSCH_TimeDomainResourceAllocation_startSymbolAndLength choice: 0..127 !\n",
+                           RC.config_file_name, i, PDSCH_TimeDomainResourceAllocation_startSymbolAndLength);
+            }
+
             //////////////////////////////////NR RateMatchPattern///////////////////////////
             NRRRC_CONFIGURATION_REQ (msg_p).rateMatchPatternId[j] = rateMatchPatternId;
             if ((rateMatchPatternId <0) || (rateMatchPatternId>3)){

openair2/GNB_APP/gnb_config.h

@@ -101,7 +101,7 @@ extern void NRRCConfig(void);
 //void                          enb_config_display(void);
 //void                          ru_config_display(void);
 
-int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc);
+void RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc);
 int RCconfig_NR_S1(MessageDef *msg_p, uint32_t i);
 
 #endif /* GNB_CONFIG_H_ */

targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf

@@ -69,7 +69,8 @@ gNBs =
       UL_BWP_SubcarrierSpacing                                      = "kHz15";
       UL_BWP_prefix_type                                            = "NORMAL";
       UL_timeAlignmentTimerCommon                                   = "infinity";
-      ServingCellConfigCommon__ssb_PositionsInBurst_PR              = "shortBitmap";
+      ServingCellConfigCommon_n_TimingAdvanceOffset                 = "n0"
+      ServingCellConfigCommon_ssb_PositionsInBurst_PR               = "shortBitmap";
       ServingCellConfigCommon_ssb_periodicityServingCell            = 10;
       ServingCellConfigCommon_dmrs_TypeA_Position                   = 2;
       NIA_SubcarrierSpacing                                         = "kHz15"; 
@@ -123,6 +124,7 @@ gNBs =
       p0_nominal                                                    = -30;
       PDSCH_TimeDomainResourceAllocation_k0                         = 2;
       PDSCH_TimeDomainResourceAllocation_mappingType                = "typeA";
+      PDSCH_TimeDomainResourceAllocation_startSymbolAndLength       = 0;
       rateMatchPatternId                                            = 0;
       RateMatchPattern_patternType                                  = "bitmaps";
       symbolsInResourceBlock                                        = "oneSlot";