diff options
author | Josh Blum | 2010-05-04 13:15:57 -0700 |
---|---|---|
committer | Josh Blum | 2010-05-04 13:15:57 -0700 |
commit | b6f86944737975efde1275144c1c344e4a633146 (patch) | |
tree | 6287b1cd117425a34d9499bc69c706bd0fdc971b /usrp2/firmware/lib/adf4350.c | |
parent | 1e4bf239c1f09a0180585de62746922bcd34b639 (diff) | |
parent | e22224454f63be561fa2a5923d35b65ba403b6ac (diff) | |
download | gnuradio-b6f86944737975efde1275144c1c344e4a633146.tar.gz gnuradio-b6f86944737975efde1275144c1c344e4a633146.tar.bz2 gnuradio-b6f86944737975efde1275144c1c344e4a633146.zip |
Merge branch 'master' of http://gnuradio.org/git/gnuradio into uhd
Diffstat (limited to 'usrp2/firmware/lib/adf4350.c')
-rw-r--r-- | usrp2/firmware/lib/adf4350.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usrp2/firmware/lib/adf4350.c b/usrp2/firmware/lib/adf4350.c index 0725c9337..dbab654ea 100644 --- a/usrp2/firmware/lib/adf4350.c +++ b/usrp2/firmware/lib/adf4350.c @@ -30,7 +30,7 @@ #define MIN_VCO_FREQ U2_DOUBLE_TO_FXPT_FREQ(2.2e9) /* minimum vco freq */ #define MAX_VCO_FREQ U2_DOUBLE_TO_FXPT_FREQ(4.4e9) /* minimum vco freq */ #define MAX_FREQ MAX_VCO_FREQ /* upper bound freq (rf div = 1) */ -#define MIN_FREQ DIV_ROUND(MIN_VCO_FREQ, MAX_RF_DIV) /* calculated lower bound freq */ +#define MIN_FREQ U2_DOUBLE_TO_FXPT_FREQ(68.75e6) /* lower bound freq (rf div = 16) */ u2_fxpt_freq_t adf4350_get_max_freq(void){ return MAX_FREQ; @@ -170,7 +170,7 @@ bool adf4350_set_freq(u2_fxpt_freq_t freq, struct db_base *dbb){ adf4350_load_register(2, dbb); adf4350_load_register(4, dbb); adf4350_load_register(0, dbb); /* register 0 must be last */ - return true; + return adf4350_get_locked(dbb); } u2_fxpt_freq_t adf4350_get_freq(struct db_base *dbb){ |