Merge branch 'master' into usrp2p

this was the merge from hell

Conflicts:

	firmware/microblaze/Makefile.am
	firmware/microblaze/bootstrap
	firmware/microblaze/configure.ac
	firmware/microblaze/lib/Makefile.inc
	host/lib/CMakeLists.txt
	host/lib/usrp/mimo_usrp.cpp
	host/lib/usrp/simple_usrp.cpp
	host/lib/usrp/usrp2/clock_ctrl.cpp
	host/lib/usrp/usrp2/codec_impl.cpp
	host/lib/usrp/usrp2/dboard_impl.cpp
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_iface.hpp
	host/lib/usrp/usrp2/usrp2_impl.hpp
	host/lib/usrp/usrp2/usrp2_regs.hpp
	host/test/CMakeLists.txt

1 files changed, 4 insertions, 2 deletions

diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp
index 5ed8ec079..ef027c1df 100644
--- a/host/lib/usrp/usrp2/clock_ctrl.cpp
+++ b/host/lib/usrp/usrp2/clock_ctrl.cpp
@@ -90,7 +90,7 @@ public:
 
     void set_rate_rx_dboard_clock(double rate){
         assert_has(get_rates_rx_dboard_clock(), rate, "rx dboard clock rate");
-        size_t divider = size_t(rate/get_master_clock_rate());
+        size_t divider = size_t(get_master_clock_rate()/rate);
         //bypass when the divider ratio is one
         _ad9510_regs.bypass_divider_out7 = (divider == 1)? 1 : 0;
         //calculate the low and high dividers
@@ -132,7 +132,9 @@ public:
 
     void set_rate_tx_dboard_clock(double rate){
         assert_has(get_rates_tx_dboard_clock(), rate, "tx dboard clock rate");
-        size_t divider = size_t(rate/get_master_clock_rate());
+        size_t divider = size_t(get_master_clock_rate()/rate);
+        //bypass when the divider ratio is one
+        _ad9510_regs.bypass_divider_out6 = (divider == 1)? 1 : 0;
         //calculate the low and high dividers
         size_t high = divider/2;
         size_t low = divider - high;