uhd: squashed support modules for usrp3 fpga cores

1 files changed, 13 insertions, 1 deletions

diff --git a/host/lib/usrp/common/recv_packet_demuxer_3000.hpp b/host/lib/usrp/common/recv_packet_demuxer_3000.hpp
index 9de3666dd..4fb6c4604 100644
--- a/host/lib/usrp/common/recv_packet_demuxer_3000.hpp
+++ b/host/lib/usrp/common/recv_packet_demuxer_3000.hpp
@@ -92,7 +92,10 @@ namespace uhd{ namespace usrp{
                     if (new_sid != sid)
                     {
                         boost::mutex::scoped_lock l(mutex);
-                        _queues[new_sid].push(buff);
+                        if (_queues.count(new_sid) == 0) UHD_MSG(error)
+                            << "recv packet demuxer unexpected sid 0x" << std::hex << new_sid << std::dec
+                            << std::endl;
+                        else _queues[new_sid].push(buff);
                         buff.reset();
                     }
                 }
@@ -102,6 +105,15 @@ namespace uhd{ namespace usrp{
             return buff;
         }
 
+        void realloc_sid(const boost::uint32_t sid)
+        {
+            boost::mutex::scoped_lock l(mutex);
+            while(not _queues[sid].empty()) //allocated and clears if already allocated
+            {
+                _queues[sid].pop();
+            }
+        }
+
         typedef std::queue<transport::managed_recv_buffer::sptr> queue_type_t;
         std::map<boost::uint32_t, queue_type_t> _queues;
         transport::zero_copy_if::sptr _xport;