bugfixes

openair1/SCHED_NR/phy_procedures_nr_gNB.c

@@ -377,7 +377,7 @@ void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
         if ((pucch->active == 1) &&
 	    (pucch->frame == frame_rx) &&
 	    (pucch->slot == slot_rx) ) {
-
+          gNB->ulmask_symb = symbol;
           nfapi_nr_pucch_pdu_t  *pucch_pdu = &pucch[i].pucch_pdu;
           if ((symbol>=pucch_pdu->start_symbol_index) &&
               (symbol<(pucch_pdu->start_symbol_index + pucch_pdu->nr_of_symbols))){
@@ -386,7 +386,6 @@ void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
               gNB->rb_mask_ul[rb2>>5] |= (1<<(rb2&31));
             }
             nb_rb+=pucch_pdu->prb_size;
-            gNB->ulmask_symb = symbol;
           }
         }
       }
@@ -407,6 +406,7 @@ void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
             (ulsch_harq->handled == 0)){
             uint8_t symbol_start = ulsch_harq->ulsch_pdu.start_symbol_index;
             uint8_t symbol_end = symbol_start + ulsch_harq->ulsch_pdu.nr_of_symbols;
+            gNB->ulmask_symb = symbol;
             if ((symbol>=symbol_start) &&
                 (symbol<symbol_end)){
               for (rb=0; rb<ulsch_harq->ulsch_pdu.rb_size; rb++) {
@@ -414,7 +414,6 @@ void fill_ul_rb_mask(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx) {
                 gNB->rb_mask_ul[rb2>>5] |= (1<<(rb2&31));
               }
               nb_rb+=ulsch_harq->ulsch_pdu.rb_size;
-              gNB->ulmask_symb = symbol;
             }
           }
         }

openair1/SIMULATION/NR_PHY/ulsim.c

@@ -463,9 +463,9 @@ int main(int argc, char **argv)
 
   gNB->if_inst->NR_PHY_config_req      = nr_phy_config_request;
   // common configuration
-  rrc_mac_config_req_gNB(0,0,1,scc,0,0,NULL);
+  rrc_mac_config_req_gNB(0,0,1,200,scc,0,0,NULL);
   // UE dedicated configuration
-  rrc_mac_config_req_gNB(0,0,1,NULL,1,secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
+  rrc_mac_config_req_gNB(0,0,1,200,NULL,1,secondaryCellGroup->spCellConfig->reconfigurationWithSync->newUE_Identity,secondaryCellGroup);
   phy_init_nr_gNB(gNB,0,0);
   N_RB_DL = gNB->frame_parms.N_RB_DL;