From 767bb419200aa80f90a8845e92c989215919f3a7 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 22 Mar 2010 17:41:49 -0700
Subject: massaged some of the dboard calls

---
 host/lib/usrp/dboard/basic.cpp   |  4 ++--
 host/lib/usrp/dboard_base.cpp    | 16 ++++++++--------
 host/lib/usrp/dboard_manager.cpp |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/usrp/dboard/basic.cpp b/host/lib/usrp/dboard/basic.cpp
index 82485ae6a..849cbd764 100644
--- a/host/lib/usrp/dboard/basic.cpp
+++ b/host/lib/usrp/dboard/basic.cpp
@@ -75,9 +75,9 @@ static dboard_base::sptr make_lf_tx(dboard_base::ctor_args_t const& args){
 }
 
 STATIC_BLOCK(reg_dboards){
-    dboard_manager::register_dboard(0x0000, &make_basic_tx, "Basic TX", list_of(""));
+    dboard_manager::register_dboard(0x0000, &make_basic_tx, "Basic TX");
     dboard_manager::register_dboard(0x0001, &make_basic_rx, "Basic RX", list_of("ab")("a")("b"));
-    dboard_manager::register_dboard(0x000e, &make_lf_tx,    "LF TX",    list_of(""));
+    dboard_manager::register_dboard(0x000e, &make_lf_tx,    "LF TX");
     dboard_manager::register_dboard(0x000f, &make_lf_rx,    "LF RX",    list_of("ab")("a")("b"));
 }
 
diff --git a/host/lib/usrp/dboard_base.cpp b/host/lib/usrp/dboard_base.cpp
index 6dd41cfd8..09d3bbfd4 100644
--- a/host/lib/usrp/dboard_base.cpp
+++ b/host/lib/usrp/dboard_base.cpp
@@ -52,15 +52,15 @@ dboard_id_t dboard_base::get_tx_id(void){
  * xcvr dboard dboard_base class
  **********************************************************************/
 xcvr_dboard_base::xcvr_dboard_base(ctor_args_t const& args) : dboard_base(args){
-    if (get_rx_id() == ID_NONE){
+    if (get_rx_id() == dboard_id::NONE){
         throw std::runtime_error(str(boost::format(
             "cannot create xcvr board when the rx id is \"%s\""
-        ) % dboard_id::to_string(ID_NONE)));
+        ) % dboard_id::to_string(dboard_id::NONE)));
     }
-    if (get_tx_id() == ID_NONE){
+    if (get_tx_id() == dboard_id::NONE){
         throw std::runtime_error(str(boost::format(
             "cannot create xcvr board when the tx id is \"%s\""
-        ) % dboard_id::to_string(ID_NONE)));
+        ) % dboard_id::to_string(dboard_id::NONE)));
     }
 }
 
@@ -72,11 +72,11 @@ xcvr_dboard_base::~xcvr_dboard_base(void){
  * rx dboard dboard_base class
  **********************************************************************/
 rx_dboard_base::rx_dboard_base(ctor_args_t const& args) : dboard_base(args){
-    if (get_tx_id() != ID_NONE){
+    if (get_tx_id() != dboard_id::NONE){
         throw std::runtime_error(str(boost::format(
             "cannot create rx board when the tx id is \"%s\""
             " -> expected a tx id of \"%s\""
-        ) % dboard_id::to_string(get_tx_id()) % dboard_id::to_string(ID_NONE)));
+        ) % dboard_id::to_string(get_tx_id()) % dboard_id::to_string(dboard_id::NONE)));
     }
 }
 
