diff options
| author | michael-west <michael.west@ettus.com> | 2017-12-05 15:49:28 -0800 |
|---|---|---|
| committer | michael-west <michael.west@ettus.com> | 2017-12-19 18:25:54 -0800 |
| commit | 109a2d26b61ce753ed5eca75e7b525bdf538e148 (patch) | |
| tree | 66c1dbbae782b38876a1eead55daa6b95a499274 /host/include | |
| parent | ffc8b89b4472fe12756f88e7edb67afc5634c13f (diff) | |
| download | uhd-109a2d26b61ce753ed5eca75e7b525bdf538e148.tar.gz uhd-109a2d26b61ce753ed5eca75e7b525bdf538e148.tar.bz2 uhd-109a2d26b61ce753ed5eca75e7b525bdf538e148.zip | |
UHD: Add eeprom info to dboard_base
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/dboard_base.hpp | 5 | ||||
| -rw-r--r-- | host/include/uhd/usrp/dboard_manager.hpp | 15 |
2 files changed, 12 insertions, 8 deletions
diff --git a/host/include/uhd/usrp/dboard_base.hpp b/host/include/uhd/usrp/dboard_base.hpp index b106a1ac6..109297bb4 100644 --- a/host/include/uhd/usrp/dboard_base.hpp +++ b/host/include/uhd/usrp/dboard_base.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010,2017 Ettus Research, A National Instruments Company // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -25,6 +25,7 @@ #include <boost/shared_ptr.hpp> #include <uhd/usrp/dboard_id.hpp> #include <uhd/usrp/dboard_iface.hpp> +#include <uhd/usrp/dboard_eeprom.hpp> namespace uhd{ namespace usrp{ @@ -54,6 +55,8 @@ protected: dboard_iface::sptr get_iface(void); dboard_id_t get_rx_id(void); dboard_id_t get_tx_id(void); + dboard_eeprom_t get_rx_eeprom(void); + dboard_eeprom_t get_tx_eeprom(void); property_tree::sptr get_rx_subtree(void); property_tree::sptr get_tx_subtree(void); diff --git a/host/include/uhd/usrp/dboard_manager.hpp b/host/include/uhd/usrp/dboard_manager.hpp index e07b87ad8..46716eab9 100644 --- a/host/include/uhd/usrp/dboard_manager.hpp +++ b/host/include/uhd/usrp/dboard_manager.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010 Ettus Research LLC +// Copyright 2010,2017 Ettus Research, A National Instruments Company // // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include <uhd/property_tree.hpp> #include <uhd/usrp/dboard_base.hpp> #include <uhd/usrp/dboard_id.hpp> +#include <uhd/usrp/dboard_eeprom.hpp> #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> #include <string> @@ -119,18 +120,18 @@ public: /*! * Make a new dboard manager. - * \param rx_dboard_id the id of the rx dboard - * \param tx_dboard_id the id of the tx dboard - * \param gdboard_id the id of the grand-dboard + * \param rx_eeprom the RX EEPROM data + * \param tx_eeprom the TX EEPROM data + * \param gdb_eeprom the grand-dboard EEPROM data * \param iface the custom dboard interface * \param subtree the subtree to load with props * \param defer_db_init initialising the daughterboards (DEPRECATED) * \return an sptr to the new dboard manager */ static sptr make( - dboard_id_t rx_dboard_id, - dboard_id_t tx_dboard_id, - dboard_id_t gdboard_id, + dboard_eeprom_t rx_eeprom, + dboard_eeprom_t tx_eeprom, + dboard_eeprom_t gdb_eeprom, dboard_iface::sptr iface, property_tree::sptr subtree, bool defer_db_init = false |