diff options
| author | Johnathan Corgan | 2010-06-19 11:32:18 -0700 |
|---|---|---|
| committer | Johnathan Corgan | 2010-06-19 11:32:18 -0700 |
| commit | ec7e995ca213a293ff5e068068ffd04e6b7ee7b1 (patch) | |
| tree | 9e0711a1650ae181eea833fd34068fdfd00bdd19 /gr-usrp2/src/usrp2_sink_16sc.cc | |
| parent | e19404263e08fce0259069a311e321ed5277e16d (diff) | |
| parent | e20160b7cc480176ba629ebfbe9fb073963c25d3 (diff) | |
| download | gnuradio-ec7e995ca213a293ff5e068068ffd04e6b7ee7b1.tar.gz gnuradio-ec7e995ca213a293ff5e068068ffd04e6b7ee7b1.tar.bz2 gnuradio-ec7e995ca213a293ff5e068068ffd04e6b7ee7b1.zip | |
Merge branch 'master' into next
* master:
gr-usrp2: implement start_streaming_at(usrp2::fpga_timestamp time)
Diffstat (limited to 'gr-usrp2/src/usrp2_sink_16sc.cc')
| -rw-r--r-- | gr-usrp2/src/usrp2_sink_16sc.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/gr-usrp2/src/usrp2_sink_16sc.cc b/gr-usrp2/src/usrp2_sink_16sc.cc index 1e7c54dcd..75cc1f4a6 100644 --- a/gr-usrp2/src/usrp2_sink_16sc.cc +++ b/gr-usrp2/src/usrp2_sink_16sc.cc @@ -67,12 +67,20 @@ usrp2_sink_16sc::work(int noutput_items, return 0; usrp2::tx_metadata metadata; - metadata.timestamp = -1; - metadata.send_now = 1; + + // 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_16sc(0, // FIXME: someday, streams will have channel numbers - in, noutput_items, &metadata); + bool ok = d_u2->tx_16sc(0, in, noutput_items, &metadata); if (!ok){ std::cerr << "usrp2_sink_16sc: tx_16sc failed" << std::endl; return -1; // say we're done |