diff options
| author | Josh Blum <josh@joshknows.com> | 2011-02-24 11:00:49 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-02-24 11:00:49 -0800 |
| commit | d588314b6f6205e0ea7051d8fc7836bdf9a6b16b (patch) | |
| tree | 93ca181b6fb98cae67a639637b6911b7ebebbd73 /host/lib/transport | |
| parent | 76ebda895cae3bd0014a5e428b07440445f3b631 (diff) | |
| parent | 57b779c5103d25a94c90fd6ac465c6f7f8add9b1 (diff) | |
| download | uhd-d588314b6f6205e0ea7051d8fc7836bdf9a6b16b.tar.gz uhd-d588314b6f6205e0ea7051d8fc7836bdf9a6b16b.tar.bz2 uhd-d588314b6f6205e0ea7051d8fc7836bdf9a6b16b.zip | |
Merge branch 'usrp2_dual_dsp' into next
Conflicts:
host/include/uhd/usrp/mboard_props.hpp
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/vrt_packet_handler.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp index 6f3ac0421..4f8ce7e52 100644 --- a/host/lib/transport/vrt_packet_handler.hpp +++ b/host/lib/transport/vrt_packet_handler.hpp @@ -300,18 +300,18 @@ template <typename T> UHD_INLINE T get_context_code( typedef boost::function<bool(managed_send_buffs_t &)> get_send_buffs_t; typedef boost::function<void(boost::uint32_t *, uhd::transport::vrt::if_packet_info_t &)> vrt_packer_t; + static const boost::uint64_t zeros = 0; + struct send_state{ //init the expected seq number size_t next_packet_seq; managed_send_buffs_t managed_buffs; - const boost::uint64_t zeros; std::vector<const void *> zero_buffs; std::vector<const void *> io_buffs; send_state(size_t width = 1): next_packet_seq(0), managed_buffs(width), - zeros(0), zero_buffs(width, &zeros), io_buffs(0) //resized later { |