@@ -96,11 +96,11 @@ void rx_dboard_base::tx_set(const wax::obj &, const wax::obj &){
  * tx dboard dboard_base class
  **********************************************************************/
 tx_dboard_base::tx_dboard_base(ctor_args_t const& args) : dboard_base(args){
-    if (get_rx_id() != ID_NONE){
+    if (get_rx_id() != dboard_id::NONE){
         throw std::runtime_error(str(boost::format(
             "cannot create tx board when the rx id is \"%s\""
             " -> expected a rx id of \"%s\""
-        ) % dboard_id::to_string(get_rx_id()) % dboard_id::to_string(ID_NONE)));
+        ) % dboard_id::to_string(get_rx_id()) % dboard_id::to_string(dboard_id::NONE)));
     }
 }
 
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index 6ca15e98c..6683534f1 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -163,12 +163,12 @@ static args_t get_dboard_args(
     std::string const& xx_type
 ){
     //special case, its rx and the none id (0xffff)
-    if (xx_type == "rx" and dboard_id == ID_NONE){
+    if (xx_type == "rx" and dboard_id == dboard_id::NONE){
         return get_dboard_args(0x0001, xx_type);
     }
 
     //special case, its tx and the none id (0xffff)
-    if (xx_type == "tx" and dboard_id == ID_NONE){
+    if (xx_type == "tx" and dboard_id == dboard_id::NONE){
         return get_dboard_args(0x0000, xx_type);
     }
 
@@ -223,7 +223,7 @@ dboard_manager_impl::dboard_manager_impl(
         //make the rx subdevs
         BOOST_FOREACH(std::string subdev, rx_subdevs){
             dboard_base::sptr rx_dboard = rx_dboard_ctor(
-                dboard_base::ctor_args_t(subdev, interface, rx_dboard_id, ID_NONE)
+                dboard_base::ctor_args_t(subdev, interface, rx_dboard_id, dboard_id::NONE)
             );
             //create a rx proxy for this rx board
             _rx_dboards[subdev] = subdev_proxy::sptr(
@@ -233,7 +233,7 @@ dboard_manager_impl::dboard_manager_impl(
         //make the tx subdevs
         BOOST_FOREACH(std::string subdev, tx_subdevs){
             dboard_base::sptr tx_dboard = tx_dboard_ctor(
-                dboard_base::ctor_args_t(subdev, interface, ID_NONE, tx_dboard_id)
+                dboard_base::ctor_args_t(subdev, interface, dboard_id::NONE, tx_dboard_id)
             );
             //create a tx proxy for this tx board
             _tx_dboards[subdev] = subdev_proxy::sptr(
-- 
cgit v1.2.3


From 694dc3c7bc6f07b9660aef0c5ace9f6e11f98066 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 22 Mar 2010 17:52:08 -0700
Subject: merged usrp2 stuff from u1e branch (without merging the u1e stuff)

---
 host/lib/usrp/usrp2/usrp2_impl.cpp | 4 +++-
 host/lib/usrp/usrp2/usrp2_impl.hpp | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index bdf8cc55b..85d73e83a 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -26,7 +26,7 @@ using namespace uhd::usrp;
 using namespace uhd::transport;
 namespace asio = boost::asio;
 
-STATIC_BLOCK(register_device){
+STATIC_BLOCK(register_usrp2_device){
     device::register_device(&usrp2::discover, &usrp2::make);
 }
 
@@ -36,6 +36,8 @@ STATIC_BLOCK(register_device){
 uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
     device_addrs_t usrp2_addrs;
 
+    if (not hint.has_key("addr")) return usrp2_addrs;
+
     //create a udp transport to communicate
     //TODO if an addr is not provided, search all interfaces?
     std::string ctrl_port = boost::lexical_cast<std::string>(USRP2_UDP_CTRL_PORT);
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 70420fd49..55ac0b192 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -86,8 +86,6 @@ private:
  */
 class usrp2_impl : public uhd::device{
 public:
-    typedef boost::shared_ptr<usrp2_impl> sptr;
-
     /*!
      * Create a new usrp2 impl base.
      * \param ctrl_transport the udp transport for control
-- 
cgit v1.2.3


From 1aef83037f6a9988b06a547710afbbe5ce815459 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 23 Mar 2010 18:17:47 -0700
Subject: Added example app to receive timed samples. Added useful calls to
 simple device. Fixed vrt frac time usage (wrong word).

---
 host/apps/CMakeLists.txt           |  3 ++
 host/apps/uhd_rx_timed_samples.cpp | 91 ++++++++++++++++++++++++++++++++++++++
 host/include/uhd/simple_device.hpp |  7 +++
 host/lib/simple_device.cpp         | 16 +++++++
 host/lib/transport/vrt.cpp         |  4 +-
 5 files changed, 119 insertions(+), 2 deletions(-)
 create mode 100644 host/apps/uhd_rx_timed_samples.cpp

(limited to 'host/lib')

diff --git a/host/apps/CMakeLists.txt b/host/apps/CMakeLists.txt
index 4deb41965..f31206e1a 100644
--- a/host/apps/CMakeLists.txt
+++ b/host/apps/CMakeLists.txt
@@ -21,3 +21,6 @@ INSTALL(TARGETS discover_usrps RUNTIME DESTINATION ${RUNTIME_DIR})
 
 ADD_EXECUTABLE(usrp2_burner usrp2_burner.cpp)
 TARGET_LINK_LIBRARIES(usrp2_burner uhd)
+
+ADD_EXECUTABLE(uhd_rx_timed_samples uhd_rx_timed_samples.cpp)
+TARGET_LINK_LIBRARIES(uhd_rx_timed_samples uhd)
diff --git a/host/apps/uhd_rx_timed_samples.cpp b/host/apps/uhd_rx_timed_samples.cpp
new file mode 100644
index 000000000..97f75647e
--- /dev/null
+++ b/host/apps/uhd_rx_timed_samples.cpp
@@ -0,0 +1,91 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/simple_device.hpp>
+#include <uhd/props.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+#include <complex>
+
+namespace po = boost::program_options;
+
+int main(int argc, char *argv[]){
+    //variables to be set by po
+    std::string transport_args;
+    int seconds_in_future;
+    size_t total_num_samps;
+
+    //setup the program options
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("args", po::value<std::string>(&transport_args)->default_value(""), "simple uhd transport args")
+        ("secs", po::value<int>(&seconds_in_future)->default_value(3), "number of seconds in the future to receive")
+        ("nsamps", po::value<size_t>(&total_num_samps)->default_value(1000), "total number of samples to receive")
+    ;
+    po::variables_map vm;
+    po::store(po::parse_command_line(argc, argv, desc), vm);
+    po::notify(vm); 
+
+    //print the help message
+    if (vm.count("help")){
+        std::cout << boost::format("UHD RX Timed Samples %s") % desc << std::endl;
+        return ~0;
+    }
+
+    //create a usrp device
+    std::cout << std::endl;
+    std::cout << boost::format("Creating the usrp device with: %s...")
+        % transport_args << std::endl;
+    uhd::simple_device::sptr sdev = uhd::simple_device::make(transport_args);
+    uhd::device::sptr dev = sdev->get_device();
+    std::cout << boost::format("Using Device: %s") % sdev->get_name() << std::endl;
+
+    //set properties on the device
+    double rx_rate = sdev->get_rx_rates()[4]; //pick some rate
+    std::cout << boost::format("Setting RX Rate: %f Msps...") % (rx_rate/1e6) << std::endl;
+    sdev->set_rx_rate(rx_rate);
+    std::cout << boost::format("Setting device timestamp to 0...") << std::endl;
+    sdev->set_time_now(uhd::time_spec_t(0));
+
+    //setup streaming
+    std::cout << std::endl;
+    std::cout << boost::format("Begin streaming %u seconds in the future...")
+        % seconds_in_future << std::endl;
+    sdev->set_streaming_at(uhd::time_spec_t(seconds_in_future));
+
+    //loop until total number of samples reached
+    size_t num_acc_samps = 0; //number of accumulated samples
+    while(num_acc_samps < total_num_samps){
+        uhd::rx_metadata_t md;
+        std::complex<float> buff[1000];
+        size_t num_rx_samps = dev->recv(boost::asio::buffer(buff, sizeof(buff)), md, "32fc");
+        if (num_rx_samps == 0) continue; //wait for packets with contents
+
+        std::cout << boost::format("Got packet: %u samples, %u secs, %u ticks")
+            % num_rx_samps % md.time_spec.secs % md.time_spec.ticks << std::endl;
+
+        num_acc_samps += num_rx_samps;
+    }
+
+    //finished, stop streaming
+    sdev->set_streaming(false);
+    std::cout << std::endl << "Done!" << std::endl << std::endl;
+
+    return 0;
+}
diff --git a/host/include/uhd/simple_device.hpp b/host/include/uhd/simple_device.hpp
index ad25eccdc..035757936 100644
--- a/host/include/uhd/simple_device.hpp
+++ b/host/include/uhd/simple_device.hpp
@@ -42,9 +42,16 @@ public:
 
     virtual std::string get_name(void) = 0;
 
+    /*******************************************************************
+     * Timing
+     ******************************************************************/
+    virtual void set_time_now(const time_spec_t &time_spec) = 0;
+    virtual void set_time_next_pps(const time_spec_t &time_spec) = 0;
+
     /*******************************************************************
      * Streaming
      ******************************************************************/
+    virtual void set_streaming_at(const time_spec_t &time_spec) = 0;
     virtual void set_streaming(bool enb) = 0;
     virtual bool get_streaming(void) = 0;
 
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index ba1966e0d..bb7ddfc68 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -153,9 +153,25 @@ public:
         return _mboard[MBOARD_PROP_NAME].as<std::string>();
     }
 
+    /*******************************************************************
+     * Timing
+     ******************************************************************/
+    void set_time_now(const time_spec_t &time_spec){
+        _mboard[MBOARD_PROP_TIME_NOW] = time_spec;
+    }
+
+    void set_time_next_pps(const time_spec_t &time_spec){
+        _mboard[MBOARD_PROP_TIME_NEXT_PPS] = time_spec;
+    }
+
     /*******************************************************************
      * Streaming
      ******************************************************************/
+    void set_streaming_at(const time_spec_t &time_spec){
+        _rx_ddc[std::string("stream_at")] = time_spec;
+        _rx_ddc[std::string("enabled")] = true;
+    }
+
     void set_streaming(bool enb){
         _rx_ddc[std::string("enabled")] = enb;
     }
diff --git a/host/lib/transport/vrt.cpp b/host/lib/transport/vrt.cpp
index a06b5bf21..cc46b2381 100644
--- a/host/lib/transport/vrt.cpp
+++ b/host/lib/transport/vrt.cpp
@@ -42,8 +42,8 @@ void vrt::pack(
     if(metadata.has_time_spec){
         vrt_hdr_flags |= (0x3 << 22) | (0x1 << 20); //TSI: Other, TSF: Sample Count Timestamp
         header_buff[num_header_words32++] = htonl(metadata.time_spec.secs);
-        header_buff[num_header_words32++] = htonl(metadata.time_spec.ticks);
         header_buff[num_header_words32++] = 0; //unused part of fractional seconds
+        header_buff[num_header_words32++] = htonl(metadata.time_spec.ticks);
     }
 
     vrt_hdr_flags |= (metadata.start_of_burst)? (0x1 << 25) : 0;
@@ -99,8 +99,8 @@ void vrt::unpack(
 
     if (vrt_hdr_word & (0x3 << 20)){ //fractional time
         metadata.has_time_spec = true;
-        metadata.time_spec.ticks = ntohl(header_buff[num_header_words32++]);
         num_header_words32++; //unused part of fractional seconds
+        metadata.time_spec.ticks = ntohl(header_buff[num_header_words32++]);
     }
 
     size_t num_trailer_words32 = (vrt_hdr_word & (0x1 << 26))? 1 : 0;
-- 
cgit v1.2.3


From 71d4a26ea047c38c2aecfa982882dd45902b2393 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Wed, 24 Mar 2010 18:30:49 -0700
Subject: mess with that usrp2 io loop unroll, also py app gets installed
 executable

---
 host/lib/usrp/usrp2/io_impl.cpp | 45 +++++++++++++++++++++--------------------
 host/utils/CMakeLists.txt       |  2 +-
 2 files changed, 24 insertions(+), 23 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index dc8eea243..df0736863 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -16,7 +16,6 @@
 //
 
 #include <complex>
-#include <algorithm>
 #include <boost/format.hpp>
 #include "usrp2_impl.hpp"
 
@@ -46,16 +45,14 @@ void usrp2_impl::io_init(void){
     _data_transport->send(asio::buffer(&zero_data, sizeof(zero_data)));
 }
 
-#define unrolled_loop(__i, __len, __inst) {\
+#define unrolled_loop(__inst, __len){ \
     size_t __i = 0; \
-    while(__i < (__len & ~0x7)){ \
-        __inst; __i++; __inst; __i++; \
-        __inst; __i++; __inst; __i++; \
-        __inst; __i++; __inst; __i++; \
-        __inst; __i++; __inst; __i++; \
+    for(; __i < (__len & ~0x3); __i+= 4){ \
+        __inst(__i+0); __inst(__i+1); \
+        __inst(__i+2); __inst(__i+3); \
     } \
-    while(__i < __len){ \
-        __inst; __i++;\
+    for(; __i < __len; __i++){ \
+        __inst(__i); \
     } \
 }
 
@@ -71,11 +68,12 @@ static inline void host_floats_to_usrp2_items(
     const fc32_t *host_floats,
     size_t num_samps
 ){
-    unrolled_loop(i, num_samps,{
-        boost::uint16_t real = boost::int16_t(host_floats[i].real()*shorts_per_float);
-        boost::uint16_t imag = boost::int16_t(host_floats[i].imag()*shorts_per_float);
-        usrp2_items[i] = htonl((real << 16) | (imag << 0));
-    });
+    #define host_floats_to_usrp2_items_i(i){ \
+        boost::uint16_t real = boost::int16_t(host_floats[i].real()*shorts_per_float); \
+        boost::uint16_t imag = boost::int16_t(host_floats[i].imag()*shorts_per_float); \
+        usrp2_items[i] = htonl((real << 16) | (imag << 0)); \
+    }
+    unrolled_loop(host_floats_to_usrp2_items_i, num_samps);
 }
 
 static inline void usrp2_items_to_host_floats(
@@ -83,12 +81,13 @@ static inline void usrp2_items_to_host_floats(
     const boost::uint32_t *usrp2_items,
     size_t num_samps
 ){
-    unrolled_loop(i, num_samps,{
-        boost::uint32_t item = ntohl(usrp2_items[i]);
-        boost::int16_t real = boost::uint16_t(item >> 16);
-        boost::int16_t imag = boost::uint16_t(item >> 0);
-        host_floats[i] = fc32_t(float(real*floats_per_short), float(imag*floats_per_short));
-    });
+    #define usrp2_items_to_host_floats_i(i){ \
+        boost::uint32_t item = ntohl(usrp2_items[i]); \
+        boost::int16_t real = boost::uint16_t(item >> 16); \
+        boost::int16_t imag = boost::uint16_t(item >> 0); \
+        host_floats[i] = fc32_t(float(real*floats_per_short), float(imag*floats_per_short)); \
+    }
+    unrolled_loop(usrp2_items_to_host_floats_i, num_samps);
 }
 
 static inline void host_items_to_usrp2_items(
@@ -96,11 +95,12 @@ static inline void host_items_to_usrp2_items(
     const boost::uint32_t *host_items,
     size_t num_samps
 ){
+    #define host_items_to_usrp2_items_i(i) usrp2_items[i] = htonl(host_items[i])
     if (is_big_endian){
         std::memcpy(usrp2_items, host_items, num_samps*sizeof(boost::uint32_t));
     }
     else{
-        unrolled_loop(i, num_samps, usrp2_items[i] = htonl(host_items[i]));
+        unrolled_loop(host_items_to_usrp2_items_i, num_samps);
     }
 }
 
@@ -109,11 +109,12 @@ static inline void usrp2_items_to_host_items(
     const boost::uint32_t *usrp2_items,
     size_t num_samps
 ){
+    #define usrp2_items_to_host_items_i(i) host_items[i] = ntohl(usrp2_items[i])
     if (is_big_endian){
         std::memcpy(host_items, usrp2_items, num_samps*sizeof(boost::uint32_t));
     }
     else{
-        unrolled_loop(i, num_samps, host_items[i] = ntohl(usrp2_items[i]));
+        unrolled_loop(usrp2_items_to_host_items_i, num_samps);
     }
 }
 
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index 9ac3f3a52..1fb132937 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -23,4 +23,4 @@ ADD_EXECUTABLE(usrp2_burner usrp2_burner.cpp)
 TARGET_LINK_LIBRARIES(usrp2_burner uhd)
 INSTALL(TARGETS usrp2_burner RUNTIME DESTINATION ${PKG_DATA_DIR}/utils)
 
-INSTALL(FILES usrp2_recovery.py DESTINATION ${PKG_DATA_DIR}/utils)
+INSTALL(PROGRAMS usrp2_recovery.py DESTINATION ${PKG_DATA_DIR}/utils)
-- 
cgit v1.2.3


From af586ae149fe6f7aa12d4d6766e4216f3f00d1c0 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 25 Mar 2010 18:36:16 -0700
Subject: Overhaullllllled the way we do streaming. There is an odd bug where a
 zero length command (now, no chain) used to stop the streaming. Now it seems
 to do the reverse... must investigate.

Made all clock configuration into enums. The strings were painful
and there cant be that many variations that enums cant cover them.
The enums will make more sense to developers than mystery strings.
---
 firmware/microblaze/apps/txrx.c           | 174 ++++++++++++++++--------------
 firmware/microblaze/lib/memory_map.h      |   3 +-
 host/examples/rx_timed_samples.cpp        |  14 ++-
 host/include/uhd/props.hpp                |   2 -
 host/include/uhd/simple_device.hpp        |   4 +-
 host/include/uhd/time_spec.hpp            |  10 +-
 host/include/uhd/types.hpp                |  52 +++++++--
 host/lib/simple_device.cpp                |  13 +--
 host/lib/time_spec.cpp                    |   5 -
 host/lib/transport/udp_zero_copy_asio.cpp |   2 +-
 host/lib/types.cpp                        |  15 ++-
 host/lib/usrp/usrp2/dsp_impl.cpp          |  42 +++-----
 host/lib/usrp/usrp2/fw_common.h           |  16 +--
 host/lib/usrp/usrp2/io_impl.cpp           |   8 +-
 host/lib/usrp/usrp2/mboard_impl.cpp       |  77 +++++++------
 host/lib/usrp/usrp2/usrp2_impl.hpp        |  10 +-
 16 files changed, 233 insertions(+), 214 deletions(-)

(limited to 'host/lib')

diff --git a/firmware/microblaze/apps/txrx.c b/firmware/microblaze/apps/txrx.c
index 5eec99c4f..a2e3f0430 100644
--- a/firmware/microblaze/apps/txrx.c
+++ b/firmware/microblaze/apps/txrx.c
@@ -54,11 +54,6 @@
 
 #define FW_SETS_SEQNO	1	// define to 0 or 1 (FIXME must be 1 for now)
 
-#if (FW_SETS_SEQNO)
-static int fw_seqno;	// used when f/w is filling in sequence numbers
-#endif
-
-
 /*
  * Full duplex Tx and Rx between ethernet and DSP pipelines
  *
@@ -127,18 +122,14 @@ dbsm_t dsp_rx_sm;	// the state machine
 // The mac address of the host we're sending to.
 eth_mac_addr_t host_mac_addr;
 
-#define TIME_NOW ((uint32_t)(~0))
-
-// variables for streaming mode
-
-static bool         streaming_p = false;
-static unsigned int streaming_items_per_frame = 0;
-static uint32_t     time_secs = TIME_NOW;
-static uint32_t     time_ticks = TIME_NOW;
-static int          streaming_frame_count = 0;
+//controls continuous streaming...
+static bool   auto_reload_command = false;
+static size_t streaming_items_per_frame = 0;
+static int    streaming_frame_count = 0;
 #define FRAMES_PER_CMD	2
 
-bool is_streaming(void){ return streaming_p; }
+static void setup_network(void);
+static void setup_vrt(void);
 
 // ----------------------------------------------------------------
 // the fast-path setup global variables
@@ -159,6 +150,9 @@ void handle_udp_data_packet(
     struct socket_address src, struct socket_address dst,
     unsigned char *payload, int payload_len
 ){
+    //store the 2nd word as the following:
+    streaming_items_per_frame = ((uint32_t *)payload)[1];
+
     //its a tiny payload, load the fast-path variables
     fp_mac_addr_src = *ethernet_mac_addr();
     arp_cache_lookup_mac(&src.addr, &fp_mac_addr_dst);
@@ -176,6 +170,24 @@ void handle_udp_data_packet(
     print_ip_addr(&fp_socket_dst.addr); newline();
     printf("  destination udp port: %d\n", fp_socket_dst.port);
     newline();
+
+    //setup network and vrt
+    setup_network();
+    setup_vrt();
+
+    // kick off the state machine
+    dbsm_start(&dsp_rx_sm);
+
+}
+
+static void inline issue_stream_command(size_t nsamps, bool now, bool chain, uint32_t secs, uint32_t ticks, bool start){
+    //printf("Stream cmd: nsamps %d, now %d, chain %d, secs %u, ticks %u\n", (int)nsamps, now, chain, secs, ticks);
+    sr_rx_ctrl->cmd = MK_RX_CMD(nsamps, now, chain);
+
+    if (start) dbsm_start(&dsp_rx_sm);
+
+    sr_rx_ctrl->time_secs = secs;
+    sr_rx_ctrl->time_ticks = ticks;	// enqueue command
 }
 
 #define OTW_GPIO_BANK_TO_NUM(bank) \
@@ -443,20 +455,68 @@ void handle_udp_ctrl_packet(
         ctrl_data_out.id = USRP2_CTRL_ID_TOTALLY_SETUP_THE_DDC_DUDE;
         break;
 
-    case USRP2_CTRL_ID_CONFIGURE_STREAMING_FOR_ME_BRO:
-        time_secs =  ctrl_data_in->data.streaming.secs;
-        time_ticks = ctrl_data_in->data.streaming.ticks;
-        streaming_items_per_frame = ctrl_data_in->data.streaming.samples;
+    /*******************************************************************
+     * Streaming
+     ******************************************************************/
+    case USRP2_CTRL_ID_SEND_STREAM_COMMAND_FOR_ME_BRO:{
+
+        //issue two commands and set the auto-reload flag
+        if (ctrl_data_in->data.stream_cmd.continuous){
+            printf("Setting up continuous streaming...\n");
+            auto_reload_command = true;
+            streaming_frame_count = FRAMES_PER_CMD;
+
+            issue_stream_command(
+                streaming_items_per_frame * FRAMES_PER_CMD,
+                (ctrl_data_in->data.stream_cmd.now == 0)? false : true, //now
+                true, //chain
+                ctrl_data_in->data.stream_cmd.secs,
+                ctrl_data_in->data.stream_cmd.ticks,
+                true //start
+            );
+
+            issue_stream_command(
+                streaming_items_per_frame * FRAMES_PER_CMD,
+                true, //now
+                true, //chain
+                0, 0, //time does not matter
+                false
+            );
 
-        if (ctrl_data_in->data.streaming.enabled == 0){
-            stop_rx_cmd();
         }
+
+        //issue regular stream commands (split commands if too large)
         else{
-            start_rx_streaming_cmd();
-        }
+            auto_reload_command = false;
+            size_t num_samps = ctrl_data_in->data.stream_cmd.num_samps;
+            if (num_samps == 0) num_samps = 1; //FIXME hack, zero is used when stopping continuous streaming but it somehow makes it inifinite
+
+            bool chain = num_samps > MAX_SAMPLES_PER_CMD;
+            issue_stream_command(
+                (chain)? streaming_items_per_frame : num_samps, //nsamps
+                (ctrl_data_in->data.stream_cmd.now == 0)? false : true, //now
+                chain, //chain
+                ctrl_data_in->data.stream_cmd.secs,
+                ctrl_data_in->data.stream_cmd.ticks,
+                false
+            );
 
-        ctrl_data_out.id = USRP2_CTRL_ID_CONFIGURED_THAT_STREAMING_DUDE;
+            //handle rest of the samples that did not fit into one cmd
+            while(chain){
+                num_samps -= MAX_SAMPLES_PER_CMD;
+                chain = num_samps > MAX_SAMPLES_PER_CMD;
+                issue_stream_command(
+                    (chain)? streaming_items_per_frame : num_samps, //nsamps
+                    true, //now
+                    chain, //chain
+                    0, 0, //time does not matter
+                    false
+                );
+            }
+        }
+        ctrl_data_out.id = USRP2_CTRL_ID_GOT_THAT_STREAM_COMMAND_DUDE;
         break;
+    }
 
     /*******************************************************************
      * DUC
@@ -531,7 +591,7 @@ eth_pkt_inspector(dbsm_t *sm, int bufno)
   // In the future, a hardware state machine will do this...
   if ( //warning! magic numbers approaching....
       (((buff + ((2 + 14 + 20)/sizeof(uint32_t)))[0] & 0xffff) == USRP2_UDP_DATA_PORT) &&
-      ((buff + ((2 + 14 + 20 + 8)/sizeof(uint32_t)))[0] != 0)
+      ((buff + ((2 + 14 + 20 + 8)/sizeof(uint32_t)))[0] != USRP2_INVALID_VRT_HEADER)
   ) return false;
 
   //test if its an ip recovery packet
@@ -557,7 +617,7 @@ eth_pkt_inspector(dbsm_t *sm, int bufno)
 
 //------------------------------------------------------------------
 
-static uint16_t get_vrt_packet_words(void){
+static size_t get_vrt_packet_words(void){
     return streaming_items_per_frame + \
         USRP2_HOST_RX_VRT_HEADER_WORDS32 + \
         USRP2_HOST_RX_VRT_TRAILER_WORDS32;
@@ -567,9 +627,7 @@ static bool vrt_has_trailer(void){
     return USRP2_HOST_RX_VRT_TRAILER_WORDS32 > 0;
 }
 
-void
-restart_streaming(void)
-{
+static void setup_vrt(void){
   // setup RX DSP regs
   sr_rx_ctrl->nsamples_per_pkt = streaming_items_per_frame;
   sr_rx_ctrl->nchannels = 1;
@@ -582,26 +640,6 @@ restart_streaming(void)
   );
   sr_rx_ctrl->vrt_stream_id = 0;
   sr_rx_ctrl->vrt_trailer = 0;
-
-  streaming_p = true;
-  streaming_frame_count = FRAMES_PER_CMD;
-
-  sr_rx_ctrl->cmd =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame,
-    (time_ticks==TIME_NOW)?1:0, 1);  // conditionally set "now" bit, set "chain" bit
-
-  // kick off the state machine
-  dbsm_start(&dsp_rx_sm);
-
-  sr_rx_ctrl->time_secs = time_secs;
-  sr_rx_ctrl->time_ticks = time_ticks;		// enqueue first of two commands
-
-  // make sure this one and the rest have the "now" and "chain" bits set.
-  sr_rx_ctrl->cmd =
-    MK_RX_CMD(FRAMES_PER_CMD * streaming_items_per_frame, 1, 1);
-
-  sr_rx_ctrl->time_secs = 0;
-  sr_rx_ctrl->time_ticks = 0;		// enqueue second command
 }
 
 /*
@@ -630,19 +668,15 @@ link_changed_callback(int speed)
   printf("\neth link changed: speed = %d\n", speed);
 }
 
-void
-start_rx_streaming_cmd(void)
-{
-  /*
-   * Construct  ethernet header and preload into two buffers
-   */
+static void setup_network(void){
+  //setup header and load into two buffers
   struct {
     uint32_t ctrl_word;
   } mem _AL4;
 
   memset(&mem, 0, sizeof(mem));
-  printf("samples per frame: %d\n", streaming_items_per_frame);
-  printf("words in a vrt packet %d\n", get_vrt_packet_words());
+  printf("items per frame: %d\n", (int)streaming_items_per_frame);
+  printf("words in a vrt packet %d\n", (int)get_vrt_packet_words());
   mem.ctrl_word = get_vrt_packet_words()*sizeof(uint32_t) | 1 << 16;
 
   memcpy_wa(buffer_ram(DSP_RX_BUF_0), &mem, sizeof(mem));
@@ -678,26 +712,6 @@ start_rx_streaming_cmd(void)
   sr_udp_sm->udp_hdr.dst_port = fp_socket_dst.port;
   sr_udp_sm->udp_hdr.length = UDP_SM_INS_UDP_LEN;
   sr_udp_sm->udp_hdr.checksum = UDP_SM_LAST_WORD;		// zero UDP checksum
-
-  if (FW_SETS_SEQNO)
-    fw_seqno = 0;
-
-  restart_streaming();
-}
-
-void
-stop_rx_cmd(void)
-{
-  if (is_streaming()){
-    streaming_p = false;
-
-    // no samples, "now", not chained
-    sr_rx_ctrl->cmd = MK_RX_CMD(0, 1, 0);
-
-    sr_rx_ctrl->time_secs = 0;
-    sr_rx_ctrl->time_ticks = 0;	// enqueue command
-  }
-
 }
 
 #if (FW_SETS_SEQNO)
@@ -713,10 +727,10 @@ bool
 fw_sets_seqno_inspector(dbsm_t *sm, int buf_this)	// returns false
 {
   // queue up another rx command when required
-  if (streaming_p && --streaming_frame_count == 0){
+  if (auto_reload_command && --streaming_frame_count == 0){
     streaming_frame_count = FRAMES_PER_CMD;
     sr_rx_ctrl->time_secs = 0;
-    sr_rx_ctrl->time_ticks = 0;
+    sr_rx_ctrl->time_ticks = 0; //enqueue last command
   }
 
   return false;		// we didn't handle the packet
@@ -820,7 +834,7 @@ main(void)
       // FIXME Figure out how to handle this robustly.
       // Any buffers that are emptying should be allowed to drain...
 
-      if (streaming_p){
+      if (auto_reload_command){
 	// restart_streaming();
 	// FIXME report error
       }
diff --git a/firmware/microblaze/lib/memory_map.h b/firmware/microblaze/lib/memory_map.h
index bb6a1036d..fed1e5259 100644
--- a/firmware/microblaze/lib/memory_map.h
+++ b/firmware/microblaze/lib/memory_map.h
@@ -525,8 +525,9 @@ typedef struct {
   volatile uint32_t     pad[7];         // Make each structure 16 elements long
 } sr_rx_ctrl_t;
 
+#define MAX_SAMPLES_PER_CMD 0x3fffffff
 #define	MK_RX_CMD(nsamples, now, chain) \
-  ((((now) & 0x1) << 31) | ((chain & 0x1) << 30) | ((nsamples) & 0x3fffffff))
+  ((((now) & 0x1) << 31) | (((chain) & 0x1) << 30) | ((nsamples) & 0x3fffffff))
 
 #define sr_rx_ctrl ((sr_rx_ctrl_t *) _SR_ADDR(SR_RX_CTRL))
 
diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 97f75647e..7d58187cd 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -65,9 +65,14 @@ int main(int argc, char *argv[]){
 
     //setup streaming
     std::cout << std::endl;
-    std::cout << boost::format("Begin streaming %u seconds in the future...")
-        % seconds_in_future << std::endl;
-    sdev->set_streaming_at(uhd::time_spec_t(seconds_in_future));
+    std::cout << boost::format("Begin streaming %u samples, %d seconds in the future...")
+        % total_num_samps % seconds_in_future << std::endl;
+    uhd::stream_cmd_t stream_cmd;
+    stream_cmd.stream_now = false;
+    stream_cmd.time_spec = uhd::time_spec_t(seconds_in_future);
+    stream_cmd.continuous = false;
+    stream_cmd.num_samps = total_num_samps;
+    sdev->issue_stream_cmd(stream_cmd);
 
     //loop until total number of samples reached
     size_t num_acc_samps = 0; //number of accumulated samples
@@ -83,8 +88,7 @@ int main(int argc, char *argv[]){
         num_acc_samps += num_rx_samps;
     }
 
-    //finished, stop streaming
-    sdev->set_streaming(false);
+    //finished
     std::cout << std::endl << "Done!" << std::endl << std::endl;
 
     return 0;
diff --git a/host/include/uhd/props.hpp b/host/include/uhd/props.hpp
index 41e0eff63..01746f853 100644
--- a/host/include/uhd/props.hpp
+++ b/host/include/uhd/props.hpp
@@ -76,8 +76,6 @@ namespace uhd{
         MBOARD_PROP_TX_DBOARD,         //ro, wax::obj
         MBOARD_PROP_TX_DBOARD_NAMES,   //ro, prop_names_t
         MBOARD_PROP_CLOCK_CONFIG,      //rw, clock_config_t
-        MBOARD_PROP_PPS_SOURCE_NAMES,  //ro, prop_names_t
-        MBOARD_PROP_REF_SOURCE_NAMES,  //ro, prop_names_t
         MBOARD_PROP_TIME_NOW,          //wo, time_spec_t
         MBOARD_PROP_TIME_NEXT_PPS      //wo, time_spec_t
     };
diff --git a/host/include/uhd/simple_device.hpp b/host/include/uhd/simple_device.hpp
index 035757936..bbe0258c7 100644
--- a/host/include/uhd/simple_device.hpp
+++ b/host/include/uhd/simple_device.hpp
@@ -51,9 +51,7 @@ public:
     /*******************************************************************
      * Streaming
      ******************************************************************/
-    virtual void set_streaming_at(const time_spec_t &time_spec) = 0;
-    virtual void set_streaming(bool enb) = 0;
-    virtual bool get_streaming(void) = 0;
+    virtual void issue_stream_cmd(const stream_cmd_t &stream_cmd) = 0;
 
     /*******************************************************************
      * RX methods
diff --git a/host/include/uhd/time_spec.hpp b/host/include/uhd/time_spec.hpp
index c1e7cf3a1..e863746ba 100644
--- a/host/include/uhd/time_spec.hpp
+++ b/host/include/uhd/time_spec.hpp
@@ -34,18 +34,12 @@ namespace uhd{
         boost::uint32_t secs;
         boost::uint32_t ticks;
 
-        /*!
-         * Create a time_spec_t that holds a wildcard time.
-         * This will have implementation-specific meaning.
-         */
-        time_spec_t(void);
-
         /*!
          * Create a time_spec_t from seconds and ticks.
-         * \param new_secs the new seconds
+         * \param new_secs the new seconds (default = 0)
          * \param new_ticks the new ticks (default = 0)
          */
-        time_spec_t(boost::uint32_t new_secs, boost::uint32_t new_ticks = 0);
+        time_spec_t(boost::uint32_t new_secs = 0, boost::uint32_t new_ticks = 0);
 
         /*!
          * Create a time_spec_t from boost posix time.
diff --git a/host/include/uhd/types.hpp b/host/include/uhd/types.hpp
index 1439f57a1..3ad3dae82 100644
--- a/host/include/uhd/types.hpp
+++ b/host/include/uhd/types.hpp
@@ -19,6 +19,7 @@
 #define INCLUDED_UHD_TYPES_HPP
 
 #include <uhd/config.hpp>
+#include <uhd/time_spec.hpp>
 #include <string>
 
 namespace uhd{
@@ -66,18 +67,53 @@ namespace uhd{
      * Clock configuration settings:
      * The source for the 10MHz reference clock.
      * The source and polarity for the PPS clock.
-     * Possible settings for the reference and pps source
-     * are implementation specific motherboard properties.
-     * See the MBOARD_PROP_XXX_SOURCE_NAMES properties.
      */
-    struct clock_config_t{
-        enum polarity_t {POLARITY_NEG, POLARITY_POS};
-        std::string ref_source;
-        std::string pps_source;
-        polarity_t  pps_polarity;
+    struct UHD_API clock_config_t{
+        enum ref_source_t {
+            REF_INT, //internal reference
+            REF_SMA, //external sma port
+            REF_MIMO //mimo cable (usrp2 only)
+        } ref_source;
+        enum pps_source_t {
+            PPS_INT, //there is no internal
+            PPS_SMA, //external sma port
+            PPS_MIMO //mimo cable (usrp2 only)
+        } pps_source;
+        enum pps_polarity_t {
+            PPS_NEG, //negative edge
+            PPS_POS  //positive edge
+        } pps_polarity;
         clock_config_t(void);
     };
 
+    /*!
+     * Command struct for configuration and control of streaming:
+     *
+     * A stream command defines how the device sends samples to the host.
+     * Streaming is controlled by submitting a stream command to the rx dsp.
+     * Granular control over what the device streams to the host can be
+     * achieved through submission of multiple (carefully-crafted) commands.
+     *
+     * The stream_now parameter controls when the stream begins.
+     * When true, the device will begin streaming ASAP. When false,
+     * the device will begin streaming at a time specified by time_spec.
+     *
+     * The continuous parameter controls the number of samples received.
+     * When true, the device continues streaming indefinitely. When false,
+     * the device will stream the number of samples specified by num_samps.
+     *
+     * Standard usage case:
+     * To start continuous streaming, set stream_now to true and continuous to true.
+     * To end continuous streaming, set stream_now to true and continuous to false.
+     */
+    struct UHD_API stream_cmd_t{
+        bool stream_now;
+        time_spec_t time_spec;
+        bool continuous;
+        size_t num_samps;
+        stream_cmd_t(void);
+    };
+
 } //namespace uhd
 
 #endif /* INCLUDED_UHD_TYPES_HPP */
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index bb7ddfc68..a25cb12e0 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -167,17 +167,8 @@ public:
     /*******************************************************************
      * Streaming
      ******************************************************************/
-    void set_streaming_at(const time_spec_t &time_spec){
-        _rx_ddc[std::string("stream_at")] = time_spec;
-        _rx_ddc[std::string("enabled")] = true;
-    }
-
-    void set_streaming(bool enb){
-        _rx_ddc[std::string("enabled")] = enb;
-    }
-
-    bool get_streaming(void){
-        return _rx_ddc[std::string("enabled")].as<bool>();
+    void issue_stream_cmd(const stream_cmd_t &stream_cmd){
+        _rx_ddc[std::string("stream_cmd")] = stream_cmd;
     }
 
     /*******************************************************************
diff --git a/host/lib/time_spec.cpp b/host/lib/time_spec.cpp
index 210010394..98bf28077 100644
--- a/host/lib/time_spec.cpp
+++ b/host/lib/time_spec.cpp
@@ -19,11 +19,6 @@
 
 using namespace uhd;
 
-time_spec_t::time_spec_t(void){
-    secs = ~0;
-    ticks = ~0;
-}
-
 time_spec_t::time_spec_t(boost::uint32_t new_secs, boost::uint32_t new_ticks){
     secs = new_secs;
     ticks = new_ticks;
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp
index 219ae8720..9436f2a13 100644
--- a/host/lib/transport/udp_zero_copy_asio.cpp
+++ b/host/lib/transport/udp_zero_copy_asio.cpp
@@ -115,7 +115,7 @@ smart_buffer::sptr udp_zero_copy_impl::recv(void){
 
     //implement timeout through polling and sleeping
     boost::asio::deadline_timer timer(_socket->get_io_service());
-    timer.expires_from_now(boost::posix_time::milliseconds(50));
+    timer.expires_from_now(boost::posix_time::milliseconds(100));
     while (not ((available = _socket->available()) or timer.expires_from_now().is_negative())){
         boost::this_thread::sleep(boost::posix_time::milliseconds(1));
     }
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index f8a9a9b36..273f87a2d 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -51,7 +51,16 @@ tune_result_t::tune_result_t(void){
  * clock config
  **********************************************************************/
 clock_config_t::clock_config_t(void){
-    ref_source = ""; //not a valid setting
-    pps_source = ""; //not a valid setting
-    pps_polarity = POLARITY_NEG;
+    ref_source = REF_INT,
+    pps_source = PPS_INT,
+    pps_polarity = PPS_NEG;
+}
+
+/***********************************************************************
+ * stream command
+ **********************************************************************/
+stream_cmd_t::stream_cmd_t(void){
+    stream_now = true;
+    continuous = false;
+    num_samps = 0;
 }
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 34cce0afb..44f654863 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -63,9 +63,8 @@ void usrp2_impl::init_ddc_config(void){
     _ddc_freq = 0;
     update_ddc_config();
 
-    _ddc_stream_at = time_spec_t();
-    _ddc_enabled = false;
-    update_ddc_enabled();
+    //initial command that kills streaming (in case if was left on)
+    //issue_ddc_stream_cmd(TODO)
 }
 
 void usrp2_impl::update_ddc_config(void){
@@ -86,21 +85,19 @@ void usrp2_impl::update_ddc_config(void){
     ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_TOTALLY_SETUP_THE_DDC_DUDE);
 }
 
-void usrp2_impl::update_ddc_enabled(void){
+void usrp2_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){
     //setup the out data
     usrp2_ctrl_data_t out_data;
-    out_data.id = htonl(USRP2_CTRL_ID_CONFIGURE_STREAMING_FOR_ME_BRO);
-    out_data.data.streaming.enabled = (_ddc_enabled)? 1 : 0;
-    out_data.data.streaming.secs =  htonl(_ddc_stream_at.secs);
-    out_data.data.streaming.ticks = htonl(_ddc_stream_at.ticks);
-    out_data.data.streaming.samples = htonl(_max_rx_samples_per_packet);
+    out_data.id = htonl(USRP2_CTRL_ID_SEND_STREAM_COMMAND_FOR_ME_BRO);
+    out_data.data.stream_cmd.now = (stream_cmd.stream_now)? 1 : 0;
+    out_data.data.stream_cmd.continuous = (stream_cmd.continuous)? 1 : 0;
+    out_data.data.stream_cmd.secs = htonl(stream_cmd.time_spec.secs);
+    out_data.data.stream_cmd.ticks = htonl(stream_cmd.time_spec.ticks);
+    out_data.data.stream_cmd.num_samps = htonl(stream_cmd.num_samps);
 
     //send and recv
     usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data);
-    ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_CONFIGURED_THAT_STREAMING_DUDE);
-
-    //clear the stream at time spec (it must be set for the next round of enable/disable)
-    _ddc_stream_at = time_spec_t();
+    ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_GOT_THAT_STREAM_COMMAND_DUDE);
 }
 
 /***********************************************************************
@@ -120,8 +117,7 @@ void usrp2_impl::ddc_get(const wax::obj &key, wax::obj &val){
                     ("decim")
                     ("decims")
                     ("freq")
-                    ("enabled")
-                    ("stream_at")
+                    ("stream_cmd")
                 ;
                 val = others;
             }
@@ -147,10 +143,6 @@ void usrp2_impl::ddc_get(const wax::obj &key, wax::obj &val){
         val = _ddc_freq;
         return;
     }
-    else if (key_name == "enabled"){
-        val = _ddc_enabled;
-        return;
-    }
 
     throw std::invalid_argument(str(
         boost::format("error getting: unknown key with name %s") % key_name
@@ -178,16 +170,8 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
         update_ddc_config();
         return;
     }
-    else if (key_name == "enabled"){
-        bool new_enabled = val.as<bool>();
-        _ddc_enabled = new_enabled; //shadow
-        update_ddc_enabled();
-        return;
-    }
-    else if (key_name == "stream_at"){
-        time_spec_t new_stream_at = val.as<time_spec_t>();
-        _ddc_stream_at = new_stream_at; //shadow
-        //update_ddc_enabled(); //dont update from here
+    else if (key_name == "stream_cmd"){
+        issue_ddc_stream_cmd(val.as<stream_cmd_t>());
         return;
     }
 
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h
index 7fcae6fb2..30fee6c32 100644
--- a/host/lib/usrp/usrp2/fw_common.h
+++ b/host/lib/usrp/usrp2/fw_common.h
@@ -32,6 +32,9 @@ extern "C" {
 #define _SINS_
 #endif
 
+//used to differentiate control packets over data port
+#define USRP2_INVALID_VRT_HEADER 0
+
 // size of the vrt header and trailer to the host
 #define USRP2_HOST_RX_VRT_HEADER_WORDS32 5
 #define USRP2_HOST_RX_VRT_TRAILER_WORDS32 1 //FIXME fpga sets wrong header size when no trailer present
@@ -90,8 +93,8 @@ typedef enum{
     USRP2_CTRL_ID_SETUP_THIS_DDC_FOR_ME_BRO,
     USRP2_CTRL_ID_TOTALLY_SETUP_THE_DDC_DUDE,
 
-    USRP2_CTRL_ID_CONFIGURE_STREAMING_FOR_ME_BRO,
-    USRP2_CTRL_ID_CONFIGURED_THAT_STREAMING_DUDE,
+    USRP2_CTRL_ID_SEND_STREAM_COMMAND_FOR_ME_BRO,
+    USRP2_CTRL_ID_GOT_THAT_STREAM_COMMAND_DUDE,
 
     USRP2_CTRL_ID_SETUP_THIS_DUC_FOR_ME_BRO,
     USRP2_CTRL_ID_TOTALLY_SETUP_THE_DUC_DUDE,
@@ -186,12 +189,13 @@ typedef struct{
             _SINS_ uint32_t scale_iq;
         } ddc_args;
         struct {
-            _SINS_ uint8_t enabled;
-            _SINS_ uint8_t _pad[3];
+            _SINS_ uint8_t now; //stream now?
+            _SINS_ uint8_t continuous; //auto-reload commmands?
+            _SINS_ uint8_t _pad[2];
             _SINS_ uint32_t secs;
             _SINS_ uint32_t ticks;
-            _SINS_ uint32_t samples;
-        } streaming;
+            _SINS_ uint32_t num_samps;
+        } stream_cmd;
         struct {
             _SINS_ uint32_t freq_word;
             _SINS_ uint32_t interp;
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index df0736863..280f124d2 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -41,8 +41,12 @@ void usrp2_impl::io_init(void){
     _rx_copy_buff = asio::buffer("", 0);
 
     //send a small data packet so the usrp2 knows the udp source port
-    boost::uint32_t zero_data = 0;
-    _data_transport->send(asio::buffer(&zero_data, sizeof(zero_data)));
+    //and the maximum number of lines (32 bit words) per packet
+    boost::uint32_t data[2] = {
+        htonl(USRP2_INVALID_VRT_HEADER),
+        htonl(_max_rx_samples_per_packet)
+    };
+    _data_transport->send(asio::buffer(&data, sizeof(data)));
 }
 
 #define unrolled_loop(__inst, __len){ \
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index cbca8eec7..c56782c4b 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -35,27 +35,10 @@ void usrp2_impl::mboard_init(void){
 }
 
 void usrp2_impl::init_clock_config(void){
-    //init the ref source clock config
-    _ref_source_dict = boost::assign::map_list_of
-        ("int", USRP2_REF_SOURCE_INT)
-        ("sma", USRP2_REF_SOURCE_SMA)
-        ("mimo", USRP2_REF_SOURCE_MIMO)
-    ;
-    _clock_config.ref_source = "int";
-
-    //init the pps source clock config
-    _pps_source_dict = boost::assign::map_list_of
-        ("sma", USRP2_PPS_SOURCE_SMA)
-        ("mimo", USRP2_PPS_SOURCE_MIMO)
-    ;
-    _clock_config.pps_source = "sma";
-
-    //init the pps polarity clock config
-    _pps_polarity_dict = boost::assign::map_list_of
-        (clock_config_t::POLARITY_POS, USRP2_PPS_POLARITY_POS)
-        (clock_config_t::POLARITY_NEG, USRP2_PPS_POLARITY_NEG)
-    ;
-    _clock_config.pps_polarity = clock_config_t::POLARITY_NEG;
+    //setup the clock configuration settings
+    _clock_config.ref_source = clock_config_t::REF_INT;
+    _clock_config.pps_source = clock_config_t::PPS_SMA;
+    _clock_config.pps_polarity = clock_config_t::PPS_NEG;
 
     //update the clock config (sends a control packet)
     update_clock_config();
@@ -65,9 +48,35 @@ void usrp2_impl::update_clock_config(void){
     //setup the out data
     usrp2_ctrl_data_t out_data;
     out_data.id = htonl(USRP2_CTRL_ID_HERES_A_NEW_CLOCK_CONFIG_BRO);
-    out_data.data.clock_config.ref_source   = _ref_source_dict  [_clock_config.ref_source];
-    out_data.data.clock_config.pps_source   = _pps_source_dict  [_clock_config.pps_source];
-    out_data.data.clock_config.pps_polarity = _pps_polarity_dict[_clock_config.pps_polarity];
+
+    //translate ref source enums
+    switch(_clock_config.ref_source){
+    case clock_config_t::REF_INT:
+        out_data.data.clock_config.ref_source = USRP2_REF_SOURCE_INT; break;
+    case clock_config_t::REF_SMA:
+        out_data.data.clock_config.ref_source = USRP2_REF_SOURCE_SMA; break;
+    case clock_config_t::REF_MIMO:
+        out_data.data.clock_config.ref_source = USRP2_REF_SOURCE_MIMO; break;
+    default: throw std::runtime_error("usrp2: unhandled clock configuration ref source");
+    }
+
+    //translate pps source enums
+    switch(_clock_config.pps_source){
+    case clock_config_t::PPS_SMA:
+        out_data.data.clock_config.pps_source = USRP2_PPS_SOURCE_SMA; break;
+    case clock_config_t::PPS_MIMO:
+        out_data.data.clock_config.pps_source = USRP2_PPS_SOURCE_MIMO; break;
+    default: throw std::runtime_error("usrp2: unhandled clock configuration pps source");
+    }
+
+    //translate pps polarity enums
+    switch(_clock_config.pps_polarity){
+    case clock_config_t::PPS_POS:
+        out_data.data.clock_config.pps_source = USRP2_PPS_POLARITY_POS; break;
+    case clock_config_t::PPS_NEG:
+        out_data.data.clock_config.pps_source = USRP2_PPS_POLARITY_NEG; break;
+    default: throw std::runtime_error("usrp2: unhandled clock configuration pps polarity");
+    }
 
     //send and recv
     usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data);
@@ -184,14 +193,6 @@ void usrp2_impl::mboard_get(const wax::obj &key_, wax::obj &val){
         val = _clock_config;
         return;
 
-    case MBOARD_PROP_PPS_SOURCE_NAMES:
-        val = prop_names_t(_pps_source_dict.get_keys());
-        return;
-
-    case MBOARD_PROP_REF_SOURCE_NAMES:
-        val = prop_names_t(_ref_source_dict.get_keys());
-        return;
-
     case MBOARD_PROP_TIME_NOW:
     case MBOARD_PROP_TIME_NEXT_PPS:
         throw std::runtime_error("Error: trying to get write-only property on usrp2 mboard");
@@ -234,13 +235,9 @@ void usrp2_impl::mboard_set(const wax::obj &key, const wax::obj &val){
     //handle the get request conditioned on the key
     switch(key.as<mboard_prop_t>()){
 
-    case MBOARD_PROP_CLOCK_CONFIG:{
-            clock_config_t clock_config = val.as<clock_config_t>();
-            assert_has(_pps_source_dict.get_keys(), clock_config.pps_source, "usrp2 pps source");
-            assert_has(_ref_source_dict.get_keys(), clock_config.ref_source, "usrp2 ref source");
-            _clock_config = clock_config; //shadow
-            update_clock_config();
-        }
+    case MBOARD_PROP_CLOCK_CONFIG:
+        _clock_config = val.as<clock_config_t>();
+        update_clock_config();
         return;
 
     case MBOARD_PROP_TIME_NOW:{
@@ -264,8 +261,6 @@ void usrp2_impl::mboard_set(const wax::obj &key, const wax::obj &val){
     case MBOARD_PROP_RX_DBOARD_NAMES:
     case MBOARD_PROP_TX_DBOARD:
     case MBOARD_PROP_TX_DBOARD_NAMES:
-    case MBOARD_PROP_PPS_SOURCE_NAMES:
-    case MBOARD_PROP_REF_SOURCE_NAMES:
         throw std::runtime_error("Error: trying to set read-only property on usrp2 mboard");
 
     }
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 55ac0b192..2794cc666 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -21,7 +21,6 @@
 #include <uhd/usrp/usrp2.hpp>
 #include <uhd/dict.hpp>
 #include <uhd/types.hpp>
-#include <uhd/time_spec.hpp>
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
@@ -146,11 +145,6 @@ private:
     void update_clock_config(void);
     void set_time_spec(const uhd::time_spec_t &time_spec, bool now);
 
-    //mappings from clock config strings to over the wire enums
-    uhd::dict<std::string, usrp2_ref_source_t> _ref_source_dict;
-    uhd::dict<std::string, usrp2_pps_source_t> _pps_source_dict;
-    uhd::dict<uhd::clock_config_t::polarity_t, usrp2_pps_polarity_t> _pps_polarity_dict;
-
     //rx and tx dboard methods and objects
     uhd::usrp::dboard_manager::sptr _dboard_manager;
     void dboard_init(void);
@@ -178,11 +172,9 @@ private:
     std::vector<size_t> _allowed_decim_and_interp_rates;
     size_t _ddc_decim;
     uhd::freq_t _ddc_freq;
-    bool _ddc_enabled;
-    uhd::time_spec_t _ddc_stream_at;
     void init_ddc_config(void);
     void update_ddc_config(void);
-    void update_ddc_enabled(void);
+    void issue_ddc_stream_cmd(const uhd::stream_cmd_t &stream_cmd);
 
     //methods and shadows for the duc dsp
     size_t _duc_interp;
-- 
cgit v1.2.3


From 08f6b21ce7cc4aa4069b4461785fc7173bed2998 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 26 Mar 2010 11:45:56 -0700
Subject: added interface address discovery

---
 host/include/uhd/transport/CMakeLists.txt    |   1 +
 host/include/uhd/transport/if_addrs.hpp      |  47 ++++
 host/include/uhd/transport/smart_buffer.hpp  |   2 +-
 host/include/uhd/transport/udp_simple.hpp    |   2 +-
 host/include/uhd/transport/udp_zero_copy.hpp |   2 +-
 host/lib/CMakeLists.txt                      |  15 +-
 host/lib/transport/if_addrs.cpp              | 343 +++++++++++++++++++++++++++
 host/lib/transport/udp_simple.cpp            |   1 +
 host/lib/transport/udp_zero_copy_asio.cpp    |   1 +
 host/lib/usrp/usrp2/usrp2_impl.cpp           |  20 +-
 host/lib/usrp/usrp2/usrp2_impl.hpp           |   1 +
 11 files changed, 429 insertions(+), 6 deletions(-)
 create mode 100644 host/include/uhd/transport/if_addrs.hpp
 create mode 100644 host/lib/transport/if_addrs.cpp

(limited to 'host/lib')

diff --git a/host/include/uhd/transport/CMakeLists.txt b/host/include/uhd/transport/CMakeLists.txt
index 75b07c540..14b5ccd29 100644
--- a/host/include/uhd/transport/CMakeLists.txt
+++ b/host/include/uhd/transport/CMakeLists.txt
@@ -17,6 +17,7 @@
 
 
 INSTALL(FILES
+    if_addrs.hpp
     smart_buffer.hpp
     udp_simple.hpp
     udp_zero_copy.hpp
diff --git a/host/include/uhd/transport/if_addrs.hpp b/host/include/uhd/transport/if_addrs.hpp
new file mode 100644
index 000000000..fbbb35e1d
--- /dev/null
+++ b/host/include/uhd/transport/if_addrs.hpp
@@ -0,0 +1,47 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_IFADDRS_HPP
+#define INCLUDED_UHD_IFADDRS_HPP
+
+#include <uhd/config.hpp>
+#include <string>
+#include <vector>
+
+namespace uhd{ namespace transport{
+
+    /*!
+     * The address for a network interface.
+     */
+    struct UHD_API if_addrs_t{
+        std::string inet;
+        std::string mask;
+        std::string bcast;
+        if_addrs_t(void);
+    };
+
+    /*!
+     * Get a list of network interface addresses.
+     * The internal implementation is system-dependent.
+     * \return a vector of if addrs
+     */
+    UHD_API std::vector<if_addrs_t> get_if_addrs(void);
+
+}} //namespace
+
+
+#endif /* INCLUDED_UHD_IFADDRS_HPP */
diff --git a/host/include/uhd/transport/smart_buffer.hpp b/host/include/uhd/transport/smart_buffer.hpp
index 9e1032feb..a9bc259e9 100644
--- a/host/include/uhd/transport/smart_buffer.hpp
+++ b/host/include/uhd/transport/smart_buffer.hpp
@@ -18,7 +18,7 @@
 #ifndef INCLUDED_UHD_TRANSPORT_SMART_BUFFER_HPP
 #define INCLUDED_UHD_TRANSPORT_SMART_BUFFER_HPP
 
-#include <boost/asio.hpp>
+#include <boost/asio/buffer.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/host/include/uhd/transport/udp_simple.hpp b/host/include/uhd/transport/udp_simple.hpp
index 40e60d091..793ec4fd7 100644
--- a/host/include/uhd/transport/udp_simple.hpp
+++ b/host/include/uhd/transport/udp_simple.hpp
@@ -19,7 +19,7 @@
 #define INCLUDED_UHD_TRANSPORT_UDP_SIMPLE_HPP
 
 #include <uhd/config.hpp>
-#include <boost/asio.hpp>
+#include <boost/asio/buffer.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/host/include/uhd/transport/udp_zero_copy.hpp b/host/include/uhd/transport/udp_zero_copy.hpp
index 03d89b3a5..0441a8e74 100644
--- a/host/include/uhd/transport/udp_zero_copy.hpp
+++ b/host/include/uhd/transport/udp_zero_copy.hpp
@@ -20,7 +20,7 @@
 
 #include <uhd/config.hpp>
 #include <uhd/transport/smart_buffer.hpp>
-#include <boost/asio.hpp>
+#include <boost/asio/buffer.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
 
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 22fbde265..4dd638336 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -28,6 +28,7 @@ SET(libuhd_sources
     time_spec.cpp
     types.cpp
     wax.cpp
+    transport/if_addrs.cpp
     transport/udp_simple.cpp
     transport/vrt.cpp
     usrp/dboard/basic.cpp
@@ -60,7 +61,6 @@ LIST(APPEND libuhd_sources
 # Setup defines for module loading
 ########################################################################
 INCLUDE(CheckIncludeFileCXX)
-
 CHECK_INCLUDE_FILE_CXX(dlfcn.h HAVE_DLFCN_H)
 CHECK_INCLUDE_FILE_CXX(Winbase.h HAVE_WINBASE_H)
 
@@ -74,6 +74,19 @@ ELSE(HAVE_DLFCN_H)
     MESSAGE(STATUS "Module loading not supported...")
 ENDIF(HAVE_DLFCN_H)
 
+########################################################################
+# Setup defines for interface address discovery
+########################################################################
+INCLUDE(CheckIncludeFileCXX)
+CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H)
+
+IF(HAVE_IFADDRS_H)
+    MESSAGE(STATUS "Interface address discovery supported through getifaddrs...")
+    ADD_DEFINITIONS(-DHAVE_IFADDRS_H)
+ELSE(HAVE_IFADDRS_H)
+    MESSAGE(STATUS "Interface address discovery not supported...")
+ENDIF(HAVE_IFADDRS_H)
+
 ########################################################################
 # Setup libuhd library
 ########################################################################
diff --git a/host/lib/transport/if_addrs.cpp b/host/lib/transport/if_addrs.cpp
new file mode 100644
index 000000000..d3ea448fd
--- /dev/null
+++ b/host/lib/transport/if_addrs.cpp
@@ -0,0 +1,343 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/transport/if_addrs.hpp>
+
+uhd::transport::if_addrs_t::if_addrs_t(void){
+    /* NOP */
+}
+
+/***********************************************************************
+ * Interface address discovery through ifaddrs api
+ **********************************************************************/
+#ifdef HAVE_IFADDRS_H
+#include <ifaddrs.h>
+#include <boost/asio/ip/address_v4.hpp>
+
+static boost::asio::ip::address_v4 sockaddr_to_ip_addr(sockaddr *addr){
+    if (addr->sa_family == AF_INET) return boost::asio::ip::address_v4(ntohl(
+        reinterpret_cast<sockaddr_in*>(addr)->sin_addr.s_addr
+    ));
+    return boost::asio::ip::address_v4::any();
+}
+
+static bool ifaddrs_valid(const struct ifaddrs *ifaddrs){
+    return (
+        ifaddrs->ifa_addr->sa_family == AF_INET and
+        sockaddr_to_ip_addr(ifaddrs->ifa_addr) != boost::asio::ip::address_v4::loopback()
+    );
+}
+
+std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
+    std::vector<if_addrs_t> if_addrs;
+    struct ifaddrs *ifap;
+    if (getifaddrs(&ifap) == 0){
+        for (struct ifaddrs *iter = ifap; iter != NULL; iter = iter->ifa_next){
+            if (not ifaddrs_valid(iter)) continue;
+            if_addrs_t if_addr;
+            if_addr.inet = sockaddr_to_ip_addr(iter->ifa_addr).to_string();
+            if_addr.mask = sockaddr_to_ip_addr(iter->ifa_netmask).to_string();
+            if_addr.bcast = sockaddr_to_ip_addr(iter->ifa_broadaddr).to_string();
+            if_addrs.push_back(if_addr);
+        }
+        freeifaddrs(ifap);
+    }
+    return if_addrs;
+}
+
+/***********************************************************************
+ * Interface address discovery through windows api (TODO)
+ **********************************************************************/
+//#elif HAVE_XXX_H
+
+/***********************************************************************
+ * Interface address discovery not included
+ **********************************************************************/
+#else /* HAVE_IFADDRS_H */
+
+std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
+    return std::vector<if_addrs_t>();
+}
+
+#endif /* HAVE_IFADDRS_H */
+
+////////////////////////////////////////////////////////////////////////
+// How to extract the ip address: unix/windows
+// http://www.developerweb.net/forum/showthread.php?t=5085
+////////////////////////////////////////////////////////////////////////
+
+/*
+#include <stdio.h>
+
+#ifdef WIN32
+# include <windows.h>
+# include <winsock.h>
+# include <iphlpapi.h>
+#else
+# include <unistd.h>
+# include <stdlib.h>
+# include <sys/socket.h>
+# include <netdb.h>
+# include <netinet/in.h>
+# include <net/if.h>
+# include <sys/ioctl.h>
+#endif
+
+#include <string.h>
+#include <sys/stat.h>
+
+typedef unsigned long uint32;
+
+#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
+# define USE_GETIFADDRS 1
+# include <ifaddrs.h>
+static uint32 SockAddrToUint32(struct sockaddr * a)
+{
+   return ((a)&&(a->sa_family == AF_INET)) ? ntohl(((struct sockaddr_in *)a)->sin_addr.s_addr) : 0;
+}
+#endif
+
+// convert a numeric IP address into its string representation
+static void Inet_NtoA(uint32 addr, char * ipbuf)
+{
+   sprintf(ipbuf, "%li.%li.%li.%li", (addr>>24)&0xFF, (addr>>16)&0xFF, (addr>>8)&0xFF, (addr>>0)&0xFF);
+}
+
+// convert a string represenation of an IP address into its numeric equivalent
+static uint32 Inet_AtoN(const char * buf)
+{
+   // net_server inexplicably doesn't have this function; so I'll just fake it
+   uint32 ret = 0;
+   int shift = 24;  // fill out the MSB first
+   bool startQuad = true;
+   while((shift >= 0)&&(*buf))
+   {
+      if (startQuad)
+      {
+         unsigned char quad = (unsigned char) atoi(buf);
+         ret |= (((uint32)quad) << shift);
+         shift -= 8;
+      }
+      startQuad = (*buf == '.');
+      buf++;
+   }
+   return ret;
+}
+
+static void PrintNetworkInterfaceInfos()
+{
+#if defined(USE_GETIFADDRS)
+   // BSD-style implementation
+   struct ifaddrs * ifap;
+   if (getifaddrs(&ifap) == 0)
+   {
+      struct ifaddrs * p = ifap;
+      while(p)
+      {
+         uint32 ifaAddr  = SockAddrToUint32(p->ifa_addr);
+         uint32 maskAddr = SockAddrToUint32(p->ifa_netmask);
+         uint32 dstAddr  = SockAddrToUint32(p->ifa_dstaddr);
+         if (ifaAddr > 0)
+         {
+            char ifaAddrStr[32];  Inet_NtoA(ifaAddr,  ifaAddrStr);
+            char maskAddrStr[32]; Inet_NtoA(maskAddr, maskAddrStr);
+            char dstAddrStr[32];  Inet_NtoA(dstAddr,  dstAddrStr);
+            printf("  Found interface:  name=[%s] desc=[%s] address=[%s] netmask=[%s] broadcastAddr=[%s]\n", p->ifa_name, "unavailable", ifaAddrStr, maskAddrStr, dstAddrStr);
+         }
+         p = p->ifa_next;
+      }
+      freeifaddrs(ifap);
+   }
+#elif defined(WIN32)
+   // Windows XP style implementation
+
+   // Adapted from example code at http://msdn2.microsoft.com/en-us/library/aa365917.aspx
+   // Now get Windows' IPv4 addresses table.  Once again, we gotta call GetIpAddrTable()
+   // multiple times in order to deal with potential race conditions properly.
+   MIB_IPADDRTABLE * ipTable = NULL;
+   {
+      ULONG bufLen = 0;
+      for (int i=0; i<5; i++)
+      {
+         DWORD ipRet = GetIpAddrTable(ipTable, &bufLen, false);
+         if (ipRet == ERROR_INSUFFICIENT_BUFFER)
+         {
+            free(ipTable);  // in case we had previously allocated it
+            ipTable = (MIB_IPADDRTABLE *) malloc(bufLen);
+         }
+         else if (ipRet == NO_ERROR) break;
+         else
+         {
+            free(ipTable);
+            ipTable = NULL;
+            break;
+         }
+     }
+   }
+
+   if (ipTable)
+   {
+      // Try to get the Adapters-info table, so we can given useful names to the IP
+      // addresses we are returning.  Gotta call GetAdaptersInfo() up to 5 times to handle
+      // the potential race condition between the size-query call and the get-data call.
+      // I love a well-designed API :^P
+      IP_ADAPTER_INFO * pAdapterInfo = NULL;
+      {
+         ULONG bufLen = 0;
+         for (int i=0; i<5; i++)
+         {
+            DWORD apRet = GetAdaptersInfo(pAdapterInfo, &bufLen);
+            if (apRet == ERROR_BUFFER_OVERFLOW)
+            {
+               free(pAdapterInfo);  // in case we had previously allocated it
+               pAdapterInfo = (IP_ADAPTER_INFO *) malloc(bufLen);
+            }
+            else if (apRet == ERROR_SUCCESS) break;
+            else
+            {
+               free(pAdapterInfo);
+               pAdapterInfo = NULL;
+               break;
+            }
+         }
+      }
+
+      for (DWORD i=0; i<ipTable->dwNumEntries; i++)
+      {
+         const MIB_IPADDRROW & row = ipTable->table[i];
+
+         // Now lookup the appropriate adaptor-name in the pAdaptorInfos, if we can find it
+         const char * name = NULL;
+         const char * desc = NULL;
+         if (pAdapterInfo)
+         {
+            IP_ADAPTER_INFO * next = pAdapterInfo;
+            while((next)&&(name==NULL))
+            {
+               IP_ADDR_STRING * ipAddr = &next->IpAddressList;
+               while(ipAddr)
+               {
+                  if (Inet_AtoN(ipAddr->IpAddress.String) == ntohl(row.dwAddr))
+                  {
+                     name = next->AdapterName;
+                     desc = next->Description;
+                     break;
+                  }
+                  ipAddr = ipAddr->Next;
+               }
+               next = next->Next;
+            }
+         }
+         char buf[128];
+         if (name == NULL)
+         {
+            sprintf(buf, "unnamed-%i", i);
+            name = buf;
+         }
+
+         uint32 ipAddr  = ntohl(row.dwAddr);
+         uint32 netmask = ntohl(row.dwMask);
+         uint32 baddr   = ipAddr & netmask;
+         if (row.dwBCastAddr) baddr |= ~netmask;
+
+         char ifaAddrStr[32];  Inet_NtoA(ipAddr,  ifaAddrStr);
+         char maskAddrStr[32]; Inet_NtoA(netmask, maskAddrStr);
+         char dstAddrStr[32];  Inet_NtoA(baddr,   dstAddrStr);
+         printf("  Found interface:  name=[%s] desc=[%s] address=[%s] netmask=[%s] broadcastAddr=[%s]\n", name, desc?desc:"unavailable", ifaAddrStr, maskAddrStr, dstAddrStr);
+      }
+
+      free(pAdapterInfo);
+      free(ipTable);
+   }
+#else
+   // Dunno what we're running on here!
+#  error "Don't know how to implement PrintNetworkInterfaceInfos() on this OS!"
+#endif
+}
+
+int main(int, char **)
+{
+   PrintNetworkInterfaceInfos();
+   return 0;
+}
+*/
+
+////////////////////////////////////////////////////////////////////////
+// How to extract the mac address: linux/windows
+// http://old.nabble.com/MAC-Address-td19111197.html
+////////////////////////////////////////////////////////////////////////
+
+/*
+Linux:
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+#include <netpacket/packet.h>
+#include <ifaddrs.h>
+
+ifaddrs * ifap = 0;
+if(getifaddrs(&ifap) == 0)
+{
+     ifaddrs * iter = ifap;
+     while(iter)
+     {
+         sockaddr_ll * sal =
+                    reinterpret_cast<sockaddr_ll*>(iter->ifa_addr);
+        if(sal->sll_family == AF_PACKET)
+        {
+                 // get the mac bytes
+                // copy(sal->sll_addr,
+                 //      sal->sll_addr+sal->sll_hallen,
+                 //      buffer);
+        }
+         iter = iter->ifa_next;
+     }
+     freeifaddrs(ifap);
+}
+
+Windows:
+#include <winsock2.h>
+#include <iphlpapi.h>
+
+std::vector<boost::uint8_t> buf;
+DWORD bufLen = 0;
+GetAdaptersAddresses(0, 0, 0, 0, &bufLen);
+if(bufLen)
+{
+     buf.resize(bufLen, 0);
+     IP_ADAPTER_ADDRESSES * ptr =
+                     reinterpret_cast<IP_ADAPTER_ADDRESSES*>(&buf[0]);
+     DWORD err = GetAdaptersAddresses(0, 0, 0, ptr, &bufLen);
+     if(err == NO_ERROR)
+     {
+          while(ptr)
+         {
+              if(ptr->PhysicalAddressLength)
+              {
+                 // get the mac bytes
+                // copy(ptr->PhysicalAddress,
+                 //      ptr->PhysicalAddress+ptr->PhysicalAddressLength,
+                 //      buffer);
+              }
+              ptr = ptr->Next;
+          }
+     }
+} 
+*/
diff --git a/host/lib/transport/udp_simple.cpp b/host/lib/transport/udp_simple.cpp
index 3c8ecb70d..f339127ad 100644
--- a/host/lib/transport/udp_simple.cpp
+++ b/host/lib/transport/udp_simple.cpp
@@ -16,6 +16,7 @@
 //
 
 #include <uhd/transport/udp_simple.hpp>
+#include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp
index 219ae8720..63944b2bf 100644
--- a/host/lib/transport/udp_zero_copy_asio.cpp
+++ b/host/lib/transport/udp_zero_copy_asio.cpp
@@ -17,6 +17,7 @@
 
 #include <uhd/transport/udp_zero_copy.hpp>
 #include <boost/cstdint.hpp>
+#include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <boost/format.hpp>
 #include <iostream>
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 85d73e83a..f04ae8d2c 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -15,9 +15,11 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include <uhd/transport/if_addrs.hpp>
+#include <uhd/utils.hpp>
 #include <boost/format.hpp>
+#include <boost/foreach.hpp>
 #include <boost/bind.hpp>
-#include <uhd/utils.hpp>
 #include <iostream>
 #include "usrp2_impl.hpp"
 
@@ -36,7 +38,21 @@ STATIC_BLOCK(register_usrp2_device){
 uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
     device_addrs_t usrp2_addrs;
 
-    if (not hint.has_key("addr")) return usrp2_addrs;
+    //if no address was specified, send a broadcast on each interface
+    if (not hint.has_key("addr")){
+        BOOST_FOREACH(const if_addrs_t &if_addrs, get_if_addrs()){
+            //create a new hint with this broadcast address
+            device_addr_t new_hint = hint;
+            new_hint["addr"] = if_addrs.bcast;
+
+            //call discover with the new hint and append results
+            device_addrs_t new_usrp2_addrs = usrp2::discover(new_hint);
+            usrp2_addrs.insert(usrp2_addrs.begin(),
+                new_usrp2_addrs.begin(), new_usrp2_addrs.end()
+            );
+        }
+        return usrp2_addrs;
+    }
 
     //create a udp transport to communicate
     //TODO if an addr is not provided, search all interfaces?
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 55ac0b192..a2f454c61 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -22,6 +22,7 @@
 #include <uhd/dict.hpp>
 #include <uhd/types.hpp>
 #include <uhd/time_spec.hpp>
+#include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/function.hpp>
-- 
cgit v1.2.3


From d1e67602d21bcf97dbea28206659f3ee1146cf4a Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 26 Mar 2010 15:38:12 -0700
Subject: made python app to generate vrt jump tables, seems to run faster...

---
 host/lib/transport/gen_vrt.py | 206 ++++++++++++++++
 host/lib/transport/vrt.cpp    | 550 +++++++++++++++++++++++++++++++++++++-----
 host/utils/usrp2_recovery.py  |  16 ++
 3 files changed, 716 insertions(+), 56 deletions(-)
 create mode 100755 host/lib/transport/gen_vrt.py

(limited to 'host/lib')

diff --git a/host/lib/transport/gen_vrt.py b/host/lib/transport/gen_vrt.py
new file mode 100755
index 000000000..918de3ad7
--- /dev/null
+++ b/host/lib/transport/gen_vrt.py
@@ -0,0 +1,206 @@
+#!/usr/bin/env python
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+"""
+The vrt packer/unpacker code generator:
+
+This script will generate the pack and unpack routines that convert
+metatdata into vrt headers and vrt headers into metadata.
+
+The generated code infers jump tables to speed-up the parsing time.
+"""
+
+TMPL_TEXT = """
+#import time
+
+########################################################################
+## setup predicates
+########################################################################
+#set $sid_p = 0b00001
+#set $cid_p = 0b00010
+#set $tsi_p = 0b00100
+#set $tsf_p = 0b01000
+#set $tlr_p = 0b10000
+
+/***********************************************************************
+ * This file was generated by $file on $time.strftime("%c")
+ **********************************************************************/
+
+\#include <uhd/transport/vrt.hpp>
+\#include <boost/asio.hpp> //endianness conversion
+\#include <stdexcept>
+
+using namespace uhd;
+using namespace uhd::transport;
+
+void vrt::pack(
+    const tx_metadata_t &metadata, //input
+    boost::uint32_t *header_buff,  //output
+    size_t &num_header_words32,    //output
+    size_t num_payload_words32,    //input
+    size_t &num_packet_words32,    //output
+    size_t packet_count            //input
+){
+    boost::uint32_t vrt_hdr_flags;
+
+    boost::uint8_t pred = 0;
+    if (metadata.has_stream_id) pred |= $hex($sid_p);
+    if (metadata.has_time_spec) pred |= $hex($tsi_p | $tsf_p);
+
+    switch(pred){
+    #for $pred in range(2**5)
+    case $pred:
+        #set $num_header_words = 1
+        #set $flags = 0
+        ########## Stream ID ##########
+        #if $pred & $sid_p
+            header_buff[$num_header_words] = htonl(metadata.stream_id);
+            #set $num_header_words += 1
+            #set $flags |= (0x1 << 28);
+        #end if
+        ########## Class ID ##########
+        #if $pred & $cid_p
+            header_buff[$num_header_words] = htonl(0);
+            #set $num_header_words += 1
+            header_buff[$num_header_words] = htonl(0);
+            #set $num_header_words += 1
+            #set $flags |= (0x1 << 27);
+        #end if
+        ########## Integer Time ##########
+        #if $pred & $tsi_p
+            header_buff[$num_header_words] = htonl(metadata.time_spec.secs);
+            #set $num_header_words += 1
+            #set $flags |= (0x3 << 22);
+        #end if
+        ########## Fractional Time ##########
+        #if $pred & $tsf_p
+            header_buff[$num_header_words] = htonl(0);
+            #set $num_header_words += 1
+            header_buff[$num_header_words] = htonl(metadata.time_spec.ticks);
+            #set $num_header_words += 1
+            #set $flags |= (0x1 << 20);
+        #end if
+        ########## Trailer ##########
+        #if $pred & $tlr_p
+            #set $flags |= (0x1 << 26);
+            #set $num_trailer_words = 1;
+        #else
+            #set $num_trailer_words = 0;
+        #end if
+        ########## Variables ##########
+            num_header_words32 = $num_header_words;
+            num_packet_words32 = $($num_header_words + $num_trailer_words) + num_payload_words32;
+            vrt_hdr_flags = $hex($flags);
+        break;
+    #end for
+    }
+
+    //set the burst flags
+    if (metadata.start_of_burst) vrt_hdr_flags |= $hex(0x1 << 25);
+    if (metadata.end_of_burst)   vrt_hdr_flags |= $hex(0x1 << 24);
+
+    //fill in complete header word
+    header_buff[0] = htonl(vrt_hdr_flags |
+        ((packet_count & 0xf) << 16) |
+        (num_packet_words32 & 0xffff)
+    );
+}
+
+void vrt::unpack(
+    rx_metadata_t &metadata,            //output
+    const boost::uint32_t *header_buff, //input
+    size_t &num_header_words32,         //output
+    size_t &num_payload_words32,        //output
+    size_t num_packet_words32,          //input
+    size_t &packet_count                //output
+){
+    //clear the metadata
+    metadata = rx_metadata_t();
+
+    //extract vrt header
+    boost::uint32_t vrt_hdr_word = ntohl(header_buff[0]);
+    size_t packet_words32 = vrt_hdr_word & 0xffff;
+    packet_count = (vrt_hdr_word >> 16) & 0xf;
+
+    //failure cases
+    if (packet_words32 == 0 or num_packet_words32 < packet_words32)
+        throw std::runtime_error("bad vrt header or packet fragment");
+    if (vrt_hdr_word & (0x7 << 29))
+        throw std::runtime_error("unsupported vrt packet type");
+
+    boost::uint8_t pred = 0;
+    if(vrt_hdr_word & $hex(0x1 << 28)) pred |= $hex($sid_p);
+    if(vrt_hdr_word & $hex(0x1 << 27)) pred |= $hex($cid_p);
+    if(vrt_hdr_word & $hex(0x3 << 22)) pred |= $hex($tsi_p);
+    if(vrt_hdr_word & $hex(0x3 << 20)) pred |= $hex($tsf_p);
+    if(vrt_hdr_word & $hex(0x1 << 26)) pred |= $hex($tlr_p);
+
+    switch(pred){
+    #for $pred in range(2**5)
+    case $pred:
+        #set $set_has_time_spec = False
+        #set $num_header_words = 1
+        ########## Stream ID ##########
+        #if $pred & $sid_p
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[$num_header_words]);
+            #set $num_header_words += 1
+        #end if
+        ########## Class ID ##########
+        #if $pred & $cid_p
+            #set $num_header_words += 1
+            #set $num_header_words += 1
+        #end if
+        ########## Integer Time ##########
+        #if $pred & $tsi_p
+            metadata.has_time_spec = true;
+            #set $set_has_time_spec = True
+            metadata.time_spec.secs = ntohl(header_buff[$num_header_words]);
+            #set $num_header_words += 1
+        #end if
+        ########## Fractional Time ##########
+        #if $pred & $tsf_p
+            #if not $set_has_time_spec
+            metadata.has_time_spec = true;
+                #set $set_has_time_spec = True
+            #end if
+            #set $num_header_words += 1
+            metadata.time_spec.ticks = ntohl(header_buff[$num_header_words]);
+            #set $num_header_words += 1
+        #end if
+        ########## Trailer ##########
+        #if $pred & $tlr_p
+            #set $num_trailer_words = 1;
+        #else
+            #set $num_trailer_words = 0;
+        #end if
+        ########## Variables ##########
+            num_header_words32 = $num_header_words;
+            num_payload_words32 = packet_words32 - $($num_header_words + $num_trailer_words);
+        break;
+    #end for
+    }
+}
+"""
+
+from Cheetah import Template
+def parse_str(_tmpl_text, **kwargs): return str(Template.Template(_tmpl_text, kwargs))
+
+if __name__ == '__main__':
+    from Cheetah import Template
+    print parse_str(TMPL_TEXT, file=__file__)
diff --git a/host/lib/transport/vrt.cpp b/host/lib/transport/vrt.cpp
index cc46b2381..bebca5db9 100644
--- a/host/lib/transport/vrt.cpp
+++ b/host/lib/transport/vrt.cpp
@@ -1,19 +1,9 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
+
+
+
+/***********************************************************************
+ * This file was generated by ./gen_vrt.py on Fri Mar 26 15:33:00 2010
+ **********************************************************************/
 
 #include <uhd/transport/vrt.hpp>
 #include <boost/asio.hpp> //endianness conversion
@@ -30,26 +20,274 @@ void vrt::pack(
     size_t &num_packet_words32,    //output
     size_t packet_count            //input
 ){
-    boost::uint32_t vrt_hdr_flags = 0;
-    num_header_words32 = 1;
+    boost::uint32_t vrt_hdr_flags;
 
-    //load the vrt header and flags
-    if(metadata.has_stream_id){
-        vrt_hdr_flags |= (0x1 << 28); //IF Data packet with Stream Identifier
-        header_buff[num_header_words32++] = htonl(metadata.stream_id);
-    }
+    boost::uint8_t pred = 0;
+    if (metadata.has_stream_id) pred |= 0x1;
+    if (metadata.has_time_spec) pred |= 0xc;
 
-    if(metadata.has_time_spec){
-        vrt_hdr_flags |= (0x3 << 22) | (0x1 << 20); //TSI: Other, TSF: Sample Count Timestamp
-        header_buff[num_header_words32++] = htonl(metadata.time_spec.secs);
-        header_buff[num_header_words32++] = 0; //unused part of fractional seconds
-        header_buff[num_header_words32++] = htonl(metadata.time_spec.ticks);
+    switch(pred){
+    case 0:
+            num_header_words32 = 1;
+            num_packet_words32 = 1 + num_payload_words32;
+            vrt_hdr_flags = 0x0;
+        break;
+    case 1:
+            header_buff[1] = htonl(metadata.stream_id);
+            num_header_words32 = 2;
+            num_packet_words32 = 2 + num_payload_words32;
+            vrt_hdr_flags = 0x10000000;
+        break;
+    case 2:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            num_header_words32 = 3;
+            num_packet_words32 = 3 + num_payload_words32;
+            vrt_hdr_flags = 0x8000000;
+        break;
+    case 3:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            num_header_words32 = 4;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0x18000000;
+        break;
+    case 4:
+            header_buff[1] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 2;
+            num_packet_words32 = 2 + num_payload_words32;
+            vrt_hdr_flags = 0xc00000;
+        break;
+    case 5:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 3;
+            num_packet_words32 = 3 + num_payload_words32;
+            vrt_hdr_flags = 0x10c00000;
+        break;
+    case 6:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 4;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0x8c00000;
+        break;
+    case 7:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 5;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0x18c00000;
+        break;
+    case 8:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 3;
+            num_packet_words32 = 3 + num_payload_words32;
+            vrt_hdr_flags = 0x100000;
+        break;
+    case 9:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 4;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0x10100000;
+        break;
+    case 10:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 5;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0x8100000;
+        break;
+    case 11:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(0);
+            header_buff[5] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 6;
+            num_packet_words32 = 6 + num_payload_words32;
+            vrt_hdr_flags = 0x18100000;
+        break;
+    case 12:
+            header_buff[1] = htonl(metadata.time_spec.secs);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 4;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0xd00000;
+        break;
+    case 13:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(metadata.time_spec.secs);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 5;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0x10d00000;
+        break;
+    case 14:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.secs);
+            header_buff[4] = htonl(0);
+            header_buff[5] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 6;
+            num_packet_words32 = 6 + num_payload_words32;
+            vrt_hdr_flags = 0x8d00000;
+        break;
+    case 15:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.secs);
+            header_buff[5] = htonl(0);
+            header_buff[6] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 7;
+            num_packet_words32 = 7 + num_payload_words32;
+            vrt_hdr_flags = 0x18d00000;
+        break;
+    case 16:
+            num_header_words32 = 1;
+            num_packet_words32 = 2 + num_payload_words32;
+            vrt_hdr_flags = 0x4000000;
+        break;
+    case 17:
+            header_buff[1] = htonl(metadata.stream_id);
+            num_header_words32 = 2;
+            num_packet_words32 = 3 + num_payload_words32;
+            vrt_hdr_flags = 0x14000000;
+        break;
+    case 18:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            num_header_words32 = 3;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0xc000000;
+        break;
+    case 19:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            num_header_words32 = 4;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0x1c000000;
+        break;
+    case 20:
+            header_buff[1] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 2;
+            num_packet_words32 = 3 + num_payload_words32;
+            vrt_hdr_flags = 0x4c00000;
+        break;
+    case 21:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 3;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0x14c00000;
+        break;
+    case 22:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 4;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0xcc00000;
+        break;
+    case 23:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.secs);
+            num_header_words32 = 5;
+            num_packet_words32 = 6 + num_payload_words32;
+            vrt_hdr_flags = 0x1cc00000;
+        break;
+    case 24:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 3;
+            num_packet_words32 = 4 + num_payload_words32;
+            vrt_hdr_flags = 0x4100000;
+        break;
+    case 25:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 4;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0x14100000;
+        break;
+    case 26:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 5;
+            num_packet_words32 = 6 + num_payload_words32;
+            vrt_hdr_flags = 0xc100000;
+        break;
+    case 27:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(0);
+            header_buff[5] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 6;
+            num_packet_words32 = 7 + num_payload_words32;
+            vrt_hdr_flags = 0x1c100000;
+        break;
+    case 28:
+            header_buff[1] = htonl(metadata.time_spec.secs);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 4;
+            num_packet_words32 = 5 + num_payload_words32;
+            vrt_hdr_flags = 0x4d00000;
+        break;
+    case 29:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(metadata.time_spec.secs);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 5;
+            num_packet_words32 = 6 + num_payload_words32;
+            vrt_hdr_flags = 0x14d00000;
+        break;
+    case 30:
+            header_buff[1] = htonl(0);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(metadata.time_spec.secs);
+            header_buff[4] = htonl(0);
+            header_buff[5] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 6;
+            num_packet_words32 = 7 + num_payload_words32;
+            vrt_hdr_flags = 0xcd00000;
+        break;
+    case 31:
+            header_buff[1] = htonl(metadata.stream_id);
+            header_buff[2] = htonl(0);
+            header_buff[3] = htonl(0);
+            header_buff[4] = htonl(metadata.time_spec.secs);
+            header_buff[5] = htonl(0);
+            header_buff[6] = htonl(metadata.time_spec.ticks);
+            num_header_words32 = 7;
+            num_packet_words32 = 8 + num_payload_words32;
+            vrt_hdr_flags = 0x1cd00000;
+        break;
     }
 
-    vrt_hdr_flags |= (metadata.start_of_burst)? (0x1 << 25) : 0;
-    vrt_hdr_flags |= (metadata.end_of_burst)?   (0x1 << 24) : 0;
-
-    num_packet_words32 = num_header_words32 + num_payload_words32;
+    //set the burst flags
+    if (metadata.start_of_burst) vrt_hdr_flags |= 0x2000000;
+    if (metadata.end_of_burst)   vrt_hdr_flags |= 0x1000000;
 
     //fill in complete header word
     header_buff[0] = htonl(vrt_hdr_flags |
@@ -80,30 +318,230 @@ void vrt::unpack(
     if (vrt_hdr_word & (0x7 << 29))
         throw std::runtime_error("unsupported vrt packet type");
 
-    //parse the header flags
-    num_header_words32 = 1;
-
-    if (vrt_hdr_word & (0x1 << 28)){ //stream id
-        metadata.has_stream_id = true;
-        metadata.stream_id = ntohl(header_buff[num_header_words32++]);
-    }
-
-    if (vrt_hdr_word & (0x1 << 27)){ //class id (we dont use)
-        num_header_words32 += 2;
-    }
-
-    if (vrt_hdr_word & (0x3 << 22)){ //integer time
-        metadata.has_time_spec = true;
-        metadata.time_spec.secs = ntohl(header_buff[num_header_words32++]);
-    }
+    boost::uint8_t pred = 0;
+    if(vrt_hdr_word & 0x10000000) pred |= 0x1;
+    if(vrt_hdr_word & 0x8000000) pred |= 0x2;
+    if(vrt_hdr_word & 0xc00000) pred |= 0x4;
+    if(vrt_hdr_word & 0x300000) pred |= 0x8;
+    if(vrt_hdr_word & 0x4000000) pred |= 0x10;
 
-    if (vrt_hdr_word & (0x3 << 20)){ //fractional time
-        metadata.has_time_spec = true;
-        num_header_words32++; //unused part of fractional seconds
-        metadata.time_spec.ticks = ntohl(header_buff[num_header_words32++]);
+    switch(pred){
+    case 0:
+            num_header_words32 = 1;
+            num_payload_words32 = packet_words32 - 1;
+        break;
+    case 1:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            num_header_words32 = 2;
+            num_payload_words32 = packet_words32 - 2;
+        break;
+    case 2:
+            num_header_words32 = 3;
+            num_payload_words32 = packet_words32 - 3;
+        break;
+    case 3:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 4:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[1]);
+            num_header_words32 = 2;
+            num_payload_words32 = packet_words32 - 2;
+        break;
+    case 5:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[2]);
+            num_header_words32 = 3;
+            num_payload_words32 = packet_words32 - 3;
+        break;
+    case 6:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[3]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 7:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[4]);
+            num_header_words32 = 5;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 8:
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[2]);
+            num_header_words32 = 3;
+            num_payload_words32 = packet_words32 - 3;
+        break;
+    case 9:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 10:
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            num_header_words32 = 5;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 11:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            num_header_words32 = 6;
+            num_payload_words32 = packet_words32 - 6;
+        break;
+    case 12:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[1]);
+            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 13:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[2]);
+            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            num_header_words32 = 5;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 14:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[3]);
+            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            num_header_words32 = 6;
+            num_payload_words32 = packet_words32 - 6;
+        break;
+    case 15:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[4]);
+            metadata.time_spec.ticks = ntohl(header_buff[6]);
+            num_header_words32 = 7;
+            num_payload_words32 = packet_words32 - 7;
+        break;
+    case 16:
+            num_header_words32 = 1;
+            num_payload_words32 = packet_words32 - 2;
+        break;
+    case 17:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            num_header_words32 = 2;
+            num_payload_words32 = packet_words32 - 3;
+        break;
+    case 18:
+            num_header_words32 = 3;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 19:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 20:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[1]);
+            num_header_words32 = 2;
+            num_payload_words32 = packet_words32 - 3;
+        break;
+    case 21:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[2]);
+            num_header_words32 = 3;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 22:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[3]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 23:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[4]);
+            num_header_words32 = 5;
+            num_payload_words32 = packet_words32 - 6;
+        break;
+    case 24:
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[2]);
+            num_header_words32 = 3;
+            num_payload_words32 = packet_words32 - 4;
+        break;
+    case 25:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 26:
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            num_header_words32 = 5;
+            num_payload_words32 = packet_words32 - 6;
+        break;
+    case 27:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            num_header_words32 = 6;
+            num_payload_words32 = packet_words32 - 7;
+        break;
+    case 28:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[1]);
+            metadata.time_spec.ticks = ntohl(header_buff[3]);
+            num_header_words32 = 4;
+            num_payload_words32 = packet_words32 - 5;
+        break;
+    case 29:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[2]);
+            metadata.time_spec.ticks = ntohl(header_buff[4]);
+            num_header_words32 = 5;
+            num_payload_words32 = packet_words32 - 6;
+        break;
+    case 30:
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[3]);
+            metadata.time_spec.ticks = ntohl(header_buff[5]);
+            num_header_words32 = 6;
+            num_payload_words32 = packet_words32 - 7;
+        break;
+    case 31:
+            metadata.has_stream_id = true;
+            metadata.stream_id = ntohl(header_buff[1]);
+            metadata.has_time_spec = true;
+            metadata.time_spec.secs = ntohl(header_buff[4]);
+            metadata.time_spec.ticks = ntohl(header_buff[6]);
+            num_header_words32 = 7;
+            num_payload_words32 = packet_words32 - 8;
+        break;
     }
-
-    size_t num_trailer_words32 = (vrt_hdr_word & (0x1 << 26))? 1 : 0;
-
-    num_payload_words32 = packet_words32 - num_header_words32 - num_trailer_words32;
 }
