[Commit-gnuradio] r9722 - gnuradio/branches/features/cppdb/gr-usrp/src

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9722 - gnuradio/branches/features/cppdb/gr-usrp/src

From:	trondeau
Subject:	[Commit-gnuradio] r9722 - gnuradio/branches/features/cppdb/gr-usrp/src
Date:	Sun, 5 Oct 2008 20:39:21 -0600 (MDT)
Author: trondeau
Date: 2008-10-05 20:39:21 -0600 (Sun, 05 Oct 2008)
New Revision: 9722

Modified:
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.i
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.h
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.cc
   gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.h
Log:
fixing pick_*subdev functions to properly return dboard specs the same as in 
the Python code.

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.cc  2008-10-05 
17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.cc  2008-10-06 
02:39:21 UTC (rev 9722)
@@ -142,7 +142,7 @@
 //           Utilities to pick the subdevice tuple (side, spec)
 
//******************************************************************************/
 
-struct subdev_spec
+std::vector<int> 
 pick_tx_subdevice(usrp_basic *u)
 {
   /*
@@ -162,7 +162,7 @@
   return pick_subdev(u, dbid, 5);
 }
 
-struct subdev_spec
+std::vector<int> 
 pick_rx_subdevice(usrp_basic *u)
 {
   /*
@@ -186,7 +186,7 @@
   return pick_subdev(u, dbid, 9);
 }
 
-struct subdev_spec 
+std::vector<int> 
 pick_subdev(usrp_basic *u, int candidates[], int ncandidates)
 {
   /*
@@ -195,30 +195,30 @@
     @returns: subdev specification
   */
 
-  struct subdev_spec ss;
+  std::vector<int> ss(2);
   
   int db0 = u->db(0)[0]->dbid();
   int db1 = u->db(1)[0]->dbid();
   for(int i=0; i < ncandidates; i++) {
     if(candidates[i] == db0) {
-      ss.side = 0;
-      ss.spec = 0;
+      ss[0] = 0;
+      ss[1] = 0;
       return ss;
     }
     if(candidates[i] == db1) {
-      ss.side = 1;
-      ss.spec = 0;
+      ss[0] = 1;
+      ss[1] = 0;
       return ss;
     }
   }
   if(db0 >= 0) {
-    ss.side = 0;
-    ss.spec = 0;
+    ss[0] = 0;
+    ss[1] = 0;
     return ss;
   }
   if(db1 >= 0) {
-    ss.side = 1;
-    ss.spec = 0;
+    ss[0] = 1;
+    ss[1] = 0;
     return ss;
   }
   

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.h   2008-10-05 
17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.h   2008-10-06 
02:39:21 UTC (rev 9722)
@@ -390,14 +390,8 @@
 
 float calc_dxc_freq(float target_freq, float baseband_freq, long fs, bool 
&inverted);
 
-struct subdev_spec
-{
-  int side;
-  int spec;
-};
+std::vector<int> pick_tx_subdevice(usrp_basic *u);
+std::vector<int> pick_rx_subdevice(usrp_basic *u);
+std::vector<int> pick_subdev(usrp_basic *u, int candidates[], int ncandidates);
 
-struct subdev_spec pick_tx_subdevice(usrp_basic *u);
-struct subdev_spec pick_rx_subdevice(usrp_basic *u);
-struct subdev_spec pick_subdev(usrp_basic *u, int candidates[], int 
ncandidates);
-
 #endif /* INCLUDED_USRP1_BASE_H */

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.i   2008-10-05 
17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_base.i   2008-10-06 
02:39:21 UTC (rev 9722)
@@ -109,7 +109,3 @@
   int  nddc();
   int  nduc();
 };
-
-struct subdev_spec pick_tx_subdevice(usrp_basic *u);
-struct subdev_spec pick_rx_subdevice(usrp_basic *u);
-struct subdev_spec pick_subdev(usrp_basic *u, int candidates[], int 
ncandidates);

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h      
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_base.h      
2008-10-06 02:39:21 UTC (rev 9722)
@@ -79,6 +79,7 @@
   std::vector<db_base_sptr> dboard(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);
+  usrp_standard_tx * usrp() { return d_usrp.get(); }
 
   // Wrapper function to call tune from USRP sink class
   tune_result tune(int chan, db_base_sptr db, double target_freq)

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.cc        
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.cc        
2008-10-06 02:39:21 UTC (rev 9722)
@@ -106,3 +106,10 @@
   bytes_written = nitems * usrp_bytes_per_input_item;
 }
 
