[Commit-gnuradio] r9651 - gnuradio/trunk/gr-usrp2/src

[jcorgan]

Author: jcorgan
Date: 2008-09-24 09:36:17 -0600 (Wed, 24 Sep 2008)
New Revision: 9651

Modified:
   gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.cc
   gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.h
   gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.cc
   gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.h
   gnuradio/trunk/gr-usrp2/src/usrp2.i
   gnuradio/trunk/gr-usrp2/src/usrp2_base.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_sink_base.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.h
   gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc
   gnuradio/trunk/gr-usrp2/src/usrp2_source_base.cc
Log:
Minor cleanup

Modified: gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.cc      2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,11 +21,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <rx_16sc_handler.h>
 
 rx_16sc_handler::~rx_16sc_handler()
 {
+  // NOP
 }

Modified: gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.h
===================================================================
--- gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.h       2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/rx_16sc_handler.h       2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -26,8 +26,6 @@
 #include <usrp2/rx_nop_handler.h>
 #include <usrp2/copiers.h>
 
-#define RX_16SC_HANDLER_DEBUG 0
-
 class rx_16sc_handler : public usrp2::rx_nop_handler
 {
   std::complex<int16_t> *d_dest;
@@ -43,30 +41,20 @@
   // Factory function to return a shared pointer to a new instance
   static sptr make(uint64_t max_samples, uint64_t max_quantum, 
std::complex<int16_t> *dest) 
   {
-    if (RX_16SC_HANDLER_DEBUG)
-      printf("rx_16sc_handler: max_samples=%li max_quantum=%li\n", 
max_samples, max_quantum);
-      
     return sptr(new rx_16sc_handler(max_samples, max_quantum, dest));
   }
 
   // Invoked by USRP2 API when samples are available
   bool operator()(const uint32_t *items, size_t nitems, const 
usrp2::rx_metadata *metadata)
   {
-    if (RX_16SC_HANDLER_DEBUG)
-      printf("rx_16sc_handler: called with items=%zu ", nitems);
-
     // Copy/reformat/endian swap USRP2 data to destination buffer
     usrp2::copy_u2_16sc_to_host_16sc(nitems, items, d_dest);
     d_dest += nitems;
 
     // FIXME: do something with metadata
 
-    // Determine if there is room to be called again
-    bool ok = rx_nop_handler::operator()(items, nitems, metadata);
-    if (RX_16SC_HANDLER_DEBUG)
-      printf("ok to call again=%i\n", ok);
-
-    return ok;
+    // Call parent to determine if there is room to be called again
+    return rx_nop_handler::operator()(items, nitems, metadata);
   }
 
   ~rx_16sc_handler();

Modified: gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.cc      2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,11 +21,12 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <rx_32fc_handler.h>
 
 rx_32fc_handler::~rx_32fc_handler()
 {
+  // NOP
 }

Modified: gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.h
===================================================================
--- gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.h       2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/rx_32fc_handler.h       2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -27,8 +27,6 @@
 #include <usrp2/copiers.h>
 #include <gr_complex.h>
 
-#define RX_32FC_HANDLER_DEBUG 0
-
 class rx_32fc_handler : public usrp2::rx_nop_handler
 {
   gr_complex *d_dest;
@@ -44,30 +42,20 @@
   // Factory function to return a shared pointer to a new instance
   static sptr make(uint64_t max_samples, uint64_t max_quantum, gr_complex 
*dest) 
   {
-    if (RX_32FC_HANDLER_DEBUG)
-      printf("rx_32fc_handler: max_samples=%li max_quantum=%li\n", 
max_samples, max_quantum);
-      
     return sptr(new rx_32fc_handler(max_samples, max_quantum, dest));
   }
 
   // Invoked by USRP2 API when samples are available
   bool operator()(const uint32_t *items, size_t nitems, const 
usrp2::rx_metadata *metadata)
   {
-    if (RX_32FC_HANDLER_DEBUG)
-      printf("rx_32fc_handler: called with items=%zu ", nitems);
-
     // Copy/reformat/endian swap USRP2 data to destination buffer
     usrp2::copy_u2_16sc_to_host_32fc(nitems, items, d_dest);
     d_dest += nitems;
 
     // FIXME: do something with metadata
 
-    // Determine if there is room to be called again
-    bool ok = rx_nop_handler::operator()(items, nitems, metadata);
-    if (RX_32FC_HANDLER_DEBUG)
-      printf("ok to call again=%i\n", ok);
-
-    return ok;
+    // Call parent to determine if there is room to be called again
+    return rx_nop_handler::operator()(items, nitems, metadata);
   }
 
   ~rx_32fc_handler();

Modified: gnuradio/trunk/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2.i 2008-09-24 00:20:41 UTC (rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2.i 2008-09-24 15:36:17 UTC (rev 9651)
@@ -98,8 +98,6 @@
 
 public:
   ~usrp2_source_16sc();
-
-  std::string mac_addr();
 };
 
 // ----------------------------------------------------------------

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_base.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_base.cc   2008-09-24 00:20:41 UTC (rev 
9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_base.cc   2008-09-24 15:36:17 UTC (rev 
9651)
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_base.h>

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_sink_16sc.cc      2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_sink_16sc.h>
@@ -62,10 +62,10 @@
   metadata.send_now = 1;
   metadata.start_of_burst = 1;
 
-  bool ok = d_u2->tx_16sc(0,  // FIXME: someday, streams will have channel 
numbers
+  bool ok = d_u2->tx_16sc(0,  // FIXME: use channel number instead of 0
                          in, noutput_items, &metadata);
   if (!ok){
-    std::cerr << "usrp2_sink_16sc: tx_complex_int16 failed" << std::endl;
+    std::cerr << "usrp2_sink_16sc: tx_16sc failed" << std::endl;
     return -1; // say we're done
   }
 

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_sink_32fc.cc      2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_sink_32fc.h>
@@ -62,7 +62,7 @@
   metadata.send_now = 1;
   metadata.start_of_burst = 1;
 
-  bool ok = d_u2->tx_32fc(0,  // FIXME: someday, streams will have channel 
numbers
+  bool ok = d_u2->tx_32fc(0, // FIXME: use channel number instead of 0
                          in, noutput_items, &metadata);
   if (!ok){
     std::cerr << "usrp2_sink_32fc: tx_32fc failed" << std::endl;

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_sink_base.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_sink_base.cc      2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_sink_base.cc      2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,15 +21,13 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_sink_base.h>
 #include <gr_io_signature.h>
 #include <iostream>
 
-#define USRP2_SINK_BASE_DEBUG 0
-
 usrp2_sink_base::usrp2_sink_base(const char *name,
                                 gr_io_signature_sptr input_signature,
                                 const std::string &ifc,

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc    2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.cc    2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_source_16sc.h>
@@ -47,6 +47,7 @@
 
 usrp2_source_16sc::~usrp2_source_16sc()
 {
+  // NOP
 }
 
 int
@@ -58,7 +59,7 @@
 
   rx_16sc_handler::sptr handler = rx_16sc_handler::make(noutput_items, 
USRP2_MIN_RX_SAMPLES, out);
 
-  bool ok = d_u2->rx_samples(0, handler.get());
+  bool ok = d_u2->rx_samples(0, handler.get()); // FIXME: channel number 
instead of 0
   if (!ok){
     std::cerr << "usrp2::rx_samples() failed" << std::endl;
     return -1; // say we're done

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.h
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.h     2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_source_16sc.h     2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -20,8 +20,8 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_USRP2_SOURCE_C_H
-#define INCLUDED_USRP2_SOURCE_C_H
+#ifndef INCLUDED_USRP2_SOURCE_16SC_H
+#define INCLUDED_USRP2_SOURCE_16SC_H
 
 #include <usrp2_source_base.h>
 

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc    2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_source_32fc.cc    2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -47,6 +47,7 @@
 
 usrp2_source_32fc::~usrp2_source_32fc()
 {
+  // NOP
 }
 
 int
@@ -58,7 +59,7 @@
 
   rx_32fc_handler::sptr handler = rx_32fc_handler::make(noutput_items, 
USRP2_MIN_RX_SAMPLES, out);
 
-  bool ok = d_u2->rx_samples(0, handler.get());
+  bool ok = d_u2->rx_samples(0, handler.get()); // FIXME: channel number 
instead of 0
   if (!ok){
     std::cerr << "usrp2::rx_samples() failed" << std::endl;
     return -1; // say we're done

Modified: gnuradio/trunk/gr-usrp2/src/usrp2_source_base.cc
===================================================================
--- gnuradio/trunk/gr-usrp2/src/usrp2_source_base.cc    2008-09-24 00:20:41 UTC 
(rev 9650)
+++ gnuradio/trunk/gr-usrp2/src/usrp2_source_base.cc    2008-09-24 15:36:17 UTC 
(rev 9651)
@@ -21,7 +21,7 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_source_base.h>