diff options
Diffstat (limited to 'host/lib/usrp/e100')
| -rw-r--r-- | host/lib/usrp/e100/clock_ctrl.cpp | 24 | ||||
| -rw-r--r-- | host/lib/usrp/e100/codec_ctrl.cpp | 36 | ||||
| -rw-r--r-- | host/lib/usrp/e100/dboard_iface.cpp | 74 | ||||
| -rw-r--r-- | host/lib/usrp/e100/e100_ctrl.cpp | 10 | ||||
| -rw-r--r-- | host/lib/usrp/e100/e100_impl.cpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/e100/e100_impl.hpp | 8 | ||||
| -rw-r--r-- | host/lib/usrp/e100/e100_regs.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/e100/io_impl.cpp | 6 | 
8 files changed, 84 insertions, 84 deletions
diff --git a/host/lib/usrp/e100/clock_ctrl.cpp b/host/lib/usrp/e100/clock_ctrl.cpp index 9e355ce17..0dbd6a5d3 100644 --- a/host/lib/usrp/e100/clock_ctrl.cpp +++ b/host/lib/usrp/e100/clock_ctrl.cpp @@ -20,7 +20,7 @@  #include <uhd/utils/msg.hpp>  #include <uhd/utils/log.hpp>  #include <uhd/utils/assert_has.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h>  #include "e100_regs.hpp" //spi slave constants  #include <boost/assign/list_of.hpp>  #include <boost/foreach.hpp> @@ -107,8 +107,8 @@ static clock_settings_type get_clock_settings(double rate){      //X = chan_div * vco_div * R      //Y = P*B + A -    const boost::uint64_t out_rate = boost::uint64_t(rate); -    const boost::uint64_t ref_rate = boost::uint64_t(cs.get_ref_rate()); +    const uint64_t out_rate = uint64_t(rate); +    const uint64_t ref_rate = uint64_t(cs.get_ref_rate());      const size_t gcd = size_t(boost::math::gcd(ref_rate, out_rate));      for (size_t i = 1; i <= 100; i++){ @@ -436,8 +436,8 @@ public:      }      bool get_locked(void){ -        static const boost::uint8_t addr = 0x01F; -        boost::uint32_t reg = _iface->read_spi( +        static const uint8_t addr = 0x01F; +        uint32_t reg = _iface->read_spi(              UE_SPI_SS_AD9522, spi_config_t::EDGE_RISE,              _ad9522_regs.get_read_reg(addr), 24          ); @@ -458,8 +458,8 @@ private:          this->send_reg(0x232);      } -    void send_reg(boost::uint16_t addr){ -        boost::uint32_t reg = _ad9522_regs.get_write_reg(addr); +    void send_reg(uint16_t addr){ +        uint32_t reg = _ad9522_regs.get_write_reg(addr);          UHD_LOGV(often) << "clock control write reg: " << std::hex << reg << std::endl;          _iface->write_spi(              UE_SPI_SS_AD9522, @@ -477,10 +477,10 @@ private:          this->send_reg(0x18);          this->latch_regs();          //wait for calibration done: -        static const boost::uint8_t addr = 0x01F; +        static const uint8_t addr = 0x01F;          for (size_t ms10 = 0; ms10 < 100; ms10++){              boost::this_thread::sleep(boost::posix_time::milliseconds(10)); -            boost::uint32_t reg = _iface->read_spi( +            uint32_t reg = _iface->read_spi(                  UE_SPI_SS_AD9522, spi_config_t::EDGE_RISE,                  _ad9522_regs.get_read_reg(addr), 24              ); @@ -492,7 +492,7 @@ private:          //wait for digital lock detect:          for (size_t ms10 = 0; ms10 < 100; ms10++){              boost::this_thread::sleep(boost::posix_time::milliseconds(10)); -            boost::uint32_t reg = _iface->read_spi( +            uint32_t reg = _iface->read_spi(                  UE_SPI_SS_AD9522, spi_config_t::EDGE_RISE,                  _ad9522_regs.get_read_reg(addr), 24              ); @@ -513,7 +513,7 @@ private:      void send_all_regs(void){          //setup a list of register ranges to write -        typedef std::pair<boost::uint16_t, boost::uint16_t> range_t; +        typedef std::pair<uint16_t, uint16_t> range_t;          static const std::vector<range_t> ranges = boost::assign::list_of              (range_t(0x000, 0x000)) (range_t(0x010, 0x01F))              (range_t(0x0F0, 0x0FD)) (range_t(0x190, 0x19B)) @@ -522,7 +522,7 @@ private:          //write initial register values and latch/update          BOOST_FOREACH(const range_t &range, ranges){ -            for(boost::uint16_t addr = range.first; addr <= range.second; addr++){ +            for(uint16_t addr = range.first; addr <= range.second; addr++){                  this->send_reg(addr);              }          } diff --git a/host/lib/usrp/e100/codec_ctrl.cpp b/host/lib/usrp/e100/codec_ctrl.cpp index 2c13176a3..7dce01e46 100644 --- a/host/lib/usrp/e100/codec_ctrl.cpp +++ b/host/lib/usrp/e100/codec_ctrl.cpp @@ -21,7 +21,7 @@  #include <uhd/types/dict.hpp>  #include <uhd/exception.hpp>  #include <uhd/utils/algorithm.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h>  #include <boost/tuple/tuple.hpp>  #include <boost/math/special_functions/round.hpp>  #include "e100_regs.hpp" //spi slave constants @@ -54,8 +54,8 @@ public:  private:      spi_iface::sptr _iface;      ad9862_regs_t _ad9862_regs; -    void send_reg(boost::uint8_t addr); -    void recv_reg(boost::uint8_t addr); +    void send_reg(uint8_t addr); +    void recv_reg(uint8_t addr);  };  /*********************************************************************** @@ -110,7 +110,7 @@ e100_codec_ctrl_impl::e100_codec_ctrl_impl(spi_iface::sptr iface){      //_ad9862_regs.dis2 = ad9862_regs_t::DIS2_DIS; needed for transmit      //write the register settings to the codec -    for (boost::uint8_t addr = 0; addr <= 25; addr++){ +    for (uint8_t addr = 0; addr <= 25; addr++){          this->send_reg(addr);      } @@ -185,8 +185,8 @@ double e100_codec_ctrl_impl::get_rx_pga_gain(char which){  /***********************************************************************   * Codec Control AUX ADC Methods   **********************************************************************/ -static double aux_adc_to_volts(boost::uint8_t high, boost::uint8_t low){ -    return double((boost::uint16_t(high) << 2) | low)*3.3/0x3ff; +static double aux_adc_to_volts(uint8_t high, uint8_t low){ +    return double((uint16_t(high) << 2) | low)*3.3/0x3ff;  }  double e100_codec_ctrl_impl::read_aux_adc(aux_adc_t which){ @@ -228,19 +228,19 @@ double e100_codec_ctrl_impl::read_aux_adc(aux_adc_t which){  void e100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){      //special case for aux dac d (aka sigma delta word)      if (which == AUX_DAC_D){ -        boost::uint16_t dac_word = uhd::clip(boost::math::iround(volts*0xfff/3.3), 0, 0xfff); -        _ad9862_regs.sig_delt_11_4 = boost::uint8_t(dac_word >> 4); -        _ad9862_regs.sig_delt_3_0 = boost::uint8_t(dac_word & 0xf); +        uint16_t dac_word = uhd::clip(boost::math::iround(volts*0xfff/3.3), 0, 0xfff); +        _ad9862_regs.sig_delt_11_4 = uint8_t(dac_word >> 4); +        _ad9862_regs.sig_delt_3_0 = uint8_t(dac_word & 0xf);          this->send_reg(42);          this->send_reg(43);          return;      }      //calculate the dac word for aux dac a, b, c -    boost::uint8_t dac_word = uhd::clip(boost::math::iround(volts*0xff/3.3), 0, 0xff); +    uint8_t dac_word = uhd::clip(boost::math::iround(volts*0xff/3.3), 0, 0xff);      //setup a lookup table for the aux dac params (reg ref, reg addr) -    typedef boost::tuple<boost::uint8_t*, boost::uint8_t> dac_params_t; +    typedef boost::tuple<uint8_t*, uint8_t> dac_params_t;      uhd::dict<aux_dac_t, dac_params_t> aux_dac_to_params = boost::assign::map_list_of          (AUX_DAC_A, dac_params_t(&_ad9862_regs.aux_dac_a, 36))          (AUX_DAC_B, dac_params_t(&_ad9862_regs.aux_dac_b, 37)) @@ -249,7 +249,7 @@ void e100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){      //set the aux dac register      UHD_ASSERT_THROW(aux_dac_to_params.has_key(which)); -    boost::uint8_t *reg_ref, reg_addr; +    uint8_t *reg_ref, reg_addr;      boost::tie(reg_ref, reg_addr) = aux_dac_to_params[which];      *reg_ref = dac_word;      this->send_reg(reg_addr); @@ -258,8 +258,8 @@ void e100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){  /***********************************************************************   * Codec Control SPI Methods   **********************************************************************/ -void e100_codec_ctrl_impl::send_reg(boost::uint8_t addr){ -    boost::uint32_t reg = _ad9862_regs.get_write_reg(addr); +void e100_codec_ctrl_impl::send_reg(uint8_t addr){ +    uint32_t reg = _ad9862_regs.get_write_reg(addr);      UHD_LOGV(often) << "codec control write reg: " << std::hex << reg << std::endl;      _iface->write_spi(          UE_SPI_SS_AD9862, @@ -268,16 +268,16 @@ void e100_codec_ctrl_impl::send_reg(boost::uint8_t addr){      );  } -void e100_codec_ctrl_impl::recv_reg(boost::uint8_t addr){ -    boost::uint32_t reg = _ad9862_regs.get_read_reg(addr); +void e100_codec_ctrl_impl::recv_reg(uint8_t addr){ +    uint32_t reg = _ad9862_regs.get_read_reg(addr);      UHD_LOGV(often) << "codec control read reg: " << std::hex << reg << std::endl; -    boost::uint32_t ret = _iface->read_spi( +    uint32_t ret = _iface->read_spi(          UE_SPI_SS_AD9862,          spi_config_t::EDGE_RISE,          reg, 16      );      UHD_LOGV(often) << "codec control read ret: " << std::hex << ret << std::endl; -    _ad9862_regs.set_reg(addr, boost::uint16_t(ret)); +    _ad9862_regs.set_reg(addr, uint16_t(ret));  }  /*********************************************************************** diff --git a/host/lib/usrp/e100/dboard_iface.cpp b/host/lib/usrp/e100/dboard_iface.cpp index ce0ac026b..ce42c5506 100644 --- a/host/lib/usrp/e100/dboard_iface.cpp +++ b/host/lib/usrp/e100/dboard_iface.cpp @@ -66,33 +66,33 @@ public:      void write_aux_dac(unit_t, aux_dac_t, double);      double read_aux_adc(unit_t, aux_adc_t); -    void set_pin_ctrl(unit_t unit, boost::uint32_t value, boost::uint32_t mask = 0xffffffff); -    boost::uint32_t get_pin_ctrl(unit_t unit); -    void set_atr_reg(unit_t unit, atr_reg_t reg, boost::uint32_t value, boost::uint32_t mask = 0xffffffff); -    boost::uint32_t get_atr_reg(unit_t unit, atr_reg_t reg); -    void set_gpio_ddr(unit_t unit, boost::uint32_t value, boost::uint32_t mask = 0xffffffff); -    boost::uint32_t get_gpio_ddr(unit_t unit); -    void set_gpio_out(unit_t unit, boost::uint32_t value, boost::uint32_t mask = 0xffffffff); -    boost::uint32_t get_gpio_out(unit_t unit); -    boost::uint32_t read_gpio(unit_t unit); +    void set_pin_ctrl(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff); +    uint32_t get_pin_ctrl(unit_t unit); +    void set_atr_reg(unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask = 0xffffffff); +    uint32_t get_atr_reg(unit_t unit, atr_reg_t reg); +    void set_gpio_ddr(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff); +    uint32_t get_gpio_ddr(unit_t unit); +    void set_gpio_out(unit_t unit, uint32_t value, uint32_t mask = 0xffffffff); +    uint32_t get_gpio_out(unit_t unit); +    uint32_t read_gpio(unit_t unit);      void set_command_time(const uhd::time_spec_t& t);      uhd::time_spec_t get_command_time(void); -    void write_i2c(boost::uint16_t, const byte_vector_t &); -    byte_vector_t read_i2c(boost::uint16_t, size_t); +    void write_i2c(uint16_t, const byte_vector_t &); +    byte_vector_t read_i2c(uint16_t, size_t);      void write_spi(          unit_t unit,          const spi_config_t &config, -        boost::uint32_t data, +        uint32_t data,          size_t num_bits      ); -    boost::uint32_t read_write_spi( +    uint32_t read_write_spi(          unit_t unit,          const spi_config_t &config, -        boost::uint32_t data, +        uint32_t data,          size_t num_bits      ); @@ -167,39 +167,39 @@ double e100_dboard_iface::get_codec_rate(unit_t){  /***********************************************************************   * GPIO   **********************************************************************/ -void e100_dboard_iface::set_pin_ctrl(unit_t unit, boost::uint32_t value, boost::uint32_t mask){ -    _gpio->set_pin_ctrl(unit, static_cast<boost::uint16_t>(value), static_cast<boost::uint16_t>(mask)); +void e100_dboard_iface::set_pin_ctrl(unit_t unit, uint32_t value, uint32_t mask){ +    _gpio->set_pin_ctrl(unit, static_cast<uint16_t>(value), static_cast<uint16_t>(mask));  } -boost::uint32_t e100_dboard_iface::get_pin_ctrl(unit_t unit){ -    return static_cast<boost::uint32_t>(_gpio->get_pin_ctrl(unit)); +uint32_t e100_dboard_iface::get_pin_ctrl(unit_t unit){ +    return static_cast<uint32_t>(_gpio->get_pin_ctrl(unit));  } -void e100_dboard_iface::set_atr_reg(unit_t unit, atr_reg_t reg, boost::uint32_t value, boost::uint32_t mask){ -    _gpio->set_atr_reg(unit, reg, static_cast<boost::uint16_t>(value), static_cast<boost::uint16_t>(mask)); +void e100_dboard_iface::set_atr_reg(unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask){ +    _gpio->set_atr_reg(unit, reg, static_cast<uint16_t>(value), static_cast<uint16_t>(mask));  } -boost::uint32_t e100_dboard_iface::get_atr_reg(unit_t unit, atr_reg_t reg){ -    return static_cast<boost::uint32_t>(_gpio->get_atr_reg(unit, reg)); +uint32_t e100_dboard_iface::get_atr_reg(unit_t unit, atr_reg_t reg){ +    return static_cast<uint32_t>(_gpio->get_atr_reg(unit, reg));  } -void e100_dboard_iface::set_gpio_ddr(unit_t unit, boost::uint32_t value, boost::uint32_t mask){ -    _gpio->set_gpio_ddr(unit, static_cast<boost::uint16_t>(value), static_cast<boost::uint16_t>(mask)); +void e100_dboard_iface::set_gpio_ddr(unit_t unit, uint32_t value, uint32_t mask){ +    _gpio->set_gpio_ddr(unit, static_cast<uint16_t>(value), static_cast<uint16_t>(mask));  } -boost::uint32_t e100_dboard_iface::get_gpio_ddr(unit_t unit){ -    return static_cast<boost::uint32_t>(_gpio->get_gpio_ddr(unit)); +uint32_t e100_dboard_iface::get_gpio_ddr(unit_t unit){ +    return static_cast<uint32_t>(_gpio->get_gpio_ddr(unit));  } -void e100_dboard_iface::set_gpio_out(unit_t unit, boost::uint32_t value, boost::uint32_t mask){ -    _gpio->set_gpio_out(unit, static_cast<boost::uint16_t>(value), static_cast<boost::uint16_t>(mask)); +void e100_dboard_iface::set_gpio_out(unit_t unit, uint32_t value, uint32_t mask){ +    _gpio->set_gpio_out(unit, static_cast<uint16_t>(value), static_cast<uint16_t>(mask));  } -boost::uint32_t e100_dboard_iface::get_gpio_out(unit_t unit){ -    return static_cast<boost::uint32_t>(_gpio->get_gpio_out(unit)); +uint32_t e100_dboard_iface::get_gpio_out(unit_t unit){ +    return static_cast<uint32_t>(_gpio->get_gpio_out(unit));  } -boost::uint32_t e100_dboard_iface::read_gpio(unit_t unit){ +uint32_t e100_dboard_iface::read_gpio(unit_t unit){      return _gpio->read_gpio(unit);  } @@ -211,7 +211,7 @@ boost::uint32_t e100_dboard_iface::read_gpio(unit_t unit){   * \param unit the dboard interface unit type enum   * \return the slave device number   */ -static boost::uint32_t unit_to_otw_spi_dev(dboard_iface::unit_t unit){ +static uint32_t unit_to_otw_spi_dev(dboard_iface::unit_t unit){      switch(unit){      case dboard_iface::UNIT_TX: return UE_SPI_SS_TX_DB;      case dboard_iface::UNIT_RX: return UE_SPI_SS_RX_DB; @@ -222,16 +222,16 @@ static boost::uint32_t unit_to_otw_spi_dev(dboard_iface::unit_t unit){  void e100_dboard_iface::write_spi(      unit_t unit,      const spi_config_t &config, -    boost::uint32_t data, +    uint32_t data,      size_t num_bits  ){      _spi_iface->write_spi(unit_to_otw_spi_dev(unit), config, data, num_bits);  } -boost::uint32_t e100_dboard_iface::read_write_spi( +uint32_t e100_dboard_iface::read_write_spi(      unit_t unit,      const spi_config_t &config, -    boost::uint32_t data, +    uint32_t data,      size_t num_bits  ){      return _spi_iface->read_spi(unit_to_otw_spi_dev(unit), config, data, num_bits); @@ -240,11 +240,11 @@ boost::uint32_t e100_dboard_iface::read_write_spi(  /***********************************************************************   * I2C   **********************************************************************/ -void e100_dboard_iface::write_i2c(boost::uint16_t addr, const byte_vector_t &bytes){ +void e100_dboard_iface::write_i2c(uint16_t addr, const byte_vector_t &bytes){      return _i2c_iface->write_i2c(addr, bytes);  } -byte_vector_t e100_dboard_iface::read_i2c(boost::uint16_t addr, size_t num_bytes){ +byte_vector_t e100_dboard_iface::read_i2c(uint16_t addr, size_t num_bytes){      return _i2c_iface->read_i2c(addr, num_bytes);  } diff --git a/host/lib/usrp/e100/e100_ctrl.cpp b/host/lib/usrp/e100/e100_ctrl.cpp index c164a6fb0..4217286f8 100644 --- a/host/lib/usrp/e100/e100_ctrl.cpp +++ b/host/lib/usrp/e100/e100_ctrl.cpp @@ -94,15 +94,15 @@ public:          this->spi_sclk_gpio(1); //out of reset      } -    boost::uint32_t transact_spi( +    uint32_t transact_spi(          int, const spi_config_t &, //not used params -        boost::uint32_t bits, +        uint32_t bits,          size_t num_bits,          bool readback      ){          boost::mutex::scoped_lock lock(gpio_irq_resp_mutex); -        boost::uint32_t rb_bits = 0; +        uint32_t rb_bits = 0;          this->spi_sen_gpio(0);          for (size_t i = 0; i < num_bits; i++){ @@ -144,7 +144,7 @@ public:          ::close(_node_fd);      } -    void write_i2c(boost::uint16_t addr, const byte_vector_t &bytes){ +    void write_i2c(uint16_t addr, const byte_vector_t &bytes){          byte_vector_t rw_bytes(bytes);          //setup the message @@ -163,7 +163,7 @@ public:          UHD_ASSERT_THROW(::ioctl(_node_fd, I2C_RDWR, &data) >= 0);      } -    byte_vector_t read_i2c(boost::uint16_t addr, size_t num_bytes){ +    byte_vector_t read_i2c(uint16_t addr, size_t num_bytes){          byte_vector_t bytes(num_bytes);          //setup the message diff --git a/host/lib/usrp/e100/e100_impl.cpp b/host/lib/usrp/e100/e100_impl.cpp index 1f8fe84cb..25c967cfa 100644 --- a/host/lib/usrp/e100/e100_impl.cpp +++ b/host/lib/usrp/e100/e100_impl.cpp @@ -183,8 +183,8 @@ e100_impl::e100_impl(const uhd::device_addr_t &device_addr){      size_t hash = time(NULL);      for (size_t i = 0; i < 100; i++){          boost::hash_combine(hash, i); -        _fifo_ctrl->poke32(TOREG(SR_MISC+0), boost::uint32_t(hash)); -        test_fail = _fifo_ctrl->peek32(REG_RB_CONFIG0) != boost::uint32_t(hash); +        _fifo_ctrl->poke32(TOREG(SR_MISC+0), uint32_t(hash)); +        test_fail = _fifo_ctrl->peek32(REG_RB_CONFIG0) != uint32_t(hash);          if (test_fail) break; //exit loop on any failure      }      UHD_MSG(status) << ((test_fail)? " fail" : "pass") << std::endl; @@ -533,8 +533,8 @@ sensor_value_t e100_impl::get_ref_locked(void){  }  void e100_impl::check_fpga_compat(void){ -    const boost::uint32_t fpga_compat_num = _fifo_ctrl->peek32(REG_RB_COMPAT); -    boost::uint16_t fpga_major = fpga_compat_num >> 16, fpga_minor = fpga_compat_num & 0xffff; +    const uint32_t fpga_compat_num = _fifo_ctrl->peek32(REG_RB_COMPAT); +    uint16_t fpga_major = fpga_compat_num >> 16, fpga_minor = fpga_compat_num & 0xffff;      if (fpga_major == 0){ //old version scheme          fpga_major = fpga_minor;          fpga_minor = 0; diff --git a/host/lib/usrp/e100/e100_impl.hpp b/host/lib/usrp/e100/e100_impl.hpp index b05053f84..5f8277dda 100644 --- a/host/lib/usrp/e100/e100_impl.hpp +++ b/host/lib/usrp/e100/e100_impl.hpp @@ -50,10 +50,10 @@ static const double          E100_RX_LINK_RATE_BPS = 166e6/3/2*2;  static const double          E100_TX_LINK_RATE_BPS = 166e6/3/1*2;  static const std::string     E100_I2C_DEV_NODE = "/dev/i2c-3";  static const std::string     E100_UART_DEV_NODE = "/dev/ttyO0"; -static const boost::uint16_t E100_FPGA_COMPAT_NUM = 11; -static const boost::uint32_t E100_RX_SID_BASE = 30; -static const boost::uint32_t E100_TX_ASYNC_SID = 10; -static const boost::uint32_t E100_CTRL_MSG_SID = 20; +static const uint16_t E100_FPGA_COMPAT_NUM = 11; +static const uint32_t E100_RX_SID_BASE = 30; +static const uint32_t E100_TX_ASYNC_SID = 10; +static const uint32_t E100_CTRL_MSG_SID = 20;  static const double          E100_DEFAULT_CLOCK_RATE = 64e6;  static const std::string     E100_EEPROM_MAP_KEY = "E100"; diff --git a/host/lib/usrp/e100/e100_regs.hpp b/host/lib/usrp/e100/e100_regs.hpp index 654163dce..208abede8 100644 --- a/host/lib/usrp/e100/e100_regs.hpp +++ b/host/lib/usrp/e100/e100_regs.hpp @@ -18,7 +18,7 @@  #ifndef INCLUDED_E100_REGS_HPP  #define INCLUDED_E100_REGS_HPP -#include <boost/cstdint.hpp> +#include <stdint.h>  #define TOREG(x) ((x)*4) diff --git a/host/lib/usrp/e100/io_impl.cpp b/host/lib/usrp/e100/io_impl.cpp index bf04a5871..ebed3614c 100644 --- a/host/lib/usrp/e100/io_impl.cpp +++ b/host/lib/usrp/e100/io_impl.cpp @@ -131,7 +131,7 @@ rx_streamer::sptr e100_impl::get_rx_stream(const uhd::stream_args_t &args_){      //calculate packet size      static const size_t hdr_size = 0 -        + vrt::max_if_hdr_words32*sizeof(boost::uint32_t) +        + vrt::max_if_hdr_words32*sizeof(uint32_t)          + sizeof(vrt::if_packet_info_t().tlr) //forced to have trailer          - sizeof(vrt::if_packet_info_t().cid) //no class id ever used          - sizeof(vrt::if_packet_info_t().tsi) //no int time ever used @@ -189,8 +189,8 @@ tx_streamer::sptr e100_impl::get_tx_stream(const uhd::stream_args_t &args_){      //calculate packet size      static const size_t hdr_size = 0 -        + vrt_send_header_offset_words32*sizeof(boost::uint32_t) -        + vrt::max_if_hdr_words32*sizeof(boost::uint32_t) +        + vrt_send_header_offset_words32*sizeof(uint32_t) +        + vrt::max_if_hdr_words32*sizeof(uint32_t)          + sizeof(vrt::if_packet_info_t().tlr) //forced to have trailer          - sizeof(vrt::if_packet_info_t().sid) //no stream id ever used          - sizeof(vrt::if_packet_info_t().cid) //no class id ever used  | 
