diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-02-03 14:39:10 -0800 |
|---|---|---|
| committer | atrnati <54334261+atrnati@users.noreply.github.com> | 2020-02-04 08:53:01 -0600 |
| commit | 8be5e2d4dd79e7c0324762fe33cc48aada85c317 (patch) | |
| tree | 57466a3531ed1d8d07ee2f5a431b216300af9e79 /host/include | |
| parent | 4b1d346a80f860ebcf26712b721606c19dd904dd (diff) | |
| download | uhd-8be5e2d4dd79e7c0324762fe33cc48aada85c317.tar.gz uhd-8be5e2d4dd79e7c0324762fe33cc48aada85c317.tar.bz2 uhd-8be5e2d4dd79e7c0324762fe33cc48aada85c317.zip | |
octoclock: Change type of EEPROM property to mboard_eeprom_t
Before, the type was octoclock_eeprom_t, which was incompatible with
mboard_eeprom_t and would cause issues with uhd_usrp_probe.
octoclock_eeprom_t is a superset of mboard_eeprom_t, and there is no
necessity for exposing the additional features to the public. This
harmonizes the Octoclock prop tree with the rest of UHD, and fixes an
issue where the Octoclock won't allow uhd_usrp_probe on master branch.
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp_clock/octoclock_eeprom.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp index 3d514ebc2..af4df2d5f 100644 --- a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp +++ b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp @@ -11,6 +11,7 @@ #include <uhd/config.hpp> #include <uhd/transport/udp_simple.hpp> #include <uhd/types/dict.hpp> +#include <uhd/usrp/mboard_eeprom.hpp> #include <string> namespace uhd { namespace usrp_clock { @@ -22,7 +23,7 @@ namespace uhd { namespace usrp_clock { * Use the dictionary interface to get and set values. * Commit to the EEPROM to save changed settings. */ -class UHD_API octoclock_eeprom_t : public uhd::dict<std::string, std::string> +class UHD_API octoclock_eeprom_t : public uhd::usrp::mboard_eeprom_t { public: //! Make a new empty OctoClock EEPROM handler |