Fix warnings after merge with develop

openair1/PHY/INIT/nr_init_ue.c

@@ -20,23 +20,14 @@
  */
 
 #include "phy_init.h"
-#include "SCHED_UE/sched_UE.h"
 #include "PHY/phy_extern_nr_ue.h"
-//#include "SIMULATION/TOOLS/sim.h"
-/*#include "RadioResourceConfigCommonSIB.h"
-#include "RadioResourceConfigDedicated.h"
-#include "TDD-Config.h"
-#include "MBSFN-SubframeConfigList.h"*/
 #include "openair1/PHY/defs_RU.h"
 #include "openair1/PHY/impl_defs_nr.h"
 #include "common/utils/LOG/vcd_signal_dumper.h"
 #include "assertions.h"
-#include <math.h>
+#include "PHY/MODULATION/nr_modulation.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_ue.h"
 #include "PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h"
-//#include "PHY/LTE_REFSIG/lte_refsig.h"
-#include "PHY/CODING/nrPolar_tools/nr_polar_pbch_defs.h"
-#include "PHY/INIT/phy_init.h"
 #include "PHY/NR_REFSIG/pss_nr.h"
 #include "PHY/NR_REFSIG/ul_ref_seq_nr.h"
 #include "PHY/NR_REFSIG/refsig_defs_ue.h"

openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c

@@ -44,15 +44,14 @@ void pcfich_unscrambling(LTE_DL_FRAME_PARMS *frame_parms,
                          int16_t *d)
 {
 
-  uint32_t i;
-  uint8_t reset;
-  uint32_t x1, x2, s=0;
+  uint8_t reset = 1;
+  uint32_t x1 = 0;
+  uint32_t s = 0;
 
-  reset = 1;
   // x1 is set in lte_gold_generic
-  x2 = ((((2*frame_parms->Nid_cell)+1)*(1+subframe))<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.7.1
+  uint32_t x2 = ((((2*frame_parms->Nid_cell)+1)*(1+subframe))<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.7.1
 
-  for (i=0; i<32; i++) {
+  for (uint32_t i=0; i<32; i++) {
     if ((i&0x1f)==0) {
       s = lte_gold_generic(&x1, &x2, reset);
       //printf("lte_gold[%d]=%x\n",i,s);

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf

@@ -35,6 +35,7 @@ gNBs =
     ssb_SubcarrierOffset                                      = 0;
     pdsch_AntennaPorts                                        = 1;
     pusch_AntennaPorts                                        = 1;
+    min_rxtxtime                                              = 6;
     sib1_tda                                                  = 0;
 
      pdcch_ConfigSIB1 = (
@@ -66,7 +67,7 @@ gNBs =
      #initialDownlinkBWP
       #genericParameters
         # this is RBstart=27,L=48 (275*(L-1))+RBstart
-        initialDLBWPlocationAndBandwidth                               = 12952; # 6366 12925 12956 28875 12952
+        initialDLBWPlocationAndBandwidth                               = 28875; # 6366 12925 12956 28875 12952
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialDLBWPsubcarrierSpacing                                   = 1;
@@ -86,7 +87,7 @@ gNBs =
       pMax                                                          = 20;
      #initialUplinkBWP
       #genericParameters
-        initialULBWPlocationAndBandwidth                            = 12952;
+        initialULBWPlocationAndBandwidth                            = 28875;
 # subcarrierSpacing
 # 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
         initialULBWPsubcarrierSpacing                               = 1;
@@ -218,7 +219,7 @@ L1s = (
 {
   num_cc = 1;
   tr_n_preference       = "local_mac";
-  pusch_proc_threads    = 8;
+  pusch_proc_threads    = 4;
   prach_dtx_threshold   = 120;
   pucch0_dtx_threshold  = 150;
   ofdm_offset_divisor   = 8; #set this to UINT_MAX for offset 0
@@ -296,5 +297,7 @@ log_config :
   rrc_log_verbosity                     ="medium";
   ngap_log_level                        ="debug";
   ngap_log_verbosity                    ="medium";
+  f1ap_log_level                        ="debug";
+  f1ap_log_verbosity                    ="medium";
 };