Adds ifc_name() to libusrp2 and gr-usrp2

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10475 221aa14e-8319-0410-a670-987f0aec2ac5

diff --git a/gr-usrp2/src/usrp2.i b/gr-usrp2/src/usrp2.i
index f49a0cafbda9fe9d38e317509fd31e39a61be7e3..2a07103cc8812ce3209e3b4c407676ec47a73fc3 100644 (file)
--- a/gr-usrp2/src/usrp2.i
+++ b/gr-usrp2/src/usrp2.i
@@ -45,6 +45,7 @@ public:
   ~usrp2_base();
 
   std::string mac_addr() const;
+  std::string ifc_name() const;
   %rename(_real_fpga_master_clock_freq) fpga_master_clock_freq;
   bool fpga_master_clock_freq(long *freq);
   bool sync_to_pps();

diff --git a/gr-usrp2/src/usrp2_base.cc b/gr-usrp2/src/usrp2_base.cc
index 9c0d1fa1e87825629654552b0ab954d8c78e7e50..6b70de6073c69961354f9f1b7f84f8f67e177228 100644 (file)
--- a/gr-usrp2/src/usrp2_base.cc
+++ b/gr-usrp2/src/usrp2_base.cc
@@ -55,6 +55,12 @@ usrp2_base::mac_addr() const
   return d_u2->mac_addr();
 }
 
+std::string
+usrp2_base::ifc_name() const
+{
+  return d_u2->ifc_name();
+}
+
 bool
 usrp2_base::fpga_master_clock_freq(long *freq) const
 {

diff --git a/gr-usrp2/src/usrp2_base.h b/gr-usrp2/src/usrp2_base.h
index 4b72a707bd2f3d1b14391dafaa42ab5ca37bc2e3..8857cc9e1ad668b66a714a9e435aaf34ac9ad960 100644 (file)
--- a/gr-usrp2/src/usrp2_base.h
+++ b/gr-usrp2/src/usrp2_base.h
@@ -53,6 +53,11 @@ public:
    */
   std::string mac_addr() const;
   
+  /*!
+   * \brief Get interface name used to communicat with USRP2
+   */
+  std::string ifc_name() const;
+
   /*!
    * \brief Get USRP2 master clock rate
    */

diff --git a/usrp2/host/include/usrp2/usrp2.h b/usrp2/host/include/usrp2/usrp2.h
index 14f04fafd8c2e5da159809b96897d99bbc85440a..3b806af876c54d6ad21fd97236b4ff6712cbf95c 100644 (file)
--- a/usrp2/host/include/usrp2/usrp2.h
+++ b/usrp2/host/include/usrp2/usrp2.h
@@ -94,6 +94,11 @@ namespace usrp2 {
      */
     std::string mac_addr();
 
+    /*!
+     * Returns the GbE interface name associated with this USRP
+     */
+    std::string ifc_name();
+
     /*
      * ----------------------------------------------------------------
      * Rx configuration and control

diff --git a/usrp2/host/lib/usrp2.cc b/usrp2/host/lib/usrp2.cc
index 77c1e3374f3e212a6e42f1ac215a34f8f90469f2..ab64cb6cdbde5975dc19833105a280f1b7d2161b 100644 (file)
--- a/usrp2/host/lib/usrp2.cc
+++ b/usrp2/host/lib/usrp2.cc
@@ -160,6 +160,12 @@ namespace usrp2 {
     return d_impl->mac_addr();
   }
 
+  std::string
+  usrp2::ifc_name()
+  {
+    return d_impl->ifc_name();
+  }
+
   // Receive
 
   bool 

diff --git a/usrp2/host/lib/usrp2_impl.cc b/usrp2/host/lib/usrp2_impl.cc
index 332e479a59b5d56802efa7892e866fe4ed7c7734..3a0cd918e02327315d0b3754f12512afa018dabe 100644 (file)
--- a/usrp2/host/lib/usrp2_impl.cc
+++ b/usrp2/host/lib/usrp2_impl.cc
@@ -129,8 +129,8 @@ namespace usrp2 {
 
 
   usrp2::impl::impl(const std::string &ifc, props *p)
-    : d_eth_buf(new eth_buffer()), d_pf(0), d_bg_thread(0), d_bg_running(false),
-      d_rx_seqno(-1), d_tx_seqno(0), d_next_rid(0),
+    : d_eth_buf(new eth_buffer()), d_ifc_name(ifc), d_pf(0), d_bg_thread(0),
+      d_bg_running(false), d_rx_seqno(-1), d_tx_seqno(0), d_next_rid(0),
       d_num_rx_frames(0), d_num_rx_missing(0), d_num_rx_overruns(0), d_num_rx_bytes(0), 
       d_num_enqueued(0), d_enqueued_mutex(), d_bg_pending_cond(&d_enqueued_mutex),
       d_channel_rings(NCHANS), d_tx_interp(0), d_rx_decim(0)

diff --git a/usrp2/host/lib/usrp2_impl.h b/usrp2/host/lib/usrp2_impl.h
index 6822f8f970d1750d5dc93069cba85c0a8bf745e7..8928751b31f16610431dbdbd0059652478ef319f 100644 (file)
--- a/usrp2/host/lib/usrp2_impl.h
+++ b/usrp2/host/lib/usrp2_impl.h
@@ -57,6 +57,7 @@ namespace usrp2 {
     static const size_t NCHANS = 32;
 
     eth_buffer    *d_eth_buf;
+    std::string    d_ifc_name;
     pktfilter     *d_pf;
     std::string    d_addr;       // FIXME: use u2_mac_addr_t instead
     usrp2_thread  *d_bg_thread;
@@ -117,6 +118,7 @@ namespace usrp2 {
     void bg_loop();
 
     std::string mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t
+    std::string ifc_name() const { return d_ifc_name; }
 
     // Rx