From 5c97330f089c9311b07e73f5c9ec6fb512dcaf67 Mon Sep 17 00:00:00 2001
From: michael-west <michael.west@ettus.com>
Date: Fri, 5 Feb 2016 09:52:45 -0800
Subject: B200: Fix for increasing retune times

---
 host/lib/usrp/b200/b200_io_impl.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp
index 5b0c4ba13..93f5b22fc 100644
--- a/host/lib/usrp/b200/b200_io_impl.cpp
+++ b/host/lib/usrp/b200/b200_io_impl.cpp
@@ -294,7 +294,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
 {
     managed_recv_buffer::sptr buff = xport->get_recv_buff();
     if (not buff or buff->size() < 8)
-        return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t());
+        return boost::none;
 
     const boost::uint32_t sid = uhd::wtohx(buff->cast<const boost::uint32_t *>()[1]);
     switch (sid) {
@@ -358,7 +358,7 @@ boost::optional<uhd::msg_task::msg_type_t> b200_impl::handle_async_task(
     default:
         UHD_MSG(error) << "Got a ctrl packet with unknown SID " << sid << std::endl;
     }
-    return uhd::msg_task::msg_type_t(0, uhd::msg_task::msg_payload_t());
+    return boost::none;
 }
 
 /***********************************************************************
-- 
cgit v1.2.3


From 147f287c9b177918749f17dd1245be817553b821 Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Fri, 5 Feb 2016 11:26:08 -0800
Subject: cmake: fixed Boost.Thread check for MinGW

* MinGW builds check for libboost_thread_win32 instead of libboost_thread
* Checks for other platforms unaffected
---
 host/CMakeLists.txt | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 6ac281ccc..8a3d661e5 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -1,5 +1,5 @@
 #
-# Copyright 2010-2015 Ettus Research LLC
+# Copyright 2010-2016 Ettus Research LLC
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -187,10 +187,14 @@ SET(BOOST_REQUIRED_COMPONENTS
     program_options
     regex
     system
-    thread
     unit_test_framework
     serialization
 )
+IF(MINGW)
+    LIST(APPEND BOOST_REQUIRED_COMPONENTS thread_win32)
+ELSE()
+    LIST(APPEND BOOST_REQUIRED_COMPONENTS thread)
+ENDIF()
 
 IF(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64")
     LIST(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix
-- 
cgit v1.2.3


From 97d338d2f8adabab13992578ece4d4b6b5d6a530 Mon Sep 17 00:00:00 2001
From: Nicholas Corgan <nick.corgan@ettus.com>
Date: Fri, 5 Feb 2016 13:01:49 -0800
Subject: Disable Winsock deprecation warnings

---
 host/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 8a3d661e5..3a5cae4bf 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -162,6 +162,7 @@ IF(MSVC)
         -D_CRT_SECURE_NO_DEPRECATE
         -D_CRT_NONSTDC_NO_WARNINGS
         -D_CRT_NONSTDC_NO_DEPRECATE
+        -D_WINSOCK_DEPRECATED_NO_WARNINGS
     )
     ADD_DEFINITIONS(/MP) #multi-threaded build
     ADD_DEFINITIONS(/bigobj) #Increases the number of addressable sections in an .obj file.
-- 
cgit v1.2.3