1 files changed, 98 insertions, 93 deletions
diff --git a/gr-uhd/lib/usrp_source_impl.h b/gr-uhd/lib/usrp_source_impl.h
index bd5865893..468fe48e0 100644
--- a/gr-uhd/lib/usrp_source_impl.h
+++ b/gr-uhd/lib/usrp_source_impl.h
@@ -30,110 +30,115 @@ static const pmt::pmt_t RATE_KEY = pmt::string_to_symbol("rx_rate");
 static const pmt::pmt_t FREQ_KEY = pmt::string_to_symbol("rx_freq");
 
 namespace gr {
-  namespace uhd {
+namespace uhd {
 
-    inline io_signature::sptr
-    args_to_io_sig(const ::uhd::stream_args_t &args)
-    {
-      const size_t nchan = std::max<size_t>(args.channels.size(), 1);
-      const size_t size = ::uhd::convert::get_bytes_per_item(args.cpu_format);
-      return io_signature::make(nchan, nchan, size);
-    }
+inline io_signature::sptr args_to_io_sig(const ::uhd::stream_args_t& args)
+{
+    const size_t nchan = std::max<size_t>(args.channels.size(), 1);
+    const size_t size = ::uhd::convert::get_bytes_per_item(args.cpu_format);
+    return io_signature::make(nchan, nchan, size);
+}
 
-    /***********************************************************************
-     * UHD Multi USRP Source Impl
-     **********************************************************************/
-    class usrp_source_impl : public usrp_source, public usrp_block_impl
-    {
-    public:
-      usrp_source_impl(const ::uhd::device_addr_t &device_addr,
-                       const ::uhd::stream_args_t &stream_args,
-                       const bool issue_stream_cmd_on_start = true);
-      ~usrp_source_impl();
+/***********************************************************************
+ * UHD Multi USRP Source Impl
+ **********************************************************************/
+class usrp_source_impl : public usrp_source, public usrp_block_impl
+{
+public:
+    usrp_source_impl(const ::uhd::device_addr_t& device_addr,
+                     const ::uhd::stream_args_t& stream_args,
+                     const bool issue_stream_cmd_on_start = true);
+    ~usrp_source_impl();
 
-      // Get Commands
-      ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan);
-      std::string get_subdev_spec(size_t mboard);
-      double get_samp_rate(void);
-      ::uhd::meta_range_t get_samp_rates(void);
-      double get_center_freq(size_t chan);
-      ::uhd::freq_range_t get_freq_range(size_t chan);
-      double get_gain(size_t chan);
-      double get_gain(const std::string &name, size_t chan);
-      double get_normalized_gain(size_t chan);
-      std::vector<std::string> get_gain_names(size_t chan);
-      ::uhd::gain_range_t get_gain_range(size_t chan);
-      ::uhd::gain_range_t get_gain_range(const std::string &name, size_t chan);
-      std::string get_antenna(size_t chan);
-      std::vector<std::string> get_antennas(size_t chan);
-      ::uhd::sensor_value_t get_sensor(const std::string &name, size_t chan);
-      std::vector<std::string> get_sensor_names(size_t chan);
-      ::uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan);
-      std::vector<std::string> get_lo_names(size_t chan);
-      const std::string get_lo_source(const std::string &name, size_t chan);
-      std::vector<std::string> get_lo_sources(const std::string &name, size_t chan);
-      bool get_lo_export_enabled(const std::string &name, size_t chan);
-      double get_lo_freq(const std::string &name, size_t chan);
-      ::uhd::freq_range_t get_lo_freq_range(const std::string &name, size_t chan);
+    // Get Commands
+    ::uhd::dict<std::string, std::string> get_usrp_info(size_t chan);
+    std::string get_subdev_spec(size_t mboard);
+    double get_samp_rate(void);
+    ::uhd::meta_range_t get_samp_rates(void);
+    double get_center_freq(size_t chan);
+    ::uhd::freq_range_t get_freq_range(size_t chan);
+    double get_gain(size_t chan);
+    double get_gain(const std::string& name, size_t chan);
+    double get_normalized_gain(size_t chan);
+    std::vector<std::string> get_gain_names(size_t chan);
+    ::uhd::gain_range_t get_gain_range(size_t chan);
+    ::uhd::gain_range_t get_gain_range(const std::string& name, size_t chan);
+    std::string get_antenna(size_t chan);
+    std::vector<std::string> get_antennas(size_t chan);
+    ::uhd::sensor_value_t get_sensor(const std::string& name, size_t chan);
+    std::vector<std::string> get_sensor_names(size_t chan);
+    ::uhd::usrp::dboard_iface::sptr get_dboard_iface(size_t chan);
+    std::vector<std::string> get_lo_names(size_t chan);
+    const std::string get_lo_source(const std::string& name, size_t chan);
+    std::vector<std::string> get_lo_sources(const std::string& name, size_t chan);
+    bool get_lo_export_enabled(const std::string& name, size_t chan);
+    double get_lo_freq(const std::string& name, size_t chan);
+    ::uhd::freq_range_t get_lo_freq_range(const std::string& name, size_t chan);
 
-      // Set Commands
-      void set_subdev_spec(const std::string &spec, size_t mboard);
-      void set_samp_rate(double rate);
-      ::uhd::tune_result_t set_center_freq(const ::uhd::tune_request_t tune_request,
+    // Set Commands
+    void set_subdev_spec(const std::string& spec, size_t mboard);
+    void set_samp_rate(double rate);
+    ::uhd::tune_result_t set_center_freq(const ::uhd::tune_request_t tune_request,
                                          size_t chan);
-      void set_gain(double gain, size_t chan);
-      void set_gain(double gain, const std::string &name, size_t chan);
-      void set_rx_agc(const bool enable, size_t chan);
-      void set_normalized_gain(double gain, size_t chan);
-      void set_antenna(const std::string &ant, size_t chan);
-      void set_bandwidth(double bandwidth, size_t chan);
-      double get_bandwidth(size_t chan);
-      ::uhd::freq_range_t get_bandwidth_range(size_t chan);
-      void set_auto_dc_offset(const bool enable, size_t chan);
-      void set_dc_offset(const std::complex<double> &offset, size_t chan);
-      void set_auto_iq_balance(const bool enable, size_t chan);
-      void set_iq_balance(const std::complex<double> &correction, size_t chan);
-      void set_stream_args(const ::uhd::stream_args_t &stream_args);
-      void set_start_time(const ::uhd::time_spec_t &time);
-      void set_lo_source(const std::string &src, const std::string &name = ALL_LOS, size_t chan = 0);
-      void set_lo_export_enabled(bool enabled, const std::string &name = ALL_LOS, size_t chan = 0);
-      double set_lo_freq(double freq, const std::string &name, size_t chan);
+    void set_gain(double gain, size_t chan);
+    void set_gain(double gain, const std::string& name, size_t chan);
+    void set_rx_agc(const bool enable, size_t chan);
+    void set_normalized_gain(double gain, size_t chan);
+    void set_antenna(const std::string& ant, size_t chan);
+    void set_bandwidth(double bandwidth, size_t chan);
+    double get_bandwidth(size_t chan);
+    ::uhd::freq_range_t get_bandwidth_range(size_t chan);
+    void set_auto_dc_offset(const bool enable, size_t chan);
+    void set_dc_offset(const std::complex<double>& offset, size_t chan);
+    void set_auto_iq_balance(const bool enable, size_t chan);
+    void set_iq_balance(const std::complex<double>& correction, size_t chan);
+    void set_stream_args(const ::uhd::stream_args_t& stream_args);
+    void set_start_time(const ::uhd::time_spec_t& time);
+    void set_lo_source(const std::string& src,
+                       const std::string& name = ALL_LOS,
+                       size_t chan = 0);
+    void set_lo_export_enabled(bool enabled,
+                               const std::string& name = ALL_LOS,
+                               size_t chan = 0);
+    double set_lo_freq(double freq, const std::string& name, size_t chan);
 
-      void issue_stream_cmd(const ::uhd::stream_cmd_t &cmd);
-      void set_recv_timeout(const double timeout, const bool one_packet);
-      void flush(void);
-      bool start(void);
-      bool stop(void);
-      std::vector<std::complex<float> > finite_acquisition(const size_t nsamps);
-      std::vector<std::vector<std::complex<float> > > finite_acquisition_v(const size_t nsamps);
-      int work(int noutput_items,
-               gr_vector_const_void_star &input_items,
-               gr_vector_void_star &output_items);
+    void issue_stream_cmd(const ::uhd::stream_cmd_t& cmd);
+    void set_recv_timeout(const double timeout, const bool one_packet);
+    void flush(void);
+    bool start(void);
+    bool stop(void);
+    std::vector<std::complex<float>> finite_acquisition(const size_t nsamps);
+    std::vector<std::vector<std::complex<float>>>
+    finite_acquisition_v(const size_t nsamps);
+    int work(int noutput_items,
+             gr_vector_const_void_star& input_items,
+             gr_vector_void_star& output_items);
 
-      void setup_rpc();
+    void setup_rpc();
 
-    private:
-      //! Like set_center_freq(), but uses _curr_freq and _curr_lo_offset
-      ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan, pmt::pmt_t direction);
-      void _cmd_handler_tag(const pmt::pmt_t &tag);
+private:
+    //! Like set_center_freq(), but uses _curr_freq and _curr_lo_offset
+    ::uhd::tune_result_t _set_center_freq_from_internals(size_t chan,
+                                                         pmt::pmt_t direction);
+    void _cmd_handler_tag(const pmt::pmt_t& tag);
 
-      ::uhd::rx_streamer::sptr _rx_stream;
-      size_t _samps_per_packet;
-      //! Timeout value for UHD's recv() call. Lower values mean lower latency.
-      double _recv_timeout;
-      //! one_packet value for UHD's recv() call. 'true' is lower latency.
-      bool _recv_one_packet;
+    ::uhd::rx_streamer::sptr _rx_stream;
+    size_t _samps_per_packet;
+    //! Timeout value for UHD's recv() call. Lower values mean lower latency.
+    double _recv_timeout;
+    //! one_packet value for UHD's recv() call. 'true' is lower latency.
+    bool _recv_one_packet;
 
-      bool _tag_now;
-      ::uhd::rx_metadata_t _metadata;
-      pmt::pmt_t _id;
-      bool _issue_stream_cmd_on_start;
+    bool _tag_now;
+    ::uhd::rx_metadata_t _metadata;
+    pmt::pmt_t _id;
+    bool _issue_stream_cmd_on_start;
 
-      //tag shadows
-      double _samp_rate;
+    // tag shadows
+    double _samp_rate;
 
-      boost::recursive_mutex d_mutex;
-    };
+    boost::recursive_mutex d_mutex;
+};
 
-  } /* namespace uhd */
+} /* namespace uhd */
 } /* namespace gr */