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

18 files changed, 382 insertions, 183 deletions

diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt
index 0b2d3f012..57670fa6e 100644
--- a/host/CMakeLists.txt
+++ b/host/CMakeLists.txt
@@ -107,7 +107,7 @@ CONFIGURE_FILE(
 @ONLY)
 
 ADD_CUSTOM_TARGET(uninstall
-  ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
+    ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
 )
 
 ########################################################################
diff --git a/host/include/uhd/transport/vrt.hpp b/host/include/uhd/transport/vrt.hpp
index f2f42f9eb..fb6efc99c 100644
--- a/host/include/uhd/transport/vrt.hpp
+++ b/host/include/uhd/transport/vrt.hpp
@@ -29,7 +29,7 @@ namespace vrt{
     static const size_t max_header_words32 = 5; //hdr+sid+tsi+tsf (no class id supported)
 
     /*!
-     * Pack a vrt header from metadata.
+     * Pack a vrt header from metadata (big endian format).
      * \param metadata the tx metadata with flags and timestamps
      * \param header_buff memory to write the packed vrt header
      * \param num_header_words32 number of words in the vrt header
@@ -38,7 +38,7 @@ namespace vrt{
      * \param packet_count the packet count sequence number
      * \param tick_rate ticks per second used in time conversion
      */
-    UHD_API void pack(
+    UHD_API void pack_be(
         const tx_metadata_t &metadata, //input
         boost::uint32_t *header_buff,  //output
         size_t &num_header_words32,    //output
@@ -49,7 +49,7 @@ namespace vrt{
     );
 
     /*!
-     * Unpack a vrt header to metadata.
+     * Unpack a vrt header to metadata (big endian format).
      * \param metadata the rx metadata with flags and timestamps
      * \param header_buff memory to read the packed vrt header
      * \param num_header_words32 number of words in the vrt header
@@ -58,7 +58,47 @@ namespace vrt{
      * \param packet_count the packet count sequence number
      * \param tick_rate ticks per second used in time conversion
      */
-    UHD_API void unpack(
+    UHD_API void unpack_be(
+        rx_metadata_t &metadata,            //output
+        const boost::uint32_t *header_buff, //input
+        size_t &num_header_words32,         //output
+        size_t &num_payload_words32,        //output
+        size_t num_packet_words32,          //input
+        size_t &packet_count,               //output
+        double tick_rate                    //input
+    );
+
+    /*!
+     * Pack a vrt header from metadata (little endian format).
+     * \param metadata the tx metadata with flags and timestamps
+     * \param header_buff memory to write the packed vrt header
+     * \param num_header_words32 number of words in the vrt header
+     * \param num_payload_words32 the length of the payload
+     * \param num_packet_words32 the length of the packet
+     * \param packet_count the packet count sequence number
+     * \param tick_rate ticks per second used in time conversion
+     */
+    UHD_API void pack_le(
+        const tx_metadata_t &metadata, //input
+        boost::uint32_t *header_buff,  //output
+        size_t &num_header_words32,    //output
+        size_t num_payload_words32,    //input
+        size_t &num_packet_words32,    //output
+        size_t packet_count,           //input
+        double tick_rate               //input
+    );
+
+    /*!
+     * Unpack a vrt header to metadata (little endian format).
+     * \param metadata the rx metadata with flags and timestamps
+     * \param header_buff memory to read the packed vrt header
+     * \param num_header_words32 number of words in the vrt header
+     * \param num_payload_words32 the length of the payload
+     * \param num_packet_words32 the length of the packet
+     * \param packet_count the packet count sequence number
+     * \param tick_rate ticks per second used in time conversion
+     */
+    UHD_API void unpack_le(
         rx_metadata_t &metadata,            //output
         const boost::uint32_t *header_buff, //input
         size_t &num_header_words32,         //output
diff --git a/host/include/uhd/utils/CMakeLists.txt b/host/include/uhd/utils/CMakeLists.txt
index 391e684c8..3684fd6e7 100644
--- a/host/include/uhd/utils/CMakeLists.txt
+++ b/host/include/uhd/utils/CMakeLists.txt
@@ -18,6 +18,7 @@
 INSTALL(FILES
     algorithm.hpp
     assert.hpp
+    byteswap.hpp
     exception.hpp
     gain_handler.hpp
     pimpl.hpp
diff --git a/host/include/uhd/utils/byteswap.hpp b/host/include/uhd/utils/byteswap.hpp
new file mode 100644
index 000000000..779b48ec9
--- /dev/null
+++ b/host/include/uhd/utils/byteswap.hpp
@@ -0,0 +1,92 @@
+//
+// Copyright 2010 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#ifndef INCLUDED_UHD_UTILS_BYTESWAP_HPP
+#define INCLUDED_UHD_UTILS_BYTESWAP_HPP
+
+#include <uhd/config.hpp>
+#include <boost/cstdint.hpp>
+
+/*! \file byteswap.hpp
+ * Provide fast byteswaping routines for 16, 32, and 64 bit integers,
+ * by using the system's native routines/intrinsics when available.
+ */
+
+namespace uhd{
+
+    //! perform a byteswap on a 16 bit integer
+    boost::uint16_t byteswap(boost::uint16_t);
+
+    //! perform a byteswap on a 32 bit integer
+    boost::uint32_t byteswap(boost::uint32_t);
+
+    //! perform a byteswap on a 64 bit integer
+    boost::uint64_t byteswap(boost::uint64_t);
+
+} //namespace uhd
+
+/***********************************************************************
+ * Platform-specific implementation details for byteswap below:
+ **********************************************************************/
+#ifdef BOOST_MSVC //http://msdn.microsoft.com/en-us/library/a3140177%28VS.80%29.aspx
+    #include <stdlib.h>
+
+    UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){
+        return _byteswap_ushort(x);
+    }
+
+    UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){
+        return _byteswap_ulong(x);
+    }
+
+    UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){
+        return _byteswap_uint64(x);
+    }
+
+#elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3
+    #include <byteswap.h>
+
+    UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){
+        return bswap_16(x); //no __builtin_bswap16
+    }
+
+    UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){
+        return __builtin_bswap32(x);
+    }
+
+    UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){
+        return __builtin_bswap64(x);
+    }
+
+#else
+    #include <byteswap.h>
+
+    UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){
+        return bswap_16(x);
+    }
+
+    UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){
+        return bswap_32(x);
+    }
+
+    UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){
+        return bswap_64(x);
+    }
+
+#endif
+
+#endif /* INCLUDED_UHD_UTILS_BYTESWAP_HPP */
diff --git a/host/lib/transport/gen_vrt.py b/host/lib/transport/gen_vrt.py
index c34ffb198..1417240ab 100755
--- a/host/lib/transport/gen_vrt.py
+++ b/host/lib/transport/gen_vrt.py
@@ -27,28 +27,42 @@ The generated code infers jump tables to speed-up the parsing time.
 
 TMPL_TEXT = """
 #import time
-
-########################################################################
-## setup predicates
-########################################################################
-#set $sid_p = 0b00001
-#set $cid_p = 0b00010
-#set $tsi_p = 0b00100
-#set $tsf_p = 0b01000
-#set $tlr_p = 0b10000
-
 /***********************************************************************
  * This file was generated by $file on $time.strftime("%c")
  **********************************************************************/
 
 \#include <uhd/transport/vrt.hpp>
-\#include <boost/asio.hpp> //endianness conversion
+\#include <uhd/utils/byteswap.hpp>
 \#include <stdexcept>
 
+//define the endian macros to convert integers
+\#ifdef HAVE_BIG_ENDIAN
+    \#define BE_MACRO(x) (x)
+    \#define LE_MACRO(x) uhd::byteswap(x)
+\#else
+    \#define BE_MACRO(x) uhd::byteswap(x)
+    \#define LE_MACRO(x) (x)
+\#endif
+
+#set $XE_MACRO = "BE_MACRO"
+
 using namespace uhd;
 using namespace uhd::transport;
 
-void vrt::pack(
+########################################################################
+#def gen_code($XE_MACRO, $suffix)
+########################################################################
+
+########################################################################
+## setup predicates
+########################################################################
+#set $sid_p = 0b00001
+#set $cid_p = 0b00010
+#set $tsi_p = 0b00100
+#set $tsf_p = 0b01000
+#set $tlr_p = 0b10000
+
+void vrt::pack_$(suffix)(
     const tx_metadata_t &metadata, //input
     boost::uint32_t *header_buff,  //output
     size_t &num_header_words32,    //output
@@ -70,29 +84,29 @@ void vrt::pack(
         #set $flags = 0
         ########## Stream ID ##########
         #if $pred & $sid_p
-            header_buff[$num_header_words] = htonl(metadata.stream_id);
+            header_buff[$num_header_words] = $(XE_MACRO)(metadata.stream_id);
             #set $num_header_words += 1
             #set $flags |= (0x1 << 28);
         #end if
         ########## Class ID ##########
         #if $pred & $cid_p
-            header_buff[$num_header_words] = htonl(0);
+            header_buff[$num_header_words] = 0;
             #set $num_header_words += 1
-            header_buff[$num_header_words] = htonl(0);
+            header_buff[$num_header_words] = 0;
             #set $num_header_words += 1
             #set $flags |= (0x1 << 27);
         #end if
         ########## Integer Time ##########
         #if $pred & $tsi_p
-            header_buff[$num_header_words] = htonl(metadata.time_spec.secs);
+            header_buff[$num_header_words] = $(XE_MACRO)(metadata.time_spec.secs);
             #set $num_header_words += 1
             #set $flags |= (0x3 << 22);
         #end if
         ########## Fractional Time ##########
         #if $pred & $tsf_p
-            header_buff[$num_header_words] = htonl(0);
+            header_buff[$num_header_words] = 0;
             #set $num_header_words += 1
-            header_buff[$num_header_words] = htonl(metadata.time_spec.get_ticks(tick_rate));
+            header_buff[$num_header_words] = $(XE_MACRO)(metadata.time_spec.get_ticks(tick_rate));
             #set $num_header_words += 1
             #set $flags |= (0x1 << 20);
         #end if
@@ -116,13 +130,13 @@ void vrt::pack(
     if (metadata.end_of_burst)   vrt_hdr_flags |= $hex(0x1 << 24);
 
     //fill in complete header word
-    header_buff[0] = htonl(vrt_hdr_flags |
+    header_buff[0] = $(XE_MACRO)(vrt_hdr_flags |
         ((packet_count & 0xf) << 16) |
         (num_packet_words32 & 0xffff)
     );
 }
 
-void vrt::unpack(
+void vrt::unpack_$(suffix)(
     rx_metadata_t &metadata,            //output
     const boost::uint32_t *header_buff, //input
     size_t &num_header_words32,         //output
@@ -135,7 +149,7 @@ void vrt::unpack(
     metadata = rx_metadata_t();
 
     //extract vrt header
-    boost::uint32_t vrt_hdr_word = ntohl(header_buff[0]);
+    boost::uint32_t vrt_hdr_word = $(XE_MACRO)(header_buff[0]);
     size_t packet_words32 = vrt_hdr_word & 0xffff;
     packet_count = (vrt_hdr_word >> 16) & 0xf;
 
@@ -160,7 +174,7 @@ void vrt::unpack(
         ########## Stream ID ##########
         #if $pred & $sid_p
             metadata.has_stream_id = true;
-            metadata.stream_id = ntohl(header_buff[$num_header_words]);
+            metadata.stream_id = $(XE_MACRO)(header_buff[$num_header_words]);
             #set $num_header_words += 1
         #end if
         ########## Class ID ##########
@@ -172,7 +186,7 @@ void vrt::unpack(
         #if $pred & $tsi_p
             metadata.has_time_spec = true;
             #set $set_has_time_spec = True
-            metadata.time_spec.secs = ntohl(header_buff[$num_header_words]);
+            metadata.time_spec.secs = $(XE_MACRO)(header_buff[$num_header_words]);
             #set $num_header_words += 1
         #end if
         ########## Fractional Time ##########
@@ -182,7 +196,7 @@ void vrt::unpack(
                 #set $set_has_time_spec = True
             #end if
             #set $num_header_words += 1
-            metadata.time_spec.set_ticks(ntohl(header_buff[$num_header_words]), tick_rate);
+            metadata.time_spec.set_ticks($(XE_MACRO)(header_buff[$num_header_words]), tick_rate);
             #set $num_header_words += 1
         #end if
         ########## Trailer ##########
@@ -198,13 +212,19 @@ void vrt::unpack(
     #end for
     }
 }
-"""
 
