1 files changed, 72 insertions, 5 deletions

diff --git a/host/lib/usrp/usrp2/codec_impl.cpp b/host/lib/usrp/usrp2/codec_impl.cpp
index fc917b102..db98e50ab 100644
--- a/host/lib/usrp/usrp2/codec_impl.cpp
+++ b/host/lib/usrp/usrp2/codec_impl.cpp
@@ -17,10 +17,23 @@
 
 #include "usrp2_impl.hpp"
 #include <uhd/usrp/codec_props.hpp>
+#include <uhd/types/dict.hpp>
+#include <uhd/types/ranges.hpp>
 #include <boost/bind.hpp>
+#include <boost/assign/list_of.hpp>
+#include <uhd/utils/assert.hpp>
+#include <uhd/utils/exception.hpp>
 
 using namespace uhd;
 using namespace uhd::usrp;
+using namespace boost::assign;
+
+//this only applies to USRP2P
+static const uhd::dict<std::string, gain_range_t> codec_rx_gain_ranges = map_list_of
+                                  ("analog", gain_range_t(0, 3.5, 3.5))
+                                  ("digital", gain_range_t(0, 6.0, 0.5))
+				  ("digital-fine", gain_range_t(0, 0.5, 0.05));
+
 
 /***********************************************************************
  * Helper Methods
@@ -40,7 +53,8 @@ void usrp2_mboard_impl::codec_init(void){
 /***********************************************************************
  * RX Codec Properties
  **********************************************************************/
-void usrp2_mboard_impl::rx_codec_get(const wax::obj &key, wax::obj &val){
+void usrp2_mboard_impl::rx_codec_get(const wax::obj &key_, wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
 
     //handle the get request conditioned on the key
     switch(key.as<codec_prop_t>()){
@@ -53,21 +67,74 @@ void usrp2_mboard_impl::rx_codec_get(const wax::obj &key, wax::obj &val){
         return;
 
     case CODEC_PROP_GAIN_NAMES:
-        val = prop_names_t(); //no gain elements to be controlled
+        if(_iface->get_hw_rev() >= USRP2P_FIRST_HW_REV) {
+          val = prop_names_t(codec_rx_gain_ranges.keys());
+        } else val = prop_names_t();
+        return;
+
+    case CODEC_PROP_GAIN_I:
+    case CODEC_PROP_GAIN_Q:
+        assert_has(_codec_rx_gains.keys(), key.name, "codec rx gain name");
+        val = _codec_rx_gains[key.name];
         return;
 
+    case CODEC_PROP_GAIN_RANGE:
+      assert_has(codec_rx_gain_ranges.keys(), key.name, "codec rx gain range name");
+      val = codec_rx_gain_ranges[key.name];
+      return;
+
     default: UHD_THROW_PROP_GET_ERROR();
     }
 }
 
-void usrp2_mboard_impl::rx_codec_set(const wax::obj &, const wax::obj &){
-    UHD_THROW_PROP_SET_ERROR();
+void usrp2_mboard_impl::rx_codec_set(const wax::obj &key_, const wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
+    float gain;
+
+  switch(key.as<codec_prop_t>()) {
+    case CODEC_PROP_GAIN_I:
+    case CODEC_PROP_GAIN_Q:
+      if(_iface->get_hw_rev() < USRP2P_FIRST_HW_REV) UHD_THROW_PROP_SET_ERROR();//this capability is only found in USRP2P
+
+      gain = val.as<float>();
+      this->rx_codec_set_gain(gain, key.name);
+      return;
+
+    default:
+      UHD_THROW_PROP_SET_ERROR();
+  }
+}
+
+/***********************************************************************
+ * Helper function to set RX codec gain
+ ***********************************************************************/
+
+void usrp2_mboard_impl::rx_codec_set_gain(float gain, const std::string &name){
+  assert_has(codec_rx_gain_ranges.keys(), name, "codec rx gain name");
+
+  _codec_rx_gains[name] = gain;
+
+  if(name == "analog") {
+    _codec_ctrl->set_rx_analog_gain(gain > 0); //just turn it on or off
+    return;
+  }
+  if(name == "digital") {
+    _codec_ctrl->set_rx_digital_gain(gain);
+    return;
+  }
+  if(name == "digital-fine") {
+    _codec_ctrl->set_rx_digital_fine_gain(gain);
+    return;
+  }
+  UHD_THROW_PROP_SET_ERROR();
 }
 
+
 /***********************************************************************
  * TX Codec Properties
  **********************************************************************/
-void usrp2_mboard_impl::tx_codec_get(const wax::obj &key, wax::obj &val){
+void usrp2_mboard_impl::tx_codec_get(const wax::obj &key_, wax::obj &val){
+    named_prop_t key = named_prop_t::extract(key_);
 
     //handle the get request conditioned on the key
     switch(key.as<codec_prop_t>()){