diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-06-14 13:21:54 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-06-14 13:21:54 -0700 |
| commit | 8cde538c6df89d9e7b2bdd7b8def9044f638fb60 (patch) | |
| tree | 7d9ec60ca26ac4548ecb0def834d246d0e31a0b9 /host/lib | |
| parent | 4e5dacc20770d557140cf196750326934e6e6b40 (diff) | |
| parent | 938a1b5c9fdeba069a060733f4a6f84dce1762c6 (diff) | |
| download | uhd-8cde538c6df89d9e7b2bdd7b8def9044f638fb60.tar.gz uhd-8cde538c6df89d9e7b2bdd7b8def9044f638fb60.tar.bz2 uhd-8cde538c6df89d9e7b2bdd7b8def9044f638fb60.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib')
| -rw-r--r-- | host/lib/usrp/dboard/db_tvrx2.cpp | 12 | ||||
| -rw-r--r-- | host/lib/usrp_clock/octoclock/octoclock_impl.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/host/lib/usrp/dboard/db_tvrx2.cpp b/host/lib/usrp/dboard/db_tvrx2.cpp index 3a5bc1198..6f0604f72 100644 --- a/host/lib/usrp/dboard/db_tvrx2.cpp +++ b/host/lib/usrp/dboard/db_tvrx2.cpp @@ -1,5 +1,5 @@ // -// Copyright 2010,2012-2014 Ettus Research LLC +// Copyright 2010,2012-2014,2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -1529,7 +1529,7 @@ void tvrx2::test_rf_filter_robustness(void){ void tvrx2::transition_0(void){ //Transition 0: Initialize Tuner and place in standby UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 0: Initialize Tuner, Calibrate and Standby\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 0: Initialize Tuner, Calibrate and Standby\n") % (get_subdev_name()) << std::endl; //Check for Power-On Reset, if reset, initialze tuner if (get_power_reset()) { @@ -1583,7 +1583,7 @@ void tvrx2::transition_0(void){ void tvrx2::transition_1(void){ //Transition 1: Select TV Standard UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 1: Select TV Standard\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 1: Select TV Standard\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); @@ -1614,7 +1614,7 @@ void tvrx2::transition_1(void){ void tvrx2::transition_2(int rf_freq){ //Transition 2: Select RF Frequency after changing TV Standard UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 2: Select RF Frequency after changing TV Standard\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 2: Select RF Frequency after changing TV Standard\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); @@ -1652,7 +1652,7 @@ void tvrx2::transition_2(int rf_freq){ void tvrx2::transition_3(void){ //Transition 3: Standby Mode UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 3: Standby Mode\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 3: Standby Mode\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); @@ -1671,7 +1671,7 @@ void tvrx2::transition_3(void){ void tvrx2::transition_4(int rf_freq){ //Transition 4: Change RF Frequency without changing TV Standard UHD_LOGV(often) << boost::format( - "\nTVRX2 (%s): Transistion 4: Change RF Frequency without changing TV Standard\n") % (get_subdev_name()) << std::endl; + "\nTVRX2 (%s): Transition 4: Change RF Frequency without changing TV Standard\n") % (get_subdev_name()) << std::endl; //send magic xtal_cal_dac setting send_reg(0x65, 0x65); diff --git a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp index cd851976f..94e8b05d8 100644 --- a/host/lib/usrp_clock/octoclock/octoclock_impl.cpp +++ b/host/lib/usrp_clock/octoclock/octoclock_impl.cpp @@ -1,5 +1,5 @@ // -// Copyright 2014 Ettus Research LLC +// Copyright 2014,2016 Ettus Research LLC // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -336,7 +336,7 @@ boost::uint32_t octoclock_impl::_get_fw_version(const std::string &oc){ if(UHD_OCTOCLOCK_PACKET_MATCHES(OCTOCLOCK_QUERY_ACK, pkt_out, pkt_in, len)){ return pkt_in->proto_ver; } - else throw uhd::runtime_error("Failed to retrive firmware version from OctoClock."); + else throw uhd::runtime_error("Failed to retrieve firmware version from OctoClock."); } void octoclock_impl::_get_state(const std::string &oc){ |