-import sys
+########################################################################
+#end def
+########################################################################
+
+$gen_code("BE_MACRO", "be")
+$gen_code("LE_MACRO", "le")
+"""
 
-from Cheetah.Template import Template
 def parse_tmpl(_tmpl_text, **kwargs):
+    from Cheetah.Template import Template
     return str(Template(_tmpl_text, kwargs))
 
 if __name__ == '__main__':
+    import sys
     open(sys.argv[1], 'w').write(parse_tmpl(TMPL_TEXT, file=__file__))
diff --git a/host/lib/transport/vrt_packet_handler.hpp b/host/lib/transport/vrt_packet_handler.hpp
index d6b863040..8dfc7b3d0 100644
--- a/host/lib/transport/vrt_packet_handler.hpp
+++ b/host/lib/transport/vrt_packet_handler.hpp
@@ -66,10 +66,12 @@ namespace vrt_packet_handler{
      * Unpack a received vrt header and set the copy buffer.
      *  - helper function for vrt_packet_handler::_recv1
      ******************************************************************/
+    template<typename vrt_unpacker_type>
     static UHD_INLINE void _recv1_helper(
         recv_state &state,
         uhd::rx_metadata_t &metadata,
         double tick_rate,
+        vrt_unpacker_type vrt_unpacker,
         size_t vrt_header_offset_words32
     ){
         size_t num_packet_words32 = state.managed_buff->size()/sizeof(boost::uint32_t);
@@ -79,7 +81,7 @@ namespace vrt_packet_handler{
         }
         const boost::uint32_t *vrt_hdr = state.managed_buff->cast<const boost::uint32_t *>() + vrt_header_offset_words32;
         size_t num_header_words32_out, num_payload_words32_out, packet_count_out;
-        uhd::transport::vrt::unpack(
+        vrt_unpacker(
             metadata,                //output
             vrt_hdr,                 //input
             num_header_words32_out,  //output
@@ -106,6 +108,7 @@ namespace vrt_packet_handler{
      * Recv data, unpack a vrt header, and copy-convert the data.
      *  - helper function for vrt_packet_handler::recv
      ******************************************************************/
+    template<typename vrt_unpacker_type>
     static UHD_INLINE size_t _recv1(
         recv_state &state,
         void *recv_mem,
@@ -114,6 +117,7 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
+        vrt_unpacker_type vrt_unpacker,
         const get_recv_buff_t &get_recv_buff,
         //use these two params to handle a layer above vrt
         size_t vrt_header_offset_words32,
@@ -127,7 +131,7 @@ namespace vrt_packet_handler{
             recv_cb(state.managed_buff); //callback before vrt unpack
             try{
                 _recv1_helper(
-                    state, metadata, tick_rate, vrt_header_offset_words32
+                    state, metadata, tick_rate, vrt_unpacker, vrt_header_offset_words32
                 );
             }catch(const std::exception &e){
                 std::cerr << "Error (recv): " << e.what() << std::endl;
@@ -164,6 +168,7 @@ namespace vrt_packet_handler{
     /*******************************************************************
      * Recv vrt packets and copy convert the samples into the buffer.
      ******************************************************************/
+    template<typename vrt_unpacker_type>
     static UHD_INLINE size_t recv(
         recv_state &state,
         const boost::asio::mutable_buffer &buff,
@@ -172,6 +177,7 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
+        vrt_unpacker_type vrt_unpacker,
         const get_recv_buff_t &get_recv_buff,
         //use these two params to handle a layer above vrt
         size_t vrt_header_offset_words32 = 0,
@@ -192,6 +198,7 @@ namespace vrt_packet_handler{
                 metadata,
                 io_type, otw_type,
                 tick_rate,
+                vrt_unpacker,
                 get_recv_buff,
                 vrt_header_offset_words32,
                 recv_cb
@@ -211,6 +218,7 @@ namespace vrt_packet_handler{
                     (accum_num_samps == 0)? metadata : tmp_md, //only the first metadata gets kept
                     io_type, otw_type,
                     tick_rate,
+                    vrt_unpacker,
                     get_recv_buff,
                     vrt_header_offset_words32,
                     recv_cb
@@ -249,6 +257,7 @@ namespace vrt_packet_handler{
      * Pack a vrt header, copy-convert the data, and send it.
      *  - helper function for vrt_packet_handler::send
      ******************************************************************/
+    template<typename vrt_packer_type>
     static UHD_INLINE void _send1(
         send_state &state,
         const void *send_mem,
@@ -257,6 +266,7 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
+        vrt_packer_type vrt_packer,
         const get_send_buff_t &get_send_buff,
         size_t vrt_header_offset_words32,
         const send_cb_t& send_cb
@@ -269,7 +279,7 @@ namespace vrt_packet_handler{
         size_t packet_count = state.next_packet_seq++;
 
         //pack metadata into a vrt header
-        uhd::transport::vrt::pack(
+        vrt_packer(
             metadata,            //input
             tx_mem,              //output
             num_header_words32,  //output
@@ -295,6 +305,7 @@ namespace vrt_packet_handler{
     /*******************************************************************
      * Send vrt packets and copy convert the samples into the buffer.
      ******************************************************************/
+    template<typename vrt_packer_type>
     static UHD_INLINE size_t send(
         send_state &state,
         const boost::asio::const_buffer &buff,
@@ -303,6 +314,7 @@ namespace vrt_packet_handler{
         const uhd::io_type_t &io_type,
         const uhd::otw_type_t &otw_type,
         double tick_rate,
+        vrt_packer_type vrt_packer,
         const get_send_buff_t &get_send_buff,
         size_t max_samples_per_packet,
         //use these two params to handle a layer above vrt
@@ -324,6 +336,7 @@ namespace vrt_packet_handler{
                 metadata,
                 io_type, otw_type,
                 tick_rate,
+                vrt_packer,
                 get_send_buff,
                 vrt_header_offset_words32,
                 send_cb
@@ -358,6 +371,7 @@ namespace vrt_packet_handler{
                     md,
                     io_type, otw_type,
                     tick_rate,
+                    vrt_packer,
                     get_send_buff,
                     vrt_header_offset_words32,
                     send_cb
diff --git a/host/lib/usrp/usrp2/codec_ctrl.cpp b/host/lib/usrp/usrp2/codec_ctrl.cpp
index abd840027..32cc13ded 100644
--- a/host/lib/usrp/usrp2/codec_ctrl.cpp
+++ b/host/lib/usrp/usrp2/codec_ctrl.cpp
@@ -57,7 +57,7 @@ public:
         }
 
         //power-up adc
-        _iface->poke32(FR_MISC_CTRL_ADC, FRF_MISC_CTRL_ADC_ON);
+        _iface->poke32(U2_REG_MISC_CTRL_ADC, U2_FLAG_MISC_CTRL_ADC_ON);
     }
 
     ~usrp2_codec_ctrl_impl(void){
@@ -66,7 +66,7 @@ public:
         this->send_ad9777_reg(0);
 
         //power-down adc
-        _iface->poke32(FR_MISC_CTRL_ADC, FRF_MISC_CTRL_ADC_OFF);
+        _iface->poke32(U2_REG_MISC_CTRL_ADC, U2_FLAG_MISC_CTRL_ADC_OFF);
     }
 
 private:
diff --git a/host/lib/usrp/usrp2/dboard_iface.cpp b/host/lib/usrp/usrp2/dboard_iface.cpp
index feee0a970..9f7c7f9e6 100644
--- a/host/lib/usrp/usrp2/dboard_iface.cpp
+++ b/host/lib/usrp/usrp2/dboard_iface.cpp
@@ -140,13 +140,13 @@ void usrp2_dboard_iface::set_pin_ctrl(unit_t unit, boost::uint16_t value){
     boost::uint32_t new_sels = 0x0;
     for(size_t i = 0; i < 16; i++){
         bool is_bit_set = (value & (0x1 << i)) != 0;
-        new_sels |= ((is_bit_set)? FRF_GPIO_SEL_ATR : FRF_GPIO_SEL_GPIO) << (i*2);
+        new_sels |= ((is_bit_set)? U2_FLAG_GPIO_SEL_ATR : U2_FLAG_GPIO_SEL_GPIO) << (i*2);
     }
 
     //write the selection mux value to register
     switch(unit){
-    case UNIT_RX: _iface->poke32(FR_GPIO_RX_SEL, new_sels); return;
-    case UNIT_TX: _iface->poke32(FR_GPIO_TX_SEL, new_sels); return;
+    case UNIT_RX: _iface->poke32(U2_REG_GPIO_RX_SEL, new_sels); return;
+    case UNIT_TX: _iface->poke32(U2_REG_GPIO_TX_SEL, new_sels); return;
     }
 }
 
@@ -154,18 +154,18 @@ void usrp2_dboard_iface::set_gpio_ddr(unit_t unit, boost::uint16_t value){
     _ddr_shadow = \
         (_ddr_shadow & ~(0xffff << unit_to_shift[unit])) |
         (boost::uint32_t(value) << unit_to_shift[unit]);
-    _iface->poke32(FR_GPIO_DDR, _ddr_shadow);
+    _iface->poke32(U2_REG_GPIO_DDR, _ddr_shadow);
 }
 
 void usrp2_dboard_iface::write_gpio(unit_t unit, boost::uint16_t value){
     _gpio_shadow = \
         (_gpio_shadow & ~(0xffff << unit_to_shift[unit])) |
         (boost::uint32_t(value) << unit_to_shift[unit]);
-    _iface->poke32(FR_GPIO_IO, _gpio_shadow);
+    _iface->poke32(U2_REG_GPIO_IO, _gpio_shadow);
 }
 
 boost::uint16_t usrp2_dboard_iface::read_gpio(unit_t unit){
-    return boost::uint16_t(_iface->peek32(FR_GPIO_IO) >> unit_to_shift[unit]);
+    return boost::uint16_t(_iface->peek32(U2_REG_GPIO_IO) >> unit_to_shift[unit]);
 }
 
 void usrp2_dboard_iface::set_atr_reg(unit_t unit, atr_reg_t atr, boost::uint16_t value){
@@ -174,16 +174,16 @@ void usrp2_dboard_iface::set_atr_reg(unit_t unit, atr_reg_t atr, boost::uint16_t
         unit_t, uhd::dict<atr_reg_t, boost::uint32_t>
     > unit_to_atr_to_addr = map_list_of
         (UNIT_RX, map_list_of
-            (ATR_REG_IDLE,        FR_ATR_IDLE_RXSIDE)
-            (ATR_REG_TX_ONLY,     FR_ATR_INTX_RXSIDE)
-            (ATR_REG_RX_ONLY,     FR_ATR_INRX_RXSIDE)
-            (ATR_REG_FULL_DUPLEX, FR_ATR_FULL_RXSIDE)
+            (ATR_REG_IDLE,        U2_REG_ATR_IDLE_RXSIDE)
+            (ATR_REG_TX_ONLY,     U2_REG_ATR_INTX_RXSIDE)
+            (ATR_REG_RX_ONLY,     U2_REG_ATR_INRX_RXSIDE)
+            (ATR_REG_FULL_DUPLEX, U2_REG_ATR_FULL_RXSIDE)
         )
         (UNIT_TX, map_list_of
-            (ATR_REG_IDLE,        FR_ATR_IDLE_TXSIDE)
-            (ATR_REG_TX_ONLY,     FR_ATR_INTX_TXSIDE)
-            (ATR_REG_RX_ONLY,     FR_ATR_INRX_TXSIDE)
-            (ATR_REG_FULL_DUPLEX, FR_ATR_FULL_TXSIDE)
+            (ATR_REG_IDLE,        U2_REG_ATR_IDLE_TXSIDE)
+            (ATR_REG_TX_ONLY,     U2_REG_ATR_INTX_TXSIDE)
+            (ATR_REG_RX_ONLY,     U2_REG_ATR_INRX_TXSIDE)
+            (ATR_REG_FULL_DUPLEX, U2_REG_ATR_FULL_TXSIDE)
         )
     ;
     _iface->poke16(unit_to_atr_to_addr[unit][atr], value);
diff --git a/host/lib/usrp/usrp2/dboard_impl.cpp b/host/lib/usrp/usrp2/dboard_impl.cpp
index 0ac39d2a3..4a3a70467 100644
--- a/host/lib/usrp/usrp2/dboard_impl.cpp
+++ b/host/lib/usrp/usrp2/dboard_impl.cpp
@@ -76,7 +76,7 @@ void usrp2_impl::update_rx_mux_config(void){
         rx_mux = (((rx_mux >> 0) & 0x3) << 2) | (((rx_mux >> 2) & 0x3) << 0);
     }
 
-    _iface->poke32(FR_DSP_RX_MUX, rx_mux);
+    _iface->poke32(U2_REG_DSP_RX_MUX, rx_mux);
 }
 
 void usrp2_impl::update_tx_mux_config(void){
@@ -89,7 +89,7 @@ void usrp2_impl::update_tx_mux_config(void){
         tx_mux = (((tx_mux >> 0) & 0xf) << 4) | (((tx_mux >> 4) & 0xf) << 0);
     }
 
-    _iface->poke32(FR_DSP_TX_MUX, tx_mux);
+    _iface->poke32(U2_REG_DSP_TX_MUX, tx_mux);
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp
index 195a9bc53..330638cb1 100644
--- a/host/lib/usrp/usrp2/dsp_impl.cpp
+++ b/host/lib/usrp/usrp2/dsp_impl.cpp
@@ -91,20 +91,8 @@ void usrp2_impl::init_ddc_config(void){
     );
 
     //initial config and update
-    _ddc_decim = default_decim;
-    _ddc_freq = 0;
-    update_ddc_config();
-}
-
-void usrp2_impl::update_ddc_config(void){
-    //set the decimation
-    _iface->poke32(FR_DSP_RX_DECIM_RATE, calculate_cic_word(_ddc_decim));
-
-    //set the scaling
-    static const boost::int16_t default_rx_scale_iq = 1024;
-    _iface->poke32(FR_DSP_RX_SCALE_IQ,
-        calculate_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
-    );
+    ddc_set(DSP_PROP_FREQ_SHIFT, double(0));
+    ddc_set(DSP_PROP_HOST_RATE, double(get_master_clock_freq()/default_decim));
 }
 
 /***********************************************************************
@@ -141,7 +129,7 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
 
     case DSP_PROP_FREQ_SHIFT:{
             double new_freq = val.as<double>();
-            _iface->poke32(FR_DSP_RX_FREQ,
+            _iface->poke32(U2_REG_DSP_RX_FREQ,
                 calculate_freq_word_and_update_actual_freq(new_freq, get_master_clock_freq())
             );
             _ddc_freq = new_freq; //shadow
@@ -151,7 +139,15 @@ void usrp2_impl::ddc_set(const wax::obj &key, const wax::obj &val){
     case DSP_PROP_HOST_RATE:{
             double extact_rate = get_master_clock_freq()/val.as<double>();
             _ddc_decim = pick_closest_rate(extact_rate, _allowed_decim_and_interp_rates);
-            update_ddc_config();
+
+            //set the decimation
+            _iface->poke32(U2_REG_DSP_RX_DECIM_RATE, calculate_cic_word(_ddc_decim));
+
+            //set the scaling
+            static const boost::int16_t default_rx_scale_iq = 1024;
+            _iface->poke32(U2_REG_DSP_RX_SCALE_IQ,
+                calculate_iq_scale_word(default_rx_scale_iq, default_rx_scale_iq)
+            );
         }
         return;
 
@@ -170,24 +166,8 @@ void usrp2_impl::init_duc_config(void){
     );
 
     //initial config and update
-    _duc_interp = default_interp;
-    _duc_freq = 0;
-    update_duc_config();
-}
-
-void usrp2_impl::update_duc_config(void){
-    // Calculate CIC interpolation (i.e., without halfband interpolators)
-    size_t tmp_interp = calculate_cic_word(_duc_interp) & 0xff;
-
-    // Calculate closest multiplier constant to reverse gain absent scale multipliers
-    double interp_cubed = std::pow(double(tmp_interp), 3);
-    boost::int16_t scale = rint((4096*std::pow(2, ceil(log2(interp_cubed))))/(1.65*interp_cubed));
-
-    //set the interpolation
-    _iface->poke32(FR_DSP_TX_INTERP_RATE, calculate_cic_word(_duc_interp));
-
-    //set the scaling
-    _iface->poke32(FR_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
+    duc_set(DSP_PROP_FREQ_SHIFT, double(0));
+    duc_set(DSP_PROP_HOST_RATE, double(get_master_clock_freq()/default_interp));
 }
 
 /***********************************************************************
@@ -224,7 +204,7 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
 
     case DSP_PROP_FREQ_SHIFT:{
             double new_freq = val.as<double>();
-            _iface->poke32(FR_DSP_TX_FREQ,
+            _iface->poke32(U2_REG_DSP_TX_FREQ,
                 calculate_freq_word_and_update_actual_freq(new_freq, get_master_clock_freq())
             );
             _duc_freq = new_freq; //shadow
@@ -234,7 +214,19 @@ void usrp2_impl::duc_set(const wax::obj &key, const wax::obj &val){
     case DSP_PROP_HOST_RATE:{
             double extact_rate = get_master_clock_freq()/val.as<double>();
             _duc_interp = pick_closest_rate(extact_rate, _allowed_decim_and_interp_rates);
-            update_duc_config();
+
+            // Calculate CIC interpolation (i.e., without halfband interpolators)
+            size_t tmp_interp = calculate_cic_word(_duc_interp) & 0xff;
+
+            // Calculate closest multiplier constant to reverse gain absent scale multipliers
+            double interp_cubed = std::pow(double(tmp_interp), 3);
+            boost::int16_t scale = rint((4096*std::pow(2, ceil(log2(interp_cubed))))/(1.65*interp_cubed));
+
+            //set the interpolation
+            _iface->poke32(U2_REG_DSP_TX_INTERP_RATE, calculate_cic_word(_duc_interp));
+
+            //set the scaling
+            _iface->poke32(U2_REG_DSP_TX_SCALE_IQ, calculate_iq_scale_word(scale, scale));
         }
         return;
 
diff --git a/host/lib/usrp/usrp2/io_impl.cpp b/host/lib/usrp/usrp2/io_impl.cpp
index 18f2d013f..6cb2a735b 100644
--- a/host/lib/usrp/usrp2/io_impl.cpp
+++ b/host/lib/usrp/usrp2/io_impl.cpp
@@ -107,17 +107,17 @@ void usrp2_impl::io_init(void){
 
     //setup RX DSP regs
     std::cout << "RX samples per packet: " << get_max_recv_samps_per_packet() << std::endl;
-    _iface->poke32(FR_RX_CTRL_NSAMPS_PER_PKT, get_max_recv_samps_per_packet());
-    _iface->poke32(FR_RX_CTRL_NCHANNELS, 1);
-    _iface->poke32(FR_RX_CTRL_CLEAR_OVERRUN, 1); //reset
-    _iface->poke32(FR_RX_CTRL_VRT_HEADER, 0
+    _iface->poke32(U2_REG_RX_CTRL_NSAMPS_PER_PKT, get_max_recv_samps_per_packet());
+    _iface->poke32(U2_REG_RX_CTRL_NCHANNELS, 1);
+    _iface->poke32(U2_REG_RX_CTRL_CLEAR_OVERRUN, 1); //reset
+    _iface->poke32(U2_REG_RX_CTRL_VRT_HEADER, 0
         | (0x1 << 28) //if data with stream id
         | (0x1 << 26) //has trailer
         | (0x3 << 22) //integer time other
         | (0x1 << 20) //fractional time sample count
     );
-    _iface->poke32(FR_RX_CTRL_VRT_STREAM_ID, 0);
-    _iface->poke32(FR_RX_CTRL_VRT_TRAILER, 0);
+    _iface->poke32(U2_REG_RX_CTRL_VRT_STREAM_ID, 0);
+    _iface->poke32(U2_REG_RX_CTRL_VRT_TRAILER, 0);
 
     std::cout << "TX samples per packet: " << get_max_send_samps_per_packet() << std::endl;
 
@@ -139,6 +139,7 @@ size_t usrp2_impl::send(
         buff, metadata, send_mode,  //buffer to empty and samples metadata
         io_type, _tx_otw_type,      //input and output types to convert
         get_master_clock_freq(),    //master clock tick rate
+        uhd::transport::vrt::pack_be,
         boost::bind(&zero_copy_if::get_send_buff, _data_transport),
         get_max_send_samps_per_packet()
     );
@@ -158,6 +159,7 @@ size_t usrp2_impl::recv(
         buff, metadata, recv_mode,  //buffer to fill and samples metadata
         io_type, _rx_otw_type,      //input and output types to convert
         get_master_clock_freq(),    //master clock tick rate
+        uhd::transport::vrt::unpack_be,
         boost::bind(&usrp2_impl::io_impl::get_recv_buff, _io_impl)
     );
 }
diff --git a/host/lib/usrp/usrp2/mboard_impl.cpp b/host/lib/usrp/usrp2/mboard_impl.cpp
index a2aeadf16..78fc5dc23 100644
--- a/host/lib/usrp/usrp2/mboard_impl.cpp
+++ b/host/lib/usrp/usrp2/mboard_impl.cpp
@@ -54,26 +54,26 @@ void usrp2_impl::update_clock_config(void){
 
     //translate pps source enums
     switch(_clock_config.pps_source){
-    case clock_config_t::PPS_SMA:  pps_flags |= FRF_TIME64_PPS_SMA;  break;
-    case clock_config_t::PPS_MIMO: pps_flags |= FRF_TIME64_PPS_MIMO; break;
+    case clock_config_t::PPS_SMA:  pps_flags |= U2_FLAG_TIME64_PPS_SMA;  break;
+    case clock_config_t::PPS_MIMO: pps_flags |= U2_FLAG_TIME64_PPS_MIMO; break;
     default: throw std::runtime_error("usrp2: unhandled clock configuration pps source");
     }
 
     //translate pps polarity enums
     switch(_clock_config.pps_polarity){
-    case clock_config_t::PPS_POS: pps_flags |= FRF_TIME64_PPS_POSEDGE; break;
-    case clock_config_t::PPS_NEG: pps_flags |= FRF_TIME64_PPS_NEGEDGE; break;
+    case clock_config_t::PPS_POS: pps_flags |= U2_FLAG_TIME64_PPS_POSEDGE; break;
+    case clock_config_t::PPS_NEG: pps_flags |= U2_FLAG_TIME64_PPS_NEGEDGE; break;
     default: throw std::runtime_error("usrp2: unhandled clock configuration pps polarity");
     }
 
     //set the pps flags
-    _iface->poke32(FR_TIME64_FLAGS, pps_flags);
+    _iface->poke32(U2_REG_TIME64_FLAGS, pps_flags);
 
     //clock source ref 10mhz
     switch(_clock_config.ref_source){
-    case clock_config_t::REF_INT : _iface->poke32(FR_MISC_CTRL_CLOCK, 0x10); break;
-    case clock_config_t::REF_SMA : _iface->poke32(FR_MISC_CTRL_CLOCK, 0x1C); break;
-    case clock_config_t::REF_MIMO: _iface->poke32(FR_MISC_CTRL_CLOCK, 0x15); break;
+    case clock_config_t::REF_INT : _iface->poke32(U2_REG_MISC_CTRL_CLOCK, 0x10); break;
+    case clock_config_t::REF_SMA : _iface->poke32(U2_REG_MISC_CTRL_CLOCK, 0x1C); break;
+    case clock_config_t::REF_MIMO: _iface->poke32(U2_REG_MISC_CTRL_CLOCK, 0x15); break;
     default: throw std::runtime_error("usrp2: unhandled clock configuration reference source");
     }
 
@@ -84,18 +84,18 @@ void usrp2_impl::update_clock_config(void){
 
 void usrp2_impl::set_time_spec(const time_spec_t &time_spec, bool now){
     //set the ticks
-    _iface->poke32(FR_TIME64_TICKS, time_spec.get_ticks(get_master_clock_freq()));
+    _iface->poke32(U2_REG_TIME64_TICKS, time_spec.get_ticks(get_master_clock_freq()));
 
     //set the flags register
-    boost::uint32_t imm_flags = (now)? FRF_TIME64_LATCH_NOW : FRF_TIME64_LATCH_NEXT_PPS;
-    _iface->poke32(FR_TIME64_IMM, imm_flags);
+    boost::uint32_t imm_flags = (now)? U2_FLAG_TIME64_LATCH_NOW : U2_FLAG_TIME64_LATCH_NEXT_PPS;
+    _iface->poke32(U2_REG_TIME64_IMM, imm_flags);
 
     //set the seconds (latches in all 3 registers)
-    _iface->poke32(FR_TIME64_SECS, time_spec.secs);
+    _iface->poke32(U2_REG_TIME64_SECS, time_spec.secs);
 }
 
 void usrp2_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){
-    UHD_ASSERT_THROW(stream_cmd.num_samps <= FR_RX_CTRL_MAX_SAMPS_PER_CMD);
+    UHD_ASSERT_THROW(stream_cmd.num_samps <= U2_REG_RX_CTRL_MAX_SAMPS_PER_CMD);
 
     //setup the mode to instruction flags
     typedef boost::tuple<bool, bool, bool> inst_t;
@@ -112,14 +112,14 @@ void usrp2_impl::issue_ddc_stream_cmd(const stream_cmd_t &stream_cmd){
     boost::tie(inst_reload, inst_chain, inst_samps) = mode_to_inst[stream_cmd.stream_mode];
 
     //issue the stream command
-    _iface->poke32(FR_RX_CTRL_STREAM_CMD, FR_RX_CTRL_MAKE_CMD(
+    _iface->poke32(U2_REG_RX_CTRL_STREAM_CMD, U2_REG_RX_CTRL_MAKE_CMD(
         (inst_samps)? stream_cmd.num_samps : ((inst_chain)? get_max_recv_samps_per_packet() : 1),
         (stream_cmd.stream_now)? 1 : 0,
         (inst_chain)? 1 : 0,
         (inst_reload)? 1 : 0
     ));
-    _iface->poke32(FR_RX_CTRL_TIME_SECS,  stream_cmd.time_spec.secs);
-    _iface->poke32(FR_RX_CTRL_TIME_TICKS, stream_cmd.time_spec.get_ticks(get_master_clock_freq()));
+    _iface->poke32(U2_REG_RX_CTRL_TIME_SECS,  stream_cmd.time_spec.secs);
+    _iface->poke32(U2_REG_RX_CTRL_TIME_TICKS, stream_cmd.time_spec.get_ticks(get_master_clock_freq()));
 }
 
 /***********************************************************************
diff --git a/host/lib/usrp/usrp2/serdes_ctrl.cpp b/host/lib/usrp/usrp2/serdes_ctrl.cpp
index 31708d377..e83dceb96 100644
--- a/host/lib/usrp/usrp2/serdes_ctrl.cpp
+++ b/host/lib/usrp/usrp2/serdes_ctrl.cpp
@@ -27,11 +27,11 @@ class usrp2_serdes_ctrl_impl : public usrp2_serdes_ctrl{
 public:
     usrp2_serdes_ctrl_impl(usrp2_iface::sptr iface){
         _iface = iface;
-        _iface->poke32(FR_MISC_CTRL_SERDES, FRF_MISC_CTRL_SERDES_ENABLE | FRF_MISC_CTRL_SERDES_RXEN);
+        _iface->poke32(U2_REG_MISC_CTRL_SERDES, U2_FLAG_MISC_CTRL_SERDES_ENABLE | U2_FLAG_MISC_CTRL_SERDES_RXEN);
     }
 
     ~usrp2_serdes_ctrl_impl(void){
-        _iface->poke32(FR_MISC_CTRL_SERDES, 0); //power-down
+        _iface->poke32(U2_REG_MISC_CTRL_SERDES, 0); //power-down
     }
 
 private:
diff --git a/host/lib/usrp/usrp2/usrp2_impl.hpp b/host/lib/usrp/usrp2/usrp2_impl.hpp
index 6ad151a0a..77148ee62 100644
--- a/host/lib/usrp/usrp2/usrp2_impl.hpp
+++ b/host/lib/usrp/usrp2/usrp2_impl.hpp
@@ -198,14 +198,12 @@ private:
     size_t _ddc_decim;
     double _ddc_freq;
     void init_ddc_config(void);
-    void update_ddc_config(void);
     void issue_ddc_stream_cmd(const uhd::stream_cmd_t &stream_cmd);
 
     //methods and shadows for the duc dsp
     size_t _duc_interp;
     double _duc_freq;
     void init_duc_config(void);
-    void update_duc_config(void);
 
     //properties interface for ddc
     void ddc_get(const wax::obj &, wax::obj &);
diff --git a/host/lib/usrp/usrp2/usrp2_regs.hpp b/host/lib/usrp/usrp2/usrp2_regs.hpp
index 0f675357b..589fa71a3 100644
--- a/host/lib/usrp/usrp2/usrp2_regs.hpp
+++ b/host/lib/usrp/usrp2/usrp2_regs.hpp
@@ -64,23 +64,23 @@
 /////////////////////////////////////////////////
 // Misc Control
 ////////////////////////////////////////////////
-#define FR_MISC_CTRL_CLOCK           _SR_ADDR(0)
-#define FR_MISC_CTRL_SERDES          _SR_ADDR(1)
-#define FR_MISC_CTRL_ADC             _SR_ADDR(2)
-#define FR_MISC_CTRL_LEDS            _SR_ADDR(3)
-#define FR_MISC_CTRL_PHY             _SR_ADDR(4) // LSB is reset line to eth phy
-#define FR_MISC_CTRL_DBG_MUX         _SR_ADDR(5)
-#define FR_MISC_CTRL_RAM_PAGE        _SR_ADDR(6) // FIXME should go somewhere else...
-#define FR_MISC_CTRL_FLUSH_ICACHE    _SR_ADDR(7) // Flush the icache
-#define FR_MISC_CTRL_LED_SRC         _SR_ADDR(8) // HW or SW control for LEDs
-
-#define FRF_MISC_CTRL_SERDES_ENABLE 8
-#define FRF_MISC_CTRL_SERDES_PRBSEN 4
-#define FRF_MISC_CTRL_SERDES_LOOPEN 2
-#define FRF_MISC_CTRL_SERDES_RXEN   1
-
-#define FRF_MISC_CTRL_ADC_ON  0x0F
-#define FRF_MISC_CTRL_ADC_OFF 0x00
+#define U2_REG_MISC_CTRL_CLOCK           _SR_ADDR(0)
+#define U2_REG_MISC_CTRL_SERDES          _SR_ADDR(1)
+#define U2_REG_MISC_CTRL_ADC             _SR_ADDR(2)
+#define U2_REG_MISC_CTRL_LEDS            _SR_ADDR(3)
+#define U2_REG_MISC_CTRL_PHY             _SR_ADDR(4) // LSB is reset line to eth phy
+#define U2_REG_MISC_CTRL_DBG_MUX         _SR_ADDR(5)
+#define U2_REG_MISC_CTRL_RAM_PAGE        _SR_ADDR(6) // FIXME should go somewhere else...
+#define U2_REG_MISC_CTRL_FLUSH_ICACHE    _SR_ADDR(7) // Flush the icache
+#define U2_REG_MISC_CTRL_LED_SRC         _SR_ADDR(8) // HW or SW control for LEDs
+
+#define U2_FLAG_MISC_CTRL_SERDES_ENABLE 8
+#define U2_FLAG_MISC_CTRL_SERDES_PRBSEN 4
+#define U2_FLAG_MISC_CTRL_SERDES_LOOPEN 2
+#define U2_FLAG_MISC_CTRL_SERDES_RXEN   1
+
+#define U2_FLAG_MISC_CTRL_ADC_ON  0x0F
+#define U2_FLAG_MISC_CTRL_ADC_OFF 0x00
 
 /////////////////////////////////////////////////
 // VITA49 64 bit time (write only)
@@ -101,26 +101,26 @@
    *
    * </pre>
    */
-#define FR_TIME64_SECS  _SR_ADDR(SR_TIME64 + 0)  // value to set absolute secs to on next PPS
-#define FR_TIME64_TICKS _SR_ADDR(SR_TIME64 + 1)  // value to set absolute ticks to on next PPS
-#define FR_TIME64_FLAGS _SR_ADDR(SR_TIME64 + 2)  // flags - see chart above
-#define FR_TIME64_IMM   _SR_ADDR(SR_TIME64 + 3) // set immediate (0=latch on next pps, 1=latch immediate, default=0)
+#define U2_REG_TIME64_SECS  _SR_ADDR(SR_TIME64 + 0)  // value to set absolute secs to on next PPS
+#define U2_REG_TIME64_TICKS _SR_ADDR(SR_TIME64 + 1)  // value to set absolute ticks to on next PPS
+#define U2_REG_TIME64_FLAGS _SR_ADDR(SR_TIME64 + 2)  // flags - see chart above
+#define U2_REG_TIME64_IMM   _SR_ADDR(SR_TIME64 + 3) // set immediate (0=latch on next pps, 1=latch immediate, default=0)
 
 //pps flags (see above)
-#define FRF_TIME64_PPS_NEGEDGE (0 << 0)
-#define FRF_TIME64_PPS_POSEDGE (1 << 0)
-#define FRF_TIME64_PPS_SMA     (0 << 1)
-#define FRF_TIME64_PPS_MIMO    (1 << 1)
+#define U2_FLAG_TIME64_PPS_NEGEDGE (0 << 0)
+#define U2_FLAG_TIME64_PPS_POSEDGE (1 << 0)
+#define U2_FLAG_TIME64_PPS_SMA     (0 << 1)
+#define U2_FLAG_TIME64_PPS_MIMO    (1 << 1)
 
-#define FRF_TIME64_LATCH_NOW 1
-#define FRF_TIME64_LATCH_NEXT_PPS 0
+#define U2_FLAG_TIME64_LATCH_NOW 1
+#define U2_FLAG_TIME64_LATCH_NEXT_PPS 0
 
 /////////////////////////////////////////////////
 // DSP TX Regs
 ////////////////////////////////////////////////
-#define FR_DSP_TX_FREQ         _SR_ADDR(SR_TX_DSP + 0)
-#define FR_DSP_TX_SCALE_IQ     _SR_ADDR(SR_TX_DSP + 1) // {scale_i,scale_q}
-#define FR_DSP_TX_INTERP_RATE  _SR_ADDR(SR_TX_DSP + 2)
+#define U2_REG_DSP_TX_FREQ         _SR_ADDR(SR_TX_DSP + 0)
+#define U2_REG_DSP_TX_SCALE_IQ     _SR_ADDR(SR_TX_DSP + 1) // {scale_i,scale_q}
+#define U2_REG_DSP_TX_INTERP_RATE  _SR_ADDR(SR_TX_DSP + 2)
 
   /*!
    * \brief output mux configuration.
@@ -156,17 +156,17 @@
    * The default value is 0x10
    * </pre>
    */
-#define FR_DSP_TX_MUX  _SR_ADDR(SR_TX_DSP + 4)
+#define U2_REG_DSP_TX_MUX  _SR_ADDR(SR_TX_DSP + 4)
 
 /////////////////////////////////////////////////
 // DSP RX Regs
 ////////////////////////////////////////////////
-#define FR_DSP_RX_FREQ         _SR_ADDR(SR_RX_DSP + 0)
-#define FR_DSP_RX_SCALE_IQ     _SR_ADDR(SR_RX_DSP + 1) // {scale_i,scale_q}
-#define FR_DSP_RX_DECIM_RATE   _SR_ADDR(SR_RX_DSP + 2)
-#define FR_DSP_RX_DCOFFSET_I   _SR_ADDR(SR_RX_DSP + 3) // Bit 31 high sets fixed offset mode, using lower 14 bits,
+#define U2_REG_DSP_RX_FREQ         _SR_ADDR(SR_RX_DSP + 0)
+#define U2_REG_DSP_RX_SCALE_IQ     _SR_ADDR(SR_RX_DSP + 1) // {scale_i,scale_q}
+#define U2_REG_DSP_RX_DECIM_RATE   _SR_ADDR(SR_RX_DSP + 2)
+#define U2_REG_DSP_RX_DCOFFSET_I   _SR_ADDR(SR_RX_DSP + 3) // Bit 31 high sets fixed offset mode, using lower 14 bits,
                                                        // otherwise it is automatic 
-#define FR_DSP_RX_DCOFFSET_Q   _SR_ADDR(SR_RX_DSP + 4) // Bit 31 high sets fixed offset mode, using lower 14 bits
+#define U2_REG_DSP_RX_DCOFFSET_Q   _SR_ADDR(SR_RX_DSP + 4) // Bit 31 high sets fixed offset mode, using lower 14 bits
   /*!
    * \brief input mux configuration.
    *
@@ -188,7 +188,7 @@
    * The default value is 0x4
    * </pre>
    */
-#define FR_DSP_RX_MUX  _SR_ADDR(SR_RX_DSP + 5)         // called adc_mux in dsp_core_rx.v
+#define U2_REG_DSP_RX_MUX  _SR_ADDR(SR_RX_DSP + 5)         // called adc_mux in dsp_core_rx.v
 
 ////////////////////////////////////////////////
 // GPIO, Slave 4
@@ -196,52 +196,52 @@
 //
 // These go to the daughterboard i/o pins
 //
-#define FR_GPIO_BASE 0xC800
+#define U2_REG_GPIO_BASE 0xC800
 
-#define FR_GPIO_IO         FR_GPIO_BASE + 0  // 32 bits, gpio io pins (tx high 16 bits, rx low 16 bits)
-#define FR_GPIO_DDR        FR_GPIO_BASE + 4  // 32 bits, gpio ddr, 1 means output (tx high 16 bits, rx low 16 bits)
-#define FR_GPIO_TX_SEL     FR_GPIO_BASE + 8  // 16 2-bit fields select which source goes to TX DB
-#define FR_GPIO_RX_SEL     FR_GPIO_BASE + 12 // 16 2-bit fields select which source goes to RX DB
+#define U2_REG_GPIO_IO         U2_REG_GPIO_BASE + 0  // 32 bits, gpio io pins (tx high 16 bits, rx low 16 bits)
+#define U2_REG_GPIO_DDR        U2_REG_GPIO_BASE + 4  // 32 bits, gpio ddr, 1 means output (tx high 16 bits, rx low 16 bits)
+#define U2_REG_GPIO_TX_SEL     U2_REG_GPIO_BASE + 8  // 16 2-bit fields select which source goes to TX DB
+#define U2_REG_GPIO_RX_SEL     U2_REG_GPIO_BASE + 12 // 16 2-bit fields select which source goes to RX DB
 
 // each 2-bit sel field is layed out this way
-#define FRF_GPIO_SEL_GPIO      0 // if pin is an output, set by GPIO register
-#define FRF_GPIO_SEL_ATR       1 // if pin is an output, set by ATR logic
-#define FRF_GPIO_SEL_DEBUG_0   2 // if pin is an output, debug lines from FPGA fabric
-#define FRF_GPIO_SEL_DEBUG_1   3 // if pin is an output, debug lines from FPGA fabric
+#define U2_FLAG_GPIO_SEL_GPIO      0 // if pin is an output, set by GPIO register
+#define U2_FLAG_GPIO_SEL_ATR       1 // if pin is an output, set by ATR logic
+#define U2_FLAG_GPIO_SEL_DEBUG_0   2 // if pin is an output, debug lines from FPGA fabric
+#define U2_FLAG_GPIO_SEL_DEBUG_1   3 // if pin is an output, debug lines from FPGA fabric
 
 ///////////////////////////////////////////////////
 // ATR Controller, Slave 11
 ////////////////////////////////////////////////
-#define FR_ATR_BASE  0xE400
+#define U2_REG_ATR_BASE  0xE400
 
-#define FR_ATR_IDLE_TXSIDE  FR_ATR_BASE + 0
-#define FR_ATR_IDLE_RXSIDE  FR_ATR_BASE + 2
-#define FR_ATR_INTX_TXSIDE  FR_ATR_BASE + 4
-#define FR_ATR_INTX_RXSIDE  FR_ATR_BASE + 6
-#define FR_ATR_INRX_TXSIDE  FR_ATR_BASE + 8
-#define FR_ATR_INRX_RXSIDE  FR_ATR_BASE + 10
-#define FR_ATR_FULL_TXSIDE  FR_ATR_BASE + 12
-#define FR_ATR_FULL_RXSIDE  FR_ATR_BASE + 14
+#define U2_REG_ATR_IDLE_TXSIDE  U2_REG_ATR_BASE + 0
+#define U2_REG_ATR_IDLE_RXSIDE  U2_REG_ATR_BASE + 2
+#define U2_REG_ATR_INTX_TXSIDE  U2_REG_ATR_BASE + 4
+#define U2_REG_ATR_INTX_RXSIDE  U2_REG_ATR_BASE + 6
+#define U2_REG_ATR_INRX_TXSIDE  U2_REG_ATR_BASE + 8
+#define U2_REG_ATR_INRX_RXSIDE  U2_REG_ATR_BASE + 10
+#define U2_REG_ATR_FULL_TXSIDE  U2_REG_ATR_BASE + 12
+#define U2_REG_ATR_FULL_RXSIDE  U2_REG_ATR_BASE + 14
 
 ///////////////////////////////////////////////////
 // VITA RX CTRL regs
 ///////////////////////////////////////////////////
 // The following 3 are logically a single command register.
 // They are clocked into the underlying fifo when time_ticks is written.
-#define FR_RX_CTRL_STREAM_CMD        _SR_ADDR(SR_RX_CTRL + 0) // {now, chain, num_samples(30)
-#define FR_RX_CTRL_TIME_SECS         _SR_ADDR(SR_RX_CTRL + 1)
-#define FR_RX_CTRL_TIME_TICKS        _SR_ADDR(SR_RX_CTRL + 2)
+#define U2_REG_RX_CTRL_STREAM_CMD        _SR_ADDR(SR_RX_CTRL + 0) // {now, chain, num_samples(30)
+#define U2_REG_RX_CTRL_TIME_SECS         _SR_ADDR(SR_RX_CTRL + 1)
+#define U2_REG_RX_CTRL_TIME_TICKS        _SR_ADDR(SR_RX_CTRL + 2)
 
-#define FR_RX_CTRL_CLEAR_OVERRUN     _SR_ADDR(SR_RX_CTRL + 3) // write anything to clear overrun
-#define FR_RX_CTRL_VRT_HEADER        _SR_ADDR(SR_RX_CTRL + 4) // word 0 of packet.  FPGA fills in packet counter
-#define FR_RX_CTRL_VRT_STREAM_ID     _SR_ADDR(SR_RX_CTRL + 5) // word 1 of packet.
-#define FR_RX_CTRL_VRT_TRAILER       _SR_ADDR(SR_RX_CTRL + 6)
-#define FR_RX_CTRL_NSAMPS_PER_PKT    _SR_ADDR(SR_RX_CTRL + 7)
-#define FR_RX_CTRL_NCHANNELS         _SR_ADDR(SR_RX_CTRL + 8) // 1 in basic case, up to 4 for vector sources
+#define U2_REG_RX_CTRL_CLEAR_OVERRUN     _SR_ADDR(SR_RX_CTRL + 3) // write anything to clear overrun
+#define U2_REG_RX_CTRL_VRT_HEADER        _SR_ADDR(SR_RX_CTRL + 4) // word 0 of packet.  FPGA fills in packet counter
+#define U2_REG_RX_CTRL_VRT_STREAM_ID     _SR_ADDR(SR_RX_CTRL + 5) // word 1 of packet.
+#define U2_REG_RX_CTRL_VRT_TRAILER       _SR_ADDR(SR_RX_CTRL + 6)
+#define U2_REG_RX_CTRL_NSAMPS_PER_PKT    _SR_ADDR(SR_RX_CTRL + 7)
+#define U2_REG_RX_CTRL_NCHANNELS         _SR_ADDR(SR_RX_CTRL + 8) // 1 in basic case, up to 4 for vector sources
 
 //helpful macros for dealing with stream cmd
-#define FR_RX_CTRL_MAX_SAMPS_PER_CMD 0x1fffffff
-#define FR_RX_CTRL_MAKE_CMD(nsamples, now, chain, reload) \
+#define U2_REG_RX_CTRL_MAX_SAMPS_PER_CMD 0x1fffffff
+#define U2_REG_RX_CTRL_MAKE_CMD(nsamples, now, chain, reload) \
   ((((now) & 0x1) << 31) | (((chain) & 0x1) << 30) | (((reload) & 0x1) << 29) | ((nsamples) & 0x1fffffff))
 
 #endif /* INCLUDED_USRP2_REGS_HPP */
diff --git a/host/test/CMakeLists.txt b/host/test/CMakeLists.txt
index 24778d13e..7fd3dd401 100644
--- a/host/test/CMakeLists.txt
+++ b/host/test/CMakeLists.txt
@@ -22,6 +22,7 @@ ADD_EXECUTABLE(main_test
     main_test.cpp
     addr_test.cpp
     buffer_test.cpp
+    byteswap_test.cpp
     dict_test.cpp
     error_test.cpp
     gain_handler_test.cpp
diff --git a/host/test/byteswap_test.cpp b/host/test/byteswap_test.cpp
new file mode 100644
index 000000000..3d50c9bfa
--- /dev/null
+++ b/host/test/byteswap_test.cpp
@@ -0,0 +1,39 @@
+//
+// Copyright 2010 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
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+
+#include <boost/test/unit_test.hpp>
+#include <uhd/utils/byteswap.hpp>
+
+BOOST_AUTO_TEST_CASE(test_byteswap16){
+    boost::uint16_t x = 0x0123;
+    boost::uint16_t y = 0x2301;
+    BOOST_CHECK_EQUAL(uhd::byteswap(x), y);
+}
+
+BOOST_AUTO_TEST_CASE(test_byteswap32){
+    boost::uint32_t x = 0x01234567;
+    boost::uint32_t y = 0x67452301;
+    BOOST_CHECK_EQUAL(uhd::byteswap(x), y);
+}
+
+BOOST_AUTO_TEST_CASE(test_byteswap64){
+    //split up 64 bit constants to avoid long-long compiler warnings
+    boost::uint64_t x = 0x01234567 | (boost::uint64_t(0x89abcdef) << 32);
+    boost::uint64_t y = 0xefcdab89 | (boost::uint64_t(0x67452301) << 32);
+    BOOST_CHECK_EQUAL(uhd::byteswap(x), y);
+}
+
diff --git a/host/test/vrt_test.cpp b/host/test/vrt_test.cpp
index 939a61eb4..3e596164c 100644
--- a/host/test/vrt_test.cpp
+++ b/host/test/vrt_test.cpp
@@ -30,7 +30,7 @@ static void pack_and_unpack(
     size_t num_packet_words32;
 
     //pack metadata into a vrt header
-    vrt::pack(
+    vrt::pack_be(
         metadata,            //input
         header_buff,         //output
         num_header_words32,  //output
@@ -46,7 +46,7 @@ static void pack_and_unpack(
     size_t packet_count_out;
 
     //unpack the vrt header back into metadata
-    vrt::unpack(
+    vrt::unpack_be(
         metadata_out,            //output
         header_buff,             //input
         num_header_words32_out,  //output