diff options
| author | Balint Seeber <balint@ettus.com> | 2014-03-19 18:44:48 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-03-31 12:50:18 -0700 |
| commit | b85457e12ecc78ea39a8124281a9dffab5a52f79 (patch) | |
| tree | 20ed4b01c8e35943fd46495ff8a5b5b9c400e859 /host/lib/usrp | |
| parent | 3df02f00eaf312574325cb35af97c0512559cf3e (diff) | |
| download | uhd-b85457e12ecc78ea39a8124281a9dffab5a52f79.tar.gz uhd-b85457e12ecc78ea39a8124281a9dffab5a52f79.tar.bz2 uhd-b85457e12ecc78ea39a8124281a9dffab5a52f79.zip | |
b200: reverted decim mask for scaling factor, and instead conditionally add new X3x0 host rates (get_host_rates) with '_is_b200'
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/cores/rx_dsp_core_3000.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_3000.cpp b/host/lib/usrp/cores/rx_dsp_core_3000.cpp index 69829bf14..02c24b4bb 100644 --- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp +++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp @@ -91,8 +91,10 @@ public: uhd::meta_range_t get_host_rates(void){ meta_range_t range; - for (int rate = 1024; rate > 512; rate -= 8){ - range.push_back(range_t(_tick_rate/rate)); + if (!_is_b200) { + for (int rate = 1024; rate > 512; rate -= 8){ + range.push_back(range_t(_tick_rate/rate)); + } } for (int rate = 512; rate > 256; rate -= 4){ range.push_back(range_t(_tick_rate/rate)); @@ -161,7 +163,7 @@ public: // Calculate CIC decimation (i.e., without halfband decimators) // Calculate closest multiplier constant to reverse gain absent scale multipliers - const double rate_pow = std::pow(double(decim & 0x1ff), 4); + const double rate_pow = std::pow(double(decim & 0xff), 4); _scaling_adjustment = std::pow(2, ceil_log2(rate_pow))/(1.65*rate_pow); this->update_scalar(); |