diff options
author | Johnathan Corgan | 2010-06-04 22:40:14 -0700 |
---|---|---|
committer | Johnathan Corgan | 2010-06-04 22:40:14 -0700 |
commit | c85f8b729f397dbe938630da5d47b85977e78215 (patch) | |
tree | 929433ef5004be90bbe1acf86e34a41e72bb2e74 /usrp/host/lib/db_wbxng_adf4350_regs.cc | |
parent | 34bf49d06e6b5e48c08d92e2b9e0794512fa761f (diff) | |
parent | 5fc7083812b85a7f3e65daff8e879ef7521f5122 (diff) | |
download | gnuradio-c85f8b729f397dbe938630da5d47b85977e78215.tar.gz gnuradio-c85f8b729f397dbe938630da5d47b85977e78215.tar.bz2 gnuradio-c85f8b729f397dbe938630da5d47b85977e78215.zip |
Merge branch 'fix/wbx_refclock' into maint
* fix/wbx_refclock:
Fixed WBX RX PLL enable
Refactor WBX and adf4350 to avoid passing usrp pointer
Clean up annoying class structure in wbx
Fixing wbx to use _refclk_freq()
Typo in error message
Diffstat (limited to 'usrp/host/lib/db_wbxng_adf4350_regs.cc')
-rw-r--r-- | usrp/host/lib/db_wbxng_adf4350_regs.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.cc b/usrp/host/lib/db_wbxng_adf4350_regs.cc index 21d77dcce..aa13d50b9 100644 --- a/usrp/host/lib/db_wbxng_adf4350_regs.cc +++ b/usrp/host/lib/db_wbxng_adf4350_regs.cc @@ -55,8 +55,7 @@ const uint8_t adf4350_regs::s_output_power = 3; /* reg 5 */ const uint8_t adf4350_regs::s_ld_pin_mode = 1; -adf4350_regs::adf4350_regs(adf4350* _adf4350){ - d_adf4350 = _adf4350; +adf4350_regs::adf4350_regs(){ /* reg 0 */ d_int = uint16_t(100); @@ -79,10 +78,10 @@ adf4350_regs::~adf4350_regs(void){ uint32_t adf4350_regs::_reg_shift(uint32_t data, uint32_t shift){ return data << shift; - } +} -void -adf4350_regs::_load_register(uint8_t addr){ +uint32_t +adf4350_regs::compute_register(uint8_t addr){ uint32_t data; switch (addr){ case 0: data = ( @@ -123,8 +122,9 @@ adf4350_regs::_load_register(uint8_t addr){ _reg_shift(s_output_power, 3)); break; case 5: data = ( _reg_shift(s_ld_pin_mode, 22)); break; - default: return; + default: return data; } - /* write the data out to spi */ - d_adf4350->_write(addr, data); + /* return the data to write out to spi */ + return data; } + |