Merge branch 'next' of ettus.sourcerepo.com:ettus/uhdpriv into next

4 files changed, 6 insertions, 9 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
 
diff --git a/host/include/uhd/usrp/mboard_eeprom.hpp b/host/include/uhd/usrp/mboard_eeprom.hpp
index 530b177be..52363b95c 100644
--- a/host/include/uhd/usrp/mboard_eeprom.hpp
+++ b/host/include/uhd/usrp/mboard_eeprom.hpp
@@ -37,7 +37,8 @@ namespace uhd{ namespace usrp{
         //! Possible EEPROM maps types
         enum map_type{
             MAP_N100,
-            MAP_B000
+            MAP_B000,
+            MAP_E100
         };
 
         //! Make a new empty mboard eeprom
diff --git a/host/include/uhd/utils/pimpl.hpp b/host/include/uhd/utils/pimpl.hpp
index 18454f0c4..09bf0c0a2 100644
--- a/host/include/uhd/utils/pimpl.hpp
+++ b/host/include/uhd/utils/pimpl.hpp
@@ -20,7 +20,6 @@
 
 #include <uhd/config.hpp>
 #include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 
 /*! \file pimpl.hpp
  * "Pimpl idiom" (pointer to implementation idiom).
@@ -51,6 +50,6 @@
  * \param _args the constructor args for the pimpl
  */
 #define UHD_PIMPL_MAKE(_name, _args) \
-    boost::make_shared<_name> _args
+    boost::shared_ptr<_name>(new _name _args)
 
 #endif /* INCLUDED_UHD_UTILS_PIMPL_HPP */