diff options
| author | Josh Blum <josh@joshknows.com> | 2011-07-28 00:34:04 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-07-28 00:34:04 -0700 |
| commit | 10ab62e55ddaf2fc622d9d4ce7b1b9738e34e22c (patch) | |
| tree | 5527933199ea674f332fa2e344c031d2f2fd739b | |
| parent | a92db9de2707ea2220d15d3bd6e49b43451b4f88 (diff) | |
| download | uhd-10ab62e55ddaf2fc622d9d4ce7b1b9738e34e22c.tar.gz uhd-10ab62e55ddaf2fc622d9d4ce7b1b9738e34e22c.tar.bz2 uhd-10ab62e55ddaf2fc622d9d4ce7b1b9738e34e22c.zip | |
usrp: use a new cmd bit to signal stop
| -rw-r--r-- | host/lib/usrp/cores/rx_dsp_core_200.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_200.cpp b/host/lib/usrp/cores/rx_dsp_core_200.cpp index 82bc7c1bf..b377b16f0 100644 --- a/host/lib/usrp/cores/rx_dsp_core_200.cpp +++ b/host/lib/usrp/cores/rx_dsp_core_200.cpp @@ -83,29 +83,30 @@ public: } void issue_stream_command(const stream_cmd_t &stream_cmd){ - UHD_ASSERT_THROW(stream_cmd.num_samps <= 0x3fffffff); + UHD_ASSERT_THROW(stream_cmd.num_samps <= 0x1fffffff); _continuous_streaming = stream_cmd.stream_mode == stream_cmd_t::STREAM_MODE_START_CONTINUOUS; //setup the mode to instruction flags - typedef boost::tuple<bool, bool, bool> inst_t; + typedef boost::tuple<bool, bool, bool, bool> inst_t; static const uhd::dict<stream_cmd_t::stream_mode_t, inst_t> mode_to_inst = boost::assign::map_list_of - //reload, chain, samps - (stream_cmd_t::STREAM_MODE_START_CONTINUOUS, inst_t(true, true, false)) - (stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS, inst_t(false, false, false)) - (stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE, inst_t(false, false, true)) - (stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_MORE, inst_t(false, true, true)) + //reload, chain, samps, stop + (stream_cmd_t::STREAM_MODE_START_CONTINUOUS, inst_t(true, true, false, false)) + (stream_cmd_t::STREAM_MODE_STOP_CONTINUOUS, inst_t(false, false, false, true)) + (stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE, inst_t(false, false, true, false)) + (stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_MORE, inst_t(false, true, true, false)) ; //setup the instruction flag values - bool inst_reload, inst_chain, inst_samps; - boost::tie(inst_reload, inst_chain, inst_samps) = mode_to_inst[stream_cmd.stream_mode]; + bool inst_reload, inst_chain, inst_samps, inst_stop; + boost::tie(inst_reload, inst_chain, inst_samps, inst_stop) = mode_to_inst[stream_cmd.stream_mode]; //calculate the word from flags and length boost::uint32_t cmd_word = 0; cmd_word |= boost::uint32_t((stream_cmd.stream_now)? 1 : 0) << 31; cmd_word |= boost::uint32_t((inst_chain)? 1 : 0) << 30; cmd_word |= boost::uint32_t((inst_reload)? 1 : 0) << 29; - cmd_word |= (inst_samps)? stream_cmd.num_samps : ((inst_chain)? 1 : 0); + cmd_word |= boost::uint32_t((inst_stop)? 1 : 0) << 28; + cmd_word |= (inst_samps)? stream_cmd.num_samps : ((inst_stop)? 0 : 1); //issue the stream command _iface->poke32(REG_RX_CTRL_STREAM_CMD, cmd_word); |