Merge branch 'fix/libdir' of git@gnuradio.org:gnuradio

[debian/gnuradio] / usrp / host / lib / db_wbxng_adf4350_regs.cc

diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.cc b/usrp/host/lib/db_wbxng_adf4350_regs.cc
index bf39c73ca5334394b5c7675ec2d77e1522994b02..bc859158e71906b262878dd57c67f0114590c2a2 100644 (file)
--- a/usrp/host/lib/db_wbxng_adf4350_regs.cc
+++ b/usrp/host/lib/db_wbxng_adf4350_regs.cc
@@ -2,21 +2,21 @@
  * Copyright 2009 Ettus Research LLC
  */
 
-#include <usrp/db_wbxng_adf4350_regs.h>
-#include <usrp/db_wbxng_adf4350.h>
+#include "db_wbxng_adf4350_regs.h"
+#include "db_wbxng_adf4350.h"
+
 //#include "cal_div.h"
 
 /* reg 0 */
 /* reg 1 */
-const uint8_t adf4350_regs::s_prescaler = 0;
 const uint16_t adf4350_regs::s_phase = 0;
 /* reg 2 */
-const uint8_t adf4350_regs::s_low_noise_and_low_spur_modes = 0;
-const uint8_t adf4350_regs::s_muxout = 3;
+const uint8_t adf4350_regs::s_low_noise_and_low_spur_modes = 3;
+const uint8_t adf4350_regs::s_muxout = 6;
 const uint8_t adf4350_regs::s_reference_doubler = 0;
-const uint8_t adf4350_regs::s_rdiv2 = 1;
+const uint8_t adf4350_regs::s_rdiv2 = 0;
 const uint8_t adf4350_regs::s_double_buff = 0;
-const uint8_t adf4350_regs::s_charge_pump_setting = 7;
+const uint8_t adf4350_regs::s_charge_pump_setting = 5;
 const uint8_t adf4350_regs::s_ldf = 0;
 const uint8_t adf4350_regs::s_ldp = 0;
 const uint8_t adf4350_regs::s_pd_polarity = 1;
@@ -32,10 +32,10 @@ const uint8_t adf4350_regs::s_feedback_select = 1;
 const uint8_t adf4350_regs::s_vco_power_down = 0;
 const uint8_t adf4350_regs::s_mtld = 0;
 const uint8_t adf4350_regs::s_aux_output_select = 1;
-const uint8_t adf4350_regs::s_aux_output_enable = 1;
-const uint8_t adf4350_regs::s_aux_output_power = 1;
-const uint8_t adf4350_regs::s_rf_output_enable = 0;
-const uint8_t adf4350_regs::s_output_power = 0;
+const uint8_t adf4350_regs::s_aux_output_enable = 0;
+const uint8_t adf4350_regs::s_aux_output_power = 0;
+const uint8_t adf4350_regs::s_rf_output_enable = 1;
+const uint8_t adf4350_regs::s_output_power = 3;
 /* reg 5 */
 const uint8_t adf4350_regs::s_ld_pin_mode = 1;
 
@@ -46,6 +46,7 @@ adf4350_regs::adf4350_regs(adf4350* _adf4350){
     d_int = uint16_t(100);
     d_frac = 0;
     /* reg 1 */
+    d_prescaler = uint8_t(0);
     d_mod = uint16_t(0xfff);                      /* max fractional accuracy */
     /* reg 2 */
     d_10_bit_r_counter = uint16_t(2);
@@ -59,12 +60,12 @@ adf4350_regs::adf4350_regs(adf4350* _adf4350){
 adf4350_regs::~adf4350_regs(void){
 }
 
-uint32_t 
+uint32_t
 adf4350_regs::_reg_shift(uint32_t data, uint32_t shift){
         return data << shift;
     }
 
-void 
+void
 adf4350_regs::_load_register(uint8_t addr){
        uint32_t data;
        switch (addr){
@@ -72,7 +73,7 @@ adf4350_regs::_load_register(uint8_t addr){
                        _reg_shift(d_int, 15)                           |
                        _reg_shift(d_frac, 3)); break;
                case 1: data = (
-                       _reg_shift(s_prescaler, 27)                     |
+                       _reg_shift(d_prescaler, 27)                     |
                        _reg_shift(s_phase, 15)                         |
                        _reg_shift(d_mod, 3)); break;
                case 2: data = (