diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-26 17:54:41 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-26 17:54:41 -0700 |
| commit | 3ff2780a82eed3bbca8f6a9f52f31746de42ea40 (patch) | |
| tree | f11a4056ccdba38ea1cc342ee5e265307c50851b /host/lib/usrp/usrp1/usrp1_impl.hpp | |
| parent | 190d7cd9d5206113fad22111107034cb52c3c28b (diff) | |
| parent | 1a81e2a35ff1d288e87eb1e65911c1a97588217c (diff) | |
| download | uhd-3ff2780a82eed3bbca8f6a9f52f31746de42ea40.tar.gz uhd-3ff2780a82eed3bbca8f6a9f52f31746de42ea40.tar.bz2 uhd-3ff2780a82eed3bbca8f6a9f52f31746de42ea40.zip | |
Merge branch 'gdb_support'
Conflicts:
host/lib/usrp/dboard/CMakeLists.txt
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; |