diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-19 20:31:15 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-19 20:31:15 +0100 |
| commit | adb20365db6dec7c7a4e23cd8b2feb78e83a7a33 (patch) | |
| tree | 07b8ba0fdcd0ed1e5308d73852fc7bb5ce0b4770 /host/lib/usrp/common/ad9361_driver/ad9361_device.h | |
| parent | 9e6ff291b464f7ae7cbc7abfe29b34550badeb74 (diff) | |
| parent | 2a49dbbc8acdd601eb4d541b43bcfa6724333785 (diff) | |
| download | uhd-adb20365db6dec7c7a4e23cd8b2feb78e83a7a33.tar.gz uhd-adb20365db6dec7c7a4e23cd8b2feb78e83a7a33.tar.bz2 uhd-adb20365db6dec7c7a4e23cd8b2feb78e83a7a33.zip | |
Merge branch 'maint'
Conflicts:
host/include/uhd/types/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/common/ad9361_driver/ad9361_device.h')
| -rw-r--r-- | host/lib/usrp/common/ad9361_driver/ad9361_device.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.h b/host/lib/usrp/common/ad9361_driver/ad9361_device.h index 8c163572c..bd93bd06b 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.h +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.h @@ -73,8 +73,8 @@ public: private: //Methods void _program_fir_filter(direction_t direction, int num_taps, boost::uint16_t *coeffs); - void _setup_tx_fir(size_t num_taps); - void _setup_rx_fir(size_t num_taps); + void _setup_tx_fir(size_t num_taps, boost::int32_t interpolation); + void _setup_rx_fir(size_t num_taps, boost::int32_t interpolation); void _calibrate_lock_bbpll(); void _calibrate_synth_charge_pumps(); double _calibrate_baseband_rx_analog_filter(); @@ -118,6 +118,7 @@ private: //Members boost::uint8_t _curr_gain_table; boost::uint32_t _rx1_gain, _rx2_gain, _tx1_gain, _tx2_gain; boost::int32_t _tfir_factor; + boost::int32_t _rfir_factor; //Register soft-copies chip_regs_t _regs; //Synchronization |