From a7b9a856409974fe3387ac553b8319b82ba1b068 Mon Sep 17 00:00:00 2001
From: francescomani <email@francescomani.it>
Date: Mon, 6 Jan 2025 12:06:40 +0100
Subject: [PATCH] move temporary code to process type0 as type1 when the RB
 allocation is contiguous to L1

---
 openair1/SCHED_NR_UE/fapi_nr_ue_l1.c         | 20 ++++++++++++++++++++
 openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c | 18 ------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
index 4ab9167c0a..c6a477a8ee 100644
--- a/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+++ b/openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
@@ -287,6 +287,26 @@ static void configure_dlsch(NR_UE_DLSCH_t *dlsch0,
                             NR_UE_MAC_INST_t *mac,
                             int rnti)
 {
+  // Temporary code to process type0 as type1 when the RB allocation is contiguous
+  if (dlsch_config_pdu->resource_alloc == 0) {
+    dlsch_config_pdu->number_rbs = count_bits(dlsch_config_pdu->rb_bitmap, sizeofArray(dlsch_config_pdu->rb_bitmap));
+    int state = 0;
+    for (int i = 0; i < sizeof(dlsch_config_pdu->rb_bitmap) * 8; i++) {
+      int allocated = dlsch_config_pdu->rb_bitmap[i / 8] & (1 << (i % 8));
+      if (allocated) {
+        if (state == 0) {
+          dlsch_config_pdu->start_rb = i;
+          state = 1;
+        } else
+          AssertFatal(state == 1, "non-contiguous RB allocation in RB allocation type 0 not implemented");
+      } else {
+        if (state == 1) {
+          state = 2;
+        }
+      }
+    }
+  }
+
   const uint8_t current_harq_pid = dlsch_config_pdu->harq_process_nbr;
   dlsch0->active = true;
   dlsch0->rnti = rnti;
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
index 038d699836..272d2b93bd 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
@@ -390,24 +390,6 @@ int8_t nr_ue_process_dci_freq_dom_resource_assignment(nfapi_nr_ue_pusch_pdu_t *p
       const int tmp=(start_DLBWP + n_RB_DLBWP) % P;
       int last_RBG = tmp ? tmp : P;
       writeBit(rb_bitmap, currentBit, last_bit_rbg, last_RBG);
-
-      dlsch_config_pdu->number_rbs = count_bits(dlsch_config_pdu->rb_bitmap, sizeofArray(dlsch_config_pdu->rb_bitmap));
-      // Temporary code to process type0 as type1 when the RB allocation is contiguous
-      int state = 0;
-      for (int i = 0; i < sizeof(dlsch_config_pdu->rb_bitmap) * 8; i++) {
-        int allocated = dlsch_config_pdu->rb_bitmap[i / 8] & (1 << (i % 8));
-        if (allocated) {
-          if (state == 0) {
-            dlsch_config_pdu->start_rb = i;
-            state = 1;
-          } else
-            AssertFatal(state == 1, "non-contiguous RB allocation in RB allocation type 0 not implemented");
-        } else {
-          if (state == 1) {
-            state = 2;
-          }
-        }
-      }
     }
     else if (pdsch_Config &&
              pdsch_Config->resourceAllocation == NR_PDSCH_Config__resourceAllocation_dynamicSwitch)