e3xx: AGC support

3 files changed, 51 insertions, 2 deletions

diff --git a/host/lib/usrp/e300/e300_network.cpp b/host/lib/usrp/e300/e300_network.cpp
index 693e78b6e..cb06a5740 100644
--- a/host/lib/usrp/e300/e300_network.cpp
+++ b/host/lib/usrp/e300/e300_network.cpp
@@ -235,6 +235,15 @@ static void e300_codec_ctrl_tunnel(
                 break;
             case codec_xact_t::ACTION_SET_IQ_BALANCE_AUTO:
                 _codec_ctrl->set_iq_balance_auto(which_str, in->use_iq_correction == 1);
+            case codec_xact_t::ACTION_SET_AGC:
+                _codec_ctrl->set_agc(which_str, in->use_agc == 1);
+                break;
+            case codec_xact_t::ACTION_SET_AGC_MODE:
+                if(in->agc_mode == 0) {
+                    _codec_ctrl->set_agc_mode(which_str, "slow");
+                } else if (in->agc_mode == 1) {
+                    _codec_ctrl->set_agc_mode(which_str, "fast");
+                }
                 break;
             default:
                 UHD_MSG(status) << "Got unknown request?!" << std::endl;
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
index 15222a96a..871885a7b 100644
--- a/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
+++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.cpp
@@ -147,13 +147,49 @@ public:
     void set_iq_balance_auto(const std::string &which, const bool on)
     {
         _clear();
-       _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_SET_IQ_BALANCE_AUTO);
+        _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_SET_IQ_BALANCE_AUTO);
+        if (which == "TX1")     _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX1);
+        else if (which == "TX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX2);
+        else if (which == "RX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX1);
+        else if (which == "RX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX2);
+        else throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect chain string.");
+        _args.use_iq_correction = on ? 1 : 0;
+
+        _transact();
+    }
+
+    void set_agc(const std::string &which, bool enable)
+    {
+        _clear();
+       _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_SET_AGC);
        if (which == "TX1")      _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX1);
        else if (which == "TX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX2);
        else if (which == "RX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX1);
        else if (which == "RX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX2);
        else throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect chain string.");
-       _args.use_iq_correction = on ? 1 : 0;
+       _args.use_agc = enable ? 1 : 0;
+
+       _transact();
+    }
+
+    void set_agc_mode(const std::string &which, const std::string &mode)
+    {
+        _clear();
+       _args.action = uhd::htonx<boost::uint32_t>(transaction_t::ACTION_SET_AGC_MODE);
+
+       if (which == "TX1")      _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX1);
+       else if (which == "TX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_TX2);
+       else if (which == "RX1") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX1);
+       else if (which == "RX2") _args.which = uhd::htonx<boost::uint32_t>(transaction_t::CHAIN_RX2);
+       else throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect chain string.");
+
+       if(mode == "slow") {
+           _args.agc_mode = 0;
+       } else if (mode == "fast") {
+           _args.agc_mode = 1;
+       } else {
+           throw std::runtime_error("e300_remote_codec_ctrl_impl incorrect agc mode.");
+       }
 
        _transact();
     }
diff --git a/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp b/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
index 855ab0f42..459d0ec55 100644
--- a/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
+++ b/host/lib/usrp/e300/e300_remote_codec_ctrl.hpp
@@ -37,6 +37,8 @@ public:
             double          temp;
             boost::uint32_t use_dc_correction;
             boost::uint32_t use_iq_correction;
+            boost::uint32_t use_agc;
+            boost::uint32_t agc_mode;
             boost::uint64_t bits;
         };
 
@@ -50,6 +52,8 @@ public:
         static const boost::uint32_t ACTION_GET_TEMPERATURE     = 16;
         static const boost::uint32_t ACTION_SET_DC_OFFSET_AUTO  = 17;
         static const boost::uint32_t ACTION_SET_IQ_BALANCE_AUTO = 18;
+        static const boost::uint32_t ACTION_SET_AGC             = 19;
+        static const boost::uint32_t ACTION_SET_AGC_MODE        = 20;
 
         //Values for "which"
         static const boost::uint32_t CHAIN_NONE = 0;