diff options
| author | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-22 12:29:55 -0700 |
|---|---|---|
| committer | Ben Hilburn <ben.hilburn@ettus.com> | 2014-05-22 12:29:55 -0700 |
| commit | c4b1f8103343b9932ca1e74128de3afbbcb81928 (patch) | |
| tree | ad51521ded352b481f8731bfc8477ebea9881f89 /host/lib/usrp/x300/x300_io_impl.cpp | |
| parent | 79c9b12b2aa3107634153db03a1fd9058f6aa6b9 (diff) | |
| parent | 482a4eaffd146de789dfc59052a4c3cb5b51938a (diff) | |
| download | uhd-c4b1f8103343b9932ca1e74128de3afbbcb81928.tar.gz uhd-c4b1f8103343b9932ca1e74128de3afbbcb81928.tar.bz2 uhd-c4b1f8103343b9932ca1e74128de3afbbcb81928.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/x300/x300_io_impl.cpp')
| -rw-r--r-- | host/lib/usrp/x300/x300_io_impl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/x300/x300_io_impl.cpp b/host/lib/usrp/x300/x300_io_impl.cpp index 9263c9b44..500a24f7f 100644 --- a/host/lib/usrp/x300/x300_io_impl.cpp +++ b/host/lib/usrp/x300/x300_io_impl.cpp @@ -265,7 +265,7 @@ static void handle_tx_async_msgs(boost::shared_ptr<x300_tx_fc_guts_t> guts, zero const boost::uint32_t *packet_buff = buff->cast<const boost::uint32_t *>(); //unpacking can fail - uint32_t (*endian_conv)(uint32_t) = uhd::ntohx; + boost::uint32_t (*endian_conv)(boost::uint32_t) = uhd::ntohx; try { if (big_endian) @@ -402,7 +402,7 @@ rx_streamer::sptr x300_impl::get_rx_stream(const uhd::stream_args_t &args_) } //allocate sid and create transport - uint8_t dest = (radio_index == 0)? X300_XB_DST_R0 : X300_XB_DST_R1; + boost::uint8_t dest = (radio_index == 0)? X300_XB_DST_R0 : X300_XB_DST_R1; boost::uint32_t data_sid; UHD_LOG << "creating rx stream " << device_addr.to_string() << std::endl; both_xports_t xport = this->make_transport(mb_index, dest, X300_RADIO_DEST_PREFIX_RX, device_addr, data_sid); @@ -565,7 +565,7 @@ tx_streamer::sptr x300_impl::get_tx_stream(const uhd::stream_args_t &args_) device_addr_t device_addr = mb.send_args; //allocate sid and create transport - uint8_t dest = (radio_index == 0)? X300_XB_DST_R0 : X300_XB_DST_R1; + boost::uint8_t dest = (radio_index == 0)? X300_XB_DST_R0 : X300_XB_DST_R1; boost::uint32_t data_sid; UHD_LOG << "creating tx stream " << device_addr.to_string() << std::endl; both_xports_t xport = this->make_transport(mb_index, dest, X300_RADIO_DEST_PREFIX_TX, device_addr, data_sid); |