Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e

Conflicts:
	host/examples/CMakeLists.txt

5 files changed, 46 insertions, 36 deletions

diff --git a/host/lib/CMakeLists.txt b/host/lib/CMakeLists.txt
index cbb68c725..81845de21 100644
--- a/host/lib/CMakeLists.txt
+++ b/host/lib/CMakeLists.txt
@@ -54,11 +54,13 @@ INCLUDE(${CMAKE_CURRENT_SOURCE_DIR}/utils/CMakeLists.txt)
 # Append to the list of sources for lib uhd
 ########################################################################
 FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${PKG_DATA_DIR} LOCAL_PKG_DATA_DIR)
+STRING(REPLACE "\\" "\\\\" LOCAL_PKG_DATA_DIR ${LOCAL_PKG_DATA_DIR})
 MESSAGE(STATUS "Local package data directory: ${LOCAL_PKG_DATA_DIR}")
 
 IF(UNIX)
     #on unix systems, installers will use this directory for the package data
     FILE(TO_NATIVE_PATH /usr/${PKG_DATA_DIR} INSTALLER_PKG_DATA_DIR)
+    STRING(REPLACE "\\" "\\\\" INSTALLER_PKG_DATA_DIR ${INSTALLER_PKG_DATA_DIR})
     MESSAGE(STATUS "Installer package data directory: ${INSTALLER_PKG_DATA_DIR}")
 ENDIF(UNIX)
 
diff --git a/host/lib/usrp/misc_utils.cpp b/host/lib/usrp/misc_utils.cpp
index 46094ba32..a1664d810 100644
--- a/host/lib/usrp/misc_utils.cpp
+++ b/host/lib/usrp/misc_utils.cpp
@@ -25,6 +25,7 @@
 #include <uhd/usrp/codec_props.hpp>
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
+#include <boost/format.hpp>
 
 using namespace uhd;
 using namespace uhd::usrp;
