diff options
author | Josh Blum <josh@joshknows.com> | 2010-03-02 14:48:11 -0800 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-03-02 14:48:11 -0800 |
commit | 13bd67b4949a91df5e6696e708c935266b14c502 (patch) | |
tree | 40c9ebfd46636307c4537980b7ee116556e7ca17 /host/lib/usrp/usrp2/dsp_impl.cpp | |
parent | 451067295399e357d73c9bfdeef5f2ad040e0243 (diff) | |
download | uhd-13bd67b4949a91df5e6696e708c935266b14c502.tar.gz uhd-13bd67b4949a91df5e6696e708c935266b14c502.tar.bz2 uhd-13bd67b4949a91df5e6696e708c935266b14c502.zip |
The net common is too slow in usrp2 firmware to figure out if its vrt data.
Added a custom function to tell if a packet is vrt data, seems to be feeding fast enough at this rate...
Fixed some buffer size calculation logic.
Diffstat (limited to 'host/lib/usrp/usrp2/dsp_impl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/dsp_impl.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp index a57f5ff2d..8fdfd685f 100644 --- a/host/lib/usrp/usrp2/dsp_impl.cpp +++ b/host/lib/usrp/usrp2/dsp_impl.cpp @@ -82,12 +82,7 @@ void usrp2_impl::update_ddc_enabled(void){ out_data.data.streaming.enabled = (_ddc_enabled)? 1 : 0; out_data.data.streaming.secs = htonl(_ddc_stream_at.secs); out_data.data.streaming.ticks = htonl(_ddc_stream_at.ticks); - out_data.data.streaming.samples = htonl( - _mtu/sizeof(uint32_t) - - USRP2_HOST_RX_VRT_HEADER_WORDS32 - - USRP2_HOST_RX_VRT_TRAILER_WORDS32 - - ((2 + 14 + 20 + 8)/sizeof(uint32_t)) //size of headers (pad, eth, ip, udp) - ); + out_data.data.streaming.samples = htonl(_max_samples_per_packet); //send and recv usrp2_ctrl_data_t in_data = ctrl_send_and_recv(out_data); |