summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau2010-11-17 16:48:25 -0800
committerTom Rondeau2010-11-17 16:48:25 -0800
commitf155f3a3f91f640eb7bb69ae76cb160c2812db54 (patch)
tree890650dc5ddb1a3587b6b7ba3ba42c462fc5b7b1
parent01a054be12bdef4d8c17d6134275ede9d9997c3d (diff)
downloadgnuradio-f155f3a3f91f640eb7bb69ae76cb160c2812db54.tar.gz
gnuradio-f155f3a3f91f640eb7bb69ae76cb160c2812db54.tar.bz2
gnuradio-f155f3a3f91f640eb7bb69ae76cb160c2812db54.zip
Some updates to uhd source with tags.
-rw-r--r--gr-uhd/lib/uhd_single_usrp_source.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-uhd/lib/uhd_single_usrp_source.cc b/gr-uhd/lib/uhd_single_usrp_source.cc
index ded3cd16d..6ea7c8af6 100644
--- a/gr-uhd/lib/uhd_single_usrp_source.cc
+++ b/gr-uhd/lib/uhd_single_usrp_source.cc
@@ -134,9 +134,10 @@ public:
uhd::rx_metadata_t metadata; //not passed out of this block
size_t total_samps = 0;
- while(total_samps + 362 < noutput_items) {
+ while(total_samps + 362 < (size_t)noutput_items) {
size_t num_samps = _dev->get_device()->recv(
output_items, noutput_items, metadata,
+ //_type, uhd::device::RECV_MODE_FULL_BUFF
_type, uhd::device::RECV_MODE_ONE_PACKET
);
total_samps += num_samps;
@@ -157,7 +158,6 @@ public:
pmt::pmt_t tsamp, nsamp;
pmt::pmt_t nsamp_val = pmt::mp((int)d_num_packet_samps);
-
add_item_tag(0, nitems_written(0),
pmt::mp("packet_time_stamp"),
d_tstamp_pair,
@@ -166,7 +166,6 @@ public:
pmt::mp("num_packet_samples"),
nsamp_val,
pmt::mp("uhd_single_usrp_source"));
-
}
return num_samps;
@@ -181,6 +180,7 @@ public:
return num_samps;
}
}
+ return -1;
}
bool start(void){