diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-07-29 21:24:28 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-07-29 21:24:28 -0700 |
| commit | b6d594ebc7696635d9ed8787bf0a15e69ccdd4f9 (patch) | |
| tree | bb6855b3b8627c91a2b0d135235aeab629ac2e2b | |
| parent | be0cd5733a9c48896ced499ecc8bf0b15bd9560f (diff) | |
| download | uhd-b6d594ebc7696635d9ed8787bf0a15e69ccdd4f9.tar.gz uhd-b6d594ebc7696635d9ed8787bf0a15e69ccdd4f9.tar.bz2 uhd-b6d594ebc7696635d9ed8787bf0a15e69ccdd4f9.zip | |
fixup! e300 + cmake merge conflict resolution
| -rw-r--r-- | host/cmake/Modules/FindGPSD.cmake | 2 | ||||
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/cmake/Modules/FindGPSD.cmake b/host/cmake/Modules/FindGPSD.cmake index 0d56a5380..46fbc7b59 100644 --- a/host/cmake/Modules/FindGPSD.cmake +++ b/host/cmake/Modules/FindGPSD.cmake @@ -25,7 +25,7 @@ INCLUDE(FindPkgConfig) PKG_CHECK_MODULES(PC_GPSD "libgps") -PKG_CHECK_MODULES(PC_GPSD_V3_11 "libgps > 3.11") +PKG_CHECK_MODULES(PC_GPSD_V3_11 "libgps >= 3.11") IF(PC_GPSD_FOUND AND NOT PC_GPSD_V3_11_FOUND) MESSAGE(WARNING "GPSD version found is too old") diff --git a/host/lib/usrp/e300/e300_impl.cpp b/host/lib/usrp/e300/e300_impl.cpp index ee4ee5ca4..6eb63c786 100644 --- a/host/lib/usrp/e300/e300_impl.cpp +++ b/host/lib/usrp/e300/e300_impl.cpp @@ -1063,7 +1063,7 @@ void e300_impl::_setup_radio(const size_t dspno) const std::string x = (dir == RX_DIRECTION) ? "rx" : "tx"; const std::string key = boost::to_upper_copy(x) + std::string(((dspno == FE0)? "1" : "2")); const fs_path rf_fe_path - = mb_path / "dboards" / "A" / (direction + "_frontends") / ((dspno == 0) ? "A" : "B"); + = mb_path / "dboards" / "A" / (x + "_frontends") / ((dspno == 0) ? "A" : "B"); // This will connect all the AD936x-specific items _codec_mgr->populate_frontend_subtree( @@ -1072,7 +1072,7 @@ void e300_impl::_setup_radio(const size_t dspno) // This will connect all the e300_impl-specific items _tree->create<sensor_value_t>(rf_fe_path / "sensors" / "lo_locked") - .publish(boost::bind(&e300_impl::_get_fe_pll_lock, this, direction == "tx")) + .publish(boost::bind(&e300_impl::_get_fe_pll_lock, this, dir == TX_DIRECTION)) ; // Network mode currently doesn't support the filter API, so |