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/lib/usrp/usrp1/usrp1_impl.hpp | |
| 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/lib/usrp/usrp1/usrp1_impl.hpp')
| -rw-r--r-- | host/lib/usrp/usrp1/usrp1_impl.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/usrp1_impl.hpp b/host/lib/usrp/usrp1/usrp1_impl.hpp index 9755c466d..f53894b29 100644 --- a/host/lib/usrp/usrp1/usrp1_impl.hpp +++ b/host/lib/usrp/usrp1/usrp1_impl.hpp @@ -175,7 +175,7 @@ private: uhd::dict<dboard_slot_t, wax_obj_proxy::sptr> _rx_dboard_proxies; //tx dboard functions and settings - uhd::dict<dboard_slot_t, uhd::usrp::dboard_eeprom_t> _tx_db_eeproms; + uhd::dict<dboard_slot_t, uhd::usrp::dboard_eeprom_t> _tx_db_eeproms, _gdb_eeproms; void tx_dboard_get(const wax::obj &, wax::obj &, dboard_slot_t); void tx_dboard_set(const wax::obj &, const wax::obj &, dboard_slot_t); uhd::dict<dboard_slot_t, wax_obj_proxy::sptr> _tx_dboard_proxies; |