Merge branch 'master' into next

4 files changed, 77 insertions, 41 deletions

diff --git a/host/cmake/Modules/UHDVersion.cmake b/host/cmake/Modules/UHDVersion.cmake
index 8f77188ee..b9ddddae3 100644
--- a/host/cmake/Modules/UHDVersion.cmake
+++ b/host/cmake/Modules/UHDVersion.cmake
@@ -32,34 +32,40 @@ SET(UHD_VERSION_PATCH 000)
 ########################################################################
 # Version information discovery through git log
 ########################################################################
-IF(UHD_RELEASE_MODE)
-    SET(UHD_BUILD_INFO_DISCOVERY FALSE)
-    SET(UHD_BUILD_INFO "release")
-ELSE()
-    SET(UHD_BUILD_INFO_DISCOVERY GIT_FOUND)
-    SET(UHD_BUILD_INFO "unknown")
-ENDIF()
 
-IF(UHD_BUILD_INFO_DISCOVERY)
+#grab the git ref id for the current head
+EXECUTE_PROCESS(
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8 --long
+    OUTPUT_VARIABLE _git_describe OUTPUT_STRIP_TRAILING_WHITESPACE
+    RESULT_VARIABLE _git_describe_result
+)
 
-    #grab the git ref id for the current head
+#only set the build info on success
+IF(_git_describe_result EQUAL 0)
+    EXECUTE_PROCESS(
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        COMMAND ${PYTHON_EXECUTABLE} -c "print '${_git_describe}'.split('-')[1]"
+        OUTPUT_VARIABLE UHD_GIT_COUNT OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
     EXECUTE_PROCESS(
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        COMMAND ${GIT_EXECUTABLE} describe --always --abbrev=8 --long
-        OUTPUT_VARIABLE _git_describe OUTPUT_STRIP_TRAILING_WHITESPACE
-        RESULT_VARIABLE _git_describe_result
+        COMMAND ${PYTHON_EXECUTABLE} -c "print '${_git_describe}'.split('-')[2]"
+        OUTPUT_VARIABLE UHD_GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+ENDIF()
 
-    #only set the build info on success
-    IF(_git_describe_result EQUAL 0)
-        EXECUTE_PROCESS(
-            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-            COMMAND ${PYTHON_EXECUTABLE} -c "print '${_git_describe}'.split('-',1)[1]"
-            OUTPUT_VARIABLE UHD_BUILD_INFO OUTPUT_STRIP_TRAILING_WHITESPACE
-        )
-    ENDIF()
+IF(NOT UHD_GIT_COUNT)
+    SET(UHD_GIT_COUNT "0")
+ENDIF()
+
+IF(NOT UHD_GIT_HASH)
+    SET(UHD_GIT_HASH "unknown")
+ENDIF()
 
-ENDIF(UHD_BUILD_INFO_DISCOVERY)
+IF(UHD_RELEASE_MODE)
+    SET(UHD_GIT_HASH ${UHD_RELEASE_MODE})
+ENDIF()
 
 ########################################################################
-SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_BUILD_INFO}")
+SET(UHD_VERSION "${UHD_VERSION_MAJOR}.${UHD_VERSION_MINOR}.${UHD_VERSION_PATCH}-${UHD_GIT_COUNT}-${UHD_GIT_HASH}")
diff --git a/host/lib/usrp/common/fx2_ctrl.cpp b/host/lib/usrp/common/fx2_ctrl.cpp
index 7b8920eb1..5cc701eb0 100644
--- a/host/lib/usrp/common/fx2_ctrl.cpp
+++ b/host/lib/usrp/common/fx2_ctrl.cpp
@@ -411,6 +411,26 @@ public:
         return usrp_control_write(request, value, index, 0, 0);
     }
 
