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.h | |
| 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.h')
| -rw-r--r-- | usrp/host/lib/db_wbxng_adf4350_regs.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usrp/host/lib/db_wbxng_adf4350_regs.h b/usrp/host/lib/db_wbxng_adf4350_regs.h index 0018aa07f..33a548e85 100644 --- a/usrp/host/lib/db_wbxng_adf4350_regs.h +++ b/usrp/host/lib/db_wbxng_adf4350_regs.h @@ -29,13 +29,11 @@ class adf4350; class adf4350_regs { public: - adf4350_regs(adf4350* _adf4350); + adf4350_regs(); ~adf4350_regs(); - adf4350* d_adf4350; - uint32_t _reg_shift(uint32_t data, uint32_t shift); - void _load_register(uint8_t addr); + uint32_t compute_register(uint8_t addr); /* reg 0 */ uint16_t d_int; @@ -75,6 +73,11 @@ public: static const uint8_t s_output_power; /* reg 5 */ static const uint8_t s_ld_pin_mode; + +protected: + usrp_basic_sptr d_usrp; + int d_spi_enable; + int d_spi_format; }; #endif /* ADF4350_REGS_H */ |