[Commit-gnuradio] r9309 - gnuradio/branches/developers/trondeau/dbs/gr-usrp/src

[trondeau]

Author: trondeau
Date: 2008-08-17 21:51:00 -0600 (Sun, 17 Aug 2008)
New Revision: 9309

Modified:
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.cc
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.h
   gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_base.h
Log:
adding selected_subdev to tx side, too; added a comment as to why these are not 
included in the base class like.

Modified: 
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.cc
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.cc    
2008-08-18 03:28:24 UTC (rev 9308)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.cc    
2008-08-18 03:51:00 UTC (rev 9309)
@@ -95,6 +95,21 @@
 
 }
 
+db_base_sptr
+usrp1_sink_base::selected_subdev(const std::vector<int> &subdev_spec)
+{
+  /*
+    Return the user specified daughterboard subdevice.
+    
+    @param subdev_spec: return value from subdev option parser.
+    @type  subdev_spec: (side, subdev), where side is 0 or 1 and subdev is 0 
or 1
+    @returns: an weakref to an instance derived from db_base
+  */
+
+  std::vector<db_base_sptr> db1 = d_usrp->db(subdev_spec[0]);
+  return db1[subdev_spec[1]];
+}
+
 bool 
 usrp1_sink_base::start()
 {

Modified: 
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.h     
2008-08-18 03:28:24 UTC (rev 9308)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.h     
2008-08-18 03:51:00 UTC (rev 9309)
@@ -74,10 +74,11 @@
  
   ~usrp1_sink_base ();
 
+  // These must be included in here and not usrp1_base because of
+  // usrp_standard_common used in that class
   std::vector<db_base_sptr> db(int which) { return d_usrp->db(which); }
-  
+  db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);  
   unsigned int determine_tx_mux_value(const std::vector<int> &subdev_spec);
-  db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);
 
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,

Modified: 
gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_base.h
===================================================================
--- gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_base.h   
2008-08-18 03:28:24 UTC (rev 9308)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_source_base.h   
2008-08-18 03:51:00 UTC (rev 9309)
@@ -90,10 +90,11 @@
 
   ~usrp1_source_base ();
 
-  std::vector<db_base_sptr> db(int which) { return d_usrp->db(which); }
-  
+  // These must be included in here and not usrp1_base because of
+  // usrp_standard_common used in that class
+  std::vector<db_base_sptr> db(int which) { return d_usrp->db(which); }  
+  db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);
   unsigned int determine_rx_mux_value(const std::vector<int> &subdev_spec);
-  db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);
 
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,