Fix after merge

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf

@@ -40,6 +40,7 @@ gNBs =
     ssb_SubcarrierOffset                                      = 0;
     pdsch_AntennaPorts                                        = 1;
     pusch_AntennaPorts                                        = 2;
+    ul_prbblacklist                                           = "51,52,53,54"
 
     pdcch_ConfigSIB1 = (
       {

ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf

@@ -35,6 +35,7 @@ gNBs =
     ssb_SubcarrierOffset                                      = 0;
     pdsch_AntennaPorts                                        = 1;
     pusch_AntennaPorts                                        = 1;
+    ul_prbblacklist                                           = "51,52,53,54"
 
      pdcch_ConfigSIB1 = (
       {

executables/nr-gnb.c

@@ -126,7 +126,7 @@ void tx_func(void *param) {
                         slot_tx,
                         1);
   info->slot = -1;
-  if ((frame_tx&127) == 0) dump_pdsch_stats(gNB);
+  //if ((frame_tx&127) == 0) dump_pdsch_stats(fd,gNB);
 
   // If the later of the 2 L1 tx thread finishes first,
   // we wait for the earlier one to finish and start the RU thread

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -532,20 +532,20 @@ void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_id,
 // Function to fill UL RB mask to be used for N0 measurements
 void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
 
-  int rb2, rb, nb_rb;
-  int prbpos;
+  int rb = 0;
+  int rb2 = 0;
+  int prbpos = 0;
+
   for (int symbol=0;symbol<14;symbol++) {
-    if (gNB->gNB_config.tdd_table.max_tdd_periodicity_list[slot_rx].max_num_of_symbol_per_slot_list[symbol].slot_config.value==1){
-      nb_rb = 0;
     for (int m=0;m<9;m++) {
-	 gNB->rb_mask_ul[m] = 0;
+      gNB->rb_mask_ul[symbol][m] = 0;
       for (int i=0;i<32;i++) {
         prbpos = (m*32)+i;
         if (prbpos>gNB->frame_parms.N_RB_UL) break;
-          gNB->rb_mask_ul[m] |= (gNB->ulprbbl[prbpos]>0 ? 1 : 0)<<i;
+        gNB->rb_mask_ul[symbol][m] |= (gNB->ulprbbl[prbpos]>0 ? 1 : 0)<<i;
+      }
     }
   }
-      gNB->ulmask_symb = -1;
 
   for (int i=0;i<NUMBER_OF_NR_PUCCH_MAX;i++){
     NR_gNB_PUCCH_t *pucch = gNB->pucch[i];

openair2/GNB_APP/gnb_paramdef.h

@@ -148,7 +148,7 @@ typedef enum {
 {GNB_CONFIG_STRING_SIB1TDA,                      NULL,   0,            iptr:NULL,   defintval:0,                 TYPE_INT,       0},  \
 {GNB_CONFIG_STRING_DOCSIRS,                      NULL,   0,            iptr:NULL,   defintval:0,                 TYPE_INT,       0},  \
 {GNB_CONFIG_STRING_NRCELLID,                     NULL,   0,            u64ptr:NULL, defint64val:1,               TYPE_UINT64,    0},  \
-{GNB_CONFIG_STRING_MINRXTXTIMEPDSCH,             NULL,   0,            iptr:NULL,   defintval:2,                 TYPE_INT,       0}   \
+{GNB_CONFIG_STRING_MINRXTXTIMEPDSCH,             NULL,   0,            iptr:NULL,   defintval:2,                 TYPE_INT,       0},  \
 {GNB_CONFIG_STRING_ULPRBBLACKLIST,               NULL,   0,            strptr:NULL, defstrval:"",                 TYPE_STRING,   0}   \
 }