diff options
| author | Josh Blum <josh@joshknows.com> | 2010-02-16 12:25:31 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-02-16 12:25:31 -0800 |
| commit | 429342fbab61b49c6622f994c5522ee3eee7e39a (patch) | |
| tree | 5d607d3f6314d79403bffdce179d6c95a5e8759b /include | |
| parent | 1b70ff306342ca1078e105488811a52c49b446f4 (diff) | |
| download | uhd-429342fbab61b49c6622f994c5522ee3eee7e39a.tar.gz uhd-429342fbab61b49c6622f994c5522ee3eee7e39a.tar.bz2 uhd-429342fbab61b49c6622f994c5522ee3eee7e39a.zip | |
Added usrp2 impl for the guts of the usrp2 handling.
The top level usrp2 will contain an impl and forward calls to it.
Diffstat (limited to 'include')
| -rw-r--r-- | include/uhd/usrp/dboard/id.hpp | 1 | ||||
| -rw-r--r-- | include/uhd/usrp/mboard/usrp2.hpp | 12 | ||||
| -rw-r--r-- | include/uhd/utils.hpp | 4 |
3 files changed, 4 insertions, 13 deletions
diff --git a/include/uhd/usrp/dboard/id.hpp b/include/uhd/usrp/dboard/id.hpp index bedc01f48..98c0acc3a 100644 --- a/include/uhd/usrp/dboard/id.hpp +++ b/include/uhd/usrp/dboard/id.hpp @@ -23,6 +23,7 @@ namespace uhd{ namespace usrp{ namespace dboard{ enum dboard_id_t{ + ID_NONE = 0xffff, ID_BASIC_TX = 0x0000, ID_BASIC_RX = 0x0001 }; diff --git a/include/uhd/usrp/mboard/usrp2.hpp b/include/uhd/usrp/mboard/usrp2.hpp index 709dbc1cc..5da9f874d 100644 --- a/include/uhd/usrp/mboard/usrp2.hpp +++ b/include/uhd/usrp/mboard/usrp2.hpp @@ -20,8 +20,6 @@ #include <uhd/usrp/mboard/base.hpp> #include <uhd/device_addr.hpp> -#include <uhd/usrp/dboard/manager.hpp> -#include <uhd/transport/udp.hpp> namespace uhd{ namespace usrp{ namespace mboard{ @@ -45,15 +43,7 @@ private: void get(const wax::obj &, wax::obj &); void set(const wax::obj &, const wax::obj &); - dboard::manager::sptr _dboard_manager; - - uhd::transport::udp::sptr _udp_ctrl_transport; - uhd::transport::udp::sptr _udp_data_transport; - - uint32_t _ctrl_seq_num; - //use this template for send/recv so this header - //does not need to know about internal structs - template <class T> T _ctrl_send_and_recv(const T &); + wax::obj _impl; }; }}} //namespace diff --git a/include/uhd/utils.hpp b/include/uhd/utils.hpp index 4c95b4964..4331aba7e 100644 --- a/include/uhd/utils.hpp +++ b/include/uhd/utils.hpp @@ -70,7 +70,7 @@ namespace std{ }//namespace std -namespace uhd{ +/*namespace uhd{ inline void tune( freq_t target_freq, @@ -116,6 +116,6 @@ inline void tune( //return some kind of tune result tuple/struct } -} //namespace uhd +} //namespace uhd*/ #endif /* INCLUDED_UHD_UTILS_HPP */ |