[Commit-gnuradio] r9310 - gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy

[trondeau]

Author: trondeau
Date: 2008-08-17 22:01:19 -0600 (Sun, 17 Aug 2008)
New Revision: 9310

Modified:
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc
   gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h
Log:
fixing usrp_basic for returning daughterboards.

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc
===================================================================
--- 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc    
    2008-08-18 03:51:00 UTC (rev 9309)
+++ 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.cc    
    2008-08-18 04:01:19 UTC (rev 9310)
@@ -247,7 +247,7 @@
 usrp_basic::db(int which)
 {
   if(which > 3) {
-    throw std::invalid_argument("usrp_standard_commond::db which must be 0, 1, 
2, or 3");
+    throw std::invalid_argument("usrp_basic::db which must be 0, 1, 2, or 3");
   }
   return d_db[which];
 }
@@ -1216,6 +1216,19 @@
   return common_daughterboard_id(C_TX, which_dboard);
 }
 
+
+std::vector<db_base_sptr> 
+usrp_basic_tx::db(int which)
+{
+  // When called from here, only return if the TX side
+  if(which == 0) {
+    return d_db[SLOT_TX_A];
+  }
+  else {
+    return d_db[SLOT_TX_B];
+  }
+}
+
 bool 
 usrp_basic_tx::_write_oe (int which_dboard, int value, int mask)
 {

Modified: 
gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h 
2008-08-18 03:51:00 UTC (rev 9309)
+++ gnuradio/branches/developers/trondeau/dbs/usrp/host/lib/legacy/usrp_basic.h 
2008-08-18 04:01:19 UTC (rev 9310)
@@ -113,7 +113,7 @@
 public:
   virtual ~usrp_basic ();
 
-  std::vector<db_base_sptr> db(int which);
+  virtual std::vector<db_base_sptr> db(int which);
 
   /*!
    * \brief Return daughterboard ID for given daughterboard slot [0,1].