diff options
| author | Josh Blum <josh@joshknows.com> | 2010-01-29 00:24:15 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-01-29 00:24:15 -0800 |
| commit | 30a8d2ecc36ce8ad6c01032e514ac66a277f06d0 (patch) | |
| tree | 894b16a38d02c677ab2038932838064edc325ab4 /include/usrp_uhd/usrp | |
| parent | d5d9da3114bf069c05a8dcb7fca32ccd70405512 (diff) | |
| download | uhd-30a8d2ecc36ce8ad6c01032e514ac66a277f06d0.tar.gz uhd-30a8d2ecc36ce8ad6c01032e514ac66a277f06d0.tar.bz2 uhd-30a8d2ecc36ce8ad6c01032e514ac66a277f06d0.zip | |
Added dboard id enum.
Moved timespec into its own header.
Diffstat (limited to 'include/usrp_uhd/usrp')
| -rw-r--r-- | include/usrp_uhd/usrp/dboard/Makefile.am | 1 | ||||
| -rw-r--r-- | include/usrp_uhd/usrp/dboard/id.hpp | 21 | ||||
| -rw-r--r-- | include/usrp_uhd/usrp/dboard/manager.hpp | 3 |
3 files changed, 23 insertions, 2 deletions
diff --git a/include/usrp_uhd/usrp/dboard/Makefile.am b/include/usrp_uhd/usrp/dboard/Makefile.am index d8c240351..2ce268a41 100644 --- a/include/usrp_uhd/usrp/dboard/Makefile.am +++ b/include/usrp_uhd/usrp/dboard/Makefile.am @@ -9,5 +9,6 @@ SUBDIRS = this_includedir = $(includedir)/usrp_uhd/usrp/dboard this_include_HEADERS = \ base.hpp \ + id.hpp \ interface.hpp \ manager.hpp diff --git a/include/usrp_uhd/usrp/dboard/id.hpp b/include/usrp_uhd/usrp/dboard/id.hpp new file mode 100644 index 000000000..b2dc7b7cf --- /dev/null +++ b/include/usrp_uhd/usrp/dboard/id.hpp @@ -0,0 +1,21 @@ +// +// Copyright 2010 Ettus Research LLC +// + +#include <iostream> + +#ifndef INCLUDED_USRP_UHD_USRP_DBOARD_ID_HPP +#define INCLUDED_USRP_UHD_USRP_DBOARD_ID_HPP + +namespace usrp_uhd{ namespace usrp{ namespace dboard{ + +enum dboard_id_t{ + ID_BASIC_TX = 0x0000, + ID_BASIC_RX = 0x0001 +}; + +}}} //namespace + +std::ostream& operator<<(std::ostream &, const usrp_uhd::usrp::dboard::dboard_id_t &); + +#endif /* INCLUDED_USRP_UHD_USRP_DBOARD_ID_HPP */ diff --git a/include/usrp_uhd/usrp/dboard/manager.hpp b/include/usrp_uhd/usrp/dboard/manager.hpp index 4eaa9f889..56adf5eea 100644 --- a/include/usrp_uhd/usrp/dboard/manager.hpp +++ b/include/usrp_uhd/usrp/dboard/manager.hpp @@ -11,6 +11,7 @@ #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> #include <usrp_uhd/usrp/dboard/base.hpp> +#include <usrp_uhd/usrp/dboard/id.hpp> namespace usrp_uhd{ namespace usrp{ namespace dboard{ @@ -22,8 +23,6 @@ namespace usrp_uhd{ namespace usrp{ namespace dboard{ class manager : boost::noncopyable{ public: - //a dboard can be identified by a 16 bit integer - typedef uint16_t dboard_id_t; //dboard constructor (each dboard should have a ::make with this signature) typedef base::sptr(*dboard_ctor_t)(base::ctor_args_t const&); |