diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:12:54 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-27 09:12:54 +0100 |
| commit | 94e11cb457fc7cc9b5fa5259881ec5b729eff201 (patch) | |
| tree | 8437e1890af5fc959420e2a6cc651a85c538f31c /host/lib/usrp/e300/e300_sensor_manager.hpp | |
| parent | 5047677c784077be82d11be26277260e6350a5bc (diff) | |
| parent | d238f12252870d73df125649d965edc2a05debf5 (diff) | |
| download | uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.tar.gz uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.tar.bz2 uhd-94e11cb457fc7cc9b5fa5259881ec5b729eff201.zip | |
Merge branch 'maint'
Conflicts:
host/docs/usrp_e3x0.dox
Diffstat (limited to 'host/lib/usrp/e300/e300_sensor_manager.hpp')
| -rw-r--r-- | host/lib/usrp/e300/e300_sensor_manager.hpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/host/lib/usrp/e300/e300_sensor_manager.hpp b/host/lib/usrp/e300/e300_sensor_manager.hpp index 503a7bb63..9c060b19a 100644 --- a/host/lib/usrp/e300/e300_sensor_manager.hpp +++ b/host/lib/usrp/e300/e300_sensor_manager.hpp @@ -22,6 +22,7 @@ #include <uhd/types/sensors.hpp> #include <uhd/utils/byteswap.hpp> #include <uhd/usrp/gps_ctrl.hpp> +#include "e300_global_regs.hpp" #ifndef INCLUDED_E300_SENSOR_MANAGER_HPP #define INCLUDED_E300_SENSOR_MANAGER_HPP @@ -39,7 +40,7 @@ struct sensor_transaction_t { enum sensor {ZYNQ_TEMP=0, GPS_FOUND=1, GPS_TIME=2, - GPS_LOCK=3}; + GPS_LOCK=3, REF_LOCK=4}; class e300_sensor_manager : boost::noncopyable { @@ -53,9 +54,10 @@ public: virtual uhd::sensor_value_t get_mb_temp(void) = 0; virtual uhd::sensor_value_t get_gps_lock(void) = 0; virtual uhd::sensor_value_t get_gps_time(void) = 0; + virtual uhd::sensor_value_t get_ref_lock(void) = 0; static sptr make_proxy(uhd::transport::zero_copy_if::sptr xport); - static sptr make_local(uhd::gps_ctrl::sptr gps_ctrl); + static sptr make_local(uhd::gps_ctrl::sptr gps_ctrl, global_regs::sptr global_regs); // Note: This is a hack static boost::uint32_t pack_float_in_uint32_t(const float &v) |