diff options
| author | Johnathan Corgan | 2010-06-04 23:01:56 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-06-04 23:01:56 -0700 |
| commit | 0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07 (patch) | |
| tree | de455c32956fba3658b6f772775a3162efd94a80 /usrp/host/lib/db_wbxng_adf4350_regs.cc | |
| parent | d784c4321114a83454493337393c5e2f5656e1e9 (diff) | |
| parent | c85f8b729f397dbe938630da5d47b85977e78215 (diff) | |
| download | gnuradio-0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07.tar.gz gnuradio-0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07.tar.bz2 gnuradio-0ea8bff6d0c62e0ddd0a344365c5e345d0a10d07.zip | |
Merge branch 'maint'
* maint:
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; } + |