+
diff --git a/host/utils/usrp2_recovery.py b/host/utils/usrp2_recovery.py
index 48c1121cb..5654e93d3 100755
--- a/host/utils/usrp2_recovery.py
+++ b/host/utils/usrp2_recovery.py
@@ -1,4 +1,20 @@
 #!/usr/bin/env python
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
 
 """
 The usrp2 recovery app:
-- 
cgit v1.2.3


From 72927d983f1f84127e83bf2d80db6b8ee882bad7 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 26 Mar 2010 15:56:04 -0800
Subject: library loading on windows, status message tweaks, warning tweaks

---
 host/CMakeLists.txt         |  2 +-
 host/include/uhd/config.hpp |  9 ++++++++-
 host/lib/CMakeLists.txt     | 20 ++++++++++++--------
 host/lib/load_modules.cpp   |  4 ++--
 4 files changed, 23 insertions(+), 12 deletions(-)

(limited to 'host/lib')

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 148ba2d00..05d782abe 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -64,10 +64,10 @@ IF(UNIX)
 ENDIF(UNIX)
 
 IF(WIN32)
-    ADD_DEFINITIONS(-Dnot=! -Dand=&& -Dor=||) #logical operators
     ADD_DEFINITIONS(-D_WIN32_WINNT=0x0501) #minimum version required is windows xp
     ADD_DEFINITIONS(-DNOMINMAX) #disables stupidity and enables std::min and std::max
     ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) #avoid warnings from boost::split
+    ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS) #avoid warnings from std::getenv
     ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) #setup boost auto-linking in msvc
 ENDIF(WIN32)
 
diff --git a/host/include/uhd/config.hpp b/host/include/uhd/config.hpp
index 10f9c093f..8e30a8333 100644
--- a/host/include/uhd/config.hpp
+++ b/host/include/uhd/config.hpp
@@ -35,8 +35,15 @@
 # pragma warning(disable: 4275) // non dll-interface class ... used as base for dll-interface class ...
 //# pragma warning(disable: 4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
 //# pragma warning(disable: 4511) // 'class' : copy constructor could not be generated
-#endif
+#endif
 
+//define logical operators
+#ifdef BOOST_MSVC
+  #define not !
+  #define and &&
+  #define or ||
+#endif
+
 // http://gcc.gnu.org/wiki/Visibility
 // Generic helper definitions for shared library support
 #if defined _WIN32 || defined __CYGWIN__
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 4dd638336..a0bfd6d0a 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -60,31 +60,35 @@ LIST(APPEND libuhd_sources
 ########################################################################
 # Setup defines for module loading
 ########################################################################
+MESSAGE(STATUS "Configuring module loading...")
+
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(dlfcn.h HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE_CXX(Winbase.h HAVE_WINBASE_H)
+CHECK_INCLUDE_FILE_CXX(Windows.h HAVE_WINDOWS_H)
 
 IF(HAVE_DLFCN_H)
-    MESSAGE(STATUS "Module loading supported through dlopen...")
+    MESSAGE(STATUS "  Module loading supported through dlopen.")
     ADD_DEFINITIONS(-DHAVE_DLFCN_H)
-ELSEIF(HAVE_WINBASE_H)
-    MESSAGE(STATUS "Module loading supported through LoadLibrary...")
-    ADD_DEFINITIONS(-DHAVE_WINBASE_H)
+ELSEIF(HAVE_WINDOWS_H)
+    MESSAGE(STATUS "  Module loading supported through LoadLibrary.")
+    ADD_DEFINITIONS(-DHAVE_WINDOWS_H)
 ELSE(HAVE_DLFCN_H)
-    MESSAGE(STATUS "Module loading not supported...")
+    MESSAGE(STATUS "  Module loading not supported.")
 ENDIF(HAVE_DLFCN_H)
 
 ########################################################################
 # Setup defines for interface address discovery
 ########################################################################
+MESSAGE(STATUS "Configuring interface address discovery...")
+
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H)
 
 IF(HAVE_IFADDRS_H)
-    MESSAGE(STATUS "Interface address discovery supported through getifaddrs...")
+    MESSAGE(STATUS "  Interface address discovery supported through getifaddrs.")
     ADD_DEFINITIONS(-DHAVE_IFADDRS_H)
 ELSE(HAVE_IFADDRS_H)
-    MESSAGE(STATUS "Interface address discovery not supported...")
+    MESSAGE(STATUS "  Interface address discovery not supported.")
 ENDIF(HAVE_IFADDRS_H)
 
 ########################################################################
diff --git a/host/lib/load_modules.cpp b/host/lib/load_modules.cpp
index 700afcd3f..bcdff98a6 100644
--- a/host/lib/load_modules.cpp
+++ b/host/lib/load_modules.cpp
@@ -40,8 +40,8 @@ static void load_module(const std::string &file_name){
     }
 }
 
-#elif HAVE_WINBASE_H
-#include <Winbase.h>
+#elif HAVE_WINDOWS_H
+#include <Windows.h>
 
 static void load_module(const std::string &file_name){
     if (LoadLibrary(file_name.c_str()) == NULL){
-- 
cgit v1.2.3


From ae02148f12615ab4f8e326dac5cf388ab976ec7f Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 26 Mar 2010 17:52:57 -0800
Subject: get interface addresses on windows

---
 host/lib/CMakeLists.txt            |   6 +-
 host/lib/load_modules.cpp          |   2 +-
 host/lib/transport/if_addrs.cpp    | 311 +++++--------------------------------
 host/lib/usrp/usrp2/usrp2_impl.cpp |   3 +
 4 files changed, 48 insertions(+), 274 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index a0bfd6d0a..170d1d3bf 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -64,7 +64,7 @@ MESSAGE(STATUS "Configuring module loading...")
 
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(dlfcn.h HAVE_DLFCN_H)
-CHECK_INCLUDE_FILE_CXX(Windows.h HAVE_WINDOWS_H)
+CHECK_INCLUDE_FILE_CXX(windows.h HAVE_WINDOWS_H)
 
 IF(HAVE_DLFCN_H)
     MESSAGE(STATUS "  Module loading supported through dlopen.")
@@ -83,10 +83,14 @@ MESSAGE(STATUS "Configuring interface address discovery...")
 
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H)
+CHECK_INCLUDE_FILE_CXX(winsock2.h HAVE_WINSOCK2_H)
 
 IF(HAVE_IFADDRS_H)
     MESSAGE(STATUS "  Interface address discovery supported through getifaddrs.")
     ADD_DEFINITIONS(-DHAVE_IFADDRS_H)
+ELSEIF(HAVE_WINSOCK2_H)
+    MESSAGE(STATUS "  Interface address discovery supported through SIO_GET_INTERFACE_LIST.")
+    ADD_DEFINITIONS(-DHAVE_WINSOCK2_H)
 ELSE(HAVE_IFADDRS_H)
     MESSAGE(STATUS "  Interface address discovery not supported.")
 ENDIF(HAVE_IFADDRS_H)
diff --git a/host/lib/load_modules.cpp b/host/lib/load_modules.cpp
index bcdff98a6..77426b898 100644
--- a/host/lib/load_modules.cpp
+++ b/host/lib/load_modules.cpp
@@ -41,7 +41,7 @@ static void load_module(const std::string &file_name){
 }
 
 #elif HAVE_WINDOWS_H
-#include <Windows.h>
+#include <windows.h>
 
 static void load_module(const std::string &file_name){
     if (LoadLibrary(file_name.c_str()) == NULL){
diff --git a/host/lib/transport/if_addrs.cpp b/host/lib/transport/if_addrs.cpp
index d3ea448fd..eb0e56b3a 100644
--- a/host/lib/transport/if_addrs.cpp
+++ b/host/lib/transport/if_addrs.cpp
@@ -36,10 +36,7 @@ static boost::asio::ip::address_v4 sockaddr_to_ip_addr(sockaddr *addr){
 }
 
 static bool ifaddrs_valid(const struct ifaddrs *ifaddrs){
-    return (
-        ifaddrs->ifa_addr->sa_family == AF_INET and
-        sockaddr_to_ip_addr(ifaddrs->ifa_addr) != boost::asio::ip::address_v4::loopback()
-    );
+    return ifaddrs->ifa_addr->sa_family == AF_INET;
 }
 
 std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
@@ -62,7 +59,44 @@ std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
 /***********************************************************************
  * Interface address discovery through windows api (TODO)
  **********************************************************************/
-//#elif HAVE_XXX_H
+#elif HAVE_WINSOCK2_H
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/cstdint.hpp>
+#include <winsock2.h>
+#include <iostream>
+
+std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
+    std::vector<if_addrs_t> if_addrs;
+    SOCKET sd = WSASocket(AF_INET, SOCK_DGRAM, 0, 0, 0, 0);
+    if (sd == SOCKET_ERROR) {
+        std::cerr << "Failed to get a socket. Error " << WSAGetLastError() <<
+            std::endl; return if_addrs;
+    }
+
+    INTERFACE_INFO InterfaceList[20];
+    unsigned long nBytesReturned;
+    if (WSAIoctl(sd, SIO_GET_INTERFACE_LIST, 0, 0, &InterfaceList,
+			sizeof(InterfaceList), &nBytesReturned, 0, 0) == SOCKET_ERROR) {
+        std::cerr << "Failed calling WSAIoctl: error " << WSAGetLastError() <<
+				std::endl;
+		return if_addrs;
+    }
+
+    int nNumInterfaces = nBytesReturned / sizeof(INTERFACE_INFO);
+    for (int i = 0; i < nNumInterfaces; ++i) {
+        boost::uint32_t iiAddress = ntohl(reinterpret_cast<sockaddr_in&>(InterfaceList[i].iiAddress).sin_addr.s_addr);
+        boost::uint32_t iiNetmask = ntohl(reinterpret_cast<sockaddr_in&>(InterfaceList[i].iiNetmask).sin_addr.s_addr);
+        boost::uint32_t iiBroadcastAddress = (iiAddress & iiNetmask) | ~iiNetmask;
+
+        if_addrs_t if_addr;
+        if_addr.inet = boost::asio::ip::address_v4(iiAddress).to_string();
+        if_addr.mask = boost::asio::ip::address_v4(iiNetmask).to_string();
+        if_addr.bcast = boost::asio::ip::address_v4(iiBroadcastAddress).to_string();
+        if_addrs.push_back(if_addr);
+    }
+
+    return if_addrs;
+}
 
 /***********************************************************************
  * Interface address discovery not included
@@ -74,270 +108,3 @@ std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
 }
 
 #endif /* HAVE_IFADDRS_H */
-
-////////////////////////////////////////////////////////////////////////
-// How to extract the ip address: unix/windows
-// http://www.developerweb.net/forum/showthread.php?t=5085
-////////////////////////////////////////////////////////////////////////
-
-/*
-#include <stdio.h>
-
-#ifdef WIN32
-# include <windows.h>
-# include <winsock.h>
-# include <iphlpapi.h>
-#else
-# include <unistd.h>
-# include <stdlib.h>
-# include <sys/socket.h>
-# include <netdb.h>
-# include <netinet/in.h>
-# include <net/if.h>
-# include <sys/ioctl.h>
-#endif
-
-#include <string.h>
-#include <sys/stat.h>
-
-typedef unsigned long uint32;
-
-#if defined(__FreeBSD__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
-# define USE_GETIFADDRS 1
-# include <ifaddrs.h>
-static uint32 SockAddrToUint32(struct sockaddr * a)
-{
-   return ((a)&&(a->sa_family == AF_INET)) ? ntohl(((struct sockaddr_in *)a)->sin_addr.s_addr) : 0;
-}
-#endif
-
-// convert a numeric IP address into its string representation
-static void Inet_NtoA(uint32 addr, char * ipbuf)
-{
-   sprintf(ipbuf, "%li.%li.%li.%li", (addr>>24)&0xFF, (addr>>16)&0xFF, (addr>>8)&0xFF, (addr>>0)&0xFF);
-}
-
-// convert a string represenation of an IP address into its numeric equivalent
-static uint32 Inet_AtoN(const char * buf)
-{
-   // net_server inexplicably doesn't have this function; so I'll just fake it
-   uint32 ret = 0;
-   int shift = 24;  // fill out the MSB first
-   bool startQuad = true;
-   while((shift >= 0)&&(*buf))
-   {
-      if (startQuad)
-      {
-         unsigned char quad = (unsigned char) atoi(buf);
-         ret |= (((uint32)quad) << shift);
-         shift -= 8;
-      }
-      startQuad = (*buf == '.');
-      buf++;
-   }
-   return ret;
-}
-
-static void PrintNetworkInterfaceInfos()
-{
-#if defined(USE_GETIFADDRS)
-   // BSD-style implementation
-   struct ifaddrs * ifap;
-   if (getifaddrs(&ifap) == 0)
-   {
-      struct ifaddrs * p = ifap;
-      while(p)
-      {
-         uint32 ifaAddr  = SockAddrToUint32(p->ifa_addr);
-         uint32 maskAddr = SockAddrToUint32(p->ifa_netmask);
-         uint32 dstAddr  = SockAddrToUint32(p->ifa_dstaddr);
-         if (ifaAddr > 0)
-         {
-            char ifaAddrStr[32];  Inet_NtoA(ifaAddr,  ifaAddrStr);
-            char maskAddrStr[32]; Inet_NtoA(maskAddr, maskAddrStr);
-            char dstAddrStr[32];  Inet_NtoA(dstAddr,  dstAddrStr);
-            printf("  Found interface:  name=[%s] desc=[%s] address=[%s] netmask=[%s] broadcastAddr=[%s]\n", p->ifa_name, "unavailable", ifaAddrStr, maskAddrStr, dstAddrStr);
-         }
-         p = p->ifa_next;
-      }
-      freeifaddrs(ifap);
-   }
-#elif defined(WIN32)
-   // Windows XP style implementation
-
-   // Adapted from example code at http://msdn2.microsoft.com/en-us/library/aa365917.aspx
-   // Now get Windows' IPv4 addresses table.  Once again, we gotta call GetIpAddrTable()
-   // multiple times in order to deal with potential race conditions properly.
-   MIB_IPADDRTABLE * ipTable = NULL;
-   {
-      ULONG bufLen = 0;
-      for (int i=0; i<5; i++)
-      {
-         DWORD ipRet = GetIpAddrTable(ipTable, &bufLen, false);
-         if (ipRet == ERROR_INSUFFICIENT_BUFFER)
-         {
-            free(ipTable);  // in case we had previously allocated it
-            ipTable = (MIB_IPADDRTABLE *) malloc(bufLen);
-         }
-         else if (ipRet == NO_ERROR) break;
-         else
-         {
-            free(ipTable);
-            ipTable = NULL;
-            break;
-         }
-     }
-   }
-
-   if (ipTable)
-   {
-      // Try to get the Adapters-info table, so we can given useful names to the IP
-      // addresses we are returning.  Gotta call GetAdaptersInfo() up to 5 times to handle
-      // the potential race condition between the size-query call and the get-data call.
-      // I love a well-designed API :^P
-      IP_ADAPTER_INFO * pAdapterInfo = NULL;
-      {
-         ULONG bufLen = 0;
-         for (int i=0; i<5; i++)
-         {
-            DWORD apRet = GetAdaptersInfo(pAdapterInfo, &bufLen);
-            if (apRet == ERROR_BUFFER_OVERFLOW)
-            {
-               free(pAdapterInfo);  // in case we had previously allocated it
-               pAdapterInfo = (IP_ADAPTER_INFO *) malloc(bufLen);
-            }
-            else if (apRet == ERROR_SUCCESS) break;
-            else
-            {
-               free(pAdapterInfo);
-               pAdapterInfo = NULL;
-               break;
-            }
-         }
-      }
-
-      for (DWORD i=0; i<ipTable->dwNumEntries; i++)
-      {
-         const MIB_IPADDRROW & row = ipTable->table[i];
-
-         // Now lookup the appropriate adaptor-name in the pAdaptorInfos, if we can find it
-         const char * name = NULL;
-         const char * desc = NULL;
-         if (pAdapterInfo)
-         {
-            IP_ADAPTER_INFO * next = pAdapterInfo;
-            while((next)&&(name==NULL))
-            {
-               IP_ADDR_STRING * ipAddr = &next->IpAddressList;
-               while(ipAddr)
-               {
-                  if (Inet_AtoN(ipAddr->IpAddress.String) == ntohl(row.dwAddr))
-                  {
-                     name = next->AdapterName;
-                     desc = next->Description;
-                     break;
-                  }
-                  ipAddr = ipAddr->Next;
-               }
-               next = next->Next;
-            }
-         }
-         char buf[128];
-         if (name == NULL)
-         {
-            sprintf(buf, "unnamed-%i", i);
-            name = buf;
-         }
-
-         uint32 ipAddr  = ntohl(row.dwAddr);
-         uint32 netmask = ntohl(row.dwMask);
-         uint32 baddr   = ipAddr & netmask;
-         if (row.dwBCastAddr) baddr |= ~netmask;
-
-         char ifaAddrStr[32];  Inet_NtoA(ipAddr,  ifaAddrStr);
-         char maskAddrStr[32]; Inet_NtoA(netmask, maskAddrStr);
-         char dstAddrStr[32];  Inet_NtoA(baddr,   dstAddrStr);
-         printf("  Found interface:  name=[%s] desc=[%s] address=[%s] netmask=[%s] broadcastAddr=[%s]\n", name, desc?desc:"unavailable", ifaAddrStr, maskAddrStr, dstAddrStr);
-      }
-
-      free(pAdapterInfo);
-      free(ipTable);
-   }
-#else
-   // Dunno what we're running on here!
-#  error "Don't know how to implement PrintNetworkInterfaceInfos() on this OS!"
-#endif
-}
-
-int main(int, char **)
-{
-   PrintNetworkInterfaceInfos();
-   return 0;
-}
-*/
-
-////////////////////////////////////////////////////////////////////////
-// How to extract the mac address: linux/windows
-// http://old.nabble.com/MAC-Address-td19111197.html
-////////////////////////////////////////////////////////////////////////
-
-/*
-Linux:
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <net/if.h>
-#include <netpacket/packet.h>
-#include <ifaddrs.h>
-
-ifaddrs * ifap = 0;
-if(getifaddrs(&ifap) == 0)
-{
-     ifaddrs * iter = ifap;
-     while(iter)
-     {
-         sockaddr_ll * sal =
-                    reinterpret_cast<sockaddr_ll*>(iter->ifa_addr);
-        if(sal->sll_family == AF_PACKET)
-        {
-                 // get the mac bytes
-                // copy(sal->sll_addr,
-                 //      sal->sll_addr+sal->sll_hallen,
-                 //      buffer);
-        }
-         iter = iter->ifa_next;
-     }
-     freeifaddrs(ifap);
-}
-
-Windows:
-#include <winsock2.h>
-#include <iphlpapi.h>
-
-std::vector<boost::uint8_t> buf;
-DWORD bufLen = 0;
-GetAdaptersAddresses(0, 0, 0, 0, &bufLen);
-if(bufLen)
-{
-     buf.resize(bufLen, 0);
-     IP_ADAPTER_ADDRESSES * ptr =
-                     reinterpret_cast<IP_ADAPTER_ADDRESSES*>(&buf[0]);
-     DWORD err = GetAdaptersAddresses(0, 0, 0, ptr, &bufLen);
-     if(err == NO_ERROR)
-     {
-          while(ptr)
-         {
-              if(ptr->PhysicalAddressLength)
-              {
-                 // get the mac bytes
-                // copy(ptr->PhysicalAddress,
-                 //      ptr->PhysicalAddress+ptr->PhysicalAddressLength,
-                 //      buffer);
-              }
-              ptr = ptr->Next;
-          }
-     }
-} 
-*/
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index f04ae8d2c..35a4aeb20 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -41,6 +41,9 @@ uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
     //if no address was specified, send a broadcast on each interface
     if (not hint.has_key("addr")){
         BOOST_FOREACH(const if_addrs_t &if_addrs, get_if_addrs()){
+            //avoid the loopback device
+            if (if_addrs.inet == asio::ip::address_v4::loopback().to_string()) continue;
+
             //create a new hint with this broadcast address
             device_addr_t new_hint = hint;
             new_hint["addr"] = if_addrs.bcast;
-- 
cgit v1.2.3


From dd41206f2a5127871fc4c9911a748f7f4e3b6c51 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 26 Mar 2010 19:02:32 -0700
Subject: tweak the ifaddrs address discovery

---
 host/lib/transport/if_addrs.cpp | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'host/lib')

diff --git a/host/lib/transport/if_addrs.cpp b/host/lib/transport/if_addrs.cpp
index eb0e56b3a..5c8c8a176 100644
--- a/host/lib/transport/if_addrs.cpp
+++ b/host/lib/transport/if_addrs.cpp
@@ -16,6 +16,9 @@
 //
 
 #include <uhd/transport/if_addrs.hpp>
+#include <boost/asio/ip/address_v4.hpp>
+#include <boost/cstdint.hpp>
+#include <iostream>
 
 uhd::transport::if_addrs_t::if_addrs_t(void){
     /* NOP */
@@ -26,17 +29,11 @@ uhd::transport::if_addrs_t::if_addrs_t(void){
  **********************************************************************/
 #ifdef HAVE_IFADDRS_H
 #include <ifaddrs.h>
-#include <boost/asio/ip/address_v4.hpp>
 
 static boost::asio::ip::address_v4 sockaddr_to_ip_addr(sockaddr *addr){
-    if (addr->sa_family == AF_INET) return boost::asio::ip::address_v4(ntohl(
+    return boost::asio::ip::address_v4(ntohl(
         reinterpret_cast<sockaddr_in*>(addr)->sin_addr.s_addr
     ));
-    return boost::asio::ip::address_v4::any();
-}
-
-static bool ifaddrs_valid(const struct ifaddrs *ifaddrs){
-    return ifaddrs->ifa_addr->sa_family == AF_INET;
 }
 
 std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
@@ -44,7 +41,12 @@ std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
     struct ifaddrs *ifap;
     if (getifaddrs(&ifap) == 0){
         for (struct ifaddrs *iter = ifap; iter != NULL; iter = iter->ifa_next){
-            if (not ifaddrs_valid(iter)) continue;
+            //ensure that the entries are valid
+            if (iter->ifa_addr->sa_family != AF_INET) continue;
+            if (iter->ifa_netmask->sa_family != AF_INET) continue;
+            if (iter->ifa_broadaddr->sa_family != AF_INET) continue;
+
+            //append a new set of interface addresses
             if_addrs_t if_addr;
             if_addr.inet = sockaddr_to_ip_addr(iter->ifa_addr).to_string();
             if_addr.mask = sockaddr_to_ip_addr(iter->ifa_netmask).to_string();
@@ -60,10 +62,7 @@ std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
  * Interface address discovery through windows api (TODO)
  **********************************************************************/
 #elif HAVE_WINSOCK2_H
-#include <boost/asio/ip/address_v4.hpp>
-#include <boost/cstdint.hpp>
 #include <winsock2.h>
-#include <iostream>
 
 std::vector<uhd::transport::if_addrs_t> uhd::transport::get_if_addrs(void){
     std::vector<if_addrs_t> if_addrs;
-- 
cgit v1.2.3


From 52df9afd679fd0f42edeef29f0bbc0d7bd76559e Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sat, 27 Mar 2010 01:02:58 -0700
Subject: Split utils.hpp into subdir with multiple files.

static for static block and static instance (singleton)
assert for assertion and throwing related stuff
algorithm for my addons to std::algorithm (has)
and a new one, safe main, for having a main catch-all
---
 host/examples/rx_timed_samples.cpp       |   3 +-
 host/include/uhd/CMakeLists.txt          |   2 +-
 host/include/uhd/utils.hpp               | 130 -------------------------------
 host/include/uhd/utils/CMakeLists.txt    |  24 ++++++
 host/include/uhd/utils/algorithm.hpp     |  60 ++++++++++++++
 host/include/uhd/utils/assert.hpp        |  76 ++++++++++++++++++
 host/include/uhd/utils/safe_main.hpp     |  43 ++++++++++
 host/include/uhd/utils/static.hpp        |  35 +++++++++
 host/lib/device.cpp                      |   7 +-
 host/lib/gain_handler.cpp                |   2 +-
 host/lib/load_modules.cpp                |   4 +-
 host/lib/simple_device.cpp               |   4 +-
 host/lib/usrp/dboard/basic.cpp           |   5 +-
 host/lib/usrp/dboard_manager.cpp         |   5 +-
 host/lib/usrp/usrp2/dboard_impl.cpp      |   2 +-
 host/lib/usrp/usrp2/dboard_interface.cpp |   2 +-
 host/lib/usrp/usrp2/dsp_impl.cpp         |   2 +-
 host/lib/usrp/usrp2/mboard_impl.cpp      |   2 +-
 host/lib/usrp/usrp2/usrp2_impl.cpp       |   5 +-
 host/test/module_test.cpp                |   4 +-
 host/utils/discover_usrps.cpp            |   3 +-
 host/utils/usrp2_burner.cpp              |   3 +-
 22 files changed, 269 insertions(+), 154 deletions(-)
 delete mode 100644 host/include/uhd/utils.hpp
 create mode 100644 host/include/uhd/utils/CMakeLists.txt
 create mode 100644 host/include/uhd/utils/algorithm.hpp
 create mode 100644 host/include/uhd/utils/assert.hpp
 create mode 100644 host/include/uhd/utils/safe_main.hpp
 create mode 100644 host/include/uhd/utils/static.hpp

(limited to 'host/lib')

diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 7d58187cd..5d4b5a68d 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include <uhd/utils/safe_main.hpp>
 #include <uhd/simple_device.hpp>
 #include <uhd/props.hpp>
 #include <boost/program_options.hpp>
@@ -24,7 +25,7 @@
 
 namespace po = boost::program_options;
 
-int main(int argc, char *argv[]){
+int UHD_SAFE_MAIN(int argc, char *argv[]){
     //variables to be set by po
     std::string transport_args;
     int seconds_in_future;
diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt
index 84e7b441b..2203ea83e 100644
--- a/host/include/uhd/CMakeLists.txt
+++ b/host/include/uhd/CMakeLists.txt
@@ -18,6 +18,7 @@
 
 ADD_SUBDIRECTORY(transport)
 ADD_SUBDIRECTORY(usrp)
+ADD_SUBDIRECTORY(utils)
 
 INSTALL(FILES
     config.hpp
@@ -30,7 +31,6 @@ INSTALL(FILES
     simple_device.hpp
     time_spec.hpp
     types.hpp
-    utils.hpp
     wax.hpp
     DESTINATION ${INCLUDE_DIR}/uhd
 )
diff --git a/host/include/uhd/utils.hpp b/host/include/uhd/utils.hpp
deleted file mode 100644
index e5333539f..000000000
--- a/host/include/uhd/utils.hpp
+++ /dev/null
@@ -1,130 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_UTILS_HPP
-#define INCLUDED_UHD_UTILS_HPP
-
-#include <uhd/config.hpp>
-#include <boost/format.hpp>
-#include <boost/current_function.hpp>
-#include <stdexcept>
-#include <algorithm>
-
-/*!
- * Defines a function that implements the "construct on first use" idiom
- * \param _t the type definition for the instance
- * \param _x the name of the defined function
- * \return a reference to the lazy instance
- */
-#define STATIC_INSTANCE(_t, _x) static _t &_x(){static _t _x; return _x;}
-
-/*!
- * Defines a static code block that will be called before main()
- * \param _x the name of the defined struct (must be unique in file)
- */
-#define STATIC_BLOCK(_x) static struct _x{_x();}_x;_x::_x()
-
-/*!
- * Useful templated functions and classes that I like to pretend are part of stl
- */
-namespace std{
-
-    class assert_error : public std::logic_error{
-    public:
-        explicit assert_error(const string& what_arg) : logic_error(what_arg){
-            /* NOP */
-        }
-    };
-
-    #define ASSERT_THROW(_x) if (not (_x)) { \
-        throw std::assert_error(str(boost::format( \
-            "Assertion Failed:\n  %s:%d\n  %s\n  ---> %s <---" \
-        ) % __FILE__ % __LINE__ % BOOST_CURRENT_FUNCTION % std::string(#_x))); \
-    }
-
-    template<class T, class InputIterator, class Function>
-    T reduce(InputIterator first, InputIterator last, Function fcn, T init = 0){
-        T tmp = init;
-        for ( ; first != last; ++first ){
-            tmp = fcn(tmp, *first);
-        }
-        return tmp;
-    }
-
-    template<class T, class Iterable, class Function>
-    T reduce(Iterable iterable, Function fcn, T init = 0){
-        return reduce(iterable.begin(), iterable.end(), fcn, init);
-    }
-
-    template<class T, class InputIterator>
-    bool has(InputIterator first, InputIterator last, const T &elem){
-        return last != std::find(first, last, elem);
-    }
-
-    template<class T, class Iterable>
-    bool has(const Iterable &iterable, const T &elem){
-        return has(iterable.begin(), iterable.end(), elem);
-    }
-
-    template<typename T> T signum(T n){
-        if (n < 0) return -1;
-        if (n > 0) return 1;
-        return 0;
-    }
-
-}//namespace std
-
-#include <boost/format.hpp>
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-
-namespace uhd{
-
-    /*!
-     * Check that an element is found in a container.
-     * If not, throw a meaningful assertion error.
-     * The "what" in the error will show what is
-     * being set and a list of known good values.
-     *
-     * \param iterable a list of possible settings
-     * \param elem an element that may be in the list
-     * \param what a description of what is being set
-     * \throw assertion_error when elem not in list
-     */
-    template<class T, class Iterable> void assert_has(
-        const Iterable &iterable,
-        const T &elem,
-        const std::string &what = "unknown"
-    ){
-        if (std::has(iterable, elem)) return;
-        std::string possible_values = "";
-        BOOST_FOREACH(T e, iterable){
-            if (e != iterable.begin()[0]) possible_values += ", ";
-            possible_values += boost::lexical_cast<std::string>(e);
-        }
-        throw std::assert_error(str(boost::format(
-                "Error: %s is not a valid %s. "
-                "Possible values are: [%s]."
-            )
-            % boost::lexical_cast<std::string>(elem)
-            % what % possible_values
-        ));
-    }
-
-}//namespace uhd
-
-#endif /* INCLUDED_UHD_UTILS_HPP */
diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt
new file mode 100644
index 000000000..f6ed87701
--- /dev/null
+++ b/host/include/uhd/utils/CMakeLists.txt
@@ -0,0 +1,24 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+INSTALL(FILES
+    algorithm.hpp
+    assert.hpp
+    safe_main.hpp
+    static.hpp
+    DESTINATION ${INCLUDE_DIR}/uhd/utils
+)
diff --git a/host/include/uhd/utils/algorithm.hpp b/host/include/uhd/utils/algorithm.hpp
new file mode 100644
index 000000000..6635c8a4a
--- /dev/null
+++ b/host/include/uhd/utils/algorithm.hpp
@@ -0,0 +1,60 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_ALGORITHM_HPP
+#define INCLUDED_UHD_UTILS_ALGORITHM_HPP
+
+#include <algorithm>
+
+/*!
+ * Useful templated functions and classes that I like to pretend are part of stl
+ */
+namespace std{
+
+    template<class T, class InputIterator, class Function>
+    T reduce(InputIterator first, InputIterator last, Function fcn, T init = 0){
+        T tmp = init;
+        for ( ; first != last; ++first ){
+            tmp = fcn(tmp, *first);
+        }
+        return tmp;
+    }
+
+    template<class T, class Iterable, class Function>
+    T reduce(Iterable iterable, Function fcn, T init = 0){
+        return reduce(iterable.begin(), iterable.end(), fcn, init);
+    }
+
+    template<class T, class InputIterator>
+    bool has(InputIterator first, InputIterator last, const T &elem){
+        return last != std::find(first, last, elem);
+    }
+
+    template<class T, class Iterable>
+    bool has(const Iterable &iterable, const T &elem){
+        return has(iterable.begin(), iterable.end(), elem);
+    }
+
+    template<typename T> T signum(T n){
+        if (n < 0) return -1;
+        if (n > 0) return 1;
+        return 0;
+    }
+
+}//namespace std
+
+#endif /* INCLUDED_UHD_UTILS_ALGORITHM_HPP */
diff --git a/host/include/uhd/utils/assert.hpp b/host/include/uhd/utils/assert.hpp
new file mode 100644
index 000000000..842ed8dfa
--- /dev/null
+++ b/host/include/uhd/utils/assert.hpp
@@ -0,0 +1,76 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_ASSERT_HPP
+#define INCLUDED_UHD_UTILS_ASSERT_HPP
+
+#include <uhd/utils/algorithm.hpp>
+#include <boost/format.hpp>
+#include <boost/foreach.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/current_function.hpp>
+#include <stdexcept>
+
+namespace uhd{
+
+    class assert_error : public std::logic_error{
+    public:
+        explicit assert_error(const std::string& what_arg) : logic_error(what_arg){
+            /* NOP */
+        }
+    };
+
+    #define ASSERT_THROW(_x) if (not (_x)) { \
+        throw uhd::assert_error(str(boost::format( \
+            "Assertion Failed:\n  %s:%d\n  %s\n  ---> %s <---" \
+        ) % __FILE__ % __LINE__ % BOOST_CURRENT_FUNCTION % std::string(#_x))); \
+    }
+
+    /*!
+     * Check that an element is found in a container.
+     * If not, throw a meaningful assertion error.
+     * The "what" in the error will show what is
+     * being set and a list of known good values.
+     *
+     * \param iterable a list of possible settings
+     * \param elem an element that may be in the list
+     * \param what a description of what is being set
+     * \throw assertion_error when elem not in list
+     */
+    template<class T, class Iterable> void assert_has(
+        const Iterable &iterable,
+        const T &elem,
+        const std::string &what = "unknown"
+    ){
+        if (std::has(iterable, elem)) return;
+        std::string possible_values = "";
+        BOOST_FOREACH(T e, iterable){
+            if (e != iterable.begin()[0]) possible_values += ", ";
+            possible_values += boost::lexical_cast<std::string>(e);
+        }
+        throw uhd::assert_error(str(boost::format(
+                "Error: %s is not a valid %s. "
+                "Possible values are: [%s]."
+            )
+            % boost::lexical_cast<std::string>(elem)
+            % what % possible_values
+        ));
+    }
+
+}//namespace uhd
+
+#endif /* INCLUDED_UHD_UTILS_ASSERT_HPP */
diff --git a/host/include/uhd/utils/safe_main.hpp b/host/include/uhd/utils/safe_main.hpp
new file mode 100644
index 000000000..dd738f2e3
--- /dev/null
+++ b/host/include/uhd/utils/safe_main.hpp
@@ -0,0 +1,43 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_SAFE_MAIN_HPP
+#define INCLUDED_UHD_UTILS_SAFE_MAIN_HPP
+
+#include <iostream>
+#include <stdexcept>
+
+/*!
+ * Defines a safe wrapper that places a catch-all around main.
+ * If an exception is thrown, it prints to stderr and returns.
+ * Usage: int UHD_SAFE_MAIN(int argc, char *argv[]){ main code here }
+ * \param _argc the declaration for argc
+ * \param _argv the declaration for argv
+ */
+#define UHD_SAFE_MAIN(_argc, _argv) _main(int, char*[]); \
+int main(int argc, char *argv[]){ \
+    try { \
+        return _main(argc, argv); \
+    } catch(const std::exception &e) { \
+        std::cerr << "Error: " << e.what() << std::endl; \
+    } catch(...) { \
+        std::cerr << "Error: unknown exception" << std::endl; \
+    } \
+    return ~0; \
+} int _main(_argc, _argv)
+
+#endif /* INCLUDED_UHD_UTILS_SAFE_MAIN_HPP */
diff --git a/host/include/uhd/utils/static.hpp b/host/include/uhd/utils/static.hpp
new file mode 100644
index 000000000..63db5a247
--- /dev/null
+++ b/host/include/uhd/utils/static.hpp
@@ -0,0 +1,35 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_STATIC_HPP
+#define INCLUDED_UHD_UTILS_STATIC_HPP
+
+/*!
+ * Defines a function that implements the "construct on first use" idiom
+ * \param _t the type definition for the instance
+ * \param _x the name of the defined function
+ * \return a reference to the lazy instance
+ */
+#define UHD_SINGLETON_FCN(_t, _x) static _t &_x(){static _t _x; return _x;}
+
+/*!
+ * Defines a static code block that will be called before main()
+ * \param _x the name of the defined struct (must be unique in file)
+ */
+#define UHD_STATIC_BLOCK(_x) static struct _x{_x();}_x;_x::_x()
+
+#endif /* INCLUDED_UHD_UTILS_STATIC_HPP */
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index cd8a01ab4..0bdbf5f23 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -17,7 +17,8 @@
 
 #include <uhd/device.hpp>
 #include <uhd/dict.hpp>
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/static.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <boost/weak_ptr.hpp>
@@ -59,7 +60,7 @@ static size_t hash_device_addr(
 typedef boost::tuple<device::discover_t, device::make_t> dev_fcn_reg_t;
 
 // instantiate the device function registry container
-STATIC_INSTANCE(std::vector<dev_fcn_reg_t>, get_dev_fcn_regs)
+UHD_SINGLETON_FCN(std::vector<dev_fcn_reg_t>, get_dev_fcn_regs)
 
 void device::register_device(
     const discover_t &discover,
@@ -136,7 +137,7 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
         return hash_to_device[dev_hash].lock();
     }
     //create and register a new device
-    catch(const std::assert_error &){
+    catch(const uhd::assert_error &){
         device::sptr dev = maker(dev_addr);
         hash_to_device[dev_hash] = dev;
         return dev;
diff --git a/host/lib/gain_handler.cpp b/host/lib/gain_handler.cpp
index 7dd1547cb..7b3dd266c 100644
--- a/host/lib/gain_handler.cpp
+++ b/host/lib/gain_handler.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <uhd/gain_handler.hpp>
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
 #include <uhd/types.hpp>
 #include <uhd/props.hpp>
 #include <boost/assign/list_of.hpp>
diff --git a/host/lib/load_modules.cpp b/host/lib/load_modules.cpp
index 77426b898..babff1ca5 100644
--- a/host/lib/load_modules.cpp
+++ b/host/lib/load_modules.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/static.hpp>
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
@@ -101,7 +101,7 @@ static void load_path(const fs::path &path){
  * Load all the modules given by the module path enviroment variable.
  * The path variable may be several paths split by path separators.
  */
-STATIC_BLOCK(load_modules){
+UHD_STATIC_BLOCK(load_modules){
     //get the environment variable module path
     char *env_module_path = std::getenv("UHD_MODULE_PATH");
     if (env_module_path == NULL) return;
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index a25cb12e0..0eb69d9fa 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -16,8 +16,8 @@
 //
 
 #include <uhd/simple_device.hpp>
-#include <uhd/device.hpp>
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/algorithm.hpp>
 #include <uhd/props.hpp>
 #include <uhd/types.hpp>
 #include <boost/algorithm/string.hpp>
diff --git a/host/lib/usrp/dboard/basic.cpp b/host/lib/usrp/dboard/basic.cpp
index 849cbd764..07cb8d11c 100644
--- a/host/lib/usrp/dboard/basic.cpp
+++ b/host/lib/usrp/dboard/basic.cpp
@@ -15,9 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
 #include <uhd/props.hpp>
 #include <uhd/types.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/static.hpp>
 #include <uhd/usrp/dboard_base.hpp>
 #include <uhd/usrp/dboard_manager.hpp>
 #include <boost/assign/list_of.hpp>
@@ -74,7 +75,7 @@ static dboard_base::sptr make_lf_tx(dboard_base::ctor_args_t const& args){
     return dboard_base::sptr(new basic_tx(args, 32e6));
 }
 
-STATIC_BLOCK(reg_dboards){
+UHD_STATIC_BLOCK(reg_dboards){
     dboard_manager::register_dboard(0x0000, &make_basic_tx, "Basic TX");
     dboard_manager::register_dboard(0x0001, &make_basic_rx, "Basic RX", list_of("ab")("a")("b"));
     dboard_manager::register_dboard(0x000e, &make_lf_tx,    "LF TX");
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index 6683534f1..0f2189cd1 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -17,7 +17,8 @@
 
 #include <uhd/usrp/dboard_manager.hpp>
 #include <uhd/gain_handler.hpp>
-#include <uhd/utils.hpp>
+#include <uhd/utils/static.hpp>
+#include <uhd/utils/assert.hpp>
 #include <uhd/dict.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/format.hpp>
@@ -35,7 +36,7 @@ typedef boost::tuple<dboard_manager::dboard_ctor_t, std::string, prop_names_t> a
 
 //map a dboard id to a dboard constructor
 typedef uhd::dict<dboard_id_t, args_t> id_to_args_map_t;
-STATIC_INSTANCE(id_to_args_map_t, get_id_to_args_map)
+UHD_SINGLETON_FCN(id_to_args_map_t, get_id_to_args_map)
 
 void dboard_manager::register_dboard(
     dboard_id_t dboard_id,
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index 66e02d469..6b49ff29d 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
 #include <boost/format.hpp>
 #include "usrp2_impl.hpp"
 
diff --git a/host/lib/usrp/usrp2/dboard_interface.cpp b/host/lib/usrp/usrp2/dboard_interface.cpp
index d20465147..8fc7864b0 100644
--- a/host/lib/usrp/usrp2/dboard_interface.cpp
+++ b/host/lib/usrp/usrp2/dboard_interface.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
 #include "usrp2_impl.hpp"
 
 using namespace uhd::usrp;
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 44f654863..654096d14 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
 #include <boost/format.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/math/special_functions/round.hpp>
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index c56782c4b..e4706dcf0 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
 #include "usrp2_impl.hpp"
 
 using namespace uhd;
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 35a4aeb20..9dce351be 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -16,7 +16,8 @@
 //
 
 #include <uhd/transport/if_addrs.hpp>
-#include <uhd/utils.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/static.hpp>
 #include <boost/format.hpp>
 #include <boost/foreach.hpp>
 #include <boost/bind.hpp>
@@ -28,7 +29,7 @@ using namespace uhd::usrp;
 using namespace uhd::transport;
 namespace asio = boost::asio;
 
-STATIC_BLOCK(register_usrp2_device){
+UHD_STATIC_BLOCK(register_usrp2_device){
     device::register_device(&usrp2::discover, &usrp2::make);
 }
 
diff --git a/host/test/module_test.cpp b/host/test/module_test.cpp
index 71721ef90..47a0e1af9 100644
--- a/host/test/module_test.cpp
+++ b/host/test/module_test.cpp
@@ -15,10 +15,10 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/utils.hpp>
+#include <uhd/utils/static.hpp>
 #include <iostream>
 
-STATIC_BLOCK(module_test){
+UHD_STATIC_BLOCK(module_test){
     std::cout << "---------------------------------------" << std::endl;
     std::cout << "-- Good news, everyone!" << std::endl;
     std::cout << "-- The test module has been loaded." << std::endl;
diff --git a/host/utils/discover_usrps.cpp b/host/utils/discover_usrps.cpp
index d670d1651..dc2b845bc 100644
--- a/host/utils/discover_usrps.cpp
+++ b/host/utils/discover_usrps.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include <uhd/utils/safe_main.hpp>
 #include <uhd/device.hpp>
 #include <uhd/props.hpp>
 #include <boost/program_options.hpp>
@@ -23,7 +24,7 @@
 
 namespace po = boost::program_options;
 
-int main(int argc, char *argv[]){
+int UHD_SAFE_MAIN(int argc, char *argv[]){
     po::options_description desc("Allowed options");
     desc.add_options()
         ("help", "help message")
diff --git a/host/utils/usrp2_burner.cpp b/host/utils/usrp2_burner.cpp
index 941e71d0c..ff6d4426f 100644
--- a/host/utils/usrp2_burner.cpp
+++ b/host/utils/usrp2_burner.cpp
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
+#include <uhd/utils/safe_main.hpp>
 #include <uhd/usrp/usrp2.hpp>
 #include <uhd/props.hpp>
 #include <boost/program_options.hpp>
@@ -23,7 +24,7 @@
 
 namespace po = boost::program_options;
 
-int main(int argc, char *argv[]){
+int UHD_SAFE_MAIN(int argc, char *argv[]){
     po::options_description desc("Allowed options");
     desc.add_options()
         ("help", "help message")
-- 
cgit v1.2.3


From b71d0cbea9e1e107eeb1da51ef14fe6b9e983ee6 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Sat, 27 Mar 2010 14:27:55 -0700
Subject: refactored types.hpp into types directory

---
 host/include/uhd/CMakeLists.txt         |   6 +-
 host/include/uhd/device.hpp             |   4 +-
 host/include/uhd/device_addr.hpp        |  69 --------------
 host/include/uhd/dict.hpp               | 154 --------------------------------
 host/include/uhd/metadata.hpp           |  61 -------------
 host/include/uhd/simple_device.hpp      |   4 +-
 host/include/uhd/time_spec.hpp          |  55 ------------
 host/include/uhd/transport/vrt.hpp      |   2 +-
 host/include/uhd/types.hpp              | 119 ------------------------
 host/include/uhd/types/CMakeLists.txt   |  30 +++++++
 host/include/uhd/types/clock_config.hpp |  50 +++++++++++
 host/include/uhd/types/device_addr.hpp  |  45 ++++++++++
 host/include/uhd/types/dict.hpp         | 154 ++++++++++++++++++++++++++++++++
 host/include/uhd/types/mac_addr.hpp     |  39 ++++++++
 host/include/uhd/types/metadata.hpp     |  61 +++++++++++++
 host/include/uhd/types/ranges.hpp       |  46 ++++++++++
 host/include/uhd/types/stream_cmd.hpp   |  56 ++++++++++++
 host/include/uhd/types/time_spec.hpp    |  55 ++++++++++++
 host/include/uhd/types/tune_result.hpp  |  44 +++++++++
 host/lib/CMakeLists.txt                 |   3 -
 host/lib/device.cpp                     |   6 +-
 host/lib/device_addr.cpp                |  86 ------------------
 host/lib/gain_handler.cpp               |  24 ++---
 host/lib/metadata.cpp                   |  37 --------
 host/lib/simple_device.cpp              |   5 +-
 host/lib/time_spec.cpp                  |  35 --------
 host/lib/types.cpp                      | 113 +++++++++++++++++++++--
 host/lib/usrp/dboard/basic.cpp          |  26 +++---
 host/lib/usrp/dboard_manager.cpp        |   2 +-
 host/lib/usrp/usrp2/dboard_impl.cpp     |   1 +
 host/lib/usrp/usrp2/dsp_impl.cpp        |   6 +-
 host/lib/usrp/usrp2/mboard_impl.cpp     |   3 +-
 host/lib/usrp/usrp2/usrp2_impl.hpp      |  10 +--
 host/test/addr_test.cpp                 |   5 +-
 host/test/gain_handler_test.cpp         |  22 ++---
 host/utils/discover_usrps.cpp           |   2 +-
 36 files changed, 752 insertions(+), 688 deletions(-)
 delete mode 100644 host/include/uhd/device_addr.hpp
 delete mode 100644 host/include/uhd/dict.hpp
 delete mode 100644 host/include/uhd/metadata.hpp
 delete mode 100644 host/include/uhd/time_spec.hpp
 delete mode 100644 host/include/uhd/types.hpp
 create mode 100644 host/include/uhd/types/CMakeLists.txt
 create mode 100644 host/include/uhd/types/clock_config.hpp
 create mode 100644 host/include/uhd/types/device_addr.hpp
 create mode 100644 host/include/uhd/types/dict.hpp
 create mode 100644 host/include/uhd/types/mac_addr.hpp
 create mode 100644 host/include/uhd/types/metadata.hpp
 create mode 100644 host/include/uhd/types/ranges.hpp
 create mode 100644 host/include/uhd/types/stream_cmd.hpp
 create mode 100644 host/include/uhd/types/time_spec.hpp
 create mode 100644 host/include/uhd/types/tune_result.hpp
 delete mode 100644 host/lib/device_addr.cpp
 delete mode 100644 host/lib/metadata.cpp
 delete mode 100644 host/lib/time_spec.cpp

(limited to 'host/lib')

diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt
index 2203ea83e..0cebea095 100644
--- a/host/include/uhd/CMakeLists.txt
+++ b/host/include/uhd/CMakeLists.txt
@@ -17,20 +17,16 @@
 
 
 ADD_SUBDIRECTORY(transport)
+ADD_SUBDIRECTORY(types)
 ADD_SUBDIRECTORY(usrp)
 ADD_SUBDIRECTORY(utils)
 
 INSTALL(FILES
     config.hpp
     device.hpp
-    device_addr.hpp
-    dict.hpp
     gain_handler.hpp
-    metadata.hpp
     props.hpp
     simple_device.hpp
-    time_spec.hpp
-    types.hpp
     wax.hpp
     DESTINATION ${INCLUDE_DIR}/uhd
 )
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp
index 13b40febe..bab8afca6 100644
--- a/host/include/uhd/device.hpp
+++ b/host/include/uhd/device.hpp
@@ -19,9 +19,9 @@
 #define INCLUDED_UHD_DEVICE_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/device_addr.hpp>
+#include <uhd/types/device_addr.hpp>
+#include <uhd/types/metadata.hpp>
 #include <uhd/props.hpp>
-#include <uhd/metadata.hpp>
 #include <uhd/wax.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/host/include/uhd/device_addr.hpp b/host/include/uhd/device_addr.hpp
deleted file mode 100644
index 7673faff0..000000000
--- a/host/include/uhd/device_addr.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_DEVICE_ADDR_HPP
-#define INCLUDED_UHD_DEVICE_ADDR_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/dict.hpp>
-#include <boost/cstdint.hpp>
-#include <string>
-#include <iostream>
-#include <vector>
-
-namespace uhd{
-
-    /*!
-    * Wrapper for an ethernet mac address.
-    * Provides conversion between string and binary formats.
-    */
-    struct UHD_API mac_addr_t{
-        boost::uint8_t mac_addr[6];
-        mac_addr_t(const std::string &mac_addr_str = "00:00:00:00:00:00");
-        std::string to_string(void) const;
-    };
-
-    /*!
-     * The device address args are just a mapping of key/value string pairs.
-     * When left empty, the discovery routine will try to find all usrps.
-     * The discovery can be narrowed down by specifying the transport type arguments.
-     *
-     * For example, to access a specific usrp2 one would specify the transport type
-     * ("type", "udp") and the transport args ("addr", "<resolvable_hostname_or_addr>").
-     */
-    typedef dict<std::string, std::string> device_addr_t;
-    typedef std::vector<device_addr_t> device_addrs_t;
-
-    /*!
-     * Function to turn a device address into a string.
-     * Just having the operator<< below should be sufficient.
-     * However, boost format seems to complain with the %
-     * and this is just easier because it works.
-     * \param device_addr a device address instance
-     * \return the string representation
-     */
-    namespace device_addr{
-        UHD_API std::string to_string(const device_addr_t &device_addr);
-    }
-
-} //namespace uhd
-
-//ability to use types with stream operators
-UHD_API std::ostream& operator<<(std::ostream &, const uhd::device_addr_t &);
-UHD_API std::ostream& operator<<(std::ostream &, const uhd::mac_addr_t &);
-
-#endif /* INCLUDED_UHD_DEVICE_ADDR_HPP */
diff --git a/host/include/uhd/dict.hpp b/host/include/uhd/dict.hpp
deleted file mode 100644
index f08493952..000000000
--- a/host/include/uhd/dict.hpp
+++ /dev/null
@@ -1,154 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_DICT_HPP
-#define INCLUDED_UHD_DICT_HPP
-
-#include <list>
-#include <vector>
-#include <stdexcept>
-#include <boost/foreach.hpp>
-
-namespace uhd{
-
-    /*!
-     * A templated dictionary class with a python-like interface.
-     */
-    template <class Key, class Val> class dict{
-    public:
-        typedef std::pair<Key, Val> pair_t;
-
-        /*!
-         * Create a new empty dictionary.
-         */
-        dict(void){
-            /* NOP */
-        }
-
-        /*!
-         * Input iterator constructor:
-         * Makes boost::assign::map_list_of work.
-         * \param first the begin iterator
-         * \param last the end iterator
-         */
-        template <class InputIterator>
-        dict(InputIterator first, InputIterator last){
-            for(InputIterator it = first; it != last; it++){
-                _map.push_back(*it);
-            }
-        }
-
-        /*!
-         * Destroy this dict.
-         */
-        ~dict(void){
-            /* NOP */
-        }
-
-        /*!
-         * Get the number of elements in this dict.
-         * \param the number of elements
-         */
-        std::size_t size(void) const{
-            return _map.size();
-        }
-
-        /*!
-         * Get a list of the keys in this dict.
-         * Key order depends on insertion precedence.
-         * \return vector of keys
-         */
-        std::vector<Key> get_keys(void) const{
-            std::vector<Key> keys;
-            BOOST_FOREACH(const pair_t &p, _map){
-                keys.push_back(p.first);
-            }
-            return keys;
-        }
-
-        /*!
-         * Get a list of the values in this dict.
-         * Value order depends on insertion precedence.
-         * \return vector of values
-         */
-        std::vector<Val> get_vals(void) const{
-            std::vector<Val> vals;
-            BOOST_FOREACH(const pair_t &p, _map){
-                vals.push_back(p.second);
-            }
-            return vals;
-        }
-
-        /*!
-         * Does the dictionary contain this key?
-         * \param key the key to look for
-         * \return true if found
-         */
-        bool has_key(const Key &key) const{
-            BOOST_FOREACH(const pair_t &p, _map){
-                if (p.first == key) return true;
-            }
-            return false;
-        }
-
-        /*!
-         * Get a value for the given key if it exists.
-         * If the key is not found throw an error.
-         * \param key the key to look for
-         * \return the value at the key
-         * \throw an exception when not found
-         */
-        const Val &operator[](const Key &key) const{
-            BOOST_FOREACH(const pair_t &p, _map){
-                if (p.first == key) return p.second;
-            }
-            throw std::invalid_argument("key not found in dict");
-        }
-
-        /*!
-         * Set a value for the given key, however, in reality
-         * it really returns a reference which can be assigned to.
-         * \param key the key to set to
-         * \return a reference to the value
-         */
-        Val &operator[](const Key &key){
-            BOOST_FOREACH(pair_t &p, _map){
-                if (p.first == key) return p.second;
-            }
-            _map.push_back(pair_t(key, Val()));
-            return _map.back().second;
-        }
-
-        /*!
-         * Pop an item out of the dictionary.
-         * \param key the item key
-         * \return the value of the item
-         * \throw an exception when not found
-         */
-        Val pop(const Key &key){
-            Val val = (*this)[key];
-            _map.remove(pair_t(key, val));
-            return val;
-        }
-
-    private:
-        std::list<pair_t> _map; //private container
-    };
-
-} //namespace uhd
-
-#endif /* INCLUDED_UHD_DICT_HPP */
diff --git a/host/include/uhd/metadata.hpp b/host/include/uhd/metadata.hpp
deleted file mode 100644
index 6d80f070d..000000000
--- a/host/include/uhd/metadata.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_METADATA_HPP
-#define INCLUDED_UHD_METADATA_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/time_spec.hpp>
-
-namespace uhd{
-
-/*!
- * RX metadata structure for describing sent IF data.
- * Includes stream ID, time specification, and fragmentation flags.
- * The receive routines will convert IF data headers into metadata.
- */
-struct UHD_API rx_metadata_t{
-    boost::uint32_t stream_id;
-    time_spec_t time_spec;
-    bool has_stream_id;
-    bool has_time_spec;
-    bool is_fragment;
-
-    //default constructor
-    rx_metadata_t(void);
-};
-
-/*!
- * TX metadata structure for describing received IF data.
- * Includes stream ID, time specification, and burst flags.
- * The send routines will convert the metadata to IF data headers.
- */
-struct UHD_API tx_metadata_t{
-    boost::uint32_t stream_id;
-    time_spec_t time_spec;
-    bool has_stream_id;
-    bool has_time_spec;
-    bool start_of_burst;
-    bool end_of_burst;
-
-    //default constructor
-    tx_metadata_t(void);
-};
-
-} //namespace uhd
-
-#endif /* INCLUDED_UHD_METADATA_HPP */
diff --git a/host/include/uhd/simple_device.hpp b/host/include/uhd/simple_device.hpp
index bbe0258c7..52928367a 100644
--- a/host/include/uhd/simple_device.hpp
+++ b/host/include/uhd/simple_device.hpp
@@ -20,7 +20,9 @@
 
 #include <uhd/config.hpp>
 #include <uhd/device.hpp>
-#include <uhd/types.hpp>
+#include <uhd/types/ranges.hpp>
+#include <uhd/types/stream_cmd.hpp>
+#include <uhd/types/tune_result.hpp>
 #include <boost/shared_ptr.hpp>
 #include <boost/utility.hpp>
 #include <vector>
diff --git a/host/include/uhd/time_spec.hpp b/host/include/uhd/time_spec.hpp
deleted file mode 100644
index e863746ba..000000000
--- a/host/include/uhd/time_spec.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_TIME_SPEC_HPP
-#define INCLUDED_UHD_TIME_SPEC_HPP
-
-#include <uhd/config.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-
-namespace 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 UHD_API time_spec_t{
-        boost::uint32_t secs;
-        boost::uint32_t ticks;
-
-        /*!
-         * Create a time_spec_t from seconds and ticks.
-         * \param new_secs the new seconds (default = 0)
-         * \param new_ticks the new ticks (default = 0)
-         */
-        time_spec_t(boost::uint32_t new_secs = 0, boost::uint32_t new_ticks = 0);
-
-        /*!
-         * Create a time_spec_t from boost posix time.
-         * \param time fine-grained boost posix time
-         * \param tick_rate the rate of ticks per second
-         */
-        time_spec_t(boost::posix_time::ptime time, double tick_rate);
-
-    };
-
-} //namespace uhd
-
-#endif /* INCLUDED_UHD_TIME_SPEC_HPP */
diff --git a/host/include/uhd/transport/vrt.hpp b/host/include/uhd/transport/vrt.hpp
index db2c57eba..04945b347 100644
--- a/host/include/uhd/transport/vrt.hpp
+++ b/host/include/uhd/transport/vrt.hpp
@@ -19,7 +19,7 @@
 #define INCLUDED_UHD_TRANSPORT_VRT_HPP
 
 #include <uhd/config.hpp>
-#include <uhd/metadata.hpp>
+#include <uhd/types/metadata.hpp>
 #include <cstddef>
 
 namespace uhd{ namespace transport{
diff --git a/host/include/uhd/types.hpp b/host/include/uhd/types.hpp
deleted file mode 100644
index 3ad3dae82..000000000
--- a/host/include/uhd/types.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_TYPES_HPP
-#define INCLUDED_UHD_TYPES_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/time_spec.hpp>
-#include <string>
-
-namespace uhd{
-
-    typedef float gain_t; //TODO REMOVE
-    typedef double freq_t; //TODO REMOVE
-
-    /*!
-     * The gain range struct describes possible gain settings.
-     * The mimumum gain, maximum gain, and step size are in dB.
-     */
-    struct UHD_API gain_range_t{
-        float min, max, step;
-        gain_range_t(float min = 0.0, float max = 0.0, float step = 0.0);
-    };
-
-    /*!
-     * The frequency range struct describes possible frequency settings.
-     * Because tuning is very granular (sub-Hz), step size is not listed.
-     * The mimumum frequency and maximum frequency are in Hz.
-     */
-    struct UHD_API freq_range_t{
-        double min, max;
-        freq_range_t(double min = 0.0, double max = 0.0);
-    };
-
-    /*!
-     * The tune result struct holds result of a 2-phase tuning:
-     * The struct hold the result of tuning the dboard as
-     * the target and actual intermediate frequency.
-     * The struct hold the result of tuning the DDC/DUC as
-     * the target and actual digital converter frequency.
-     * It also tell us weather or not the spectrum is inverted.
-     */
-    struct UHD_API tune_result_t{
-        double target_inter_freq;
-        double actual_inter_freq;
-        double target_dxc_freq;
-        double actual_dxc_freq;
-        bool spectrum_inverted;
-        tune_result_t(void);
-    };
-
-    /*!
-     * Clock configuration settings:
-     * The source for the 10MHz reference clock.
-     * The source and polarity for the PPS clock.
-     */
-    struct UHD_API clock_config_t{
-        enum ref_source_t {
-            REF_INT, //internal reference
-            REF_SMA, //external sma port
-            REF_MIMO //mimo cable (usrp2 only)
-        } ref_source;
-        enum pps_source_t {
-            PPS_INT, //there is no internal
-            PPS_SMA, //external sma port
-            PPS_MIMO //mimo cable (usrp2 only)
-        } pps_source;
-        enum pps_polarity_t {
-            PPS_NEG, //negative edge
-            PPS_POS  //positive edge
-        } pps_polarity;
-        clock_config_t(void);
-    };
-
-    /*!
-     * Command struct for configuration and control of streaming:
-     *
-     * A stream command defines how the device sends samples to the host.
-     * Streaming is controlled by submitting a stream command to the rx dsp.
-     * Granular control over what the device streams to the host can be
-     * achieved through submission of multiple (carefully-crafted) commands.
-     *
-     * The stream_now parameter controls when the stream begins.
-     * When true, the device will begin streaming ASAP. When false,
-     * the device will begin streaming at a time specified by time_spec.
-     *
-     * The continuous parameter controls the number of samples received.
-     * When true, the device continues streaming indefinitely. When false,
-     * the device will stream the number of samples specified by num_samps.
-     *
-     * Standard usage case:
-     * To start continuous streaming, set stream_now to true and continuous to true.
-     * To end continuous streaming, set stream_now to true and continuous to false.
-     */
-    struct UHD_API stream_cmd_t{
-        bool stream_now;
-        time_spec_t time_spec;
-        bool continuous;
-        size_t num_samps;
-        stream_cmd_t(void);
-    };
-
-} //namespace uhd
-
-#endif /* INCLUDED_UHD_TYPES_HPP */
diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt
new file mode 100644
index 000000000..10262dd65
--- /dev/null
+++ b/host/include/uhd/types/CMakeLists.txt
@@ -0,0 +1,30 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+INSTALL(FILES
+    clock_config.hpp
+    device_addr.hpp
+    dict.hpp
+    mac_addr.hpp
+    metadata.hpp
+    ranges.hpp
+    stream_cmd.hpp
+    time_spec.hpp
+    tune_result.hpp
+    DESTINATION ${INCLUDE_DIR}/uhd/types
+)
diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp
new file mode 100644
index 000000000..8b2fea016
--- /dev/null
+++ b/host/include/uhd/types/clock_config.hpp
@@ -0,0 +1,50 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_CLOCK_CONFIG_HPP
+#define INCLUDED_UHD_TYPES_CLOCK_CONFIG_HPP
+
+#include <uhd/config.hpp>
+
+namespace uhd{
+
+    /*!
+     * Clock configuration settings:
+     * The source for the 10MHz reference clock.
+     * The source and polarity for the PPS clock.
+     */
+    struct UHD_API clock_config_t{
+        enum ref_source_t {
+            REF_INT, //internal reference
+            REF_SMA, //external sma port
+            REF_MIMO //mimo cable (usrp2 only)
+        } ref_source;
+        enum pps_source_t {
+            PPS_INT, //there is no internal
+            PPS_SMA, //external sma port
+            PPS_MIMO //mimo cable (usrp2 only)
+        } pps_source;
+        enum pps_polarity_t {
+            PPS_NEG, //negative edge
+            PPS_POS  //positive edge
+        } pps_polarity;
+        clock_config_t(void);
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_CLOCK_CONFIG_HPP */
diff --git a/host/include/uhd/types/device_addr.hpp b/host/include/uhd/types/device_addr.hpp
new file mode 100644
index 000000000..d32dfa77e
--- /dev/null
+++ b/host/include/uhd/types/device_addr.hpp
@@ -0,0 +1,45 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP
+#define INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/types/dict.hpp>
+#include <vector>
+#include <string>
+
+namespace uhd{
+
+    /*!
+     * The device address args are just a mapping of key/value string pairs.
+     * When left empty, the discovery routine will try to find all usrps.
+     * The discovery can be narrowed down by specifying the transport type arguments.
+     *
+     * For example, to access a specific usrp2 one would specify the transport type
+     * ("type", "udp") and the transport args ("addr", "<resolvable_hostname_or_addr>").
+     */
+    class UHD_API device_addr_t : public dict<std::string, std::string>{
+        public: std::string to_string(void) const;
+    };
+
+    //handy typedef for a vector of device addresses
+    typedef std::vector<device_addr_t> device_addrs_t;
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_DEVICE_ADDR_HPP */
diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp
new file mode 100644
index 000000000..5b9883704
--- /dev/null
+++ b/host/include/uhd/types/dict.hpp
@@ -0,0 +1,154 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_DICT_HPP
+#define INCLUDED_UHD_TYPES_DICT_HPP
+
+#include <list>
+#include <vector>
+#include <stdexcept>
+#include <boost/foreach.hpp>
+
+namespace uhd{
+
+    /*!
+     * A templated dictionary class with a python-like interface.
+     */
+    template <class Key, class Val> class dict{
+    public:
+        typedef std::pair<Key, Val> pair_t;
+
+        /*!
+         * Create a new empty dictionary.
+         */
+        dict(void){
+            /* NOP */
+        }
+
+        /*!
+         * Input iterator constructor:
+         * Makes boost::assign::map_list_of work.
+         * \param first the begin iterator
+         * \param last the end iterator
+         */
+        template <class InputIterator>
+        dict(InputIterator first, InputIterator last){
+            for(InputIterator it = first; it != last; it++){
+                _map.push_back(*it);
+            }
+        }
+
+        /*!
+         * Destroy this dict.
+         */
+        ~dict(void){
+            /* NOP */
+        }
+
+        /*!
+         * Get the number of elements in this dict.
+         * \param the number of elements
+         */
+        std::size_t size(void) const{
+            return _map.size();
+        }
+
+        /*!
+         * Get a list of the keys in this dict.
+         * Key order depends on insertion precedence.
+         * \return vector of keys
+         */
+        std::vector<Key> get_keys(void) const{
+            std::vector<Key> keys;
+            BOOST_FOREACH(const pair_t &p, _map){
+                keys.push_back(p.first);
+            }
+            return keys;
+        }
+
+        /*!
+         * Get a list of the values in this dict.
+         * Value order depends on insertion precedence.
+         * \return vector of values
+         */
+        std::vector<Val> get_vals(void) const{
+            std::vector<Val> vals;
+            BOOST_FOREACH(const pair_t &p, _map){
+                vals.push_back(p.second);
+            }
+            return vals;
+        }
+
+        /*!
+         * Does the dictionary contain this key?
+         * \param key the key to look for
+         * \return true if found
+         */
+        bool has_key(const Key &key) const{
+            BOOST_FOREACH(const pair_t &p, _map){
+                if (p.first == key) return true;
+            }
+            return false;
+        }
+
+        /*!
+         * Get a value for the given key if it exists.
+         * If the key is not found throw an error.
+         * \param key the key to look for
+         * \return the value at the key
+         * \throw an exception when not found
+         */
+        const Val &operator[](const Key &key) const{
+            BOOST_FOREACH(const pair_t &p, _map){
+                if (p.first == key) return p.second;
+            }
+            throw std::invalid_argument("key not found in dict");
+        }
+
+        /*!
+         * Set a value for the given key, however, in reality
+         * it really returns a reference which can be assigned to.
+         * \param key the key to set to
+         * \return a reference to the value
+         */
+        Val &operator[](const Key &key){
+            BOOST_FOREACH(pair_t &p, _map){
+                if (p.first == key) return p.second;
+            }
+            _map.push_back(pair_t(key, Val()));
+            return _map.back().second;
+        }
+
+        /*!
+         * Pop an item out of the dictionary.
+         * \param key the item key
+         * \return the value of the item
+         * \throw an exception when not found
+         */
+        Val pop(const Key &key){
+            Val val = (*this)[key];
+            _map.remove(pair_t(key, val));
+            return val;
+        }
+
+    private:
+        std::list<pair_t> _map; //private container
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_DICT_HPP */
diff --git a/host/include/uhd/types/mac_addr.hpp b/host/include/uhd/types/mac_addr.hpp
new file mode 100644
index 000000000..2cac7d343
--- /dev/null
+++ b/host/include/uhd/types/mac_addr.hpp
@@ -0,0 +1,39 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_MAC_ADDR_HPP
+#define INCLUDED_UHD_TYPES_MAC_ADDR_HPP
+
+#include <uhd/config.hpp>
+#include <boost/cstdint.hpp>
+#include <string>
+
+namespace uhd{
+
+    /*!
+    * Wrapper for an ethernet mac address.
+    * Provides conversion between string and binary formats.
+    */
+    struct UHD_API mac_addr_t{
+        boost::uint8_t mac_addr[6];
+        mac_addr_t(const std::string &mac_addr_str = "00:00:00:00:00:00");
+        std::string to_string(void) const;
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_MAC_ADDR_HPP */
diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp
new file mode 100644
index 000000000..6e93040d9
--- /dev/null
+++ b/host/include/uhd/types/metadata.hpp
@@ -0,0 +1,61 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_METADATA_HPP
+#define INCLUDED_UHD_TYPES_METADATA_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/types/time_spec.hpp>
+
+namespace uhd{
+
+    /*!
+     * RX metadata structure for describing sent IF data.
+     * Includes stream ID, time specification, and fragmentation flags.
+     * The receive routines will convert IF data headers into metadata.
+     */
+    struct UHD_API rx_metadata_t{
+        boost::uint32_t stream_id;
+        time_spec_t time_spec;
+        bool has_stream_id;
+        bool has_time_spec;
+        bool is_fragment;
+
+        //default constructor
+        rx_metadata_t(void);
+    };
+
+    /*!
+     * TX metadata structure for describing received IF data.
+     * Includes stream ID, time specification, and burst flags.
+     * The send routines will convert the metadata to IF data headers.
+     */
+    struct UHD_API tx_metadata_t{
+        boost::uint32_t stream_id;
+        time_spec_t time_spec;
+        bool has_stream_id;
+        bool has_time_spec;
+        bool start_of_burst;
+        bool end_of_burst;
+
+        //default constructor
+        tx_metadata_t(void);
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_METADATA_HPP */
diff --git a/host/include/uhd/types/ranges.hpp b/host/include/uhd/types/ranges.hpp
new file mode 100644
index 000000000..a2057d1c8
--- /dev/null
+++ b/host/include/uhd/types/ranges.hpp
@@ -0,0 +1,46 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_RANGES_HPP
+#define INCLUDED_UHD_TYPES_RANGES_HPP
+
+#include <uhd/config.hpp>
+
+namespace uhd{
+
+    /*!
+     * The gain range struct describes possible gain settings.
+     * The mimumum gain, maximum gain, and step size are in dB.
+     */
+    struct UHD_API gain_range_t{
+        float min, max, step;
+        gain_range_t(float min = 0.0, float max = 0.0, float step = 0.0);
+    };
+
+    /*!
+     * The frequency range struct describes possible frequency settings.
+     * Because tuning is very granular (sub-Hz), step size is not listed.
+     * The mimumum frequency and maximum frequency are in Hz.
+     */
+    struct UHD_API freq_range_t{
+        double min, max;
+        freq_range_t(double min = 0.0, double max = 0.0);
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_RANGES_HPP */
diff --git a/host/include/uhd/types/stream_cmd.hpp b/host/include/uhd/types/stream_cmd.hpp
new file mode 100644
index 000000000..97a6b73ce
--- /dev/null
+++ b/host/include/uhd/types/stream_cmd.hpp
@@ -0,0 +1,56 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_STREAM_CMD_HPP
+#define INCLUDED_UHD_TYPES_STREAM_CMD_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/types/time_spec.hpp>
+
+namespace uhd{
+
+    /*!
+     * Command struct for configuration and control of streaming:
+     *
+     * A stream command defines how the device sends samples to the host.
+     * Streaming is controlled by submitting a stream command to the rx dsp.
+     * Granular control over what the device streams to the host can be
+     * achieved through submission of multiple (carefully-crafted) commands.
+     *
+     * The stream_now parameter controls when the stream begins.
+     * When true, the device will begin streaming ASAP. When false,
+     * the device will begin streaming at a time specified by time_spec.
+     *
+     * The continuous parameter controls the number of samples received.
+     * When true, the device continues streaming indefinitely. When false,
+     * the device will stream the number of samples specified by num_samps.
+     *
+     * Standard usage case:
+     * To start continuous streaming, set stream_now to true and continuous to true.
+     * To end continuous streaming, set stream_now to true and continuous to false.
+     */
+    struct UHD_API stream_cmd_t{
+        bool stream_now;
+        time_spec_t time_spec;
+        bool continuous;
+        size_t num_samps;
+        stream_cmd_t(void);
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_STREAM_CMD_HPP */
diff --git a/host/include/uhd/types/time_spec.hpp b/host/include/uhd/types/time_spec.hpp
new file mode 100644
index 000000000..8c8f2bc25
--- /dev/null
+++ b/host/include/uhd/types/time_spec.hpp
@@ -0,0 +1,55 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_TIME_SPEC_HPP
+#define INCLUDED_UHD_TYPES_TIME_SPEC_HPP
+
+#include <uhd/config.hpp>
+#include <boost/cstdint.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+namespace 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 UHD_API time_spec_t{
+        boost::uint32_t secs;
+        boost::uint32_t ticks;
+
+        /*!
+         * Create a time_spec_t from seconds and ticks.
+         * \param new_secs the new seconds (default = 0)
+         * \param new_ticks the new ticks (default = 0)
+         */
+        time_spec_t(boost::uint32_t new_secs = 0, boost::uint32_t new_ticks = 0);
+
+        /*!
+         * Create a time_spec_t from boost posix time.
+         * \param time fine-grained boost posix time
+         * \param tick_rate the rate of ticks per second
+         */
+        time_spec_t(boost::posix_time::ptime time, double tick_rate);
+
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_TIME_SPEC_HPP */
diff --git a/host/include/uhd/types/tune_result.hpp b/host/include/uhd/types/tune_result.hpp
new file mode 100644
index 000000000..31742e1af
--- /dev/null
+++ b/host/include/uhd/types/tune_result.hpp
@@ -0,0 +1,44 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_TUNE_RESULT_HPP
+#define INCLUDED_UHD_TYPES_TUNE_RESULT_HPP
+
+#include <uhd/config.hpp>
+
+namespace uhd{
+
+    /*!
+     * The tune result struct holds result of a 2-phase tuning:
+     * The struct hold the result of tuning the dboard as
+     * the target and actual intermediate frequency.
+     * The struct hold the result of tuning the DDC/DUC as
+     * the target and actual digital converter frequency.
+     * It also tell us weather or not the spectrum is inverted.
+     */
+    struct UHD_API tune_result_t{
+        double target_inter_freq;
+        double actual_inter_freq;
+        double target_dxc_freq;
+        double actual_dxc_freq;
+        bool spectrum_inverted;
+        tune_result_t(void);
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_TUNE_RESULT_HPP */
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 170d1d3bf..1eceb53ea 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -20,12 +20,9 @@
 ########################################################################
 SET(libuhd_sources
     device.cpp
-    device_addr.cpp
     gain_handler.cpp
     load_modules.cpp
-    metadata.cpp
     simple_device.cpp
-    time_spec.cpp
     types.cpp
     wax.cpp
     transport/if_addrs.cpp
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 0bdbf5f23..833e7a0da 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <uhd/device.hpp>
-#include <uhd/dict.hpp>
+#include <uhd/types/dict.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/utils/static.hpp>
 #include <boost/foreach.hpp>
@@ -110,14 +110,14 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
     //check that we found any devices
     if (dev_addr_makers.size() == 0){
         throw std::runtime_error(str(
-            boost::format("No devices found for ----->\n%s") % device_addr::to_string(hint)
+            boost::format("No devices found for ----->\n%s") % hint.to_string()
         ));
     }
 
     //check that the which index is valid
     if (dev_addr_makers.size() <= which){
         throw std::runtime_error(str(
-            boost::format("No device at index %d for ----->\n%s") % which % device_addr::to_string(hint)
+            boost::format("No device at index %d for ----->\n%s") % which % hint.to_string()
         ));
     }
 
diff --git a/host/lib/device_addr.cpp b/host/lib/device_addr.cpp
deleted file mode 100644
index d26bb4b9d..000000000
--- a/host/lib/device_addr.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/device_addr.hpp>
-#include <sstream>
-#include <cstring>
-#include <stdexcept>
-#include <boost/format.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/foreach.hpp>
-
-//----------------------- u2 mac addr wrapper ------------------------//
-uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
-    std::string mac_addr_str = (mac_addr_str_ == "")? "ff:ff:ff:ff:ff:ff" : mac_addr_str_;
-
-    //ether_aton_r(str.c_str(), &mac_addr);
-    boost::uint8_t p[6] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB
-
-    try{
-        //only allow patterns of xx:xx or xx:xx:xx:xx:xx:xx
-        //the IAB above will fill in for the shorter pattern
-        if (mac_addr_str.size() != 5 and mac_addr_str.size() != 17)
-            throw std::runtime_error("expected exactly 5 or 17 characters");
-
-        //split the mac addr hex string at the colons
-        std::vector<std::string> hex_strs;
-        boost::split(hex_strs, mac_addr_str, boost::is_any_of(":"));
-        for (size_t i = 0; i < hex_strs.size(); i++){
-            int hex_num;
-            std::istringstream iss(hex_strs[i]);
-            iss >> std::hex >> hex_num;
-            p[i] = boost::uint8_t(hex_num);
-        }
-
-    }
-    catch(std::exception const& e){
-        throw std::runtime_error(str(
-            boost::format("Invalid mac address: %s\n\t%s") % mac_addr_str % e.what()
-        ));
-    }
-
-    memcpy(&mac_addr, p, sizeof(mac_addr));
-}
-
-std::string uhd::mac_addr_t::to_string(void) const{
-    //ether_ntoa_r(&mac_addr, addr_buf);
-    const boost::uint8_t *p = reinterpret_cast<const boost::uint8_t *>(&mac_addr);
-    return str(
-        boost::format("%02x:%02x:%02x:%02x:%02x:%02x")
-        % int(p[0]) % int(p[1]) % int(p[2])
-        % int(p[3]) % int(p[4]) % int(p[5])
-    );
-}
-
-std::ostream& operator<<(std::ostream &os, const uhd::mac_addr_t &x){
-    os << x.to_string();
-    return os;
-}
-
-//----------------------- usrp device_addr_t wrapper -------------------------//
-std::string uhd::device_addr::to_string(const uhd::device_addr_t &device_addr){
-    std::stringstream ss;
-    BOOST_FOREACH(std::string key, device_addr.get_keys()){
-        ss << boost::format("%s: %s") % key % device_addr[key] << std::endl;
-    }
-    return ss.str();
-}
-
-std::ostream& operator<<(std::ostream &os, const uhd::device_addr_t &device_addr){
-    os << uhd::device_addr::to_string(device_addr);
-    return os;
-}
diff --git a/host/lib/gain_handler.cpp b/host/lib/gain_handler.cpp
index 7b3dd266c..a6ae06c50 100644
--- a/host/lib/gain_handler.cpp
+++ b/host/lib/gain_handler.cpp
@@ -17,7 +17,7 @@
 
 #include <uhd/gain_handler.hpp>
 #include <uhd/utils/assert.hpp>
-#include <uhd/types.hpp>
+#include <uhd/types/ranges.hpp>
 #include <uhd/props.hpp>
 #include <boost/assign/list_of.hpp>
 #include <boost/foreach.hpp>
@@ -47,7 +47,7 @@ private:
     is_equal_t   _is_equal;
 
     prop_names_t get_gain_names(void);
-    gain_t get_overall_gain_val(void);
+    float get_overall_gain_val(void);
     gain_range_t get_overall_gain_range(void);
     template <class T> T get_named_prop(const wax::obj &prop, const std::string &name){
         return _link[named_prop_t(prop, name)].as<T>();
@@ -90,21 +90,21 @@ prop_names_t gain_handler_impl::get_gain_names(void){
     return _link[_props.names].as<prop_names_t>();
 }
 
-gain_t gain_handler_impl::get_overall_gain_val(void){
-    gain_t gain_val = 0;
+float gain_handler_impl::get_overall_gain_val(void){
+    float gain_val = 0;
     BOOST_FOREACH(std::string name, get_gain_names()){
-        gain_val += get_named_prop<gain_t>(_props.value, name);
+        gain_val += get_named_prop<float>(_props.value, name);
     }
     return gain_val;
 }
 
 gain_range_t gain_handler_impl::get_overall_gain_range(void){
-    gain_t gain_min = 0, gain_max = 0, gain_step = 0;
+    float gain_min = 0, gain_max = 0, gain_step = 0;
     BOOST_FOREACH(std::string name, get_gain_names()){
-        gain_range_t gain_tmp = get_named_prop<gain_range_t>(_props.range, name);
-        gain_min += gain_tmp.min;
-        gain_max += gain_tmp.max;
-        gain_step = std::max(gain_step, gain_tmp.step);
+        gain_range_t floatmp = get_named_prop<gain_range_t>(_props.range, name);
+        gain_min += floatmp.min;
+        gain_max += floatmp.max;
+        gain_step = std::max(gain_step, floatmp.step);
     }
     return gain_range_t(gain_min, gain_max, gain_step);
 }
@@ -145,7 +145,7 @@ bool gain_handler_impl::intercept_set(const wax::obj &key_, const wax::obj &val)
     //not a gain value key... dont handle
     if (not _is_equal(key, _props.value)) return false;
 
-    gain_t gain_val = val.as<gain_t>();
+    float gain_val = val.as<float>();
 
     //not a wildcard... dont handle (but check name and range)
     if (name != ""){
@@ -164,7 +164,7 @@ bool gain_handler_impl::intercept_set(const wax::obj &key_, const wax::obj &val)
         gain_range_t gain = get_named_prop<gain_range_t>(_props.range, name);
 
         //clip g to be within the allowed range
-        gain_t g = std::min(std::max(gain_val, gain.min), gain.max);
+        float g = std::min(std::max(gain_val, gain.min), gain.max);
         //set g to be a multiple of the step size
         g -= std::fmod(g, gain.step);
         //set g to be the new gain
diff --git a/host/lib/metadata.cpp b/host/lib/metadata.cpp
deleted file mode 100644
index 40fdb7c73..000000000
--- a/host/lib/metadata.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/metadata.hpp>
-
-using namespace uhd;
-
-rx_metadata_t::rx_metadata_t(void){
-    stream_id = 0;
-    has_stream_id = false;
-    time_spec = time_spec_t();
-    has_time_spec = false;
-    is_fragment = false;
-}
-
-tx_metadata_t::tx_metadata_t(void){
-    stream_id = 0;
-    has_stream_id = false;
-    time_spec = time_spec_t();
-    has_time_spec = false;
-    start_of_burst = false;
-    end_of_burst = false;
-}
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index 0eb69d9fa..95bc8fecc 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -19,7 +19,6 @@
 #include <uhd/utils/assert.hpp>
 #include <uhd/utils/algorithm.hpp>
 #include <uhd/props.hpp>
-#include <uhd/types.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
@@ -208,7 +207,7 @@ public:
     }
 
     float get_rx_gain(void){
-        return _rx_subdev[SUBDEV_PROP_GAIN].as<gain_t>();
+        return _rx_subdev[SUBDEV_PROP_GAIN].as<float>();
     }
 
     gain_range_t get_rx_gain_range(void){
@@ -264,7 +263,7 @@ public:
     }
 
     float get_tx_gain(void){
-        return _tx_subdev[SUBDEV_PROP_GAIN].as<gain_t>();
+        return _tx_subdev[SUBDEV_PROP_GAIN].as<float>();
     }
 
     gain_range_t get_tx_gain_range(void){
diff --git a/host/lib/time_spec.cpp b/host/lib/time_spec.cpp
deleted file mode 100644
index 98bf28077..000000000
--- a/host/lib/time_spec.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/time_spec.hpp>
-
-using namespace uhd;
-
-time_spec_t::time_spec_t(boost::uint32_t new_secs, boost::uint32_t new_ticks){
-    secs = new_secs;
-    ticks = new_ticks;
-}
-
-static const boost::posix_time::ptime epoch(boost::gregorian::date(1970,1,1));
-static double time_tick_rate = double(boost::posix_time::time_duration::ticks_per_second());
-
-time_spec_t::time_spec_t(boost::posix_time::ptime time, double tick_rate){
-    boost::posix_time::time_duration td = time - epoch;
-    secs = boost::uint32_t(td.total_seconds());
-    double time_ticks_per_device_ticks = time_tick_rate/tick_rate;
-    ticks = boost::uint32_t(td.fractional_seconds()/time_ticks_per_device_ticks);
-}
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index 273f87a2d..bd5dc8e26 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -15,12 +15,23 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/types.hpp>
+#include <uhd/types/ranges.hpp>
+#include <uhd/types/tune_result.hpp>
+#include <uhd/types/clock_config.hpp>
+#include <uhd/types/stream_cmd.hpp>
+#include <uhd/types/metadata.hpp>
+#include <uhd/types/time_spec.hpp>
+#include <uhd/types/device_addr.hpp>
+#include <uhd/types/mac_addr.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
+#include <boost/format.hpp>
+#include <stdexcept>
 
 using namespace uhd;
 
 /***********************************************************************
- * gain range
+ * ranges
  **********************************************************************/
 gain_range_t::gain_range_t(float min_, float max_, float step_){
     min = min_;
@@ -28,9 +39,6 @@ gain_range_t::gain_range_t(float min_, float max_, float step_){
     step = step_;
 }
 
-/***********************************************************************
- * freq range
- **********************************************************************/
 freq_range_t::freq_range_t(double min_, double max_){
     min = min_;
     max = max_;
@@ -64,3 +72,98 @@ stream_cmd_t::stream_cmd_t(void){
     continuous = false;
     num_samps = 0;
 }
+
+/***********************************************************************
+ * metadata
+ **********************************************************************/
+rx_metadata_t::rx_metadata_t(void){
+    stream_id = 0;
+    has_stream_id = false;
+    time_spec = time_spec_t();
+    has_time_spec = false;
+    is_fragment = false;
+}
+
+tx_metadata_t::tx_metadata_t(void){
+    stream_id = 0;
+    has_stream_id = false;
+    time_spec = time_spec_t();
+    has_time_spec = false;
+    start_of_burst = false;
+    end_of_burst = false;
+}
+
+/***********************************************************************
+ * time spec
+ **********************************************************************/
+time_spec_t::time_spec_t(boost::uint32_t new_secs, boost::uint32_t new_ticks){
+    secs = new_secs;
+    ticks = new_ticks;
+}
+
+static const boost::posix_time::ptime epoch(boost::gregorian::date(1970,1,1));
+static double time_tick_rate = double(boost::posix_time::time_duration::ticks_per_second());
+
+time_spec_t::time_spec_t(boost::posix_time::ptime time, double tick_rate){
+    boost::posix_time::time_duration td = time - epoch;
+    secs = boost::uint32_t(td.total_seconds());
+    double time_ticks_per_device_ticks = time_tick_rate/tick_rate;
+    ticks = boost::uint32_t(td.fractional_seconds()/time_ticks_per_device_ticks);
+}
+
+/***********************************************************************
+ * device addr
+ **********************************************************************/
+std::string device_addr_t::to_string(void) const{
+    const device_addr_t &device_addr = *this;
+    std::stringstream ss;
+    BOOST_FOREACH(std::string key, device_addr.get_keys()){
+        ss << boost::format("%s: %s") % key % device_addr[key] << std::endl;
+    }
+    return ss.str();
+}
+
+/***********************************************************************
+ * mac addr
+ **********************************************************************/
+uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
+    std::string mac_addr_str = (mac_addr_str_ == "")? "ff:ff:ff:ff:ff:ff" : mac_addr_str_;
+
+    //ether_aton_r(str.c_str(), &mac_addr);
+    boost::uint8_t p[6] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB
+
+    try{
+        //only allow patterns of xx:xx or xx:xx:xx:xx:xx:xx
+        //the IAB above will fill in for the shorter pattern
+        if (mac_addr_str.size() != 5 and mac_addr_str.size() != 17)
+            throw std::runtime_error("expected exactly 5 or 17 characters");
+
+        //split the mac addr hex string at the colons
+        std::vector<std::string> hex_strs;
+        boost::split(hex_strs, mac_addr_str, boost::is_any_of(":"));
+        for (size_t i = 0; i < hex_strs.size(); i++){
+            int hex_num;
+            std::istringstream iss(hex_strs[i]);
+            iss >> std::hex >> hex_num;
+            p[i] = boost::uint8_t(hex_num);
+        }
+
+    }
+    catch(std::exception const& e){
+        throw std::runtime_error(str(
+            boost::format("Invalid mac address: %s\n\t%s") % mac_addr_str % e.what()
+        ));
+    }
+
+    memcpy(&mac_addr, p, sizeof(mac_addr));
+}
+
+std::string uhd::mac_addr_t::to_string(void) const{
+    //ether_ntoa_r(&mac_addr, addr_buf);
+    const boost::uint8_t *p = reinterpret_cast<const boost::uint8_t *>(&mac_addr);
+    return str(
+        boost::format("%02x:%02x:%02x:%02x:%02x:%02x")
+        % int(p[0]) % int(p[1]) % int(p[2])
+        % int(p[3]) % int(p[4]) % int(p[5])
+    );
+}
diff --git a/host/lib/usrp/dboard/basic.cpp b/host/lib/usrp/dboard/basic.cpp
index 07cb8d11c..2f29c8e0c 100644
--- a/host/lib/usrp/dboard/basic.cpp
+++ b/host/lib/usrp/dboard/basic.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <uhd/props.hpp>
-#include <uhd/types.hpp>
+#include <uhd/types/ranges.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/usrp/dboard_base.hpp>
@@ -34,26 +34,26 @@ using namespace boost::assign;
  **********************************************************************/
 class basic_rx : public rx_dboard_base{
 public:
-    basic_rx(ctor_args_t const& args, freq_t max_freq);
+    basic_rx(ctor_args_t const& args, double max_freq);
     ~basic_rx(void);
 
     void rx_get(const wax::obj &key, wax::obj &val);
     void rx_set(const wax::obj &key, const wax::obj &val);
 
 private:
-    freq_t _max_freq;
+    double _max_freq;
 };
 
 class basic_tx : public tx_dboard_base{
 public:
-    basic_tx(ctor_args_t const& args, freq_t max_freq);
+    basic_tx(ctor_args_t const& args, double max_freq);
     ~basic_tx(void);
 
     void tx_get(const wax::obj &key, wax::obj &val);
     void tx_set(const wax::obj &key, const wax::obj &val);
 
 private:
-    freq_t _max_freq;
+    double _max_freq;
 };
 
 /***********************************************************************
@@ -85,7 +85,7 @@ UHD_STATIC_BLOCK(reg_dboards){
 /***********************************************************************
  * Basic and LF RX dboard
  **********************************************************************/
-basic_rx::basic_rx(ctor_args_t const& args, freq_t max_freq) : rx_dboard_base(args){
+basic_rx::basic_rx(ctor_args_t const& args, double max_freq) : rx_dboard_base(args){
     _max_freq = max_freq;
     // set the gpios to safe values (all inputs)
     get_interface()->set_gpio_ddr(dboard_interface::GPIO_RX_BANK, 0x0000, 0xffff);
@@ -113,7 +113,7 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        val = gain_t(0);
+        val = float(0);
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
@@ -125,7 +125,7 @@ void basic_rx::rx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_FREQ:
-        val = freq_t(0);
+        val = double(0);
         return;
 
     case SUBDEV_PROP_FREQ_RANGE:
@@ -164,7 +164,7 @@ void basic_rx::rx_set(const wax::obj &key_, const wax::obj &val){
     switch(key.as<subdev_prop_t>()){
 
     case SUBDEV_PROP_GAIN:
-        ASSERT_THROW(val.as<gain_t>() == gain_t(0));
+        ASSERT_THROW(val.as<float>() == float(0));
         return;
 
     case SUBDEV_PROP_ANTENNA:
@@ -196,7 +196,7 @@ void basic_rx::rx_set(const wax::obj &key_, const wax::obj &val){
 /***********************************************************************
  * Basic and LF TX dboard
  **********************************************************************/
-basic_tx::basic_tx(ctor_args_t const& args, freq_t max_freq) : tx_dboard_base(args){
+basic_tx::basic_tx(ctor_args_t const& args, double max_freq) : tx_dboard_base(args){
     _max_freq = max_freq;
     // set the gpios to safe values (all inputs)
     get_interface()->set_gpio_ddr(dboard_interface::GPIO_TX_BANK, 0x0000, 0xffff);
@@ -221,7 +221,7 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_GAIN:
-        val = gain_t(0);
+        val = float(0);
         return;
 
     case SUBDEV_PROP_GAIN_RANGE:
@@ -233,7 +233,7 @@ void basic_tx::tx_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case SUBDEV_PROP_FREQ:
-        val = freq_t(0);
+        val = double(0);
         return;
 
     case SUBDEV_PROP_FREQ_RANGE:
@@ -272,7 +272,7 @@ void basic_tx::tx_set(const wax::obj &key_, const wax::obj &val){
     switch(key.as<subdev_prop_t>()){
 
     case SUBDEV_PROP_GAIN:
-        ASSERT_THROW(val.as<gain_t>() == gain_t(0));
+        ASSERT_THROW(val.as<float>() == float(0));
         return;
 
     case SUBDEV_PROP_ANTENNA:
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index 0f2189cd1..bc9bfbf14 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -19,7 +19,7 @@
 #include <uhd/gain_handler.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/utils/assert.hpp>
-#include <uhd/dict.hpp>
+#include <uhd/types/dict.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/format.hpp>
 #include <boost/bind.hpp>
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index 6b49ff29d..fd72aeaa4 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -16,6 +16,7 @@
 //
 
 #include <uhd/utils/assert.hpp>
+#include <uhd/types/clock_config.hpp>
 #include <boost/format.hpp>
 #include "usrp2_impl.hpp"
 
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 654096d14..40ef06a8c 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -35,7 +35,7 @@ template <class T> T log2(T num){
 /***********************************************************************
  * DDC Helper Methods
  **********************************************************************/
-static boost::uint32_t calculate_freq_word_and_update_actual_freq(freq_t &freq, freq_t clock_freq){
+static boost::uint32_t calculate_freq_word_and_update_actual_freq(double &freq, double clock_freq){
     double scale_factor = std::pow(2.0, 32);
 
     //calculate the freq register word
@@ -163,7 +163,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
         return;
     }
     else if (key_name == "freq"){
-        freq_t new_freq = val.as<freq_t>();
+        double new_freq = val.as<double>();
         ASSERT_THROW(new_freq <= get_master_clock_freq()/2.0);
         ASSERT_THROW(new_freq >= -get_master_clock_freq()/2.0);
         _ddc_freq = new_freq; //shadow
@@ -283,7 +283,7 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
         return;
     }
     else if (key_name == "freq"){
-        freq_t new_freq = val.as<freq_t>();
+        double new_freq = val.as<double>();
         ASSERT_THROW(new_freq <= get_master_clock_freq()/2.0);
         ASSERT_THROW(new_freq >= -get_master_clock_freq()/2.0);
         _duc_freq = new_freq; //shadow
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index e4706dcf0..b6919a738 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -16,6 +16,7 @@
 //
 
 #include <uhd/utils/assert.hpp>
+#include <uhd/types/mac_addr.hpp>
 #include "usrp2_impl.hpp"
 
 using namespace uhd;
@@ -168,7 +169,7 @@ void usrp2_impl::mboard_get(const wax::obj &key_, wax::obj &val){
         return;
 
     case MBOARD_PROP_CLOCK_RATE:
-        val = freq_t(get_master_clock_freq());
+        val = double(get_master_clock_freq());
         return;
 
     case MBOARD_PROP_RX_DSP:
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 3a2963c5a..6535e7049 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -19,9 +19,9 @@
 #define INCLUDED_USRP2_IMPL_HPP
 
 #include <uhd/usrp/usrp2.hpp>
-#include <uhd/dict.hpp>
-#include <uhd/types.hpp>
-#include <uhd/time_spec.hpp>
+#include <uhd/types/dict.hpp>
+#include <uhd/types/stream_cmd.hpp>
+#include <uhd/types/clock_config.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
 #include <boost/shared_ptr.hpp>
@@ -173,14 +173,14 @@ private:
     //methods and shadows for the ddc dsp
     std::vector<size_t> _allowed_decim_and_interp_rates;
     size_t _ddc_decim;
-    uhd::freq_t _ddc_freq;
+    double _ddc_freq;
     void init_ddc_config(void);
     void update_ddc_config(void);
     void issue_ddc_stream_cmd(const uhd::stream_cmd_t &stream_cmd);
 
     //methods and shadows for the duc dsp
     size_t _duc_interp;
-    uhd::freq_t _duc_freq;
+    double _duc_freq;
     void init_duc_config(void);
     void update_duc_config(void);
 
diff --git a/host/test/addr_test.cpp b/host/test/addr_test.cpp
index 148aee015..0c8f63b0a 100644
--- a/host/test/addr_test.cpp
+++ b/host/test/addr_test.cpp
@@ -16,13 +16,14 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <uhd/device_addr.hpp>
+#include <uhd/types/mac_addr.hpp>
+#include <iostream>
 
 BOOST_AUTO_TEST_CASE(test_mac_addr){
     std::cout << "Testing mac addr..." << std::endl;
     const std::string mac_addr_str("00:01:23:45:67:89");
     uhd::mac_addr_t mac_addr(mac_addr_str);
     std::cout << "Input: " << mac_addr_str << std::endl;
-    std::cout << "Output: " << mac_addr << std::endl;
+    std::cout << "Output: " << mac_addr.to_string() << std::endl;
     BOOST_CHECK_EQUAL(mac_addr_str, mac_addr.to_string());
 }
diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp
index 47acb30f0..e13063e06 100644
--- a/host/test/gain_handler_test.cpp
+++ b/host/test/gain_handler_test.cpp
@@ -17,9 +17,9 @@
 
 #include <boost/test/unit_test.hpp>
 #include <uhd/gain_handler.hpp>
-#include <uhd/types.hpp>
+#include <uhd/types/ranges.hpp>
+#include <uhd/types/dict.hpp>
 #include <uhd/props.hpp>
-#include <uhd/dict.hpp>
 #include <boost/bind.hpp>
 #include <iostream>
 
@@ -84,7 +84,7 @@ private:
         //handle the get request conditioned on the key
         switch(key.as<prop_t>()){
         case PROP_GAIN_VALUE:
-            _gain_values[name] = val.as<gain_t>();
+            _gain_values[name] = val.as<float>();
             return;
 
         case PROP_GAIN_RANGE:
@@ -94,7 +94,7 @@ private:
     }
 
     gain_handler::sptr _gain_handler;
-    uhd::dict<std::string, gain_t> _gain_values;
+    uhd::dict<std::string, float> _gain_values;
     uhd::dict<std::string, gain_range_t> _gain_ranges;
 
 };
@@ -104,18 +104,18 @@ BOOST_AUTO_TEST_CASE(test_gain_handler){
     gainful_obj go0;
 
     BOOST_CHECK_THROW(
-        go0[named_prop_t(PROP_GAIN_VALUE, "fail")].as<gain_t>(),
+        go0[named_prop_t(PROP_GAIN_VALUE, "fail")].as<float>(),
         std::exception
     );
 
     std::cout << "verifying the overall min, max, step" << std::endl;
     gain_range_t gain = go0[PROP_GAIN_RANGE].as<gain_range_t>();
-    BOOST_CHECK_EQUAL(gain.min, gain_t(-10));
-    BOOST_CHECK_EQUAL(gain.max, gain_t(100));
-    BOOST_CHECK_EQUAL(gain.step, gain_t(1.5));
+    BOOST_CHECK_EQUAL(gain.min, float(-10));
+    BOOST_CHECK_EQUAL(gain.max, float(100));
+    BOOST_CHECK_EQUAL(gain.step, float(1.5));
 
     std::cout << "verifying the overall gain" << std::endl;
-    go0[named_prop_t(PROP_GAIN_VALUE, "g0")] = gain_t(-5);
-    go0[named_prop_t(PROP_GAIN_VALUE, "g1")] = gain_t(30);
-    BOOST_CHECK_EQUAL(go0[PROP_GAIN_VALUE].as<gain_t>(), gain_t(25));
+    go0[named_prop_t(PROP_GAIN_VALUE, "g0")] = float(-5);
+    go0[named_prop_t(PROP_GAIN_VALUE, "g1")] = float(30);
+    BOOST_CHECK_EQUAL(go0[PROP_GAIN_VALUE].as<float>(), float(25));
 }
diff --git a/host/utils/discover_usrps.cpp b/host/utils/discover_usrps.cpp
index dc2b845bc..72c5b8822 100644
--- a/host/utils/discover_usrps.cpp
+++ b/host/utils/discover_usrps.cpp
@@ -63,7 +63,7 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
         std::cout << "--------------------------------------------------" << std::endl;
         std::cout << "-- USRP Device " << i << std::endl;
         std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << device_addrs[i] << std::endl << std::endl;
+        std::cout << device_addrs[i].to_string() << std::endl << std::endl;
         uhd::device::make(device_addrs[i]); //test make
     }
 
-- 
cgit v1.2.3


From 86fffe7f9ed78a682879dd56c26628256f89e6ae Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 29 Mar 2010 00:45:26 -0700
Subject: Added tune helper to utils.

Takes a subdevice and dxc properties object and tunes them.
Made use of tune helper in simple device.

Moved gain handler into utils header dir.
---
 host/include/uhd/CMakeLists.txt         |   1 -
 host/include/uhd/gain_handler.hpp       |  90 -----------------------
 host/include/uhd/utils/CMakeLists.txt   |   2 +
 host/include/uhd/utils/gain_handler.hpp |  90 +++++++++++++++++++++++
 host/include/uhd/utils/tune_helper.hpp  |  79 ++++++++++++++++++++
 host/lib/CMakeLists.txt                 |   1 +
 host/lib/gain_handler.cpp               |   2 +-
 host/lib/simple_device.cpp              |  74 +------------------
 host/lib/tune_helper.cpp                | 125 ++++++++++++++++++++++++++++++++
 host/lib/usrp/dboard_manager.cpp        |   2 +-
 host/test/gain_handler_test.cpp         |   2 +-
 11 files changed, 303 insertions(+), 165 deletions(-)
 delete mode 100644 host/include/uhd/gain_handler.hpp
 create mode 100644 host/include/uhd/utils/gain_handler.hpp
 create mode 100644 host/include/uhd/utils/tune_helper.hpp
 create mode 100644 host/lib/tune_helper.cpp

(limited to 'host/lib')

diff --git a/host/include/uhd/CMakeLists.txt b/host/include/uhd/CMakeLists.txt
index 0cebea095..b364f78cd 100644
--- a/host/include/uhd/CMakeLists.txt
+++ b/host/include/uhd/CMakeLists.txt
@@ -24,7 +24,6 @@ ADD_SUBDIRECTORY(utils)
 INSTALL(FILES
     config.hpp
     device.hpp
-    gain_handler.hpp
     props.hpp
     simple_device.hpp
     wax.hpp
diff --git a/host/include/uhd/gain_handler.hpp b/host/include/uhd/gain_handler.hpp
deleted file mode 100644
index 65d6cecf9..000000000
--- a/host/include/uhd/gain_handler.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#ifndef INCLUDED_UHD_GAIN_HANDLER_HPP
-#define INCLUDED_UHD_GAIN_HANDLER_HPP
-
-#include <uhd/config.hpp>
-#include <uhd/wax.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/function.hpp>
-
-namespace uhd{
-
-class UHD_API gain_handler{
-public:
-    typedef boost::shared_ptr<gain_handler> sptr;
-    typedef boost::function<bool(const wax::obj &, const wax::obj &)> is_equal_t;
-
-    /*!
-     * A set of properties for dealing with gains.
-     */
-    struct UHD_API props_t{
-        wax::obj value, range, names;
-        props_t(void); //default constructor
-    };
-
-    /*!
-     * Make a new gain handler.
-     * The construction arguments are agnostic to the property type.
-     * It is up to the caller to provide an "is_equal" function that
-     * can tell weather two properties (in a wax obj) are equal.
-     * \param link a link to the wax obj with properties
-     * \param props a struct of properties keys
-     * \param is_equal the function that tests for equal properties
-     */
-    static sptr make(
-        const wax::obj &link,
-        const props_t &props,
-        is_equal_t is_equal
-    );
-
-    /*!
-     * Intercept gets for overall gain, min, max, step.
-     * Ensures that the gain name is valid.
-     * \return true for handled, false to pass on
-     */
-    virtual bool intercept_get(const wax::obj &key, wax::obj &val) = 0;
-
-    /*!
-     * Intercept sets for overall gain.
-     * Ensures that the gain name is valid.
-     * Ensures that the new gain is within range.
-     * \return true for handled, false to pass on
-     */
-    virtual bool intercept_set(const wax::obj &key, const wax::obj &val) = 0;
-
-    /*!
-     * Function template to test if two wax types are equal:
-     * The constructor will bind an instance of this for a specific type.
-     * This bound equals functions allows the intercept methods to be non-templated.
-     */
-    template <class T> static bool is_equal(const wax::obj &a, const wax::obj &b){
-        try{
-            return a.as<T>() == b.as<T>();
-        }
-        catch(const wax::bad_cast &){
-            return false;
-        }
-    }
-
-};
-
-} //namespace uhd
-
-#endif /* INCLUDED_UHD_GAIN_HANDLER_HPP */
-
diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt
index f6ed87701..1b673f44a 100644
--- a/host/include/uhd/utils/CMakeLists.txt
+++ b/host/include/uhd/utils/CMakeLists.txt
@@ -18,7 +18,9 @@
 INSTALL(FILES
     algorithm.hpp
     assert.hpp
+    gain_handler.hpp
     safe_main.hpp
     static.hpp
+    tune_helper.hpp
     DESTINATION ${INCLUDE_DIR}/uhd/utils
 )
diff --git a/host/include/uhd/utils/gain_handler.hpp b/host/include/uhd/utils/gain_handler.hpp
new file mode 100644
index 000000000..f4629e6a7
--- /dev/null
+++ b/host/include/uhd/utils/gain_handler.hpp
@@ -0,0 +1,90 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_GAIN_HANDLER_HPP
+#define INCLUDED_UHD_UTILS_GAIN_HANDLER_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/wax.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
+
+namespace uhd{
+
+class UHD_API gain_handler{
+public:
+    typedef boost::shared_ptr<gain_handler> sptr;
+    typedef boost::function<bool(const wax::obj &, const wax::obj &)> is_equal_t;
+
+    /*!
+     * A set of properties for dealing with gains.
+     */
+    struct UHD_API props_t{
+        wax::obj value, range, names;
+        props_t(void); //default constructor
+    };
+
+    /*!
+     * Make a new gain handler.
+     * The construction arguments are agnostic to the property type.
+     * It is up to the caller to provide an "is_equal" function that
+     * can tell weather two properties (in a wax obj) are equal.
+     * \param link a link to the wax obj with properties
+     * \param props a struct of properties keys
+     * \param is_equal the function that tests for equal properties
+     */
+    static sptr make(
+        const wax::obj &link,
+        const props_t &props,
+        is_equal_t is_equal
+    );
+
+    /*!
+     * Intercept gets for overall gain, min, max, step.
+     * Ensures that the gain name is valid.
+     * \return true for handled, false to pass on
+     */
+    virtual bool intercept_get(const wax::obj &key, wax::obj &val) = 0;
+
+    /*!
+     * Intercept sets for overall gain.
+     * Ensures that the gain name is valid.
+     * Ensures that the new gain is within range.
+     * \return true for handled, false to pass on
+     */
+    virtual bool intercept_set(const wax::obj &key, const wax::obj &val) = 0;
+
+    /*!
+     * Function template to test if two wax types are equal:
+     * The constructor will bind an instance of this for a specific type.
+     * This bound equals functions allows the intercept methods to be non-templated.
+     */
+    template <class T> static bool is_equal(const wax::obj &a, const wax::obj &b){
+        try{
+            return a.as<T>() == b.as<T>();
+        }
+        catch(const wax::bad_cast &){
+            return false;
+        }
+    }
+
+};
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_UTILS_GAIN_HANDLER_HPP */
+
diff --git a/host/include/uhd/utils/tune_helper.hpp b/host/include/uhd/utils/tune_helper.hpp
new file mode 100644
index 000000000..828575c99
--- /dev/null
+++ b/host/include/uhd/utils/tune_helper.hpp
@@ -0,0 +1,79 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_TUNE_HELPER_HPP
+#define INCLUDED_UHD_UTILS_TUNE_HELPER_HPP
+
+#include <uhd/config.hpp>
+#include <uhd/wax.hpp>
+#include <uhd/types/tune_result.hpp>
+
+namespace uhd{
+
+/*!
+ * Tune a rx chain to the desired frequency:
+ * The IF of the subdevice is set as close as possible to
+ * the given target frequency + the LO offset (when applicable).
+ * The ddc cordic is setup to bring the IF down to baseband.
+ * \param subdev the dboard subdevice object with properties
+ * \param ddc the ddc properties object (with "rate", "decim", "freq")
+ * \param target_freq the desired center frequency
+ * \param lo_offset an offset for the subdevice IF from center
+ * \return a tune result struct
+ */
+UHD_API tune_result_t tune_rx_subdev_and_ddc(
+    wax::obj subdev, wax::obj ddc,
+    double target_freq, double lo_offset
+);
+
+/*!
+ * Tune a rx chain to the desired frequency:
+ * Same as the above, except the LO offset
+ * is calculated based on the subdevice and BW.
+ */
+UHD_API tune_result_t tune_rx_subdev_and_ddc(
+    wax::obj subdev, wax::obj ddc, double target_freq
+);
+
+/*!
+ * Tune a tx chain to the desired frequency:
+ * The IF of the subdevice is set as close as possible to
+ * the given target frequency + the LO offset (when applicable).
+ * The duc cordic is setup to bring the baseband up to IF.
+ * \param subdev the dboard subdevice object with properties
+ * \param duc the duc properties object (with "rate", "interp", "freq")
+ * \param target_freq the desired center frequency
+ * \param lo_offset an offset for the subdevice IF from center
+ * \return a tune result struct
+ */
+UHD_API tune_result_t tune_tx_subdev_and_duc(
+    wax::obj subdev, wax::obj duc,
+    double target_freq, double lo_offset
+);
+
+/*!
+ * Tune a tx chain to the desired frequency:
+ * Same as the above, except the LO offset
+ * is calculated based on the subdevice and BW.
+ */
+UHD_API tune_result_t tune_tx_subdev_and_duc(
+    wax::obj subdev, wax::obj duc, double target_freq
+);
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_UTILS_TUNE_HELPER_HPP */
diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index 1eceb53ea..55034c780 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -23,6 +23,7 @@ SET(libuhd_sources
     gain_handler.cpp
     load_modules.cpp
     simple_device.cpp
+    tune_helper.cpp
     types.cpp
     wax.cpp
     transport/if_addrs.cpp
diff --git a/host/lib/gain_handler.cpp b/host/lib/gain_handler.cpp
index a6ae06c50..daf629f0b 100644
--- a/host/lib/gain_handler.cpp
+++ b/host/lib/gain_handler.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
-#include <uhd/gain_handler.hpp>
+#include <uhd/utils/gain_handler.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/types/ranges.hpp>
 #include <uhd/props.hpp>
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index 95bc8fecc..d507762a9 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -16,8 +16,8 @@
 //
 
 #include <uhd/simple_device.hpp>
+#include <uhd/utils/tune_helper.hpp>
 #include <uhd/utils/assert.hpp>
-#include <uhd/utils/algorithm.hpp>
 #include <uhd/props.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
@@ -26,64 +26,6 @@
 
 using namespace uhd;
 
-/***********************************************************************
- * Tune Helper Function
- **********************************************************************/
-static tune_result_t tune(
-    double target_freq,
-    double lo_offset,
-    wax::obj subdev,
-    wax::obj dxc,
-    bool is_tx
-){
-    wax::obj subdev_freq_proxy = subdev[SUBDEV_PROP_FREQ];
-    bool subdev_quadrature = subdev[SUBDEV_PROP_QUADRATURE].as<bool>();
-    bool subdev_spectrum_inverted = subdev[SUBDEV_PROP_SPECTRUM_INVERTED].as<bool>();
-    wax::obj dxc_freq_proxy = dxc[std::string("freq")];
-    double dxc_sample_rate = dxc[std::string("rate")].as<double>();
-
-    // Ask the d'board to tune as closely as it can to target_freq+lo_offset
-    double target_inter_freq = target_freq + lo_offset;
-    subdev_freq_proxy = target_inter_freq;
-    double actual_inter_freq = subdev_freq_proxy.as<double>();
-
-    // Calculate the DDC setting that will downconvert the baseband from the
-    // daughterboard to our target frequency.
-    double delta_freq = target_freq - actual_inter_freq;
-    double delta_sign = std::signum(delta_freq);
-    delta_freq *= delta_sign;
-    delta_freq = fmod(delta_freq, dxc_sample_rate);
-    bool inverted = delta_freq > dxc_sample_rate/2.0;
-    double target_dxc_freq = inverted? (delta_freq - dxc_sample_rate) : (-delta_freq);
-    target_dxc_freq *= delta_sign;
-
-    // If the spectrum is inverted, and the daughterboard doesn't do
-    // quadrature downconversion, we can fix the inversion by flipping the
-    // sign of the dxc_freq...  (This only happens using the basic_rx board)
-    if (subdev_spectrum_inverted){
-        inverted = not inverted;
-    }
-    if (inverted and not subdev_quadrature){
-        target_dxc_freq *= -1.0;
-        inverted = not inverted;
-    }
-    // down conversion versus up conversion, fight!
-    // your mother is ugly and your going down...
-    target_dxc_freq *= (is_tx)? -1.0 : +1.0;
-
-    dxc_freq_proxy = target_dxc_freq;
-    double actual_dxc_freq = dxc_freq_proxy.as<double>();
-
-    //return some kind of tune result tuple/struct
-    tune_result_t tune_result;
-    tune_result.target_inter_freq = target_inter_freq;
-    tune_result.actual_inter_freq = actual_inter_freq;
-    tune_result.target_dxc_freq = target_dxc_freq;
-    tune_result.actual_dxc_freq = actual_dxc_freq;
-    tune_result.spectrum_inverted = inverted;
-    return tune_result;
-}
-
 /***********************************************************************
  * Helper Functions
  **********************************************************************/
@@ -190,12 +132,7 @@ public:
     }
 
     tune_result_t set_rx_freq(double target_freq){
-        double lo_offset = 0.0;
-        //if the local oscillator will be in the passband, use an offset
-        if (_rx_subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){
-            lo_offset = get_rx_rate()*2.0;
-        }
-        return tune(target_freq, lo_offset, _rx_subdev, _rx_ddc, false/* not tx */);
+        return tune_rx_subdev_and_ddc(_rx_subdev, _rx_ddc, target_freq);
     }
 
     freq_range_t get_rx_freq_range(void){
@@ -246,12 +183,7 @@ public:
     }
 
     tune_result_t set_tx_freq(double target_freq){
-        double lo_offset = 0.0;
-        //if the local oscillator will be in the passband, use an offset
-        if (_tx_subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){
-            lo_offset = get_tx_rate()*2.0;
-        }
-        return tune(target_freq, lo_offset, _tx_subdev, _tx_duc, true/* is tx */);
+        return tune_tx_subdev_and_duc(_tx_subdev, _tx_duc, target_freq);
     }
 
     freq_range_t get_tx_freq_range(void){
diff --git a/host/lib/tune_helper.cpp b/host/lib/tune_helper.cpp
new file mode 100644
index 000000000..eeda0b6be
--- /dev/null
+++ b/host/lib/tune_helper.cpp
@@ -0,0 +1,125 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/tune_helper.hpp>
+#include <uhd/utils/algorithm.hpp>
+#include <uhd/props.hpp>
+#include <cmath>
+
+using namespace uhd;
+
+/***********************************************************************
+ * Tune Helper Function
+ **********************************************************************/
+static tune_result_t tune_xx_subdev_and_dxc(
+    bool is_tx,
+    wax::obj subdev, wax::obj dxc,
+    double target_freq, double lo_offset
+){
+    wax::obj subdev_freq_proxy = subdev[SUBDEV_PROP_FREQ];
+    bool subdev_quadrature = subdev[SUBDEV_PROP_QUADRATURE].as<bool>();
+    bool subdev_spectrum_inverted = subdev[SUBDEV_PROP_SPECTRUM_INVERTED].as<bool>();
+    wax::obj dxc_freq_proxy = dxc[std::string("freq")];
+    double dxc_sample_rate = dxc[std::string("rate")].as<double>();
+
+    // Ask the d'board to tune as closely as it can to target_freq+lo_offset
+    double target_inter_freq = target_freq + lo_offset;
+    subdev_freq_proxy = target_inter_freq;
+    double actual_inter_freq = subdev_freq_proxy.as<double>();
+
+    // Calculate the DDC setting that will downconvert the baseband from the
+    // daughterboard to our target frequency.
+    double delta_freq = target_freq - actual_inter_freq;
+    double delta_sign = std::signum(delta_freq);
+    delta_freq *= delta_sign;
+    delta_freq = std::fmod(delta_freq, dxc_sample_rate);
+    bool inverted = delta_freq > dxc_sample_rate/2.0;
+    double target_dxc_freq = inverted? (delta_freq - dxc_sample_rate) : (-delta_freq);
+    target_dxc_freq *= delta_sign;
+
+    // If the spectrum is inverted, and the daughterboard doesn't do
+    // quadrature downconversion, we can fix the inversion by flipping the
+    // sign of the dxc_freq...  (This only happens using the basic_rx board)
+    if (subdev_spectrum_inverted){
+        inverted = not inverted;
+    }
+    if (inverted and not subdev_quadrature){
+        target_dxc_freq *= -1.0;
+        inverted = not inverted;
+    }
+    // down conversion versus up conversion, fight!
+    // your mother is ugly and your going down...
+    target_dxc_freq *= (is_tx)? -1.0 : +1.0;
+
+    dxc_freq_proxy = target_dxc_freq;
+    double actual_dxc_freq = dxc_freq_proxy.as<double>();
+
+    //return some kind of tune result tuple/struct
+    tune_result_t tune_result;
+    tune_result.target_inter_freq = target_inter_freq;
+    tune_result.actual_inter_freq = actual_inter_freq;
+    tune_result.target_dxc_freq = target_dxc_freq;
+    tune_result.actual_dxc_freq = actual_dxc_freq;
+    tune_result.spectrum_inverted = inverted;
+    return tune_result;
+}
+
+/***********************************************************************
+ * RX Tune
+ **********************************************************************/
+tune_result_t uhd::tune_rx_subdev_and_ddc(
+    wax::obj subdev, wax::obj ddc,
+    double target_freq, double lo_offset
+){
+    bool is_tx = false;
+    return tune_xx_subdev_and_dxc(is_tx, subdev, ddc, target_freq, lo_offset);
+}
+
+tune_result_t uhd::tune_rx_subdev_and_ddc(
+    wax::obj subdev, wax::obj ddc,
+    double target_freq
+){
+    double lo_offset = 0.0;
+    //if the local oscillator will be in the passband, use an offset
+    if (subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){
+        lo_offset = 2.0*ddc[std::string("rate")].as<double>()/ddc[std::string("decim")].as<size_t>();
+    }
+    return tune_rx_subdev_and_ddc(subdev, ddc, target_freq, lo_offset);
+}
+
+/***********************************************************************
+ * TX Tune
+ **********************************************************************/
+tune_result_t uhd::tune_tx_subdev_and_duc(
+    wax::obj subdev, wax::obj duc,
+    double target_freq, double lo_offset
+){
+    bool is_tx = true;
+    return tune_xx_subdev_and_dxc(is_tx, subdev, duc, target_freq, lo_offset);
+}
+
+tune_result_t uhd::tune_tx_subdev_and_duc(
+    wax::obj subdev, wax::obj duc,
+    double target_freq
+){
+    double lo_offset = 0.0;
+    //if the local oscillator will be in the passband, use an offset
+    if (subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){
+        lo_offset = 2.0*duc[std::string("rate")].as<double>()/duc[std::string("interp")].as<size_t>();
+    }
+    return tune_tx_subdev_and_duc(subdev, duc, target_freq, lo_offset);
+}
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index bc9bfbf14..f86545696 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <uhd/usrp/dboard_manager.hpp>
-#include <uhd/gain_handler.hpp>
+#include <uhd/utils/gain_handler.hpp>
 #include <uhd/utils/static.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/types/dict.hpp>
diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp
index a7c6e1e82..76b065ce2 100644
--- a/host/test/gain_handler_test.cpp
+++ b/host/test/gain_handler_test.cpp
@@ -16,7 +16,7 @@
 //
 
 #include <boost/test/unit_test.hpp>
-#include <uhd/gain_handler.hpp>
+#include <uhd/utils/gain_handler.hpp>
 #include <uhd/types/ranges.hpp>
 #include <uhd/types/dict.hpp>
 #include <uhd/props.hpp>
-- 
cgit v1.2.3


From 7396b53e1bdd1aa5f9dcba760c8993a0cf620b6a Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 29 Mar 2010 11:16:42 -0700
Subject: use bb_rate and if_rate to handle dxc io rates

---
 host/include/uhd/utils/tune_helper.hpp |  4 ++--
 host/lib/simple_device.cpp             | 16 ++++++----------
 host/lib/tune_helper.cpp               |  6 +++---
 host/lib/usrp/usrp2/dsp_impl.cpp       | 18 ++++++++++++++----
 4 files changed, 25 insertions(+), 19 deletions(-)

(limited to 'host/lib')

diff --git a/host/include/uhd/utils/tune_helper.hpp b/host/include/uhd/utils/tune_helper.hpp
index 828575c99..958d1eceb 100644
--- a/host/include/uhd/utils/tune_helper.hpp
+++ b/host/include/uhd/utils/tune_helper.hpp
@@ -30,7 +30,7 @@ namespace uhd{
  * the given target frequency + the LO offset (when applicable).
  * The ddc cordic is setup to bring the IF down to baseband.
  * \param subdev the dboard subdevice object with properties
- * \param ddc the ddc properties object (with "rate", "decim", "freq")
+ * \param ddc the ddc properties object (with "if_rate", "bb_rate", "freq")
  * \param target_freq the desired center frequency
  * \param lo_offset an offset for the subdevice IF from center
  * \return a tune result struct
@@ -55,7 +55,7 @@ UHD_API tune_result_t tune_rx_subdev_and_ddc(
  * the given target frequency + the LO offset (when applicable).
  * The duc cordic is setup to bring the baseband up to IF.
  * \param subdev the dboard subdevice object with properties
- * \param duc the duc properties object (with "rate", "interp", "freq")
+ * \param duc the duc properties object (with "if_rate", "bb_rate", "freq")
  * \param target_freq the desired center frequency
  * \param lo_offset an offset for the subdevice IF from center
  * \return a tune result struct
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index d507762a9..2e6bffc9c 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -116,19 +116,17 @@ public:
      * RX methods
      ******************************************************************/
     void set_rx_rate(double rate){
-        double samp_rate = _rx_ddc[std::string("rate")].as<double>();
+        double samp_rate = _rx_ddc[std::string("if_rate")].as<double>();
         assert_has(get_rx_rates(), rate, "simple device rx rate");
         _rx_ddc[std::string("decim")] = size_t(samp_rate/rate);
     }
 
     double get_rx_rate(void){
-        double samp_rate = _rx_ddc[std::string("rate")].as<double>();
-        size_t decim = _rx_ddc[std::string("decim")].as<size_t>();
-        return samp_rate/decim;
+        return _rx_ddc[std::string("bb_rate")].as<double>();
     }
 
     std::vector<double> get_rx_rates(void){
-        return get_xx_rates(_rx_ddc[std::string("decims")], _rx_ddc[std::string("rate")]);
+        return get_xx_rates(_rx_ddc[std::string("decims")], _rx_ddc[std::string("if_rate")]);
     }
 
     tune_result_t set_rx_freq(double target_freq){
@@ -167,19 +165,17 @@ public:
      * TX methods
      ******************************************************************/
     void set_tx_rate(double rate){
-        double samp_rate = _tx_duc[std::string("rate")].as<double>();
+        double samp_rate = _tx_duc[std::string("if_rate")].as<double>();
         assert_has(get_tx_rates(), rate, "simple device tx rate");
         _tx_duc[std::string("interp")] = size_t(samp_rate/rate);
     }
 
     double get_tx_rate(void){
-        double samp_rate = _tx_duc[std::string("rate")].as<double>();
-        size_t interp = _tx_duc[std::string("interp")].as<size_t>();
-        return samp_rate/interp;
+        return _tx_duc[std::string("bb_rate")].as<double>();
     }
 
     std::vector<double> get_tx_rates(void){
-        return get_xx_rates(_tx_duc[std::string("interps")], _tx_duc[std::string("rate")]);
+        return get_xx_rates(_tx_duc[std::string("interps")], _tx_duc[std::string("if_rate")]);
     }
 
     tune_result_t set_tx_freq(double target_freq){
diff --git a/host/lib/tune_helper.cpp b/host/lib/tune_helper.cpp
index eeda0b6be..1e5c4cd0d 100644
--- a/host/lib/tune_helper.cpp
+++ b/host/lib/tune_helper.cpp
@@ -34,7 +34,7 @@ static tune_result_t tune_xx_subdev_and_dxc(
     bool subdev_quadrature = subdev[SUBDEV_PROP_QUADRATURE].as<bool>();
     bool subdev_spectrum_inverted = subdev[SUBDEV_PROP_SPECTRUM_INVERTED].as<bool>();
     wax::obj dxc_freq_proxy = dxc[std::string("freq")];
-    double dxc_sample_rate = dxc[std::string("rate")].as<double>();
+    double dxc_sample_rate = dxc[std::string("if_rate")].as<double>();
 
     // Ask the d'board to tune as closely as it can to target_freq+lo_offset
     double target_inter_freq = target_freq + lo_offset;
@@ -96,7 +96,7 @@ tune_result_t uhd::tune_rx_subdev_and_ddc(
     double lo_offset = 0.0;
     //if the local oscillator will be in the passband, use an offset
     if (subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){
-        lo_offset = 2.0*ddc[std::string("rate")].as<double>()/ddc[std::string("decim")].as<size_t>();
+        lo_offset = 2.0*ddc[std::string("bb_rate")].as<double>();
     }
     return tune_rx_subdev_and_ddc(subdev, ddc, target_freq, lo_offset);
 }
@@ -119,7 +119,7 @@ tune_result_t uhd::tune_tx_subdev_and_duc(
     double lo_offset = 0.0;
     //if the local oscillator will be in the passband, use an offset
     if (subdev[SUBDEV_PROP_LO_INTERFERES].as<bool>()){
-        lo_offset = 2.0*duc[std::string("rate")].as<double>()/duc[std::string("interp")].as<size_t>();
+        lo_offset = 2.0*duc[std::string("bb_rate")].as<double>();
     }
     return tune_tx_subdev_and_duc(subdev, duc, target_freq, lo_offset);
 }
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 40ef06a8c..0d43fac0e 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -113,7 +113,8 @@ void usrp2_impl::ddc_get(const wax::obj &key, wax::obj &val){
 
         case DSP_PROP_OTHERS:{
                 prop_names_t others = boost::assign::list_of
-                    ("rate")
+                    ("if_rate")
+                    ("bb_rate")
                     ("decim")
                     ("decims")
                     ("freq")
@@ -127,10 +128,14 @@ void usrp2_impl::ddc_get(const wax::obj &key, wax::obj &val){
 
     //handle string-based properties specific to this dsp
     std::string key_name = key.as<std::string>();
-    if (key_name == "rate"){
+    if (key_name == "if_rate"){
         val = get_master_clock_freq();
         return;
     }
+    else if (key_name == "bb_rate"){
+        val = get_master_clock_freq()/_ddc_decim;
+        return;
+    }
     else if (key_name == "decim"){
         val = _ddc_decim;
         return;
@@ -234,7 +239,8 @@ void usrp2_impl::duc_get(const wax::obj &key, wax::obj &val){
 
         case DSP_PROP_OTHERS:{
                 prop_names_t others = boost::assign::list_of
-                    ("rate")
+                    ("if_rate")
+                    ("bb_rate")
                     ("interp")
                     ("interps")
                     ("freq")
@@ -247,10 +253,14 @@ void usrp2_impl::duc_get(const wax::obj &key, wax::obj &val){
 
     //handle string-based properties specific to this dsp
     std::string key_name = key.as<std::string>();
-    if (key_name == "rate"){
+    if (key_name == "if_rate"){
         val = get_master_clock_freq();
         return;
     }
+    else if (key_name == "bb_rate"){
+        val = get_master_clock_freq()/_duc_interp;
+        return;
+    }
     else if (key_name == "interp"){
         val = _duc_interp;
         return;
-- 
cgit v1.2.3


From 1295df8cbba76c088a36f9d546a68c1d00e7a1a8 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Mon, 29 Mar 2010 12:58:06 -0700
Subject: Added utility methods to device addr and mac addr to make them more
 usable.

---
 host/include/uhd/types/device_addr.hpp | 37 ++++++++++++++++----
 host/include/uhd/types/dict.hpp        |  7 ++--
 host/include/uhd/types/mac_addr.hpp    | 35 +++++++++++++++++--
 host/lib/device.cpp                    |  8 ++---
 host/lib/simple_device.cpp             | 26 +-------------
 host/lib/types.cpp                     | 63 ++++++++++++++++++++++++++++------
 host/lib/usrp/dboard_manager.cpp       |  6 ++--
 host/lib/usrp/usrp2/mboard_impl.cpp    |  6 ++--
 host/test/addr_test.cpp                |  2 +-
 host/utils/usrp2_burner.cpp            | 17 +++++----
 10 files changed, 143 insertions(+), 64 deletions(-)

(limited to 'host/lib')

diff --git a/host/include/uhd/types/device_addr.hpp b/host/include/uhd/types/device_addr.hpp
index d32dfa77e..1162884fb 100644
--- a/host/include/uhd/types/device_addr.hpp
+++ b/host/include/uhd/types/device_addr.hpp
@@ -26,15 +26,40 @@
 namespace uhd{
 
     /*!
-     * The device address args are just a mapping of key/value string pairs.
-     * When left empty, the discovery routine will try to find all usrps.
-     * The discovery can be narrowed down by specifying the transport type arguments.
+     * Mapping of key/value pairs for locating devices on the system.
+     * When left empty, the device discovery routines will search
+     * all available transports on the system (ethernet, usb...).
      *
-     * For example, to access a specific usrp2 one would specify the transport type
-     * ("type", "udp") and the transport args ("addr", "<resolvable_hostname_or_addr>").
+     * To narrow down the discovery process to a particular device,
+     * specify a transport key/value pair specific to your device.
+     * Ex, to find a usrp2: my_dev_addr["addr"] = <resolvable_hostname_or_ip>
+     *
+     * The device address can also be used to pass arguments into
+     * the transport layer control to set (for example) buffer sizes.
      */
     class UHD_API device_addr_t : public dict<std::string, std::string>{
-        public: std::string to_string(void) const;
+    public:
+
+        /*!
+         * Convert a device address into a printable string.
+         * \return string good for use with std::cout <<
+         */
+        std::string to_string(void) const;
+
+        /*!
+         * Convert the device address into an args string.
+         * The args string contains delimiter symbols.
+         * \return a string with delimiter markup
+         */
+        std::string to_args_str(void) const;
+
+        /*!
+         * Make a device address from an args string.
+         * The args string contains delimiter symbols.
+         * \param args_str the arguments string
+         * \return the new device address
+         */
+        static device_addr_t from_args_str(const std::string &args_str);
     };
 
     //handy typedef for a vector of device addresses
diff --git a/host/include/uhd/types/dict.hpp b/host/include/uhd/types/dict.hpp
index 5b9883704..7fb712e76 100644
--- a/host/include/uhd/types/dict.hpp
+++ b/host/include/uhd/types/dict.hpp
@@ -18,10 +18,11 @@
 #ifndef INCLUDED_UHD_TYPES_DICT_HPP
 #define INCLUDED_UHD_TYPES_DICT_HPP
 
-#include <list>
-#include <vector>
-#include <stdexcept>
+#include <uhd/config.hpp>
 #include <boost/foreach.hpp>
+#include <stdexcept>
+#include <vector>
+#include <list>
 
 namespace uhd{
 
diff --git a/host/include/uhd/types/mac_addr.hpp b/host/include/uhd/types/mac_addr.hpp
index 2cac7d343..3cd1fe86b 100644
--- a/host/include/uhd/types/mac_addr.hpp
+++ b/host/include/uhd/types/mac_addr.hpp
@@ -28,10 +28,39 @@ namespace uhd{
     * Wrapper for an ethernet mac address.
     * Provides conversion between string and binary formats.
     */
-    struct UHD_API mac_addr_t{
-        boost::uint8_t mac_addr[6];
-        mac_addr_t(const std::string &mac_addr_str = "00:00:00:00:00:00");
+    class UHD_API mac_addr_t{
+    public:
+        static const size_t hlen = 6;
+
+        /*!
+         * Create a mac address a byte array.
+         * \param bytes a pointer for the byte array
+         * \return a new mac address
+         */
+        static mac_addr_t from_bytes(const boost::uint8_t *bytes);
+
+        /*!
+         * Create a mac address from a string.
+         * \param mac_addr_str the string with delimiters
+         * \return a new mac address
+         */
+        static mac_addr_t from_string(const std::string &mac_addr_str);
+
+        /*!
+         * Get the byte representation of the mac address.
+         * \return a pointer to the internal byte array
+         */
+        const boost::uint8_t *to_bytes(void) const;
+
+        /*!
+         * Get the string representation of this mac address.
+         * \return a string with delimiters
+         */
         std::string to_string(void) const;
+
+    private:
+        mac_addr_t(const boost::uint8_t *bytes); //private constructor
+        boost::uint8_t _bytes[hlen]; //internal representation
     };
 
 } //namespace uhd
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index 833e7a0da..ca45d0795 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -47,7 +47,7 @@ static size_t hash_device_addr(
 
     //combine the hashes of sorted keys/value pairs
     size_t hash = 0;
-    BOOST_FOREACH(std::string key, keys){
+    BOOST_FOREACH(const std::string &key, keys){
         boost::hash_combine(hash, key);
         boost::hash_combine(hash, dev_addr[key]);
     }
@@ -76,7 +76,7 @@ void device::register_device(
 device_addrs_t device::discover(const device_addr_t &hint){
     device_addrs_t device_addrs;
 
-    BOOST_FOREACH(dev_fcn_reg_t fcn, get_dev_fcn_regs()){
+    BOOST_FOREACH(const dev_fcn_reg_t &fcn, get_dev_fcn_regs()){
         device_addrs_t discovered_addrs = fcn.get<0>()(hint);
         device_addrs.insert(
             device_addrs.begin(),
@@ -95,11 +95,11 @@ device::sptr device::make(const device_addr_t &hint, size_t which){
     typedef boost::tuple<device_addr_t, make_t> dev_addr_make_t;
     std::vector<dev_addr_make_t> dev_addr_makers;
 
-    BOOST_FOREACH(dev_fcn_reg_t fcn, get_dev_fcn_regs()){
+    BOOST_FOREACH(const dev_fcn_reg_t &fcn, get_dev_fcn_regs()){
         BOOST_FOREACH(device_addr_t dev_addr, fcn.get<0>()(hint)){
             //copy keys that were in hint but not in dev_addr
             //this way, we can pass additional transport arguments
-            BOOST_FOREACH(std::string key, hint.get_keys()){
+            BOOST_FOREACH(const std::string &key, hint.get_keys()){
                 if (not dev_addr.has_key(key)) dev_addr[key] = hint[key];
             }
             //append the discovered address and its factory function
diff --git a/host/lib/simple_device.cpp b/host/lib/simple_device.cpp
index 2e6bffc9c..25beb45a9 100644
--- a/host/lib/simple_device.cpp
+++ b/host/lib/simple_device.cpp
@@ -19,7 +19,6 @@
 #include <uhd/utils/tune_helper.hpp>
 #include <uhd/utils/assert.hpp>
 #include <uhd/props.hpp>
-#include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
 #include <stdexcept>
@@ -29,29 +28,6 @@ using namespace uhd;
 /***********************************************************************
  * Helper Functions
  **********************************************************************/
-static std::string trim(const std::string &in){
-    return boost::algorithm::trim_copy(in);
-}
-
-device_addr_t args_to_device_addr(const std::string &args){
-    device_addr_t addr;
-
-    //split the args at the semi-colons
-    std::vector<std::string> pairs;
-    boost::split(pairs, args, boost::is_any_of(";"));
-    BOOST_FOREACH(std::string pair, pairs){
-        if (trim(pair) == "") continue;
-
-        //split the key value pairs at the equals
-        std::vector<std::string> key_val;
-        boost::split(key_val, pair, boost::is_any_of("="));
-        if (key_val.size() != 2) throw std::runtime_error("invalid args string: "+args);
-        addr[trim(key_val[0])] = trim(key_val[1]);
-    }
-
-    return addr;
-}
-
 static std::vector<double> get_xx_rates(wax::obj decerps, wax::obj rate){
     std::vector<double> rates;
     BOOST_FOREACH(size_t decerp, decerps.as<std::vector<size_t> >()){
@@ -223,5 +199,5 @@ private:
  * The Make Function
  **********************************************************************/
 simple_device::sptr simple_device::make(const std::string &args){
-    return sptr(new simple_device_impl(args_to_device_addr(args)));
+    return sptr(new simple_device_impl(device_addr_t::from_args_str(args)));
 }
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index bd5dc8e26..3fde40596 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -123,14 +123,55 @@ std::string device_addr_t::to_string(void) const{
     return ss.str();
 }
 
+static const std::string arg_delim = ";";
+static const std::string pair_delim = "=";
+
+static std::string trim(const std::string &in){
+    return boost::algorithm::trim_copy(in);
+}
+
+std::string device_addr_t::to_args_str(void) const{
+    std::string args_str;
+    const device_addr_t &device_addr = *this;
+    BOOST_FOREACH(const std::string &key, device_addr.get_keys()){
+        args_str += key + pair_delim + device_addr[key] + arg_delim;
+    }
+    return args_str;
+}
+
+device_addr_t device_addr_t::from_args_str(const std::string &args_str){
+    device_addr_t addr;
+
+    //split the args at the semi-colons
+    std::vector<std::string> pairs;
+    boost::split(pairs, args_str, boost::is_any_of(arg_delim));
+    BOOST_FOREACH(const std::string &pair, pairs){
+        if (trim(pair) == "") continue;
+
+        //split the key value pairs at the equals
+        std::vector<std::string> key_val;
+        boost::split(key_val, pair, boost::is_any_of(pair_delim));
+        if (key_val.size() != 2) throw std::runtime_error("invalid args string: "+args_str);
+        addr[trim(key_val[0])] = trim(key_val[1]);
+    }
+
+    return addr;
+}
+
 /***********************************************************************
  * mac addr
  **********************************************************************/
-uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
-    std::string mac_addr_str = (mac_addr_str_ == "")? "ff:ff:ff:ff:ff:ff" : mac_addr_str_;
+mac_addr_t::mac_addr_t(const boost::uint8_t *bytes){
+    std::copy(bytes, bytes+hlen, _bytes);
+}
 
-    //ether_aton_r(str.c_str(), &mac_addr);
-    boost::uint8_t p[6] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB
+mac_addr_t mac_addr_t::from_bytes(const boost::uint8_t *bytes){
+    return mac_addr_t(bytes);
+}
+
+mac_addr_t mac_addr_t::from_string(const std::string &mac_addr_str){
+
+    boost::uint8_t p[hlen] = {0x00, 0x50, 0xC2, 0x85, 0x30, 0x00}; // Matt's IAB
 
     try{
         //only allow patterns of xx:xx or xx:xx:xx:xx:xx:xx
@@ -155,15 +196,17 @@ uhd::mac_addr_t::mac_addr_t(const std::string &mac_addr_str_){
         ));
     }
 
-    memcpy(&mac_addr, p, sizeof(mac_addr));
+    return from_bytes(p);
+}
+
+const boost::uint8_t *mac_addr_t::to_bytes(void) const{
+    return _bytes;
 }
 
-std::string uhd::mac_addr_t::to_string(void) const{
-    //ether_ntoa_r(&mac_addr, addr_buf);
-    const boost::uint8_t *p = reinterpret_cast<const boost::uint8_t *>(&mac_addr);
+std::string mac_addr_t::to_string(void) const{
     return str(
         boost::format("%02x:%02x:%02x:%02x:%02x:%02x")
-        % int(p[0]) % int(p[1]) % int(p[2])
-        % int(p[3]) % int(p[4]) % int(p[5])
+        % int(to_bytes()[0]) % int(to_bytes()[1]) % int(to_bytes()[2])
+        % int(to_bytes()[3]) % int(to_bytes()[4]) % int(to_bytes()[5])
     );
 }
diff --git a/host/lib/usrp/dboard_manager.cpp b/host/lib/usrp/dboard_manager.cpp
index f86545696..424626023 100644
--- a/host/lib/usrp/dboard_manager.cpp
+++ b/host/lib/usrp/dboard_manager.cpp
@@ -204,7 +204,7 @@ dboard_manager_impl::dboard_manager_impl(
     //make xcvr subdevs (make one subdev for both rx and tx dboards)
     if (rx_dboard_ctor == tx_dboard_ctor){
         ASSERT_THROW(rx_subdevs == tx_subdevs);
-        BOOST_FOREACH(std::string subdev, rx_subdevs){
+        BOOST_FOREACH(const std::string &subdev, rx_subdevs){
             dboard_base::sptr xcvr_dboard = rx_dboard_ctor(
                 dboard_base::ctor_args_t(subdev, interface, rx_dboard_id, tx_dboard_id)
             );
@@ -222,7 +222,7 @@ dboard_manager_impl::dboard_manager_impl(
     //make tx and rx subdevs (separate subdevs for rx and tx dboards)
     else{
         //make the rx subdevs
-        BOOST_FOREACH(std::string subdev, rx_subdevs){
+        BOOST_FOREACH(const std::string &subdev, rx_subdevs){
             dboard_base::sptr rx_dboard = rx_dboard_ctor(
                 dboard_base::ctor_args_t(subdev, interface, rx_dboard_id, dboard_id::NONE)
             );
@@ -232,7 +232,7 @@ dboard_manager_impl::dboard_manager_impl(
             );
         }
         //make the tx subdevs
-        BOOST_FOREACH(std::string subdev, tx_subdevs){
+        BOOST_FOREACH(const std::string &subdev, tx_subdevs){
             dboard_base::sptr tx_dboard = tx_dboard_ctor(
                 dboard_base::ctor_args_t(subdev, interface, dboard_id::NONE, tx_dboard_id)
             );
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index b6919a738..35dfd6287 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -116,7 +116,7 @@ void usrp2_impl::mboard_get(const wax::obj &key_, wax::obj &val){
             ASSERT_THROW(htonl(in_data.id) == USRP2_CTRL_ID_THIS_IS_MY_MAC_ADDR_DUDE);
 
             //extract the address
-            val = reinterpret_cast<mac_addr_t*>(in_data.data.mac_addr)->to_string();
+            val = mac_addr_t::from_bytes(in_data.data.mac_addr).to_string();
             return;
         }
 
@@ -211,8 +211,8 @@ void usrp2_impl::mboard_set(const wax::obj &key, const wax::obj &val){
             //setup the out data
             usrp2_ctrl_data_t out_data;
             out_data.id = htonl(USRP2_CTRL_ID_HERE_IS_A_NEW_MAC_ADDR_BRO);
-            mac_addr_t mac_addr(val.as<std::string>());
-            std::memcpy(out_data.data.mac_addr, &mac_addr, sizeof(mac_addr_t));
+            mac_addr_t mac_addr = mac_addr_t::from_string(val.as<std::string>());
+            std::copy(mac_addr.to_bytes(), mac_addr.to_bytes()+mac_addr_t::hlen, out_data.data.mac_addr);
 
             //send and recv
             usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data);
diff --git a/host/test/addr_test.cpp b/host/test/addr_test.cpp
index 0c8f63b0a..a75804949 100644
--- a/host/test/addr_test.cpp
+++ b/host/test/addr_test.cpp
@@ -22,7 +22,7 @@
 BOOST_AUTO_TEST_CASE(test_mac_addr){
     std::cout << "Testing mac addr..." << std::endl;
     const std::string mac_addr_str("00:01:23:45:67:89");
-    uhd::mac_addr_t mac_addr(mac_addr_str);
+    uhd::mac_addr_t mac_addr = uhd::mac_addr_t::from_string(mac_addr_str);
     std::cout << "Input: " << mac_addr_str << std::endl;
     std::cout << "Output: " << mac_addr.to_string() << std::endl;
     BOOST_CHECK_EQUAL(mac_addr_str, mac_addr.to_string());
diff --git a/host/utils/usrp2_burner.cpp b/host/utils/usrp2_burner.cpp
index ff6d4426f..b24425316 100644
--- a/host/utils/usrp2_burner.cpp
+++ b/host/utils/usrp2_burner.cpp
@@ -57,27 +57,32 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     uhd::device::sptr u2_dev = uhd::usrp::usrp2::make(device_addr);
     //FIXME usees the default mboard for now (until the mimo link is supported)
     wax::obj u2_mb = (*u2_dev)[uhd::DEVICE_PROP_MBOARD];
+    std::cout << std::endl;
+
+    //fetch and print current settings
+    std::cout << "Fetching current settings from usrp2 eeprom:" << std::endl;
+    std::string curr_ip = u2_mb[std::string("ip-addr")].as<std::string>();
+    std::cout << boost::format("  Current IP Address: %s") % curr_ip << std::endl;
+    std::string curr_mac = u2_mb[std::string("mac-addr")].as<std::string>();
+    std::cout << boost::format("  Current MAC Address: %s") % curr_mac << std::endl;
+    std::cout << "  Done" << std::endl << std::endl;
 
     //try to set the new ip (if provided)
     if (vm.count("new-ip")){
         std::cout << "Burning a new ip address into the usrp2 eeprom:" << std::endl;
-        std::string old_ip = u2_mb[std::string("ip-addr")].as<std::string>();
-        std::cout << boost::format("  Old IP Address: %s") % old_ip << std::endl;
         std::string new_ip = vm["new-ip"].as<std::string>();
         std::cout << boost::format("  New IP Address: %s") % new_ip << std::endl;
         u2_mb[std::string("ip-addr")] = new_ip;
-        std::cout << "  Done" << std::endl;
+        std::cout << "  Done" << std::endl << std::endl;
     }
 
     //try to set the new mac (if provided)
     if (vm.count("new-mac")){
         std::cout << "Burning a new mac address into the usrp2 eeprom:" << std::endl;
-        std::string old_mac = u2_mb[std::string("mac-addr")].as<std::string>();
-        std::cout << boost::format("  Old MAC Address: %s") % old_mac << std::endl;
         std::string new_mac = vm["new-mac"].as<std::string>();
         std::cout << boost::format("  New MAC Address: %s") % new_mac << std::endl;
         u2_mb[std::string("mac-addr")] = new_mac;
-        std::cout << "  Done" << std::endl;
+        std::cout << "  Done" << std::endl << std::endl;
     }
 
     std::cout << "Power-cycle the usrp2 for the changes to take effect." << std::endl;
-- 
cgit v1.2.3


From f9be69cae7c0fd9bca8b310ff79dd6aad958dc2b Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 30 Mar 2010 14:07:19 -0700
Subject: Added io type and otw type for describing types.

---
 host/examples/rx_timed_samples.cpp      |  5 ++-
 host/include/uhd/device.hpp             | 10 ++---
 host/include/uhd/types/CMakeLists.txt   |  2 +
 host/include/uhd/types/clock_config.hpp | 16 ++++----
 host/include/uhd/types/io_type.hpp      | 69 +++++++++++++++++++++++++++++++++
 host/include/uhd/types/otw_type.hpp     | 63 ++++++++++++++++++++++++++++++
 host/lib/types.cpp                      | 35 +++++++++++++++++
 host/lib/usrp/usrp2/io_impl.cpp         | 68 ++++++++++++++++----------------
 host/lib/usrp/usrp2/usrp2_impl.hpp      |  4 +-
 9 files changed, 221 insertions(+), 51 deletions(-)
 create mode 100644 host/include/uhd/types/io_type.hpp
 create mode 100644 host/include/uhd/types/otw_type.hpp

(limited to 'host/lib')

diff --git a/host/examples/rx_timed_samples.cpp b/host/examples/rx_timed_samples.cpp
index 5d4b5a68d..88e112584 100644
--- a/host/examples/rx_timed_samples.cpp
+++ b/host/examples/rx_timed_samples.cpp
@@ -80,7 +80,10 @@ int UHD_SAFE_MAIN(int argc, char *argv[]){
     while(num_acc_samps < total_num_samps){
         uhd::rx_metadata_t md;
         std::complex<float> buff[1000];
-        size_t num_rx_samps = dev->recv(boost::asio::buffer(buff, sizeof(buff)), md, "32fc");
+        size_t num_rx_samps = dev->recv(
+            boost::asio::buffer(buff, sizeof(buff)),
+            md, uhd::io_type_t::COMPLEX_FLOAT32
+        );
         if (num_rx_samps == 0) continue; //wait for packets with contents
 
         std::cout << boost::format("Got packet: %u samples, %u secs, %u ticks")
diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp
index bab8afca6..1d0360799 100644
--- a/host/include/uhd/device.hpp
+++ b/host/include/uhd/device.hpp
@@ -21,7 +21,7 @@
 #include <uhd/config.hpp>
 #include <uhd/types/device_addr.hpp>
 #include <uhd/types/metadata.hpp>
-#include <uhd/props.hpp>
+#include <uhd/types/io_type.hpp>
 #include <uhd/wax.hpp>
 #include <boost/utility.hpp>
 #include <boost/shared_ptr.hpp>
@@ -91,13 +91,13 @@ public:
      *
      * \param buff a buffer pointing to some read-only memory
      * \param metadata data describing the buffer's contents
-     * \param the type of data loaded in the buffer (32fc, 16sc)
+     * \param io_type the type of data loaded in the buffer
      * \return the number of samples sent
      */
     virtual size_t send(
         const boost::asio::const_buffer &buff,
         const tx_metadata_t &metadata,
-        const std::string &type = "32fc"
+        const io_type_t &io_type
     ) = 0;
 
     /*!
@@ -123,13 +123,13 @@ public:
      *
      * \param buff the buffer to fill with IF data
      * \param metadata data to fill describing the buffer
-     * \param the type of data to fill into the buffer (32fc, 16sc)
+     * \param io_type the type of data to fill into the buffer
      * \return the number of samples received
      */
     virtual size_t recv(
         const boost::asio::mutable_buffer &buff,
         rx_metadata_t &metadata,
-        const std::string &type = "32fc"
+        const io_type_t &io_type
     ) = 0;
 };
 
diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt
index 10262dd65..e4cdf2cef 100644
--- a/host/include/uhd/types/CMakeLists.txt
+++ b/host/include/uhd/types/CMakeLists.txt
@@ -20,8 +20,10 @@ INSTALL(FILES
     clock_config.hpp
     device_addr.hpp
     dict.hpp
+    io_type.hpp
     mac_addr.hpp
     metadata.hpp
+    otw_type.hpp
     ranges.hpp
     stream_cmd.hpp
     time_spec.hpp
diff --git a/host/include/uhd/types/clock_config.hpp b/host/include/uhd/types/clock_config.hpp
index 8b2fea016..42d74ad90 100644
--- a/host/include/uhd/types/clock_config.hpp
+++ b/host/include/uhd/types/clock_config.hpp
@@ -29,18 +29,18 @@ namespace uhd{
      */
     struct UHD_API clock_config_t{
         enum ref_source_t {
-            REF_INT, //internal reference
-            REF_SMA, //external sma port
-            REF_MIMO //mimo cable (usrp2 only)
+            REF_INT  = 'i', //internal reference
+            REF_SMA  = 's', //external sma port
+            REF_MIMO = 'm'  //mimo cable (usrp2 only)
         } ref_source;
         enum pps_source_t {
-            PPS_INT, //there is no internal
-            PPS_SMA, //external sma port
-            PPS_MIMO //mimo cable (usrp2 only)
+            PPS_INT  = 'i', //there is no internal
+            PPS_SMA  = 's', //external sma port
+            PPS_MIMO = 'm'  //mimo cable (usrp2 only)
         } pps_source;
         enum pps_polarity_t {
-            PPS_NEG, //negative edge
-            PPS_POS  //positive edge
+            PPS_NEG = 'n', //negative edge
+            PPS_POS = 'p'  //positive edge
         } pps_polarity;
         clock_config_t(void);
     };
diff --git a/host/include/uhd/types/io_type.hpp b/host/include/uhd/types/io_type.hpp
new file mode 100644
index 000000000..930394d1b
--- /dev/null
+++ b/host/include/uhd/types/io_type.hpp
@@ -0,0 +1,69 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_IO_TYPE_HPP
+#define INCLUDED_UHD_TYPES_IO_TYPE_HPP
+
+#include <uhd/config.hpp>
+
+namespace uhd{
+
+    /*!
+     * Used to specify the IO type with device send/recv.
+     */
+    class UHD_API io_type_t{
+    public:
+
+        /*!
+         * Built in IO types known to the system.
+         */
+        enum tid_t{
+            CUSTOM_TYPE =     '?',
+            COMPLEX_FLOAT32 = 'f',
+            COMPLEX_INT16 =   's',
+            COMPLEX_INT8 =    'b'
+        };
+
+        /*!
+         * The size of this io type in bytes.
+         */
+        const size_t size;
+
+        /*!
+         * The type id of this io type.
+         * Good for using with switch statements.
+         */
+        const tid_t tid;
+
+        /*!
+         * Create an io type from a built-in type id.
+         * \param tid a type id known to the system
+         */
+        io_type_t(tid_t tid);
+
+        /*!
+         * Create an io type from attributes.
+         * The tid will be set to custom.
+         * \param size the size in bytes
+         */
+        io_type_t(size_t size);
+
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_IO_TYPE_HPP */
diff --git a/host/include/uhd/types/otw_type.hpp b/host/include/uhd/types/otw_type.hpp
new file mode 100644
index 000000000..f10664584
--- /dev/null
+++ b/host/include/uhd/types/otw_type.hpp
@@ -0,0 +1,63 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_TYPES_OTW_TYPE_HPP
+#define INCLUDED_UHD_TYPES_OTW_TYPE_HPP
+
+#include <uhd/config.hpp>
+
+namespace uhd{
+
+    /*!
+     * Description for over-the-wire integers:
+     * The DSP units in the FPGA deal with signed 16-bit integers.
+     * The width and shift define the translation between OTW and DSP,
+     * defined by the following relation: otw_int = dsp_int >> shift
+     *
+     * Note: possible combinations of width, shift, and byteorder
+     * depend on the internals of the FPGA. Not all are supported!
+     */
+    struct UHD_API otw_type_t{
+
+        /*!
+         * Width of an over-the-wire integer in bits.
+         */
+        size_t width; //in bits
+
+        /*!
+         * Shift of an over-the-wire integer in bits.
+         * otw_int = dsp_int >> shift
+         * dsp_int = otw_int << shift
+         */
+        size_t shift; //in bits
+
+        /*!
+         * Constants for byte order (borrowed from numpy's dtype)
+         */
+        enum /*bo_t*/ {
+            BO_NATIVE         = '=',
+            BO_LITTLE_ENDIAN  = '<',
+            BO_BIG_ENDIAN     = '>',
+            BO_NOT_APPLICABLE = '|'
+        } byteorder;
+
+        otw_type_t(void);
+    };
+
+} //namespace uhd
+
+#endif /* INCLUDED_UHD_TYPES_OTW_TYPE_HPP */
diff --git a/host/lib/types.cpp b/host/lib/types.cpp
index 3fde40596..bf9f8b895 100644
--- a/host/lib/types.cpp
+++ b/host/lib/types.cpp
@@ -23,10 +23,14 @@
 #include <uhd/types/time_spec.hpp>
 #include <uhd/types/device_addr.hpp>
 #include <uhd/types/mac_addr.hpp>
+#include <uhd/types/otw_type.hpp>
+#include <uhd/types/io_type.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/format.hpp>
+#include <boost/cstdint.hpp>
 #include <stdexcept>
+#include <complex>
 
 using namespace uhd;
 
@@ -210,3 +214,34 @@ std::string mac_addr_t::to_string(void) const{
         % int(to_bytes()[3]) % int(to_bytes()[4]) % int(to_bytes()[5])
     );
 }
+
+/***********************************************************************
+ * otw type
+ **********************************************************************/
+otw_type_t::otw_type_t(void){
+    width = 0;
+    shift = 0;
+    byteorder = BO_NATIVE;
+}
+
+/***********************************************************************
+ * io type
+ **********************************************************************/
+static size_t tid_to_size(io_type_t::tid_t tid){
+    switch(tid){
+    case io_type_t::COMPLEX_FLOAT32: return sizeof(std::complex<float>);
+    case io_type_t::COMPLEX_INT16:   return sizeof(std::complex<boost::int16_t>);
+    case io_type_t::COMPLEX_INT8:    return sizeof(std::complex<boost::int8_t>);
+    default: throw std::runtime_error("unknown io type tid");
+    }
+}
+
+io_type_t::io_type_t(tid_t tid)
+: size(tid_to_size(tid)), tid(tid){
+    /* NOP */
+}
+
+io_type_t::io_type_t(size_t size)
+: size(size), tid(CUSTOM_TYPE){
+    /* NOP */
+}
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 280f124d2..c87884ebb 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -172,46 +172,43 @@ void usrp2_impl::recv_raw(rx_metadata_t &metadata){
 size_t usrp2_impl::send(
     const asio::const_buffer &buff,
     const tx_metadata_t &metadata,
-    const std::string &type
+    const io_type_t &io_type
 ){
     boost::uint32_t tx_mem[_mtu/sizeof(boost::uint32_t)];
-    boost::uint32_t *items = tx_mem + vrt::max_header_words32; //offset for data
-    size_t num_samps = _max_tx_samples_per_packet;
-
-    //calculate the number of samples to be copied
-    //and copy the samples into the send buffer
-    if (type == "32fc"){
-        num_samps = std::min(asio::buffer_size(buff)/sizeof(fc32_t), num_samps);
-        host_floats_to_usrp2_items(items, asio::buffer_cast<const fc32_t*>(buff), num_samps);
-    }
-    else if (type == "16sc"){
-        num_samps = std::min(asio::buffer_size(buff)/sizeof(sc16_t), num_samps);
-        host_items_to_usrp2_items(items, asio::buffer_cast<const boost::uint32_t*>(buff), num_samps);
-    }
-    else{
-        throw std::runtime_error(str(boost::format("usrp2 send: cannot handle type \"%s\"") % type));
-    }
+    size_t num_samps = std::min(
+        asio::buffer_size(buff)/io_type.size,
+        size_t(_max_tx_samples_per_packet)
+    );
 
-    boost::uint32_t vrt_hdr[vrt::max_header_words32];
     size_t num_header_words32, num_packet_words32;
     size_t packet_count = _tx_stream_id_to_packet_seq[metadata.stream_id]++;
 
     //pack metadata into a vrt header
     vrt::pack(
         metadata,            //input
-        vrt_hdr,             //output
+        tx_mem,              //output
         num_header_words32,  //output
         num_samps,           //input
         num_packet_words32,  //output
         packet_count         //input
     );
 
-    //copy in the vrt header (yes we left space)
-    items -= num_header_words32;
-    std::memcpy(items, vrt_hdr, num_header_words32*sizeof(boost::uint32_t));
+    boost::uint32_t *items = tx_mem + num_header_words32; //offset for data
+
+    //copy the samples into the send buffer
+    switch(io_type.tid){
+    case io_type_t::COMPLEX_FLOAT32:
+        host_floats_to_usrp2_items(items, asio::buffer_cast<const fc32_t*>(buff), num_samps);
+        break;
+    case io_type_t::COMPLEX_INT16:
+        host_items_to_usrp2_items(items, asio::buffer_cast<const boost::uint32_t*>(buff), num_samps);
+        break;
+    default:
+        throw std::runtime_error(str(boost::format("usrp2 send: cannot handle type \"%c\"") % io_type.tid));
+    }
 
     //send and return number of samples
-    _data_transport->send(asio::buffer(items, num_packet_words32*sizeof(boost::uint32_t)));
+    _data_transport->send(asio::buffer(tx_mem, num_packet_words32*sizeof(boost::uint32_t)));
     return num_samps;
 }
 
@@ -221,7 +218,7 @@ size_t usrp2_impl::send(
 size_t usrp2_impl::recv(
     const asio::mutable_buffer &buff,
     rx_metadata_t &metadata,
-    const std::string &type
+    const io_type_t &io_type
 ){
     //perform a receive if no rx data is waiting to be copied
     if (asio::buffer_size(_rx_copy_buff) == 0){
@@ -237,21 +234,22 @@ size_t usrp2_impl::recv(
     //and a pointer into the usrp2 received items memory
     size_t bytes_to_copy = asio::buffer_size(_rx_copy_buff);
     if (bytes_to_copy == 0) return 0; //nothing to receive
-    size_t num_samps = bytes_to_copy/sizeof(boost::uint32_t);
+    size_t num_samps = std::min(
+        asio::buffer_size(buff)/io_type.size,
+        bytes_to_copy/sizeof(boost::uint32_t)
+    );
     const boost::uint32_t *items = asio::buffer_cast<const boost::uint32_t*>(_rx_copy_buff);
 
-    //calculate the number of samples to be copied
-    //and copy the samples from the recv buffer
-    if (type == "32fc"){
-        num_samps = std::min(asio::buffer_size(buff)/sizeof(fc32_t), num_samps);
+    //copy the samples from the recv buffer
+    switch(io_type.tid){
+    case io_type_t::COMPLEX_FLOAT32:
         usrp2_items_to_host_floats(asio::buffer_cast<fc32_t*>(buff), items, num_samps);
-    }
-    else if (type == "16sc"){
-        num_samps = std::min(asio::buffer_size(buff)/sizeof(sc16_t), num_samps);
+        break;
+    case io_type_t::COMPLEX_INT16:
         usrp2_items_to_host_items(asio::buffer_cast<boost::uint32_t*>(buff), items, num_samps);
-    }
-    else{
-        throw std::runtime_error(str(boost::format("usrp2 recv: cannot handle type \"%s\"") % type));
+        break;
+    default:
+        throw std::runtime_error(str(boost::format("usrp2 recv: cannot handle type \"%c\"") % io_type.tid));
     }
 
     //update the rx copy buffer to reflect the bytes copied
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 6535e7049..3468a0cf1 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -106,8 +106,8 @@ public:
     double get_master_clock_freq(void);
 
     //the io interface
-    size_t send(const boost::asio::const_buffer &, const uhd::tx_metadata_t &, const std::string &);
-    size_t recv(const boost::asio::mutable_buffer &, uhd::rx_metadata_t &, const std::string &);
+    size_t send(const boost::asio::const_buffer &, const uhd::tx_metadata_t &, const uhd::io_type_t &);
+    size_t recv(const boost::asio::mutable_buffer &, uhd::rx_metadata_t &, const uhd::io_type_t &);
 
 private:
     //device properties interface
-- 
cgit v1.2.3


From 281307833c8275031bd2469e6aef3f472490749a Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Tue, 30 Mar 2010 15:11:23 -0700
Subject: use find to discover devices

---
 host/include/uhd/device.hpp          | 14 +++----
 host/include/uhd/usrp/usrp1e.hpp     |  5 +--
 host/include/uhd/usrp/usrp2.hpp      |  5 +--
 host/lib/device.cpp                  |  8 ++--
 host/lib/usrp/usrp1e/usrp1e_none.cpp |  2 +-
 host/lib/usrp/usrp2/usrp2_impl.cpp   |  7 ++--
 host/utils/CMakeLists.txt            |  6 +--
 host/utils/discover_usrps.cpp        | 71 ------------------------------------
 host/utils/uhd_find_devices.cpp      | 71 ++++++++++++++++++++++++++++++++++++
 9 files changed, 93 insertions(+), 96 deletions(-)
 delete mode 100644 host/utils/discover_usrps.cpp
 create mode 100644 host/utils/uhd_find_devices.cpp

(limited to 'host/lib')

diff --git a/host/include/uhd/device.hpp b/host/include/uhd/device.hpp
index 1d0360799..4d4196d98 100644
--- a/host/include/uhd/device.hpp
+++ b/host/include/uhd/device.hpp
@@ -38,22 +38,22 @@ class UHD_API device : boost::noncopyable, public wax::obj{
 
 public:
     typedef boost::shared_ptr<device> sptr;
-    typedef boost::function<device_addrs_t(const device_addr_t &)> discover_t;
+    typedef boost::function<device_addrs_t(const device_addr_t &)> find_t;
     typedef boost::function<sptr(const device_addr_t &)> make_t;
 
     /*!
      * Register a device into the discovery and factory system.
      *
-     * \param discover a function that discovers devices
+     * \param find a function that discovers devices
      * \param make a factory function that makes a device
      */
     static void register_device(
-        const discover_t &discover,
+        const find_t &find,
         const make_t &make
     );
 
     /*!
-     * \brief Discover usrp devices attached to the host.
+     * \brief Find usrp devices attached to the host.
      *
      * The hint device address should be used to narrow down the search
      * to particular transport types and/or transport arguments.
@@ -61,17 +61,17 @@ public:
      * \param hint a partially (or fully) filled in device address
      * \return a vector of device addresses for all usrps on the system
      */
-    static device_addrs_t discover(const device_addr_t &hint);
+    static device_addrs_t find(const device_addr_t &hint);
 
     /*!
      * \brief Create a new usrp device from the device address hint.
      *
-     * The make routine will call discover and pick one of the results.
+     * The make routine will call find and pick one of the results.
      * By default, the first result will be used to create a new device.
      * Use the which parameter as an index into the list of results.
      *
      * \param hint a partially (or fully) filled in device address
-     * \param which which address to use when multiple are discovered
+     * \param which which address to use when multiple are found
      * \return a shared pointer to a new device instance
      */
     static sptr make(const device_addr_t &hint, size_t which = 0);
diff --git a/host/include/uhd/usrp/usrp1e.hpp b/host/include/uhd/usrp/usrp1e.hpp
index 5cba4ef52..cee9dc3d5 100644
--- a/host/include/uhd/usrp/usrp1e.hpp
+++ b/host/include/uhd/usrp/usrp1e.hpp
@@ -29,12 +29,11 @@ namespace uhd{ namespace usrp{
 class UHD_API usrp1e : public device{
 public:
     /*!
-     * Discover usrp1e devices on the system via the device node.
-     * This static method will be called by the device::discover.
+     * Find usrp1e devices on the system via the device node.
      * \param hint a device addr with the usrp1e address filled in
      * \return a vector of device addresses for all usrp1es found
      */
-    static device_addrs_t discover(const device_addr_t &hint);
+    static device_addrs_t find(const device_addr_t &hint);
 
     /*!
      * Make a usrp1e from a device address.
diff --git a/host/include/uhd/usrp/usrp2.hpp b/host/include/uhd/usrp/usrp2.hpp
index 277ddc131..613b40ae3 100644
--- a/host/include/uhd/usrp/usrp2.hpp
+++ b/host/include/uhd/usrp/usrp2.hpp
@@ -29,17 +29,16 @@ namespace uhd{ namespace usrp{
 class UHD_API usrp2 : public device{
 public:
     /*!
-     * Discover usrp2 devices over the ethernet.
+     * Find usrp2 devices over the ethernet.
      *
      * Recommended key/value pairs for the device hint address:
      * hint["addr"] = address, where address is a resolvable address
      * or ip address, which may or may not be a broadcast address.
      *
-     * This static method will be called by the device::discover.
      * \param hint a device addr with the usrp2 address filled in
      * \return a vector of device addresses for all usrp2s found
      */
-    static device_addrs_t discover(const device_addr_t &hint);
+    static device_addrs_t find(const device_addr_t &hint);
 
     /*!
      * Make a usrp2 from a device address.
diff --git a/host/lib/device.cpp b/host/lib/device.cpp
index ca45d0795..27a365d34 100644
--- a/host/lib/device.cpp
+++ b/host/lib/device.cpp
@@ -57,23 +57,23 @@ static size_t hash_device_addr(
 /***********************************************************************
  * Registration
  **********************************************************************/
-typedef boost::tuple<device::discover_t, device::make_t> dev_fcn_reg_t;
+typedef boost::tuple<device::find_t, device::make_t> dev_fcn_reg_t;
 
 // instantiate the device function registry container
 UHD_SINGLETON_FCN(std::vector<dev_fcn_reg_t>, get_dev_fcn_regs)
 
 void device::register_device(
-    const discover_t &discover,
+    const find_t &find,
     const make_t &make
 ){
     //std::cout << "registering device" << std::endl;
-    get_dev_fcn_regs().push_back(dev_fcn_reg_t(discover, make));
+    get_dev_fcn_regs().push_back(dev_fcn_reg_t(find, make));
 }
 
 /***********************************************************************
  * Discover
  **********************************************************************/
-device_addrs_t device::discover(const device_addr_t &hint){
+device_addrs_t device::find(const device_addr_t &hint){
     device_addrs_t device_addrs;
 
     BOOST_FOREACH(const dev_fcn_reg_t &fcn, get_dev_fcn_regs()){
diff --git a/host/lib/usrp/usrp1e/usrp1e_none.cpp b/host/lib/usrp/usrp1e/usrp1e_none.cpp
index 1c8cf9a5b..84fb9276c 100644
--- a/host/lib/usrp/usrp1e/usrp1e_none.cpp
+++ b/host/lib/usrp/usrp1e/usrp1e_none.cpp
@@ -25,7 +25,7 @@ using namespace uhd::usrp;
  * when the required kernel module headers are not present.
  */
 
-device_addrs_t usrp1e::discover(const device_addr_t &){
+device_addrs_t usrp1e::find(const device_addr_t &){
     return device_addrs_t(); //return empty list
 }
 
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 9dce351be..b0ee395fb 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -30,13 +30,13 @@ using namespace uhd::transport;
 namespace asio = boost::asio;
 
 UHD_STATIC_BLOCK(register_usrp2_device){
-    device::register_device(&usrp2::discover, &usrp2::make);
+    device::register_device(&usrp2::find, &usrp2::make);
 }
 
 /***********************************************************************
  * Discovery over the udp transport
  **********************************************************************/
-uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
+uhd::device_addrs_t usrp2::find(const device_addr_t &hint){
     device_addrs_t usrp2_addrs;
 
     //if no address was specified, send a broadcast on each interface
@@ -50,7 +50,7 @@ uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
             new_hint["addr"] = if_addrs.bcast;
 
             //call discover with the new hint and append results
-            device_addrs_t new_usrp2_addrs = usrp2::discover(new_hint);
+            device_addrs_t new_usrp2_addrs = usrp2::find(new_hint);
             usrp2_addrs.insert(usrp2_addrs.begin(),
                 new_usrp2_addrs.begin(), new_usrp2_addrs.end()
             );
@@ -83,7 +83,6 @@ uhd::device_addrs_t usrp2::discover(const device_addr_t &hint){
                 boost::asio::ip::address_v4 ip_addr(ntohl(ctrl_data_in.data.ip_addr));
                 device_addr_t new_addr;
                 new_addr["name"] = "USRP2";
-                new_addr["transport"] = "udp";
                 new_addr["addr"] = ip_addr.to_string();
                 usrp2_addrs.push_back(new_addr);
                 //dont break here, it will exit the while loop
diff --git a/host/utils/CMakeLists.txt b/host/utils/CMakeLists.txt
index 1fb132937..aa01d1e35 100644
--- a/host/utils/CMakeLists.txt
+++ b/host/utils/CMakeLists.txt
@@ -15,9 +15,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-ADD_EXECUTABLE(discover_usrps discover_usrps.cpp)
-TARGET_LINK_LIBRARIES(discover_usrps uhd)
-INSTALL(TARGETS discover_usrps RUNTIME DESTINATION ${RUNTIME_DIR})
+ADD_EXECUTABLE(uhd_find_devices uhd_find_devices.cpp)
+TARGET_LINK_LIBRARIES(uhd_find_devices uhd)
+INSTALL(TARGETS uhd_find_devices RUNTIME DESTINATION ${RUNTIME_DIR})
 
 ADD_EXECUTABLE(usrp2_burner usrp2_burner.cpp)
 TARGET_LINK_LIBRARIES(usrp2_burner uhd)
diff --git a/host/utils/discover_usrps.cpp b/host/utils/discover_usrps.cpp
deleted file mode 100644
index 72c5b8822..000000000
--- a/host/utils/discover_usrps.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-//
-// Copyright 2010 Ettus Research LLC
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-//
-
-#include <uhd/utils/safe_main.hpp>
-#include <uhd/device.hpp>
-#include <uhd/props.hpp>
-#include <boost/program_options.hpp>
-#include <boost/format.hpp>
-#include <iostream>
-
-namespace po = boost::program_options;
-
-int UHD_SAFE_MAIN(int argc, char *argv[]){
-    po::options_description desc("Allowed options");
-    desc.add_options()
-        ("help", "help message")
-        ("addr", po::value<std::string>(), "resolvable network address")
-        ("node", po::value<std::string>(), "path to linux device node")
-    ;
-
-    po::variables_map vm;
-    po::store(po::parse_command_line(argc, argv, desc), vm);
-    po::notify(vm); 
-
-    //print the help message
-    if (vm.count("help")){
-        std::cout << boost::format("Discover USRPs %s") % desc << std::endl;
-        return ~0;
-    }
-
-    //load the options into the address
-    uhd::device_addr_t device_addr;
-    if (vm.count("addr")){
-        device_addr["addr"] = vm["addr"].as<std::string>();
-    }
-    if (vm.count("node")){
-        device_addr["node"] = vm["node"].as<std::string>();
-    }
-
-    //discover the usrps and print the results
-    uhd::device_addrs_t device_addrs = uhd::device::discover(device_addr);
-
-    if (device_addrs.size() == 0){
-        std::cerr << "No USRP Devices Found" << std::endl;
-        return ~0;
-    }
-
-    for (size_t i = 0; i < device_addrs.size(); i++){
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << "-- USRP Device " << i << std::endl;
-        std::cout << "--------------------------------------------------" << std::endl;
-        std::cout << device_addrs[i].to_string() << std::endl << std::endl;
-        uhd::device::make(device_addrs[i]); //test make
-    }
-
-    return 0;
-}
diff --git a/host/utils/uhd_find_devices.cpp b/host/utils/uhd_find_devices.cpp
new file mode 100644
index 000000000..b328216d0
--- /dev/null
+++ b/host/utils/uhd_find_devices.cpp
@@ -0,0 +1,71 @@
+//
+// Copyright 2010 Ettus Research LLC
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <uhd/utils/safe_main.hpp>
+#include <uhd/device.hpp>
+#include <uhd/props.hpp>
+#include <boost/program_options.hpp>
+#include <boost/format.hpp>
+#include <iostream>
+
+namespace po = boost::program_options;
+
+int UHD_SAFE_MAIN(int argc, char *argv[]){
+    po::options_description desc("Allowed options");
+    desc.add_options()
+        ("help", "help message")
+        ("addr", po::value<std::string>(), "resolvable network address")
+        ("node", po::value<std::string>(), "path to linux device node")
+    ;
+
+    po::variables_map vm;
+    po::store(po::parse_command_line(argc, argv, desc), vm);
+    po::notify(vm);
+
+    //print the help message
+    if (vm.count("help")){
+        std::cout << boost::format("UHD Find Devices %s") % desc << std::endl;
+        return ~0;
+    }
+
+    //load the options into the address
+    uhd::device_addr_t device_addr;
+    if (vm.count("addr")){
+        device_addr["addr"] = vm["addr"].as<std::string>();
+    }
+    if (vm.count("node")){
+        device_addr["node"] = vm["node"].as<std::string>();
+    }
+
+    //discover the usrps and print the results
+    uhd::device_addrs_t device_addrs = uhd::device::find(device_addr);
+
+    if (device_addrs.size() == 0){
+        std::cerr << "No UHD Devices Found" << std::endl;
+        return ~0;
+    }
+
+    for (size_t i = 0; i < device_addrs.size(); i++){
+        std::cout << "--------------------------------------------------" << std::endl;
+        std::cout << "-- UHD Device " << i << std::endl;
+        std::cout << "--------------------------------------------------" << std::endl;
+        std::cout << device_addrs[i].to_string() << std::endl << std::endl;
+        uhd::device::make(device_addrs[i]); //test make
+    }
+
+    return 0;
+}
-- 
cgit v1.2.3