+/******************************************************************************/
+
+std::vector<int>
+pick_tx_subdevice(usrp1_sink_c_sptr u)
+{
+  return pick_tx_subdevice(u->usrp());
+}

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.h 2008-10-05 
17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_c.h 2008-10-06 
02:39:21 UTC (rev 9722)
@@ -84,4 +84,8 @@
   ~usrp1_sink_c ();
 };
 
+
+std::vector<int> pick_tx_subdevice(usrp1_sink_c_sptr u);
+
+
 #endif /* INCLUDED_USRP1_SINK_C_H */

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.cc        
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.cc        
2008-10-06 02:39:21 UTC (rev 9722)
@@ -105,3 +105,10 @@
   bytes_written = nitems * usrp_bytes_per_input_item;
 }
 
+/******************************************************************************/
+
+std::vector<int>
+pick_tx_subdevice(usrp1_sink_s_sptr u)
+{
+  return pick_tx_subdevice(u->usrp());
+}

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.h 2008-10-05 
17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_sink_s.h 2008-10-06 
02:39:21 UTC (rev 9722)
@@ -83,4 +83,8 @@
   ~usrp1_sink_s ();
 };
 
+
+std::vector<int> pick_tx_subdevice(usrp1_sink_s_sptr u);
+
+
 #endif /* INCLUDED_USRP1_SINK_S_H */

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i 2008-10-05 
17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source.i 2008-10-06 
02:39:21 UTC (rev 9722)
@@ -55,6 +55,7 @@
 
   unsigned int determine_rx_mux_value(const std::vector<int> &subdev_spec);
   db_base_sptr selected_subdev(const std::vector<int> &subdev_spec);
+  usrp_standard_rx * usrp();
 
   int work (int noutput_items,
            gr_vector_const_void_star &input_items,
@@ -182,4 +183,5 @@
   ~usrp1_source_s ();
 };
 
-
+std::vector<int> pick_rx_subdevice(usrp1_source_c_sptr u);
+std::vector<int> pick_rx_subdevice(usrp1_source_s_sptr u);

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h    
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_base.h    
2008-10-06 02:39:21 UTC (rev 9722)
@@ -95,6 +95,7 @@
   std::vector<db_base_sptr> dboard(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);
+  usrp_standard_rx * usrp() { return d_usrp.get(); }
 
   // Wrapper function to call tune from USRP source class
   tune_result tune(int chan, db_base_sptr db, double target_freq)

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.cc      
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.cc      
2008-10-06 02:39:21 UTC (rev 9722)
@@ -130,3 +130,11 @@
   output_items_produced = nitems;
   bytes_read = nitems * nusrp_bytes_per_item;
 }
+
+/******************************************************************************/
+
+std::vector<int>
+pick_rx_subdevice(usrp1_source_c_sptr u)
+{
+  return pick_rx_subdevice(u->usrp());
+}

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.h       
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_c.h       
2008-10-06 02:39:21 UTC (rev 9722)
@@ -89,4 +89,8 @@
   ~usrp1_source_c ();
 };
 
+
+std::vector<int> pick_rx_subdevice(usrp1_source_c_sptr u);
+
+
 #endif /* INCLUDED_USRP1_SOURCE_C_H */

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.cc
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.cc      
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.cc      
2008-10-06 02:39:21 UTC (rev 9722)
@@ -130,3 +130,12 @@
   output_items_produced = nitems;
   bytes_read = nitems * nusrp_bytes_per_item;
 }
+
+
+/******************************************************************************/
+
+std::vector<int>
+pick_rx_subdevice(usrp1_source_s_sptr u)
+{
+  return pick_rx_subdevice(u->usrp());
+}

Modified: gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.h
===================================================================
--- gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.h       
2008-10-05 17:01:22 UTC (rev 9721)
+++ gnuradio/branches/features/cppdb/gr-usrp/src/usrp1_source_s.h       
2008-10-06 02:39:21 UTC (rev 9722)
@@ -91,4 +91,8 @@
   ~usrp1_source_s ();
 };
 
+
+std::vector<int> pick_rx_subdevice(usrp1_source_s_sptr u);
+
+
 #endif /* INCLUDED_USRP1_SOURCE_S_H */
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] r9722 - gnuradio/branches/features/cppdb/gr-usrp/src, trondeau <=
Prev by Date: [Commit-gnuradio] r9721 - in gnuradio/trunk/dtools: . microblaze
Next by Date: [Commit-gnuradio] r9723 - in gnuradio/trunk: . grc/freedesktop grc/src/platforms/base grc/src/platforms/python
Previous by thread: [Commit-gnuradio] r9721 - in gnuradio/trunk/dtools: . microblaze
Next by thread: [Commit-gnuradio] r9723 - in gnuradio/trunk: . grc/freedesktop grc/src/platforms/base grc/src/platforms/python
Index(es):
- Date
- Thread