@@ -132,43 +133,49 @@ static void verify_xx_subdev_spec(
     wax::obj mboard,
     std::string xx_type
 ){
-    prop_names_t dboard_names = mboard[dboard_names_prop].as<prop_names_t>();
-    UHD_ASSERT_THROW(dboard_names.size() > 0); //well i hope there is a dboard
+    try{
+        prop_names_t dboard_names = mboard[dboard_names_prop].as<prop_names_t>();
+        UHD_ASSERT_THROW(dboard_names.size() > 0); //well i hope there is a dboard
 
-    //the subdevice specification is empty: handle automatic
-    if (subdev_spec.empty()){
-        BOOST_FOREACH(const std::string &db_name, dboard_names){
-            wax::obj dboard = mboard[named_prop_t(dboard_prop, db_name)];
+        //the subdevice specification is empty: handle automatic
+        if (subdev_spec.empty()){
+            BOOST_FOREACH(const std::string &db_name, dboard_names){
+                wax::obj dboard = mboard[named_prop_t(dboard_prop, db_name)];
+
+                //if the dboard slot is populated, take the first subdevice
+                if (dboard[DBOARD_PROP_DBOARD_ID].as<dboard_id_t>() != dboard_id_t::none()){
+                    std::string sd_name = dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>().front();
+                    subdev_spec.push_back(subdev_spec_pair_t(db_name, sd_name));
+                    break;
+                }
+            }
 
-            //if the dboard slot is populated, take the first subdevice
-            if (dboard[DBOARD_PROP_DBOARD_ID].as<dboard_id_t>() != dboard_id_t::none()){
+            //didnt find any populated dboards: add the first subdevice
+            if (subdev_spec.empty()){
+                std::string db_name = dboard_names.front();
+                wax::obj dboard = mboard[named_prop_t(dboard_prop, db_name)];
                 std::string sd_name = dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>().front();
                 subdev_spec.push_back(subdev_spec_pair_t(db_name, sd_name));
-                break;
             }
         }
 
-        //didnt find any populated dboards: add the first subdevice
-        if (subdev_spec.empty()){
-            std::string db_name = dboard_names.front();
-            wax::obj dboard = mboard[named_prop_t(dboard_prop, db_name)];
-            std::string sd_name = dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>().front();
-            subdev_spec.push_back(subdev_spec_pair_t(db_name, sd_name));
-        }
-    }
-
-    //sanity check that the dboard/subdevice names exist for this mboard
-    BOOST_FOREACH(const subdev_spec_pair_t &pair, subdev_spec){
-        //empty db name means select dboard automatically
-        if (pair.db_name.empty()){
-            if (dboard_names.size() != 1) throw std::runtime_error(
-                "A daughterboard name must be provided for multi-slot boards: " + subdev_spec.to_string()
-            );
-            pair.db_name == dboard_names.front();
+        //sanity check that the dboard/subdevice names exist for this mboard
+        BOOST_FOREACH(const subdev_spec_pair_t &pair, subdev_spec){
+            //empty db name means select dboard automatically
+            if (pair.db_name.empty()){
+                if (dboard_names.size() != 1) throw std::runtime_error(
+                    "A daughterboard name must be provided for multi-slot boards: " + subdev_spec.to_string()
+                );
+                pair.db_name == dboard_names.front();
+            }
+            uhd::assert_has(dboard_names, pair.db_name, xx_type + " dboard name");
+            wax::obj dboard = mboard[named_prop_t(dboard_prop, pair.db_name)];
+            uhd::assert_has(dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>(), pair.sd_name, xx_type + " subdev name");
         }
-        uhd::assert_has(dboard_names, pair.db_name, xx_type + " dboard name");
-        wax::obj dboard = mboard[named_prop_t(dboard_prop, pair.db_name)];
-        uhd::assert_has(dboard[DBOARD_PROP_SUBDEV_NAMES].as<prop_names_t>(), pair.sd_name, xx_type + " subdev name");
+    }catch(const std::exception &e){
+        throw std::runtime_error(str(boost::format(
+            "Validate %s subdev spec failed: %s\n    %s"
+        ) % xx_type % subdev_spec.to_string() % e.what()));
     }
 }
 
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 347ec38af..6422142ce 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -31,9 +31,10 @@ static const size_t default_interp = 16;
 /***********************************************************************
  * DDC Helper Methods
  **********************************************************************/
-static unsigned pick_closest_rate(double exact_rate, const std::vector<unsigned> &rates){
+template <typename rate_type>
+static rate_type pick_closest_rate(double exact_rate, const std::vector<rate_type> &rates){
     unsigned closest_match = rates.front();
-    BOOST_FOREACH(unsigned possible_rate, rates){
+    BOOST_FOREACH(rate_type possible_rate, rates){
         if(std::abs(exact_rate - possible_rate) < std::abs(exact_rate - closest_match))
             closest_match = possible_rate;
     }
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h
index a781c1a21..cc6c41ba7 100644
--- a/host/lib/usrp/usrp2/fw_common.h
+++ b/host/lib/usrp/usrp2/fw_common.h
@@ -34,7 +34,7 @@ extern "C" {
 
 //fpga and firmware compatibility numbers
 #define USRP2_FPGA_COMPAT_NUM 1
-#define USRP2_FW_COMPAT_NUM 5
+#define USRP2_FW_COMPAT_NUM 6
 
 //used to differentiate control packets over data port
 #define USRP2_INVALID_VRT_HEADER 0
@@ -104,12 +104,12 @@ typedef struct{
     union{
         __stdint(uint32_t) ip_addr;
         struct {
-            __stdint(uint8_t) dev;
+            __stdint(uint32_t) dev;
+            __stdint(uint32_t) data;
             __stdint(uint8_t) miso_edge;
             __stdint(uint8_t) mosi_edge;
-            __stdint(uint8_t) readback;
-            __stdint(uint32_t) data;
             __stdint(uint8_t) num_bits;
+            __stdint(uint8_t) readback;
         } spi_args;
         struct {
             __stdint(uint8_t) addr;
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index 4124221ef..2d450bfc6 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -115,7 +115,7 @@ public:
         //setup the out data
         usrp2_ctrl_data_t out_data;
         out_data.id = htonl(USRP2_CTRL_ID_TRANSACT_ME_SOME_SPI_BRO);
-        out_data.data.spi_args.dev = which_slave;
+        out_data.data.spi_args.dev = htonl(which_slave);
         out_data.data.spi_args.miso_edge = spi_edge_to_otw[config.miso_edge];
         out_data.data.spi_args.mosi_edge = spi_edge_to_otw[config.mosi_edge];
         out_data.data.spi_args.readback = (readback)? 1 : 0;