Merge branch 'ngap-wf-1120-srb-gtp' of http://git.opensource5g.org/nkrd/5gran...

Merge branch 'ngap-wf-1120-srb-gtp' of http://git.opensource5g.org/nkrd/5gran into ngap-wf-1120-srb-gtp

openair1/PHY/CODING/nr_rate_matching.c

@@ -407,8 +407,13 @@ int nr_rate_matching_ldpc(uint8_t Ilbrm,
 #ifdef RM_DEBUG
   printf("nr_rate_matching_ldpc: E %d, F %d, Foffset %d, k0 %d, Ncb %d, rvidx %d\n", E, F, Foffset,ind, Ncb, rvidx);
 #endif
-  AssertFatal(Foffset <= E,"Foffset %d > E %d\n",Foffset,E); 
-  AssertFatal(Foffset <= Ncb,"Foffset %d > Ncb %d\n",Foffset,Ncb); 
+  if ((Foffset > E) || (Foffset > Ncb))
+  {
+    LOG_E(PHY,"Foffset %d > E(%d) or Ncb(%d), return -1 \n",Foffset,E,Ncb);
+    return -1;
+  }
+  //AssertFatal(Foffset <= E,"Foffset %d > E %d\n",Foffset,E); 
+  //AssertFatal(Foffset <= Ncb,"Foffset %d > Ncb %d\n",Foffset,Ncb); 
 
   if (ind >= Foffset && ind < (F+Foffset)) ind = F+Foffset;
 

openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

@@ -1010,8 +1010,8 @@ boolean_t select_pucch_resource(PHY_VARS_NR_UE *ue, NR_UE_MAC_INST_t *mac, uint8
       if (pucch_resource_indicator < MAX_PUCCH_RESOURCE_INDICATOR) {
         /* check if resource indexing by pucch_resource_indicator of this set is compatible */
         if ((ready_pucch_resource_id == TRUE) 
-        || (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator] != NULL)
-        || (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator][0] != MAX_NB_OF_PUCCH_RESOURCES)) {
+        || ((mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator] != NULL)
+        && (mac->ULbwp[bwp_id-1]->bwp_Dedicated->pucch_Config->choice.setup->resourceSetToAddModList->list.array[pucch_resource_set_id]->resourceList.list.array[pucch_resource_indicator][0] != MAX_NB_OF_PUCCH_RESOURCES))) {
 
           if (ready_pucch_resource_id == TRUE) {
             current_resource_id = *resource_id;