phy: propagate estimated cfo

Author: dvdgrgrtt

include/srsran/phy/upper/channel_estimation.h

@@ -219,10 +219,10 @@ class channel_estimate
 
   /// \brief Gets the general Channel State Information.
   ///
-  /// param[in] csi Channel State Information object where the CSI parameters are stored.
+  /// \param[out] csi Channel State Information object where the CSI parameters are stored.
   void get_channel_state_information(channel_state_information& csi) const
   {
-    // EPRE, RSRP and time alignment are reported as a linear average of the results for all Rx ports.
+    // EPRE and RSRP are reported as a linear average of the results for all Rx ports.
     float    epre_lin      = 0.0F;
     float    rsrp_lin      = 0.0F;
     unsigned best_rx_port  = 0;
@@ -246,9 +246,15 @@ class channel_estimate
     csi.set_epre(convert_power_to_dB(epre_lin));
     csi.set_rsrp(convert_power_to_dB(rsrp_lin));
 
-    // Use the time alignment of the channel path with better SNR.
+    // Use the time alignment of the channel path with best SNR.
     csi.set_time_alignment(get_time_alignment(best_rx_port, 0));
 
+    // Use the CFO of the channel path with best SNR.
+    optional<float> cfo_help = get_cfo_Hz(best_rx_port, 0);
+    if (cfo_help.has_value()) {
+      csi.set_cfo(cfo_help.value());
+    }
+
     // SINR is reported by averaging the signal and noise power contributions of all Rx ports.
     csi.set_sinr_dB(channel_state_information::sinr_type::channel_estimator,
                     convert_power_to_dB(get_layer_average_snr(0)));

include/srsran/phy/upper/channel_processors/pusch/formatters.h

@@ -236,6 +236,7 @@ struct formatter<srsran::channel_state_information> {
       srsran::optional<float>                 rsrp_dB       = csi.get_rsrp_dB();
       srsran::optional<float>                 sinr_dB       = csi.get_sinr_dB();
       srsran::optional<srsran::phy_time_unit> time_aligment = csi.get_time_alignment();
+      srsran::optional<float>                 cfo_Hz        = csi.get_cfo_Hz();
 
       // Print the measurements that are present.
       if (epre_dB.has_value()) {
@@ -258,6 +259,11 @@ struct formatter<srsran::channel_state_information> {
       } else {
         helper.format_if_verbose(ctx, "t_align=na");
       }
+      if (cfo_Hz.has_value()) {
+        helper.format_if_verbose(ctx, "cfo={:.2f}Hz", cfo_Hz.value());
+      } else {
+        helper.format_if_verbose(ctx, "cfo=na");
+      }
     } else {
       // Short representation only prints the SINR selected for CSI reporting to higher layers.
       srsran::optional<float> sinr_dB = csi.get_sinr_dB();
@@ -340,4 +346,4 @@ struct formatter<srsran::pusch_processor_result_control> {
   }
 };
 
-} // namespace fmt
+} // namespace fmt

include/srsran/phy/upper/channel_state_information.h

@@ -158,6 +158,22 @@ class channel_state_information
   /// \return The measured RSRP if present, otherwise \c nullopt.
   optional<float> get_rsrp_dB() const { return rsrp_dB; }
 
+  /// \brief Sets the measured Carrier Frequency Offset (CFO) in hertz.
+  ///
+  /// The CFO value is ignored if NaN.
+  void set_cfo(float cfo_Hz_)
+  {
+    if (std::isnan(cfo_Hz_)) {
+      return;
+    }
+
+    cfo_Hz.emplace(cfo_Hz_);
+  }
+
+  /// \brief Gets the measured Carrier Frequency Offset (CFO) in hertz.
+  /// \return The measured CFO if present, \c nullopt otherwise.
+  optional<float> get_cfo_Hz() const { return cfo_Hz; }
+
 private:
   friend struct fmt::formatter<channel_state_information>;
   /// \brief SINR type that can be accessed by \ref get_sinr_dB.
@@ -179,6 +195,8 @@ class channel_state_information
   optional<float> epre_dB;
   /// Average RSRP in decibels.
   optional<float> rsrp_dB;
+  /// CFO measurement in hertz.
+  optional<float> cfo_Hz;
 };
 
 } // namespace srsran