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

[trondeau]

Author: trondeau
Date: 2008-08-17 21:28:24 -0600 (Sun, 17 Aug 2008)
New Revision: 9308

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
Log:
fixing tx side (still untested but compiling)

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:14:16 UTC (rev 9307)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.cc    
2008-08-18 03:28:24 UTC (rev 9308)
@@ -61,8 +61,8 @@
 {
 }
 
-int
-usrp1_base::determine_tx_mux_value(const std::vector<int> &subdev_spec)
+unsigned int
+usrp1_sink_base::determine_tx_mux_value(const std::vector<int> &subdev_spec)
 {
   /*
     Determine appropriate Tx mux value as a function of the subdevice choosen.
@@ -79,11 +79,10 @@
 
   int side = subdev_spec[0];  // side A = 0, side B = 1
   if(!((side == 0) || (side == 1))) {
-    throw "Invalid subdev_spec";
-    //raise ValueError, "Invalid subdev_spec: %r:" % (subdev_spec,)
+    throw std::runtime_error("Invalid subdev_spec\n");
   }
 
-  std::vector<db_base_sptr> db = (usrp_standard_tx*)d_usrp->db(side);
+  std::vector<db_base_sptr> db = d_usrp->db(side);
   
   if(db[0]->i_and_q_swapped()) {
     unsigned int mask[2] = {0x0089, 0x8900};

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:14:16 UTC (rev 9307)
+++ gnuradio/branches/developers/trondeau/dbs/gr-usrp/src/usrp1_sink_base.h     
2008-08-18 03:28:24 UTC (rev 9308)
@@ -74,6 +74,11 @@
  
   ~usrp1_sink_base ();
 
+  std::vector<db_base_sptr> db(int which) { return d_usrp->db(which); }
+  
+  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,
            gr_vector_void_star &output_items);