Merge remote branch 'trondeau/qtclock'

[debian/gnuradio] / gr-usrp2 / src / usrp2_sink_32fc.cc

diff --git a/gr-usrp2/src/usrp2_sink_32fc.cc b/gr-usrp2/src/usrp2_sink_32fc.cc
index 56cde6ba7a3480ba0649199c14271bc1ce89b06c..fa75b380571dc960fe4ea56449917f2d5c295362 100644 (file)
--- a/gr-usrp2/src/usrp2_sink_32fc.cc
+++ b/gr-usrp2/src/usrp2_sink_32fc.cc
@@ -21,26 +21,70 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <usrp2_sink_32fc.h>
+#include <usrp2/metadata.h>
 #include <gr_io_signature.h>
-#include <usrp_standard.h>
-#include <usrp_bytesex.h>
+#include <iostream>
+
+// FIXME hack until VRT replaces libusrp2
+#define U2_MIN_SAMPLES 9
 
 usrp2_sink_32fc_sptr
-usrp2_make_sink_32fc() throw (std::runtime_error)
+usrp2_make_sink_32fc(const std::string &ifc, const std::string &mac_addr) 
+  throw (std::runtime_error)
 {
-  return usrp2_sink_32fc_sptr(new usrp2_sink_32fc());
+  return gnuradio::get_initial_sptr(new usrp2_sink_32fc(ifc, mac_addr));
 }
 
-usrp2_sink_32fc::usrp2_sink_32fc() throw (std::runtime_error)
+usrp2_sink_32fc::usrp2_sink_32fc(const std::string &ifc, const std::string &mac_addr) 
+  throw (std::runtime_error)
   : usrp2_sink_base("usrp2_sink_32fc",
-                   gr_make_io_signature(1, 1, sizeof(gr_complex)))
+                   gr_make_io_signature(1, 1, sizeof(gr_complex)),
+                   ifc, mac_addr)
 {
+  // NOP
 }
 
 usrp2_sink_32fc::~usrp2_sink_32fc()
 {
+  // NOP
+}
+
+int
+usrp2_sink_32fc::work(int noutput_items,
+                     gr_vector_const_void_star &input_items,
+                     gr_vector_void_star &output_items)
+{
+  gr_complex *in = (gr_complex *)input_items[0];
+
+  // FIXME: Current libusrp2 can't handle short packets.
+  // Returning 0 assumes there will be more samples
+  // the next round...
+  if (noutput_items < U2_MIN_SAMPLES)
+    return 0;
+
+  usrp2::tx_metadata metadata;
+
+  // Set TX metadata to either start time or now
+  if (d_should_wait == true) {
+    metadata.timestamp = d_tx_time;
+    metadata.send_now = 0;
+    d_should_wait = false;
+  }
+  else {
+    metadata.timestamp = -1;
+    metadata.send_now = 1;
+  }
+  metadata.start_of_burst = 1;
+
+  bool ok = d_u2->tx_32fc(0, in, noutput_items, &metadata);
+  if (!ok){
+    std::cerr << "usrp2_sink_32fc: tx_32fc failed" << std::endl;
+    return -1; // say we're done
+  }
+
+  return noutput_items;
 }