+    void write_eeprom(
+        boost::uint8_t addr,
+        boost::uint8_t offset,
+        const byte_vector_t &bytes
+    ){
+        byte_vector_t bytes_with_cmd(bytes.size() + 1);
+        bytes_with_cmd[0] = offset;
+        std::copy(bytes.begin(), bytes.end(), &bytes_with_cmd[1]);
+        this->write_i2c(addr, bytes_with_cmd);
+    }
+
+    byte_vector_t read_eeprom(
+        boost::uint8_t addr,
+        boost::uint8_t offset,
+        size_t num_bytes
+    ){
+        this->write_i2c(addr, byte_vector_t(1, offset));
+        return this->read_i2c(addr, num_bytes);
+    }
+
     int usrp_i2c_write(boost::uint16_t i2c_addr, unsigned char *buf, boost::uint16_t len)
     {
         return usrp_control_write(VRQ_I2C_WRITE, i2c_addr, 0, buf, len);
@@ -428,12 +448,7 @@ public:
     {
         UHD_ASSERT_THROW(bytes.size() < max_i2c_data_bytes);
 
-        unsigned char buff[max_i2c_data_bytes] = {};
-        std::copy(bytes.begin(), bytes.end(), buff);
-
-        int ret = this->usrp_i2c_write(addr & 0xff,
-                                             buff,
-                                             bytes.size());
+        int ret = this->usrp_i2c_write(addr, (unsigned char *)&bytes.front(), bytes.size());
 
         if (iface_debug && (ret < 0))
             uhd::runtime_error("USRP: failed i2c write");
@@ -443,19 +458,13 @@ public:
     {
       UHD_ASSERT_THROW(num_bytes < max_i2c_data_bytes);
 
-      unsigned char buff[max_i2c_data_bytes] = {};
-      int ret = this->usrp_i2c_read(addr & 0xff,
-                                            buff,
-                                            num_bytes);
+      byte_vector_t bytes(num_bytes);
+      int ret = this->usrp_i2c_read(addr, (unsigned char *)&bytes.front(), num_bytes);
 
       if (iface_debug && ((ret < 0) || (unsigned)ret < (num_bytes)))
           uhd::runtime_error("USRP: failed i2c read");
 
-      byte_vector_t out_bytes;
-      for (size_t i = 0; i < num_bytes; i++)
-          out_bytes.push_back(buff[i]);
-
-      return out_bytes;
+      return bytes;
     }
 
 
diff --git a/host/lib/usrp/dboard/db_dbsrx.cpp b/host/lib/usrp/dboard/db_dbsrx.cpp
index 846597f06..95c5c5d4d 100644
--- a/host/lib/usrp/dboard/db_dbsrx.cpp
+++ b/host/lib/usrp/dboard/db_dbsrx.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010-2011 Ettus Research LLC
+// Copyright 2010-2012 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
@@ -58,6 +58,8 @@ static const uhd::dict<std::string, gain_range_t> dbsrx_gain_ranges = map_list_o
     ("GC2", gain_range_t(0, 24, 1))
 ;
 
+static const double usrp1_gpio_clock_rate_limit = 4e6;
+
 /***********************************************************************
  * The DBSRX dboard class
  **********************************************************************/
@@ -265,6 +267,11 @@ double dbsrx::set_lo_freq(double target_freq){
     std::vector<double> clock_rates = this->get_iface()->get_clock_rates(dboard_iface::UNIT_RX);
     const double max_clock_rate = uhd::sorted(clock_rates).back();
     BOOST_FOREACH(ref_clock, uhd::reversed(uhd::sorted(clock_rates))){
+        //USRP1 feeds the DBSRX clock from a FPGA GPIO line.
+        //make sure that this clock does not exceed rate limit.
+        if (this->get_iface()->get_special_props().soft_clock_divider){
+            if (ref_clock > usrp1_gpio_clock_rate_limit) continue;
+        }
         if (ref_clock > 27.0e6) continue;
         if (size_t(max_clock_rate/ref_clock)%2 == 1) continue; //reject asymmetric clocks (odd divisors)
 
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp
index 2e3d1e479..55c5e7dac 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
@@ -121,12 +121,26 @@ static device_addrs_t usrp2_find(const device_addr_t &hint_){
             //new_addr["addr"] = ip_addr.to_string();
             new_addr["addr"] = udp_transport->get_recv_addr();
 
+            //Attempt a simple 2-way communication with a connected socket.
+            //Reason: Although the USRP will respond the broadcast above,
+            //we may not be able to communicate directly (non-broadcast).
+            udp_simple::sptr ctrl_xport = udp_simple::make_connected(
+                new_addr["addr"], BOOST_STRINGIZE(USRP2_UDP_CTRL_PORT)
+            );
+            ctrl_xport->send(boost::asio::buffer(&ctrl_data_out, sizeof(ctrl_data_out)));
+            size_t len = ctrl_xport->recv(asio::buffer(usrp2_ctrl_data_in_mem));
+            if (len > offsetof(usrp2_ctrl_data_t, data) and ntohl(ctrl_data_in->id) == USRP2_CTRL_ID_WAZZUP_DUDE){
+                //found the device, open up for communication!
+            }
+            else{
+                //otherwise we don't find it...
+                continue;
+            }
+
             //Attempt to read the name from the EEPROM and perform filtering.
             //This operation can throw due to compatibility mismatch.
             try{
-                usrp2_iface::sptr iface = usrp2_iface::make(udp_simple::make_connected(
-                    new_addr["addr"], BOOST_STRINGIZE(USRP2_UDP_CTRL_PORT)
-                ));
+                usrp2_iface::sptr iface = usrp2_iface::make(ctrl_xport);
                 if (iface->is_device_locked()) continue; //ignore locked devices
                 mboard_eeprom_t mb_eeprom = iface->mb_eeprom;
                 new_addr["name"] = mb_eeprom["name"];