diff options
| author | Josh Blum <josh@joshknows.com> | 2012-03-26 14:25:56 -0700 | 
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-03-26 17:51:27 -0700 | 
| commit | 097f20df1653c33035b6dcfefbbef22572426c65 (patch) | |
| tree | b25c4800f475f3d66e0fdeda21ee3c7c0ea4ab3e | |
| parent | 277d4d2f76b163a954ff99e10b299c39e03b53bb (diff) | |
| download | uhd-097f20df1653c33035b6dcfefbbef22572426c65.tar.gz uhd-097f20df1653c33035b6dcfefbbef22572426c65.tar.bz2 uhd-097f20df1653c33035b6dcfefbbef22572426c65.zip | |
dbsrx: limit the USRP1 + DBSRX GPIO clock rate to 4MHz
This fixes the lockup/clocking condition when the following hw combo is used:
USRP1 r4.5 + DBSRX + another i2c board
| -rw-r--r-- | host/lib/usrp/dboard/db_dbsrx.cpp | 9 | 
1 files changed, 8 insertions, 1 deletions
| 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) | 
