Changeset 9716

Timestamp:

10/04/08 13:27:15

Author:

trondeau

Message:

adding export functions for getting dboard objects.

Files:

• gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.cc (modified) (3 diffs)
• gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.h (modified) (3 diffs)

gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.cc

@@ -244 +244 @@
-}
-
+std::vector< std::vector<db_base_sptr> >
+usrp_basic::db()
+{
+  return d_db;
+}
+
-std::vector<db_base_sptr> 
-usrp_basic::db(int which)
@@ -824 +830 @@
-}
-
+
+std::vector< std::vector<db_base_sptr> >
+usrp_basic_rx::db()
+{
+  // When called from here, only return if the RX side
+  std::vector< std::vector<db_base_sptr> > ret;
+  ret.push_back(d_db[SLOT_RX_A]);
+  ret.push_back(d_db[SLOT_RX_B]);
+  return ret;
+}
-
-std::vector<db_base_sptr> 
@@ -1217 +1233 @@
-}
-
+std::vector< std::vector<db_base_sptr> >
+usrp_basic_tx::db()
+{
+  // When called from here, only return if the RX side
+  std::vector< std::vector<db_base_sptr> > ret;
+  ret.push_back(d_db[SLOT_TX_A]);
+  ret.push_back(d_db[SLOT_TX_B]);
+  return ret;
+}
-
-std::vector<db_base_sptr> 

gnuradio/branches/features/cppdb/usrp/host/lib/legacy/usrp_basic.h

@@ -122 +122 @@
-   * \return list of shared pointers to daughterboard objects
-   */
+  virtual std::vector< std::vector<db_base_sptr> > db();
-  virtual std::vector<db_base_sptr> db(int which);
-  
@@ -494 +495 @@
-  ~usrp_basic_rx ();
-
+  std::vector< std::vector<db_base_sptr> > db();
-  std::vector<db_base_sptr> db(int which);
-
+
-  int daughterboard_id (int which_dboard) const;
-  bool _write_oe (int which_dboard, int value, int mask);
@@ -688 +690 @@
-  ~usrp_basic_tx ();
-
+  std::vector< std::vector<db_base_sptr> > db();
-  std::vector<db_base_sptr> db(int which);
-