diff options
author | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2011-04-30 17:11:46 -0700 |
commit | 493ed897f24fff5265b766ee634916b002cadf94 (patch) | |
tree | 09082fa8be0c71b92ca668083dd1519a452b679d /host/lib/usrp/dboard/db_xcvr2450.cpp | |
parent | 7b509d6fe4ac4cfcafc63f11f5b298d3e0237acd (diff) | |
parent | 1e57d1c0496ca6263652cd84c9eeacafde833915 (diff) | |
download | uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.gz uhd-493ed897f24fff5265b766ee634916b002cadf94.tar.bz2 uhd-493ed897f24fff5265b766ee634916b002cadf94.zip |
Merge branch 'master' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
Diffstat (limited to 'host/lib/usrp/dboard/db_xcvr2450.cpp')
-rw-r--r-- | host/lib/usrp/dboard/db_xcvr2450.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/dboard/db_xcvr2450.cpp b/host/lib/usrp/dboard/db_xcvr2450.cpp index 70b0bbabd..45f600569 100644 --- a/host/lib/usrp/dboard/db_xcvr2450.cpp +++ b/host/lib/usrp/dboard/db_xcvr2450.cpp @@ -153,7 +153,7 @@ private: */ double get_rssi(void){ //*FIXME* RSSI depends on LNA Gain Setting (datasheet pg 16 top middle chart) - double max_power; + double max_power = 0.0; switch(_max2829_regs.rx_lna_gain){ case 0: case 1: max_power = 0; break; |