for push to OSA git

ci-scripts/conf_files/gnb.band78.tm1.fr1.106PRB.usrpb210.conf

@@ -199,7 +199,7 @@ gNBs =
 
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "127.0.0.20";
+    mme_ip_address      = ( { ipv4       = "CI_MME_IP_ADDR";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
@@ -213,7 +213,7 @@ gNBs =
     t_dc_prep         = 1000;      /* unit: millisecond */
     t_dc_overall      = 2000;      /* unit: millisecond */
     target_enb_x2_ip_address      = (
-                                     { ipv4       = "127.0.0.10";
+                                     { ipv4       = "CI_FR1_CTL_ENB_IP_ADDR";
                                        ipv6       = "192:168:30::17";
                                        preference = "ipv4";
                                      }
@@ -223,11 +223,11 @@ gNBs =
     {
 
         GNB_INTERFACE_NAME_FOR_S1_MME            = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1_MME              = "127.0.0.10";
+        GNB_IPV4_ADDRESS_FOR_S1_MME              = "CI_GNB_IP_ADDR";
         GNB_INTERFACE_NAME_FOR_S1U               = "eth0";
-        GNB_IPV4_ADDRESS_FOR_S1U                 = "127.0.0.10";
+        GNB_IPV4_ADDRESS_FOR_S1U                 = "CI_GNB_IP_ADDR";
         GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
-        GNB_IPV4_ADDRESS_FOR_X2C                 = "127.0.0.10";
+        GNB_IPV4_ADDRESS_FOR_X2C                 = "CI_GNB_IP_ADDR";
         GNB_PORT_FOR_X2C                         = 36422; # Spec 36422
     };
   }
@@ -259,7 +259,7 @@ RUs = (
          max_pdschReferenceSignalPower = -27;
          max_rxgain                    = 114;
          eNB_instances  = [0];
-         clock_src = "internal";
+         clock_src = "external";
     }
 );  
 
@@ -277,7 +277,7 @@ THREAD_STRUCT = (
      {
        global_log_level                      ="info";
        global_log_verbosity                  ="medium";
-       hw_log_level                          ="debug";
+       hw_log_level                          ="info";
        hw_log_verbosity                      ="medium";
        phy_log_level                         ="info";
        phy_log_verbosity                     ="medium";
@@ -290,6 +290,7 @@ THREAD_STRUCT = (
        rrc_log_level                         ="info";
        rrc_log_verbosity                     ="medium";
     };
+
 uicc: {
 opc = "testopc";
 };

executables/ocp-gnb.c

@@ -93,6 +93,8 @@ time_stats_t softmodem_stats_hw; //  hw acquisition
 time_stats_t softmodem_stats_rxtx_sf; // total tx time
 time_stats_t nfapi_meas; // total tx time
 time_stats_t softmodem_stats_rx_sf; // total rx time
+// not used but needed for link
+openair0_config_t openair0_cfg[MAX_CARDS];
 
 AGENT_RRC_xface *agent_rrc_xface[NUM_MAX_ENB];
 AGENT_MAC_xface *agent_mac_xface[NUM_MAX_ENB];

openair1/PHY/INIT/nr_init.c

@@ -479,7 +479,7 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
 
   AssertFatal(fp->ul_CarrierFreq==(fp->dl_CarrierFreq+dlul_offset), "Disagreement in uplink frequency for band %d\n", fp->nr_band);
   
-  //fp->threequarter_fs = openair0_cfg[0].threequarter_fs;
+  fp->threequarter_fs = openair0_cfg[0].threequarter_fs;
   LOG_I(PHY,"Configuring MIB for instance %d, : (Nid_cell %d,DL freq %llu, UL freq %llu)\n",
         Mod_id,
         gNB_config->cell_config.phy_cell_id.value,

openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c

@@ -346,7 +346,7 @@ uint32_t nr_ulsch_decoding(PHY_VARS_gNB *gNB,
     printf("ulsch_decoding.c: NULL ulsch_llr pointer\n");
     return (ulsch->max_ldpc_iterations + 1);
   }
-  //log_dump(PHY,ulsch_llr, 32, LOG_DUMP_CHAR, "ul llr");
+
   if (!frame_parms) {
     printf("ulsch_decoding.c: NULL frame_parms pointer\n");
     return (ulsch->max_ldpc_iterations + 1);

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -693,8 +693,8 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
              pdsch_vars[eNB_id]->llr_length[symbol],
              pdsch_vars[eNB_id]->llr_offset[symbol],
 	     signal_energy(pdsch_vars[eNB_id]->rxdataF_comp0[0], 7*2*frame_parms->N_RB_DL*12));
-   //if (ue->current_thread_id[nr_tti_rx] ==0 )          
-   //phy_scope_nrUE(NULL, ue, 0, 0, 0);
+
+
              /*printf("compute LLRs [symbol %d] NbRB %d Qm %d LLRs-Length %d LLR-Offset %d @LLR Buff %p @LLR Buff(symb) %p\n",
              symbol,
              nb_rb,dlsch0_harq->Qm,

openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c

@@ -203,6 +203,7 @@ int pdcp_fifo_flush_mbms_sdus(const protocol_ctxt_t *const  ctxt_pP) {
 
     //AssertFatal(ret >= 0,"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s)\n", errno, strerror(errno));
 
+    //AssertFatal(ret >= 0,"[PDCP_FIFOS] pdcp_fifo_flush_sdus (errno: %d %s)\n", errno, strerror(errno));
     delNotifiedFIFO_elt (sdu_p);
     pdcp_nb_sdu_sent ++;
   }