From a28c6e7c9f7d53b14eea55d234931c2f02f22f72 Mon Sep 17 00:00:00 2001
From: Eurecom <raymond.knopp@eurecom.fr>
Date: Fri, 8 Oct 2021 21:21:28 +0200
Subject: [PATCH] MAC support for prb blacklisting
---
openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c | 2 +-
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
index 157c9533d00..73b8660e83a 100644
--- a/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
+++ b/openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
@@ -84,7 +84,7 @@ void dump_nr_I0_stats(FILE *fd,PHY_VARS_gNB *gNB) {
for (int i=0; i<gNB->frame_parms.N_RB_UL; i++) {
if (gNB->ulprbbl[i] ==0) fprintf(fd,"%2d.",gNB->measurements.n0_subband_power_tot_dB[i]-gNB->measurements.n0_subband_power_avg_dB);
- else fprintf(fd,"X .");
+ else fprintf(fd," X.");
if (i%25 == 24) fprintf(fd,"\n");
}
fprintf(fd,"\n");
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index ec57befd717..03c0bbe7777 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -1322,6 +1322,7 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
int st = 0, e = 0, len = 0;
for (int i = 0; i < bwpSize; i++) {
+ if (RC.nrmac[module_id]->ulprbbl[i] == 1) vrb_map_UL[i]=1;
while ((vrb_map_UL[i] & symb) != 0 && i < bwpSize)
i++;
st = i;
--
GitLab