From 31d9cf59df92c66324ed709f8e4dd3677660010f Mon Sep 17 00:00:00 2001
From: Guy De Souza <desouza@eurecom.fr>
Date: Fri, 30 Nov 2018 11:50:50 +0100
Subject: [PATCH] Warning fixes

---
 openair1/PHY/NR_TRANSPORT/nr_pbch.c      | 44 +-----------------------
 openair1/PHY/NR_TRANSPORT/nr_transport.h |  2 +-
 openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h  |  4 +++
 targets/RT/USER/nr-softmodem.c           |  2 +-
 4 files changed, 7 insertions(+), 45 deletions(-)

diff --git a/openair1/PHY/NR_TRANSPORT/nr_pbch.c b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
index 7aaecdc882..fc8b586688 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_pbch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pbch.c
@@ -149,48 +149,6 @@ int nr_generate_pbch_dmrs(uint32_t *gold_pbch_dmrs,
   return 0;
 }
 
-/*void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
-                        uint32_t Nid,
-                        uint8_t nushift,
-                        uint16_t M,
-                        uint16_t length,
-                        uint8_t encoded,
-                        uint32_t unscrambling_mask)
-{
-  uint8_t reset, offset;
-  uint32_t x1, x2, s=0;
-  uint32_t *pbch_e = pbch->pbch_e;
-
-  reset = 1;
-  // x1 is set in lte_gold_generic
-  x2 = Nid;
-  // The Gold sequence is shifted by nushift* M, so we skip (nushift*M /32) double words
-  for (int i=0; i<CEILIDIV(nushift*M,32); i++) {
-    s = lte_gold_generic(&x1, &x2, reset);
-    reset = 0;
-  }
-  // Scrambling is now done with offset (nushift*M)%32
-  offset = (nushift*M)&0x1f;
-#ifdef DEBUG_PBCH_ENCODING
-  printf("Scrambling params: nushift %d M %d length %d encoded %d offset %d mask 0x%08x\n", nushift, M, length, encoded, offset, unscrambling_mask);
-#endif
-
-  for (int i=0; i<length; i++) {
-    if (((i+offset)&0x1f)==0) {
-      s = lte_gold_generic(&x1, &x2, reset);
-      reset = 0;
-    }
-#ifdef DEBUG_PBCH_ENCODING
-  printf("i %d (i+offset)&0x1f %d s: %04x\n",i, (i+offset)&0x1f, s);
-#endif
-    if (!encoded)
-      pbch->pbch_a_prime ^= ((unscrambling_mask>>i)&1)? ((pbch->pbch_a_interleaved>>i)&1)<<i : (((pbch->pbch_a_interleaved>>i)&1) ^ ((s>>((i+offset)&0x1f))&1))<<i;      
-
-    else
-      pbch_e[i>>5] ^= (((s>>((i+offset)&0x1f))&1)<<(i&0x1f));
-  }
-}*/
-
 void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
                         uint32_t Nid,
                         uint8_t nushift,
@@ -250,7 +208,7 @@ void nr_pbch_scrambling(NR_gNB_PBCH *pbch,
 }
 
 
-uint8_t nr_init_pbch_interleaver(uint8_t *interleaver) {
+void nr_init_pbch_interleaver(uint8_t *interleaver) {
   uint8_t j_sfn=0, j_hrf=10, j_ssb=11, j_other=14;
   memset((void*)interleaver,0, NR_POLAR_PBCH_PAYLOAD_BITS);
 
diff --git a/openair1/PHY/NR_TRANSPORT/nr_transport.h b/openair1/PHY/NR_TRANSPORT/nr_transport.h
index eb25b8da6f..436ec10f79 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_transport.h
+++ b/openair1/PHY/NR_TRANSPORT/nr_transport.h
@@ -104,6 +104,6 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
 @param bit index i of the input payload
 @returns the bit index of the output
  */
-uint8_t nr_init_pbch_interleaver(uint8_t *interleaver);
+void nr_init_pbch_interleaver(uint8_t *interleaver);
 
 #endif /*__NR_TRANSPORT__H__*/
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index c8c006a6b8..1799721325 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -167,4 +167,8 @@ typedef struct gNB_MAC_INST_s {
   time_stats_t schedule_pch;
 } gNB_MAC_INST;
 
+void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
+                                   frame_t       frameP,
+                                   sub_frame_t   subframeP);
+
 #endif /*__LAYER2_NR_MAC_GNB_H__ */
diff --git a/targets/RT/USER/nr-softmodem.c b/targets/RT/USER/nr-softmodem.c
index 481386a7c8..973362f327 100644
--- a/targets/RT/USER/nr-softmodem.c
+++ b/targets/RT/USER/nr-softmodem.c
@@ -191,7 +191,7 @@ int                             otg_enabled;
 
 
 //static NR_DL_FRAME_PARMS      *frame_parms[MAX_NUM_CCs];
-static nfapi_nr_config_request_t *config[MAX_NUM_CCs];
+//static nfapi_nr_config_request_t *config[MAX_NUM_CCs];
 uint32_t target_dl_mcs = 28; //maximum allowed mcs
 uint32_t target_ul_mcs = 20;
 uint32_t timing_advance = 0;