Cleaning up references to LTE in some NR UE functions

- replaced eNB naming with gNB

openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c

@@ -108,7 +108,7 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
   ue->measurements.nb_antennas_rx = frame_parms->nb_antennas_rx;
 
   // signal measurements
-  for (gNB_id = 0; gNB_id < ue->n_connected_eNB; gNB_id++){
+  for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++){
 
     ue->measurements.rx_power_tot[gNB_id] = 0;
 
@@ -140,7 +140,7 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
   // filter to remove jitter
   if (ue->init_averaging == 0) {
 
-    for (gNB_id = 0; gNB_id < ue->n_connected_eNB; gNB_id++)
+    for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++)
       ue->measurements.rx_power_avg[gNB_id] = (int)(((k1*((long long int)(ue->measurements.rx_power_avg[gNB_id]))) + (k2*((long long int)(ue->measurements.rx_power_tot[gNB_id])))) >> 10);
 
     ue->measurements.n0_power_avg = (int)(((k1*((long long int) (ue->measurements.n0_power_avg))) + (k2*((long long int) (ue->measurements.n0_power_tot))))>>10);
@@ -149,7 +149,7 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
 
   } else {
 
-    for (gNB_id = 0; gNB_id < ue->n_connected_eNB; gNB_id++)
+    for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++)
       ue->measurements.rx_power_avg[gNB_id] = ue->measurements.rx_power_tot[gNB_id];
 
     ue->measurements.n0_power_avg = ue->measurements.n0_power_tot;
@@ -157,7 +157,7 @@ void nr_ue_measurements(PHY_VARS_NR_UE *ue,
 
   }
 
-  for (gNB_id = 0; gNB_id < ue->n_connected_eNB; gNB_id++) {
+  for (gNB_id = 0; gNB_id < ue->n_connected_gNB; gNB_id++) {
 
     ue->measurements.rx_power_avg_dB[gNB_id] = dB_fixed( ue->measurements.rx_power_avg[gNB_id]);
     ue->measurements.wideband_cqi_tot[gNB_id] = dB_fixed2(ue->measurements.rx_power_tot[gNB_id], ue->measurements.n0_power_tot);

openair1/PHY/defs_nr_UE.h

@@ -832,8 +832,8 @@ typedef struct {
   int tx_total_RE[NR_MAX_SLOTS_PER_FRAME];
   /// \brief Maximum transmit power
   int8_t tx_power_max_dBm;
-  /// \brief Number of eNB seen by UE
-  uint8_t n_connected_eNB;
+  /// \brief Number of gNB seen by UE
+  uint8_t n_connected_gNB;
   /// \brief indicator that Handover procedure has been initiated
   uint8_t ho_initiated;
   /// \brief indicator that Handover procedure has been triggered

openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

@@ -762,7 +762,7 @@ uint8_t get_downlink_ack(PHY_VARS_NR_UE *ue, uint8_t gNB_id,  UE_nr_rxtx_proc_t
     number_of_code_word = 1;
   }
 
-  if (ue->n_connected_eNB > 1) {
+  if (ue->n_connected_gNB > 1) {
     LOG_E(PHY,"PUCCH ACK feedback is not implemented for mutiple gNB cells : at line %d in function %s of file %s \n", LINE_FILE , __func__, FILE_NAME);
     return (0);
   }

openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c

@@ -232,7 +232,7 @@ int test_pucch_basic_error(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pr
     v_return = -1;
   }
 
-  ue->n_connected_eNB = 2;
+  ue->n_connected_gNB = 2;
 
   printf("\n  => Test : Error due to PUCCH format with multiple cells not already implemented \n");
 
@@ -240,7 +240,7 @@ int test_pucch_basic_error(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pr
     v_return = -1;
   }
 
-  ue->n_connected_eNB = 1;
+  ue->n_connected_gNB = 1;
 
   return (v_return);
 }