projects
/
debian
/
gnuradio
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' into dfsg-orig
[debian/gnuradio]
/
gr-usrp2
/
src
/
usrp2_sink_16sc.cc
diff --git
a/gr-usrp2/src/usrp2_sink_16sc.cc
b/gr-usrp2/src/usrp2_sink_16sc.cc
index 96e6b174c7aa2c9468a6d4b0a41aaa81ba5caa33..1e7c54dcdb16d8c0cb62f0281c39af9303b0c3bf 100644
(file)
--- a/
gr-usrp2/src/usrp2_sink_16sc.cc
+++ b/
gr-usrp2/src/usrp2_sink_16sc.cc
@@
-29,6
+29,9
@@
#include <gr_io_signature.h>
#include <iostream>
#include <gr_io_signature.h>
#include <iostream>
+// FIXME hack until VRT replaces libusrp2
+#define U2_MIN_SAMPLES 9
+
usrp2_sink_16sc_sptr
usrp2_make_sink_16sc(const std::string &ifc, const std::string &mac_addr)
throw (std::runtime_error)
usrp2_sink_16sc_sptr
usrp2_make_sink_16sc(const std::string &ifc, const std::string &mac_addr)
throw (std::runtime_error)
@@
-57,6
+60,12
@@
usrp2_sink_16sc::work(int noutput_items,
{
std::complex<int16_t> *in = (std::complex<int16_t> *)input_items[0];
{
std::complex<int16_t> *in = (std::complex<int16_t> *)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;
metadata.timestamp = -1;
metadata.send_now = 1;
usrp2::tx_metadata metadata;
metadata.timestamp = -1;
metadata.send_now = 1;