Added dboard id enum.

Moved timespec into its own header.

6 files changed, 69 insertions, 33 deletions

diff --git a/include/usrp_uhd/Makefile.am b/include/usrp_uhd/Makefile.am
index 0a19bfe56..c546fd0e2 100644
--- a/include/usrp_uhd/Makefile.am
+++ b/include/usrp_uhd/Makefile.am
@@ -12,5 +12,6 @@ this_include_HEADERS = \
 	device_addr.hpp \
 	gain_handler.hpp \
 	props.hpp \
+	time_spec.hpp \
 	utils.hpp \
 	wax.hpp
diff --git a/include/usrp_uhd/props.hpp b/include/usrp_uhd/props.hpp
index b74493961..2e740045f 100644
--- a/include/usrp_uhd/props.hpp
+++ b/include/usrp_uhd/props.hpp
@@ -3,46 +3,16 @@
 //
 
 #include <boost/tuple/tuple.hpp>
+#include <usrp_uhd/time_spec.hpp>
 #include <usrp_uhd/wax.hpp>
 #include <complex>
 #include <vector>
-#include <stdint.h>
 
 #ifndef INCLUDED_USRP_UHD_PROPS_HPP
 #define INCLUDED_USRP_UHD_PROPS_HPP
 
 namespace usrp_uhd{
 
-    /*!
-     * A time_spec_t holds a seconds and ticks time value.
-     * The temporal width of a tick depends on the device's clock rate.
-     * The time_spec_t can be used when setting the time on devices
-     * and for controlling the start of streaming for applicable dsps.
-     */
-    struct time_spec_t{
-        uint32_t secs;
-        uint32_t ticks;
-
-        /*!
-         * Create a time_spec_t that holds a wildcard time.
-         * This will have implementation-specific meaning.
-         */
-        time_spec_t(void){
-            secs = ~0;
-            ticks = ~0;
-        }
-
-        /*!
-         * Create a time_spec_t from seconds and ticks.
-         * \param new_secs the new seconds
-         * \param new_ticks the new ticks (default = 0)
-         */
-        time_spec_t(uint32_t new_secs, uint32_t new_ticks = 0){
-            secs = new_secs;
-            ticks = new_ticks;
-        }
-    };
-
     //common typedefs for board properties
     typedef float gain_t;
     typedef double freq_t;
diff --git a/include/usrp_uhd/time_spec.hpp b/include/usrp_uhd/time_spec.hpp
new file mode 100644
index 000000000..dc16a72aa
--- /dev/null
+++ b/include/usrp_uhd/time_spec.hpp
@@ -0,0 +1,44 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+
+#include <stdint.h>
+
+#ifndef INCLUDED_USRP_UHD_TIME_SPEC_HPP
+#define INCLUDED_USRP_UHD_TIME_SPEC_HPP
+
+namespace usrp_uhd{
+
+    /*!
+     * A time_spec_t holds a seconds and ticks time value.
+     * The temporal width of a tick depends on the device's clock rate.
+     * The time_spec_t can be used when setting the time on devices
+     * and for controlling the start of streaming for applicable dsps.
+     */
+    struct time_spec_t{
+        uint32_t secs;
+        uint32_t ticks;
+
+        /*!
+         * Create a time_spec_t that holds a wildcard time.
+         * This will have implementation-specific meaning.
+         */
+        time_spec_t(void){
+            secs = ~0;
+            ticks = ~0;
+        }
+
+        /*!
+         * Create a time_spec_t from seconds and ticks.
+         * \param new_secs the new seconds
+         * \param new_ticks the new ticks (default = 0)
+         */
+        time_spec_t(uint32_t new_secs, uint32_t new_ticks = 0){
+            secs = new_secs;
+            ticks = new_ticks;
+        }
+    };
+
+} //namespace usrp_uhd
+
+#endif /* INCLUDED_USRP_UHD_TIME_SPEC_HPP */
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&);