diff options
| author | Josh Blum <josh@joshknows.com> | 2011-06-17 15:37:30 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-06-17 15:37:30 -0700 |
| commit | 2e401993b5b3e8920017729f4325ff5a51790fa5 (patch) | |
| tree | 51f904c8fa927cc55586b9b05e319fa089da8c79 /host/lib/usrp/b100/b100_ctrl.cpp | |
| parent | a852b6011c11e32e000ccd18c2009edfe81500ee (diff) | |
| download | uhd-2e401993b5b3e8920017729f4325ff5a51790fa5.tar.gz uhd-2e401993b5b3e8920017729f4325ff5a51790fa5.tar.bz2 uhd-2e401993b5b3e8920017729f4325ff5a51790fa5.zip | |
e100: removed usrp from directory prefix
Diffstat (limited to 'host/lib/usrp/b100/b100_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/b100/b100_ctrl.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/host/lib/usrp/b100/b100_ctrl.cpp b/host/lib/usrp/b100/b100_ctrl.cpp index 2a87703f7..6d415facc 100644 --- a/host/lib/usrp/b100/b100_ctrl.cpp +++ b/host/lib/usrp/b100/b100_ctrl.cpp @@ -205,18 +205,15 @@ void b100_ctrl_impl::viking_marauder_loop(boost::barrier &spawn_barrier) { time_t(if_packet_info.tsi), size_t(if_packet_info.tsf), 64e6 //FIXME get from clock_ctrl ); metadata.event_code = async_metadata_t::event_code_t(sph::get_context_code(vrt_hdr, if_packet_info)); - //print the famous U, and push the metadata into the message queue - if (metadata.event_code & + async_msg_fifo.push_with_pop_on_full(metadata); + if (metadata.event_code & ( async_metadata_t::EVENT_CODE_UNDERFLOW - | async_metadata_t::EVENT_CODE_UNDERFLOW_IN_PACKET) ) - UHD_MSG(fastpath) << "U"; - - if (metadata.event_code & + | async_metadata_t::EVENT_CODE_UNDERFLOW_IN_PACKET) + ) UHD_MSG(fastpath) << "U"; + else if (metadata.event_code & ( async_metadata_t::EVENT_CODE_SEQ_ERROR - | async_metadata_t::EVENT_CODE_SEQ_ERROR_IN_BURST) ) - UHD_MSG(fastpath) << "S"; - - async_msg_fifo.push_with_pop_on_full(metadata); + | async_metadata_t::EVENT_CODE_SEQ_ERROR_IN_BURST) + ) UHD_MSG(fastpath) << "S"; continue; } UHD_MSG(error) << "Control: unknown async response" << std::endl; |