diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-12-15 15:17:36 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-12-15 15:17:36 -0800 |
| commit | f44f7f2ca7dbbd1a72f5b3d239856a1954569884 (patch) | |
| tree | 310055d734a28063359b26f7cdc4d4704c517b9e /host/lib/usrp/e300/e300_impl.hpp | |
| parent | 75ea07bd6d19494e018cd5c3109e1f85969b7ac6 (diff) | |
| parent | 10178875a154e58af6c14774621776d13e7e3daa (diff) | |
| download | uhd-f44f7f2ca7dbbd1a72f5b3d239856a1954569884.tar.gz uhd-f44f7f2ca7dbbd1a72f5b3d239856a1954569884.tar.bz2 uhd-f44f7f2ca7dbbd1a72f5b3d239856a1954569884.zip | |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.hpp
host/lib/usrp/e300/e300_fpga_defs.hpp
host/lib/usrp/x300/x300_fw_common.h
Diffstat (limited to 'host/lib/usrp/e300/e300_impl.hpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_impl.hpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/host/lib/usrp/e300/e300_impl.hpp b/host/lib/usrp/e300/e300_impl.hpp index 9b39c7468..1bf5cb950 100644 --- a/host/lib/usrp/e300/e300_impl.hpp +++ b/host/lib/usrp/e300/e300_impl.hpp @@ -200,6 +200,8 @@ private: // types boost::uint32_t rx_bandsel_b; boost::uint32_t rx_bandsel_c; + boost::uint32_t time_sync; + static const size_t PPS_SEL = 0; static const size_t MIMO = 2; static const size_t CODEC_ARST = 3; @@ -207,6 +209,7 @@ private: // types static const size_t RX_BANDSELA = 7; static const size_t RX_BANDSELB = 13; static const size_t RX_BANDSELC = 17; + static const size_t TIME_SYNC = 21; }; private: // methods @@ -257,6 +260,8 @@ private: // methods void _update_time_source(const std::string &source); void _update_clock_source(const std::string &); + void _set_time(const uhd::time_spec_t&); + void _sync_times(void); void _update_subdev_spec( const std::string &txrx, |