[Commit-gnuradio] r8510 - in usrp2/trunk/host: apps gr-usrp2 lib

[jcorgan]

Author: jcorgan
Date: 2008-05-26 10:50:47 -0600 (Mon, 26 May 2008)
New Revision: 8510

Modified:
   usrp2/trunk/host/apps/rx_streaming_samples.cc
   usrp2/trunk/host/apps/rx_streaming_samples2.cc
   usrp2/trunk/host/gr-usrp2/usrp2.i
   usrp2/trunk/host/gr-usrp2/usrp2_source_base.cc
   usrp2/trunk/host/gr-usrp2/usrp2_source_base.h
   usrp2/trunk/host/lib/usrp2_basic.cc
   usrp2/trunk/host/lib/usrp2_basic.h
Log:
Revert set_rx_freq to prior pattern.

Modified: usrp2/trunk/host/apps/rx_streaming_samples.cc
===================================================================
--- usrp2/trunk/host/apps/rx_streaming_samples.cc       2008-05-26 13:33:34 UTC 
(rev 8509)
+++ usrp2/trunk/host/apps/rx_streaming_samples.cc       2008-05-26 16:50:47 UTC 
(rev 8510)
@@ -334,8 +334,6 @@
   class file_writer *writer = new file_writer(ofd, rb);
   writer->start_undetached();
 
-  usrp2_tune_result_sptr tune_result;
-  
   if (gain != GAIN_NOT_SET){
     if (!u2->set_rx_gain(gain)){
       std::cerr << "set_rx_gain failed\n";
@@ -343,7 +341,7 @@
     }
   }
 
-  if (!(tune_result = u2->set_rx_freq(freq))){
+  if (!(u2->set_rx_freq(freq, NULL))){
     std::cerr << "set_rx_freq failed\n";
     //return 1;
   }

Modified: usrp2/trunk/host/apps/rx_streaming_samples2.cc
===================================================================
--- usrp2/trunk/host/apps/rx_streaming_samples2.cc      2008-05-26 13:33:34 UTC 
(rev 8509)
+++ usrp2/trunk/host/apps/rx_streaming_samples2.cc      2008-05-26 16:50:47 UTC 
(rev 8510)
@@ -201,8 +201,6 @@
   if (rt != RT_OK)
     std::cerr << "failed to enable realtime scheduling\n";
 
-  usrp2_tune_result_sptr tune_result;
-  
   if (gain != GAIN_NOT_SET){
     if (!u2->set_rx_gain(gain)){
       std::cerr << "set_rx_gain failed\n";
@@ -210,7 +208,7 @@
     }
   }
 
-  if (!(tune_result = u2->set_rx_freq(freq))){
+  if (!(u2->set_rx_freq(freq, NULL))){
     std::cerr << "set_rx_freq failed\n";
     //return 1;
   }

Modified: usrp2/trunk/host/gr-usrp2/usrp2.i
===================================================================
--- usrp2/trunk/host/gr-usrp2/usrp2.i   2008-05-26 13:33:34 UTC (rev 8509)
+++ usrp2/trunk/host/gr-usrp2/usrp2.i   2008-05-26 16:50:47 UTC (rev 8510)
@@ -32,9 +32,6 @@
 #include "usrp2_source_raw.h"
 %}
 
-%include "../lib/usrp2_tune_result.h"
-%template(usrp2_tune_result_sptr) boost::shared_ptr<usrp2_tune_result>;
-
 // ----------------------------------------------------------------
 
 class usrp2_source_base : public gr_sync_block {
@@ -47,7 +44,7 @@
   ~usrp2_source_base();
 
   bool set_gain(double gain);
-  usrp2_tune_result_sptr set_freq(double frequency);
+  bool set_freq(double frequency, usrp2_tune_result *result);
   bool set_decim(int decimation_factor);
   bool set_scale_iq(int scale_i, int scale_q);
 

Modified: usrp2/trunk/host/gr-usrp2/usrp2_source_base.cc
===================================================================
--- usrp2/trunk/host/gr-usrp2/usrp2_source_base.cc      2008-05-26 13:33:34 UTC 
(rev 8509)
+++ usrp2/trunk/host/gr-usrp2/usrp2_source_base.cc      2008-05-26 16:50:47 UTC 
(rev 8510)
@@ -29,7 +29,7 @@
 #include <gr_io_signature.h>
 #include <iostream>
 
-#define USRP2_SOURCE_BASE_DEBUG 1
+#define USRP2_SOURCE_BASE_DEBUG 0
 
 #define SAMPLES_PER_PACKET 250
 
@@ -73,10 +73,10 @@
   return d_u2->set_rx_gain(gain);
 }
 
-usrp2_tune_result_sptr
-usrp2_source_base::set_freq(double frequency) 
+bool
+usrp2_source_base::set_freq(double frequency, usrp2_tune_result *result) 
 {
-  return d_u2->set_rx_freq(frequency);
+  return d_u2->set_rx_freq(frequency, result);
 }
 
 bool

Modified: usrp2/trunk/host/gr-usrp2/usrp2_source_base.h
===================================================================
--- usrp2/trunk/host/gr-usrp2/usrp2_source_base.h       2008-05-26 13:33:34 UTC 
(rev 8509)
+++ usrp2/trunk/host/gr-usrp2/usrp2_source_base.h       2008-05-26 16:50:47 UTC 
(rev 8510)
@@ -45,7 +45,7 @@
   virtual bool stop();
 
   bool set_gain(double gain);
-  usrp2_tune_result_sptr set_freq(double frequency);
+  bool set_freq(double frequency, usrp2_tune_result *result);
   bool set_decim(int decimation_factor);
   bool set_scale_iq(int scale_i, int scale_q);
 

Modified: usrp2/trunk/host/lib/usrp2_basic.cc
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.cc 2008-05-26 13:33:34 UTC (rev 8509)
+++ usrp2/trunk/host/lib/usrp2_basic.cc 2008-05-26 16:50:47 UTC (rev 8510)
@@ -278,10 +278,9 @@
   return true;
 }
 
-usrp2_tune_result_sptr
-usrp2_basic::set_rx_freq(double freq)
+bool
+usrp2_basic::set_rx_freq(double freq, usrp2_tune_result *result)
 {
-  usrp2_tune_result_sptr result(new usrp2_tune_result());
   uint8_t      pktbuf[MAX_PKTLEN];
   memset(pktbuf, 0, sizeof(pktbuf));
 
@@ -311,7 +310,7 @@
     // FIXME: wait for corresponding reply, set tune result members
   }
 
-  return result;
+  return true;
 }
 
 bool

Modified: usrp2/trunk/host/lib/usrp2_basic.h
===================================================================
--- usrp2/trunk/host/lib/usrp2_basic.h  2008-05-26 13:33:34 UTC (rev 8509)
+++ usrp2/trunk/host/lib/usrp2_basic.h  2008-05-26 16:50:47 UTC (rev 8510)
@@ -113,7 +113,7 @@
    * Rx configuration and control
    */
   bool set_rx_gain(double gain);
-  usrp2_tune_result_sptr set_rx_freq(double frequency);
+  bool set_rx_freq(double frequency, usrp2_tune_result *result);
   bool set_rx_decim(int decimation_factor);
   bool set_rx_scale_iq(int scale_i, int scale_q);