From 0df80e648a53b8e00f6ee59126df97f889c2173e Mon Sep 17 00:00:00 2001
From: Guido Casati <guido.casati@iis.fraunhofer.de>
Date: Wed, 29 Sep 2021 09:04:25 +0200
Subject: [PATCH] Replaced lcid_mask with arrays logic

- this will be later used to prioritise the LCs
---
 openair2/LAYER2/NR_MAC_gNB/config.c           | 47 ++++++++++++++-----
 .../LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c |  1 -
 .../NR_MAC_gNB/gNB_scheduler_primitives.c     |  1 +
 openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h       |  2 -
 4 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index 19c82c71df..27dc7df94f 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -58,19 +58,42 @@ void process_rlcBearerConfig(struct NR_CellGroupConfig__rlc_BearerToAddModList *
                              struct NR_CellGroupConfig__rlc_BearerToReleaseList *rlc_bearer2release_list,
                              NR_UE_sched_ctrl_t *sched_ctrl) {
 
-
-  if (rlc_bearer2add_list)
-  // keep lcids
-    for (int i=0;i<rlc_bearer2add_list->list.count;i++) {
-      sched_ctrl->lcid_mask |= (1<<rlc_bearer2add_list->list.array[i]->logicalChannelIdentity);
-      LOG_I(NR_MAC,"Adding LCID %d (%s %d)\n",
-            (int)rlc_bearer2add_list->list.array[i]->logicalChannelIdentity,
-            rlc_bearer2add_list->list.array[i]->logicalChannelIdentity<4 ? "SRB" : "DRB",
-            (int)rlc_bearer2add_list->list.array[i]->logicalChannelIdentity);
+  if (rlc_bearer2release_list) {
+    for (int i = 0; i < rlc_bearer2release_list->list.count; i++) {
+      for (int idx = 0; idx < sched_ctrl->dl_lc_num; idx++) {
+        if (sched_ctrl->dl_lc_ids[idx] == *rlc_bearer2release_list->list.array[i]) {
+          const int remaining_lcs = sched_ctrl->dl_lc_num - idx - 1;
+          memmove(&sched_ctrl->dl_lc_ids[idx], &sched_ctrl->dl_lc_ids[idx + 1], sizeof(sched_ctrl->dl_lc_ids[idx]) * remaining_lcs);
+          sched_ctrl->dl_lc_num--;
+          break;
+        }
+      }
     }
-  if (rlc_bearer2release_list)
-    for (int i=0;i<rlc_bearer2release_list->list.count;i++)
-      sched_ctrl->lcid_mask |= (1<<*rlc_bearer2release_list->list.array[i]);
+  }
+
+  if (rlc_bearer2add_list) {
+    // keep lcids
+    for (int i = 0; i < rlc_bearer2add_list->list.count; i++) {
+      const int lcid = rlc_bearer2add_list->list.array[i]->logicalChannelIdentity;
+      bool found = false;
+      for (int idx = 0; idx < sched_ctrl->dl_lc_num; idx++) {
+        if (sched_ctrl->dl_lc_ids[idx] == lcid) {
+          found = true;
+          break;
+        }
+      }
+
+      if (!found) {
+        sched_ctrl->dl_lc_num++;
+        sched_ctrl->dl_lc_ids[sched_ctrl->dl_lc_num - 1] = lcid;
+        LOG_D(NR_MAC, "Adding LCID %d (%s %d)\n", lcid, lcid < 4 ? "SRB" : "DRB", lcid);
+      }
+    }
+  }
+
+  LOG_D(NR_MAC, "In %s: total num of active bearers %d) \n",
+      __FUNCTION__,
+      sched_ctrl->dl_lc_num);
 
 }
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index fddf084a38..61cc2c505f 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -329,7 +329,6 @@ void nr_preprocessor_phytest(module_id_t module_id,
                                                     0,
                                                     0);
   sched_ctrl->num_total_bytes += sched_ctrl->rlc_status[lcid].bytes_in_buffer;
-  sched_ctrl->lcid_to_schedule = lcid;
 
   uint8_t nr_of_candidates;
   for (int i=0; i<5; i++) {
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 721f67295b..b76a781491 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -2152,6 +2152,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
     if (!get_softmodem_params()->phy_test && !get_softmodem_params()->do_ra && !get_softmodem_params()->sa) {
       sched_ctrl->lcid_mask = 1<<DL_SCH_LCID_DTCH;
     }
+    sched_ctrl->dl_lc_num = 0;
     sched_ctrl->ta_frame = 0;
     sched_ctrl->ta_update = 31;
     sched_ctrl->ta_apply = false;
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index 2745a4c46a..b6364c6d15 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -604,8 +604,6 @@ typedef struct {
   /// Estimation of HARQ from BLER
   NR_DL_bler_stats_t dl_bler_stats;
 
-  int lcid_mask;
-  int lcid_to_schedule;
   uint16_t ta_frame;
   int16_t ta_update;
   bool ta_apply;