bladerf: Added 'verbosity' and 'loopback' device parameters

The 'verbosity' parameter may be used to increase or suppress output from
libbladeRF. The available log levels are, in order of decreasing
verbosity are:
    verbose, debug, info, warning, critical, silent

The 'loopback' parameter may be used to put the bladeRF into one of the
supported loopback modes.  The valid modes are listed below. Their
descriptions may be found in the libbladeRF documentation:

      bb_txlpf_rxvga2, bb_txlpf_rxlpf bb_txvga1_rxvga2, bb_txvga1_rxlpf
      rf_lna1, rf_lna2, rf_lna3

2 files changed, 67 insertions, 0 deletions

diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc
index 70c7965..0a7b0f7 100644
--- a/lib/bladerf/bladerf_common.cc
+++ b/lib/bladerf/bladerf_common.cc
@@ -113,6 +113,63 @@ bladerf_sptr bladerf_common::open(const std::string &device_name)
   return dev;
 }
 
+void bladerf_common::set_loopback_mode(const std::string &loopback)
+{
+    bladerf_loopback mode;
+    int status;
+
+    if (loopback == "bb_txlpf_rxvga2") {
+        mode = BLADERF_LB_BB_TXLPF_RXVGA2;
+    } else if (loopback == "bb_txlpf_rxlpf") {
+        mode = BLADERF_LB_BB_TXLPF_RXLPF;
+    } else if (loopback == "bb_txvga1_rxvga2") {
+        mode = BLADERF_LB_BB_TXVGA1_RXVGA2;
+    } else if (loopback == "bb_txvga1_rxlpf") {
+        mode = BLADERF_LB_BB_TXVGA1_RXLPF;
+    } else if (loopback == "rf_lna1") {
+        mode = BLADERF_LB_RF_LNA1;
+    } else if (loopback == "rf_lna2") {
+        mode = BLADERF_LB_RF_LNA2;
+    } else if (loopback == "rf_lna3") {
+        mode = BLADERF_LB_RF_LNA3;
+    } else if (loopback == "none") {
+        mode = BLADERF_LB_NONE;
+    } else {
+        throw std::runtime_error( _pfx + "Invalid loopback mode:" + loopback );
+    }
+
+    status = bladerf_set_loopback( _dev.get(), mode);
+    if ( status != 0 ) {
+        throw std::runtime_error( _pfx + "Failed to set loopback mode: " +
+                                  bladerf_strerror(status) );
+    }
+}
+
+void bladerf_common::set_verbosity(const std::string &verbosity)
+{
+    bladerf_log_level l;
+
+    if (verbosity == "verbose") {
+        l = BLADERF_LOG_LEVEL_VERBOSE;
+    } else if (verbosity == "debug") {
+        l = BLADERF_LOG_LEVEL_DEBUG;
+    } else if (verbosity == "info") {
+        l = BLADERF_LOG_LEVEL_INFO;
+    } else if (verbosity == "warning") {
+        l = BLADERF_LOG_LEVEL_WARNING;
+    } else if (verbosity == "error") {
+        l = BLADERF_LOG_LEVEL_ERROR;
+    } else if (verbosity == "critical") {
+        l = BLADERF_LOG_LEVEL_CRITICAL;
+    } else if (verbosity == "silent") {
+        l = BLADERF_LOG_LEVEL_SILENT;
+    } else {
+        throw std::runtime_error( _pfx + "Invalid log level: " + verbosity );
+    }
+
+    bladerf_log_set_verbosity(l);
+}
+
 void bladerf_common::init(dict_t &dict, const char *type)
 {
   int ret;
@@ -177,6 +234,14 @@ void bladerf_common::init(dict_t &dict, const char *type)
     throw std::runtime_error( oss.str() );
   }
 
+  if ( dict.count("loopback") )
+    set_loopback_mode( dict["loopback"] );
+  else
+    set_loopback_mode( "none" );
+
+  if ( dict.count("verbosity") )
+    set_verbosity( dict["verbosity"] );
+
 
   /* Show some info about the device we've opened */
   std::cerr << _pfx << "Using nuand LLC bladeRF #" << device_number;
diff --git a/lib/bladerf/bladerf_common.h b/lib/bladerf/bladerf_common.h
index 734ff36..ee359bc 100644
--- a/lib/bladerf/bladerf_common.h
+++ b/lib/bladerf/bladerf_common.h
@@ -94,6 +94,8 @@ protected:
   static const int16_t PHASE_SCALE  = 4096;
 
 private:
+  void set_verbosity(const std::string &verbosity);
+  void set_loopback_mode(const std::string &loopback);
   bladerf_sptr open(const std::string &device_name);
 
   bool _is_running;