From 2ffceb333cec7a0befcf7ee5931e65a52ff97d09 Mon Sep 17 00:00:00 2001
From: francescomani <francesco.mani@eurecom.fr>
Date: Fri, 21 May 2021 18:19:16 +0200
Subject: [PATCH] function for SR periodicity in mac common

---
 openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c | 60 +++++++++++++++++
 openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h |  2 +
 .../LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c     | 64 +------------------
 openair2/LAYER2/NR_MAC_gNB/mac_proto.h        |  4 --
 4 files changed, 63 insertions(+), 67 deletions(-)

diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
index cb5ee8fee3..1801098ffc 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -3537,6 +3537,66 @@ void get_type0_PDCCH_CSS_config_parameters(NR_Type0_PDCCH_CSS_config_t *type0_PD
 
 }
 
+void find_period_offest_SR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRec, int *period, int *offset) {
+  NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR P_O = SchedulingReqRec->periodicityAndOffset->present;
+  switch (P_O){
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl1:
+      *period = 1;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl1;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl2:
+      *period = 2;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl2;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl4:
+      *period = 4;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl4;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl5:
+      *period = 5;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl5;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl8:
+      *period = 8;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl8;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl10:
+      *period = 10;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl10;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl16:
+      *period = 16;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl16;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl20:
+      *period = 20;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl20;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl40:
+      *period = 40;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl40;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl80:
+      *period = 80;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl80;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl160:
+      *period = 160;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl160;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl320:
+      *period = 320;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl320;
+      break;
+    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl640:
+      *period = 640;
+      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl640;
+      break;
+    default:
+      AssertFatal(1==0,"No periodicityAndOffset resources found in schedulingrequestresourceconfig");
+  }
+}
+
 uint16_t compute_pucch_prb_size(uint8_t format,
                                 uint8_t nr_prbs,
                                 uint16_t O_tot,
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
index cb3d25352b..088a82d210 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
@@ -150,6 +150,8 @@ uint16_t compute_pucch_prb_size(uint8_t format,
 
 int16_t get_N_RA_RB (int delta_f_RA_PRACH,int delta_f_PUSCH);
 
+void find_period_offest_SR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRec, int *period, int *offset);
+
 bool set_dl_ptrs_values(NR_PTRS_DownlinkConfig_t *ptrs_config,
                         uint16_t rbSize, uint8_t mcsIndex, uint8_t mcsTable,
                         uint8_t *K_ptrs, uint8_t *L_ptrs,uint8_t *portIndex,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
index d20a8b6fa0..8264b76856 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -1387,7 +1387,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
 
       int SR_period; int SR_offset;
 
-      periodicity__SRR(SchedulingRequestResourceConfig,&SR_period,&SR_offset);
+      find_period_offest_SR(SchedulingRequestResourceConfig,&SR_period,&SR_offset);
       // convert to int to avoid underflow of uint
       int sfn_sf = SFN * n_slots_frame + slot;
       if ((sfn_sf - SR_offset) % SR_period != 0)
@@ -1456,65 +1456,3 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
   }
 }
 
-
-void periodicity__SRR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRec, int *period, int *offset)
-{
-  NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR P_O = SchedulingReqRec->periodicityAndOffset->present;
-  switch (P_O){
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl1:
-      *period = 1;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl1;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl2:
-      *period = 2;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl2;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl4:
-      *period = 4;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl4;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl5:
-      *period = 5;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl5;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl8:
-      *period = 8;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl8;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl10:
-      *period = 10;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl10;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl16:
-      *period = 16;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl16;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl20:
-      *period = 20;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl20;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl40:
-      *period = 40;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl40;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl80:
-      *period = 80;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl80;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl160:
-      *period = 160;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl160;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl320:
-      *period = 320;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl320;
-      break;
-    case NR_SchedulingRequestResourceConfig__periodicityAndOffset_PR_sl640:
-      *period = 640;
-      *offset = SchedulingReqRec->periodicityAndOffset->choice.sl640;
-      break;
-    default:
-      AssertFatal(1==0,"No periodicityAndOffset resources found in schedulingrequestresourceconfig");
-  }
-}
-
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 9dfeae67d6..5734820aaa 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -416,8 +416,4 @@ bool nr_find_nb_rb(uint16_t Qm,
 
 void nr_sr_reporting(int Mod_idP, frame_t frameP, sub_frame_t slotP);
 
-void periodicity__SRR (NR_SchedulingRequestResourceConfig_t *SchedulingReqRecconf,
-                       int *period,
-                       int *offset);
-
 #endif /*__LAYER2_NR_MAC_PROTO_H__*/