diff options
author | Tom Rondeau | 2012-04-13 18:36:53 -0400 |
---|---|---|
committer | Tom Rondeau | 2012-04-13 18:36:53 -0400 |
commit | f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2 (patch) | |
tree | 7e846386b9eb1676f9a93fc4a1e55916b9accc97 /gr-shd/lib | |
parent | 6a1e9783fec6ed827f49db27c171591d30f32933 (diff) | |
download | gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.tar.gz gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.tar.bz2 gnuradio-f919f9dcbb54a08e6e26d6c229ce92fb784fa1b2.zip |
Removed whitespace and added dtools/bin/remove-whitespace as a tool to do this in the future.
The sed script was provided by Moritz Fischer.
Diffstat (limited to 'gr-shd/lib')
-rw-r--r-- | gr-shd/lib/CMakeLists.txt | 8 | ||||
-rw-r--r-- | gr-shd/lib/gr_shd_smini_sink.cc | 78 | ||||
-rw-r--r-- | gr-shd/lib/gr_shd_smini_source.cc | 38 |
3 files changed, 62 insertions, 62 deletions
diff --git a/gr-shd/lib/CMakeLists.txt b/gr-shd/lib/CMakeLists.txt index e8528fddb..9ddf109af 100644 --- a/gr-shd/lib/CMakeLists.txt +++ b/gr-shd/lib/CMakeLists.txt @@ -1,17 +1,17 @@ # Copyright 2011 Free Software Foundation, Inc. -# +# # This file is part of GNU Radio -# +# # GNU Radio is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3, or (at your option) # any later version. -# +# # GNU Radio is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with GNU Radio; see the file COPYING. If not, write to # the Free Software Foundation, Inc., 51 Franklin Street, diff --git a/gr-shd/lib/gr_shd_smini_sink.cc b/gr-shd/lib/gr_shd_smini_sink.cc index c9fb222d0..658f5719e 100644 --- a/gr-shd/lib/gr_shd_smini_sink.cc +++ b/gr-shd/lib/gr_shd_smini_sink.cc @@ -1,18 +1,18 @@ /* * Copyright 2011 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -52,11 +52,11 @@ public: _dev->set_tx_rate(rate); _sample_rate = this->get_samp_rate(); } - + double get_samp_rate(void){ return _dev->get_tx_rate(); } - + shd::tune_result_t set_center_freq( const shd::tune_request_t tune_request, size_t chan) { @@ -67,142 +67,142 @@ public: { return _dev->get_tx_freq(chan); } - + shd::freq_range_t get_freq_range(size_t chan) { return _dev->get_tx_freq_range(chan); } - + void set_gain(double gain, size_t chan) { return _dev->set_tx_gain(gain, chan); } - + void set_gain(double gain, const std::string &name, size_t chan) { return _dev->set_tx_gain(gain, name, chan); } - + double get_gain(size_t chan){ return _dev->get_tx_gain(chan); } - + double get_gain(const std::string &name, size_t chan) { return _dev->get_tx_gain(name, chan); } - + std::vector<std::string> get_gain_names(size_t chan) { return _dev->get_tx_gain_names(chan); } - + shd::gain_range_t get_gain_range(size_t chan) { return _dev->get_tx_gain_range(chan); } - + shd::gain_range_t get_gain_range(const std::string &name, size_t chan) { return _dev->get_tx_gain_range(name, chan); } - + void set_antenna(const std::string &ant, size_t chan) { return _dev->set_tx_antenna(ant, chan); } - + std::string get_antenna(size_t chan) { return _dev->get_tx_antenna(chan); } - + std::vector<std::string> get_antennas(size_t chan) { return _dev->get_tx_antennas(chan); } - + void set_bandwidth(double bandwidth, size_t chan) { return _dev->set_tx_bandwidth(bandwidth, chan); } - + shd::sensor_value_t get_dboard_sensor(const std::string &name, size_t chan) { return _dev->get_tx_sensor(name, chan); } - + std::vector<std::string> get_dboard_sensor_names(size_t chan) { return _dev->get_tx_sensor_names(chan); } - + shd::sensor_value_t get_mboard_sensor(const std::string &name, size_t mboard) { return _dev->get_mboard_sensor(name, mboard); } - + std::vector<std::string> get_mboard_sensor_names(size_t mboard) { return _dev->get_mboard_sensor_names(mboard); } - + void set_clock_config(const shd::clock_config_t &clock_config, size_t mboard) { return _dev->set_clock_config(clock_config, mboard); } - + double get_clock_rate(size_t mboard) { return _dev->get_master_clock_rate(mboard); } - + void set_clock_rate(double rate, size_t mboard) { return _dev->set_master_clock_rate(rate, mboard); } - + shd::time_spec_t get_time_now(size_t mboard = 0) { return _dev->get_time_now(mboard); } - + shd::time_spec_t get_time_last_pps(size_t mboard) { return _dev->get_time_last_pps(mboard); } - + void set_time_now(const shd::time_spec_t &time_spec, size_t mboard) { return _dev->set_time_now(time_spec, mboard); } - + void set_time_next_pps(const shd::time_spec_t &time_spec) { return _dev->set_time_next_pps(time_spec); } - + void set_time_unknown_pps(const shd::time_spec_t &time_spec) { return _dev->set_time_unknown_pps(time_spec); } - + shd::xmini::dboard_iface::sptr get_dboard_iface(size_t chan) { return _dev->get_tx_dboard_iface(chan); } - + shd::xmini::multi_xmini::sptr get_device(void) { return _dev; } - + /******************************************************************* * Work ******************************************************************/ @@ -214,7 +214,7 @@ public: _metadata.start_of_burst = false; _metadata.end_of_burst = false; _metadata.has_time_spec = _has_time_spec; - + size_t num_sent = _dev->get_device()->send( input_items, noutput_items, _metadata, _type, shd::device::SEND_MODE_FULL_BUFF, 1.0); @@ -223,7 +223,7 @@ public: _metadata.time_spec += shd::time_spec_t(0, num_sent, _sample_rate); return num_sent; } - + //Send an empty start-of-burst packet to begin streaming. //Set at a time in the near future to avoid late packets. bool start(void) @@ -232,13 +232,13 @@ public: _metadata.end_of_burst = false; _metadata.has_time_spec = _has_time_spec; _metadata.time_spec = get_time_now() + shd::time_spec_t(0.01); - + _dev->get_device()->send( gr_vector_const_void_star(_nchan), 0, _metadata, _type, shd::device::SEND_MODE_ONE_PACKET, 1.0); return true; } - + //Send an empty end-of-burst packet to end streaming. //Ending the burst avoids an underflow error on stop. bool stop(void) @@ -246,13 +246,13 @@ public: _metadata.start_of_burst = false; _metadata.end_of_burst = true; _metadata.has_time_spec = false; - + _dev->get_device()->send( gr_vector_const_void_star(_nchan), 0, _metadata, _type, shd::device::SEND_MODE_ONE_PACKET, 1.0); return true; } - + protected: shd::xmini::multi_xmini::sptr _dev; const shd::io_type_t _type; diff --git a/gr-shd/lib/gr_shd_smini_source.cc b/gr-shd/lib/gr_shd_smini_source.cc index caf98f311..58559a623 100644 --- a/gr-shd/lib/gr_shd_smini_source.cc +++ b/gr-shd/lib/gr_shd_smini_source.cc @@ -1,18 +1,18 @@ /* * Copyright 2011 Free Software Foundation, Inc. - * + * * This file is part of GNU Radio - * + * * GNU Radio is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3, or (at your option) * any later version. - * + * * GNU Radio is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with GNU Radio; see the file COPYING. If not, write to * the Free Software Foundation, Inc., 51 Franklin Street, @@ -48,7 +48,7 @@ public: { _dev = shd::xmini::multi_xmini::make(device_addr); } - + void set_subdev_spec(const std::string &spec, size_t mboard) { return _dev->set_rx_subdev_spec(spec, mboard); @@ -85,7 +85,7 @@ public: return _dev->set_rx_gain(gain, chan); } - void set_gain(double gain, const std::string &name, + void set_gain(double gain, const std::string &name, size_t chan) { return _dev->set_rx_gain(gain, name, chan); @@ -100,7 +100,7 @@ public: { return _dev->get_rx_gain(name, chan); } - + std::vector<std::string> get_gain_names(size_t chan) { return _dev->get_rx_gain_names(chan); @@ -111,7 +111,7 @@ public: return _dev->get_rx_gain_range(chan); } - shd::gain_range_t get_gain_range(const std::string &name, + shd::gain_range_t get_gain_range(const std::string &name, size_t chan) { return _dev->get_rx_gain_range(name, chan); @@ -136,8 +136,8 @@ public: { return _dev->set_rx_bandwidth(bandwidth, chan); } - - shd::sensor_value_t get_dboard_sensor(const std::string &name, + + shd::sensor_value_t get_dboard_sensor(const std::string &name, size_t chan) { return _dev->get_rx_sensor(name, chan); @@ -147,18 +147,18 @@ public: { return _dev->get_rx_sensor_names(chan); } - + shd::sensor_value_t get_mboard_sensor(const std::string &name, size_t mboard) { return _dev->get_mboard_sensor(name, mboard); } - + std::vector<std::string> get_mboard_sensor_names(size_t mboard) { return _dev->get_mboard_sensor_names(mboard); } - + void set_clock_config(const shd::clock_config_t &clock_config, size_t mboard) { @@ -232,23 +232,23 @@ public: output_items, noutput_items, _metadata, _type, shd::device::RECV_MODE_ONE_PACKET, 1.0); } - + //handle possible errors conditions switch(_metadata.error_code) { case shd::rx_metadata_t::ERROR_CODE_NONE: //TODO insert tag for time stamp break; - + case shd::rx_metadata_t::ERROR_CODE_TIMEOUT: //Assume that the user called stop() on the flow graph. //However, a timeout can occur under error conditions. return WORK_DONE; - + case shd::rx_metadata_t::ERROR_CODE_OVERFLOW: //ignore overflows and try work again //TODO insert tag for overflow return work(noutput_items, input_items, output_items); - + default: std::cout << boost::format("SHD source block got error code 0x%x" ) % _metadata.error_code << std::endl; @@ -257,7 +257,7 @@ public: return num_samps; } - + bool start(void) { //setup a stream command that starts streaming slightly in the future @@ -268,7 +268,7 @@ public: _dev->issue_stream_cmd(stream_cmd); return true; } - + bool stop(void) { _dev->issue_stream_cmd(shd::stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS); |