diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
| commit | 493ed897f24fff5265b766ee634916b002cadf94 (patch) | |
| tree | 09082fa8be0c71b92ca668083dd1519a452b679d /host/include | |
| parent | 7b509d6fe4ac4cfcafc63f11f5b298d3e0237acd (diff) | |
| parent | 1e57d1c0496ca6263652cd84c9eeacafde833915 (diff) | |
| download | uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.gz uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.bz2 uhd-493ed897f24fff5265b766ee634916b002cadf94.zip | |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/dboard_props.hpp | 1 | ||||
| -rw-r--r-- | host/include/uhd/usrp/gps_ctrl.hpp | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/host/include/uhd/usrp/dboard_props.hpp b/host/include/uhd/usrp/dboard_props.hpp index 35721ab47..29211ec8c 100644 --- a/host/include/uhd/usrp/dboard_props.hpp +++ b/host/include/uhd/usrp/dboard_props.hpp @@ -32,6 +32,7 @@ namespace uhd{ namespace usrp{ DBOARD_PROP_SUBDEV, //ro, wax::obj DBOARD_PROP_SUBDEV_NAMES, //ro, prop_names_t DBOARD_PROP_DBOARD_EEPROM, //rw, dboard_eeprom_t + DBOARD_PROP_GBOARD_EEPROM, //rw, dboard_eeprom_t DBOARD_PROP_DBOARD_IFACE, //ro, dboard_iface::sptr DBOARD_PROP_CODEC, //ro, wax::obj DBOARD_PROP_GAIN_GROUP //ro, gain_group diff --git a/host/include/uhd/usrp/gps_ctrl.hpp b/host/include/uhd/usrp/gps_ctrl.hpp index 21d400b3b..bd679b165 100644 --- a/host/include/uhd/usrp/gps_ctrl.hpp +++ b/host/include/uhd/usrp/gps_ctrl.hpp @@ -42,6 +42,12 @@ public: * \return current GPS time and date as boost::posix_time::ptime object */ virtual ptime get_time(void) = 0; + + /*! + * Get the epoch time (as time_t, which is int) + * \return current GPS time and date as time_t + */ + virtual time_t get_epoch_time(void) = 0; /*! * Tell you if there's a supported GPS connected or not |