diff options
| author | Josh Blum <josh@joshknows.com> | 2010-11-23 09:57:33 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-11-23 09:57:33 -0800 |
| commit | d35b7327710f08f96f2cfb93bcc28f14515ea9bb (patch) | |
| tree | 0cfe31630905570c776a45746fcb3e2011d3dabd /host/include | |
| parent | 6741de7b4545bb33d22cc6508e121023dd1a7a8c (diff) | |
| parent | 768af46dc01d036999cb60ff16df4215d014c906 (diff) | |
| download | uhd-d35b7327710f08f96f2cfb93bcc28f14515ea9bb.tar.gz uhd-d35b7327710f08f96f2cfb93bcc28f14515ea9bb.tar.bz2 uhd-d35b7327710f08f96f2cfb93bcc28f14515ea9bb.zip | |
Merge branch 'flow_ctrl' into next
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/types/metadata.hpp | 4 | ||||
| -rw-r--r-- | host/include/uhd/usrp/dsp_utils.hpp | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp index 3f250d13e..f4e084430 100644 --- a/host/include/uhd/types/metadata.hpp +++ b/host/include/uhd/types/metadata.hpp @@ -132,8 +132,8 @@ namespace uhd{ * The type of event for a receive async message call. */ enum event_code_t { - //! A packet was successfully transmitted. - EVENT_CODE_SUCCESS = 0x1, + //! A burst was successfully transmitted. + EVENT_CODE_BURST_ACK = 0x1, //! An internal send buffer has emptied. EVENT_CODE_UNDERFLOW = 0x2, //! Packet loss between host and device. diff --git a/host/include/uhd/usrp/dsp_utils.hpp b/host/include/uhd/usrp/dsp_utils.hpp index 8ec04dd2f..5b81ce322 100644 --- a/host/include/uhd/usrp/dsp_utils.hpp +++ b/host/include/uhd/usrp/dsp_utils.hpp @@ -85,12 +85,9 @@ namespace dsp_type1{ /*! * Calculate the stream command word from the stream command struct. * \param stream_cmd the requested stream command with mode, flags, timestamp - * \param num_samps_continuous number of samples to request in continuous mode * \return the 32-bit stream command word */ - UHD_API boost::uint32_t calc_stream_cmd_word( - const stream_cmd_t &stream_cmd, size_t num_samps_continuous - ); + UHD_API boost::uint32_t calc_stream_cmd_word(const stream_cmd_t &stream_cmd); } //namespace dsp_type1 |