block ul prbs in map with prbbl

openair2/GNB_APP/gnb_config.c

@@ -675,13 +675,13 @@ void RCconfig_nr_macrlc() {
   config_getlist( &GNBParamList,GNBParams,sizeof(GNBParams)/sizeof(paramdef_t),NULL); 
   char *ulprbbl = *GNBParamList.paramarray[0][GNB_ULPRBBLACKLIST_IDX].strptr; 
   char *pt = strtok(ulprbbl,",");
-  int prbbl[275];
+  uint16_t prbbl[275];
   int num_prbbl=0;
   int prb;
-  memset(prbbl,0,275*sizeof(int));
+  memset(prbbl,0,275*sizeof(uint16_t));
   while (pt) {
     prb=atoi(pt); 
-    prbbl[prb] = 1;
+    prbbl[prb] = 0x3FFF; // all symbols taken
     pt = strtok(NULL,",");
     num_prbbl++;
   }

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -323,7 +323,7 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
     const int num_slots = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
     const int last_slot = (slot + num_slots - 1) % num_slots;
     uint16_t *vrb_map_UL = cc[CC_id].vrb_map_UL;
-    memset(&vrb_map_UL[last_slot * MAX_BWP_SIZE], 0, sizeof(uint16_t) * MAX_BWP_SIZE);
+    memcpy(&vrb_map_UL[last_slot * MAX_BWP_SIZE], &RC.nrmac[module_idP]->ulprbbl, MAX_BWP_SIZE);
 
     clear_nr_nfapi_information(RC.nrmac[module_idP], CC_id, frame, slot);
 

openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h

@@ -697,7 +697,7 @@ typedef struct gNB_MAC_INST_s {
   /// current PDU index (BCH,DLSCH)
   uint16_t pdu_index[NFAPI_CC_MAX];
   int num_ulprbbl;
-  int ulprbbl[275];
+  uint16_t ulprbbl[275];
   /// NFAPI Config Request Structure
   nfapi_nr_config_request_scf_t     config[NFAPI_CC_MAX];
   /// NFAPI DL Config Request Structure