From 8be5e2d4dd79e7c0324762fe33cc48aada85c317 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Mon, 3 Feb 2020 14:39:10 -0800 Subject: 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. --- host/include/uhd/usrp_clock/octoclock_eeprom.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'host/include') 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 #include #include +#include #include 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 +class UHD_API octoclock_eeprom_t : public uhd::usrp::mboard_eeprom_t { public: //! Make a new empty OctoClock EEPROM handler -- cgit v1.2.3