summaryrefslogtreecommitdiffstats
path: root/host/lib/usrp
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2012-02-24 17:44:57 -0800
committerJosh Blum <josh@joshknows.com>2012-03-11 15:56:06 -0700
commit72d78c6f10ecac9120a75aa9b49fed58ef8cec40 (patch)
tree1ed47c4186dee82887547dae00926716a54c8e02 /host/lib/usrp
parentb2c0d1f55a1c2190a6a6fd5967eb0a6ffd60b272 (diff)
downloaduhd-72d78c6f10ecac9120a75aa9b49fed58ef8cec40.tar.gz
uhd-72d78c6f10ecac9120a75aa9b49fed58ef8cec40.tar.bz2
uhd-72d78c6f10ecac9120a75aa9b49fed58ef8cec40.zip
uhd: added fullscale option stream arg
Diffstat (limited to 'host/lib/usrp')
-rw-r--r--host/lib/usrp/cores/rx_dsp_core_200.cpp2
-rw-r--r--host/lib/usrp/cores/tx_dsp_core_200.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_200.cpp b/host/lib/usrp/cores/rx_dsp_core_200.cpp
index 0996952ff..4b60f111c 100644
--- a/host/lib/usrp/cores/rx_dsp_core_200.cpp
+++ b/host/lib/usrp/cores/rx_dsp_core_200.cpp
@@ -241,6 +241,8 @@ public:
}
else throw uhd::value_error("USRP RX cannot handle requested wire format: " + stream_args.otw_format);
+ _host_extra_scaling *= stream_args.args.cast<double>("fullscale", 1.0);
+
this->update_scalar();
_iface->poke32(REG_RX_CTRL_FORMAT, format_word);
diff --git a/host/lib/usrp/cores/tx_dsp_core_200.cpp b/host/lib/usrp/cores/tx_dsp_core_200.cpp
index 7f02d59ca..2faf7c28b 100644
--- a/host/lib/usrp/cores/tx_dsp_core_200.cpp
+++ b/host/lib/usrp/cores/tx_dsp_core_200.cpp
@@ -192,6 +192,8 @@ public:
}
else throw uhd::value_error("USRP TX cannot handle requested wire format: " + stream_args.otw_format);
+ _host_extra_scaling /= stream_args.args.cast<double>("fullscale", 1.0);
+
this->update_scalar();
_iface->poke32(REG_TX_CTRL_FORMAT, format_word);