From 1190bc5c1a7bd0946bc55373eca58ec60a100f63 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 8 Oct 2010 15:52:33 -0700
Subject: usrp: added calls to get subdev and mboard canonical names

---
 host/include/uhd/usrp/single_usrp.hpp | 16 +++++++++++++---
 host/lib/usrp/single_usrp.cpp         | 18 +++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/host/include/uhd/usrp/single_usrp.hpp b/host/include/uhd/usrp/single_usrp.hpp
index 1b89a3620..bc6943478 100644
--- a/host/include/uhd/usrp/single_usrp.hpp
+++ b/host/include/uhd/usrp/single_usrp.hpp
@@ -57,15 +57,21 @@ public:
      */
     virtual device::sptr get_device(void) = 0;
 
+    /*******************************************************************
+     * Mboard methods
+     ******************************************************************/
     /*!
      * Get a printable name for this usrp.
      * \return a printable string
      */
     virtual std::string get_pp_string(void) = 0;
 
-    /*******************************************************************
-     * Misc
-     ******************************************************************/
+    /*!
+     * Get canonical name for this USRP motherboard.
+     * \return a string representing the name
+     */
+    virtual std::string get_mboard_name(void) = 0;
+
     /*!
      * Gets the current time in the usrp time registers.
      * \return a timespec representing current usrp time
@@ -113,6 +119,8 @@ public:
     virtual void set_rx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
     virtual uhd::usrp::subdev_spec_t get_rx_subdev_spec(void) = 0;
 
+    virtual std::string get_rx_subdev_name(size_t chan = 0) = 0;
+
     virtual void set_rx_rate(double rate) = 0;
     virtual double get_rx_rate(void) = 0;
 
@@ -146,6 +154,8 @@ public:
     virtual void set_tx_subdev_spec(const uhd::usrp::subdev_spec_t &spec) = 0;
     virtual uhd::usrp::subdev_spec_t get_tx_subdev_spec(void) = 0;
 
+    virtual std::string get_tx_subdev_name(size_t chan = 0) = 0;
+
     virtual void set_tx_rate(double rate) = 0;
     virtual double get_tx_rate(void) = 0;
 
diff --git a/host/lib/usrp/single_usrp.cpp b/host/lib/usrp/single_usrp.cpp
index bb4af44b8..08dc3bb1d 100644
--- a/host/lib/usrp/single_usrp.cpp
+++ b/host/lib/usrp/single_usrp.cpp
@@ -54,6 +54,9 @@ public:
         return _dev;
     }
 
+    /*******************************************************************
+     * Mboard methods
+     ******************************************************************/
     std::string get_pp_string(void){
         std::string buff = str(boost::format(
             "Single USRP:\n"
@@ -101,9 +104,10 @@ public:
         return buff;
     }
 
-    /*******************************************************************
-     * Misc
-     ******************************************************************/
+    std::string get_mboard_name(void){
+        return _mboard()[MBOARD_PROP_NAME].as<std::string>();
+    }
+
     time_spec_t get_time_now(void){
         return _mboard()[MBOARD_PROP_TIME_NOW].as<time_spec_t>();
     }
@@ -135,6 +139,10 @@ public:
         return _mboard()[MBOARD_PROP_RX_SUBDEV_SPEC].as<subdev_spec_t>();
     }
 
+    std::string get_rx_subdev_name(size_t chan){
+        return _rx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>();
+    }
+
     void set_rx_rate(double rate){
         _rx_dsp()[DSP_PROP_HOST_RATE] = rate;
     }
@@ -206,6 +214,10 @@ public:
         return _mboard()[MBOARD_PROP_TX_SUBDEV_SPEC].as<subdev_spec_t>();
     }
 
+    std::string get_tx_subdev_name(size_t chan){
+        return _tx_subdev(chan)[SUBDEV_PROP_NAME].as<std::string>();
+    }
+
     void set_tx_rate(double rate){
         _tx_dsp()[DSP_PROP_HOST_RATE] = rate;
     }
-- 
cgit v1.2.3