diff options
| author | Andrej Rode <andrej.rode@ettus.com> | 2016-12-16 10:40:00 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-01-12 15:15:37 -0800 |
| commit | 6d7692f393b9d1e5e75b8239a3249ee02e0441d9 (patch) | |
| tree | 3fc05ae46f9be46f8fcab696f690e589aaf97c60 | |
| parent | fba670a3c7d45847e48fc9dc8a3bdb6da0b1b948 (diff) | |
| download | uhd-6d7692f393b9d1e5e75b8239a3249ee02e0441d9.tar.gz uhd-6d7692f393b9d1e5e75b8239a3249ee02e0441d9.tar.bz2 uhd-6d7692f393b9d1e5e75b8239a3249ee02e0441d9.zip | |
usrp2: fixes according to coverity reports
| -rw-r--r-- | host/lib/usrp/usrp2/dboard_iface.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/io_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/n200_image_loader.cpp | 2 | ||||
| -rw-r--r-- | host/utils/usrp_n2xx_simple_net_burner.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp index 9fde9a626..1dafe5721 100644 --- a/host/lib/usrp/usrp2/dboard_iface.cpp +++ b/host/lib/usrp/usrp2/dboard_iface.cpp @@ -182,7 +182,7 @@ void usrp2_dboard_iface::set_clock_enabled(unit_t unit, bool enb){ switch(unit){ case UNIT_RX: _clock_ctrl->enable_rx_dboard_clock(enb); return; case UNIT_TX: _clock_ctrl->enable_tx_dboard_clock(enb); return; - case UNIT_BOTH: set_clock_enabled(UNIT_RX, enb); set_clock_enabled(UNIT_TX, enb); return; + default: UHD_THROW_INVALID_CODE_PATH(); } } diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp index 199436fa2..224519944 100644 --- a/host/lib/usrp/usrp2/io_impl.cpp +++ b/host/lib/usrp/usrp2/io_impl.cpp @@ -433,7 +433,7 @@ rx_streamer::sptr usrp2_impl::get_rx_stream(const uhd::stream_args_t &args_){ ; const size_t bpp = _mbc[_mbc.keys().front()].rx_dsp_xports[0]->get_recv_frame_size() - hdr_size; const size_t bpi = convert::get_bytes_per_item(args.otw_format); - const size_t spp = unsigned(args.args.cast<double>("spp", bpp/bpi)); + const size_t spp = args.args.cast<size_t>("spp", bpp/bpi); //make the new streamer given the samples per packet boost::shared_ptr<sph::recv_packet_streamer> my_streamer = boost::make_shared<sph::recv_packet_streamer>(spp); diff --git a/host/lib/usrp/usrp2/n200_image_loader.cpp b/host/lib/usrp/usrp2/n200_image_loader.cpp index 16cc7b08a..c68484600 100644 --- a/host/lib/usrp/usrp2/n200_image_loader.cpp +++ b/host/lib/usrp/usrp2/n200_image_loader.cpp @@ -324,7 +324,7 @@ static void n200_validate_fpga_image(n200_session_t &session){ image_file.seekg(0, std::ios::beg); image_file.read((char*)test_bytes, 63); bool is_good = false; - for(int i = 0; i < 63; i++){ + for(int i = 0; i < 62; i++){ if(test_bytes[i] == 255) continue; else if(test_bytes[i] == 170 and test_bytes[i+1] == 153){ diff --git a/host/utils/usrp_n2xx_simple_net_burner.cpp b/host/utils/usrp_n2xx_simple_net_burner.cpp index 56af3ce4a..f85ea9def 100644 --- a/host/utils/usrp_n2xx_simple_net_burner.cpp +++ b/host/utils/usrp_n2xx_simple_net_burner.cpp @@ -326,7 +326,7 @@ int read_fpga_image(std::string& fpga_path){ fpga_file.seekg(0, std::ios::beg); fpga_file.read((char*)fpga_test_bytes,63); bool is_good = false; - for(int i = 0; i < 63; i++){ + for(int i = 0; i < 62; i++){ if(fpga_test_bytes[i] == 255) continue; else if(fpga_test_bytes[i] == 170 and fpga_test_bytes[i+1] == 153){ |