aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/usrp/n230
diff options
context:
space:
mode:
Diffstat (limited to 'host/lib/usrp/n230')
-rw-r--r--host/lib/usrp/n230/n230_clk_pps_ctrl.cpp2
-rw-r--r--host/lib/usrp/n230/n230_cores.cpp4
-rw-r--r--host/lib/usrp/n230/n230_cores.hpp4
-rw-r--r--host/lib/usrp/n230/n230_eeprom_manager.cpp50
-rw-r--r--host/lib/usrp/n230/n230_eeprom_manager.hpp4
-rw-r--r--host/lib/usrp/n230/n230_fpga_defs.h6
-rw-r--r--host/lib/usrp/n230/n230_frontend_ctrl.cpp26
-rw-r--r--host/lib/usrp/n230/n230_image_loader.cpp46
-rw-r--r--host/lib/usrp/n230/n230_impl.cpp16
-rw-r--r--host/lib/usrp/n230/n230_resource_manager.cpp58
-rw-r--r--host/lib/usrp/n230/n230_resource_manager.hpp12
-rw-r--r--host/lib/usrp/n230/n230_stream_manager.cpp26
-rw-r--r--host/lib/usrp/n230/n230_stream_manager.hpp6
-rw-r--r--host/lib/usrp/n230/n230_uart.cpp20
-rw-r--r--host/lib/usrp/n230/n230_uart.hpp2
15 files changed, 141 insertions, 141 deletions
diff --git a/host/lib/usrp/n230/n230_clk_pps_ctrl.cpp b/host/lib/usrp/n230/n230_clk_pps_ctrl.cpp
index 9d704b702..2bcfb0394 100644
--- a/host/lib/usrp/n230/n230_clk_pps_ctrl.cpp
+++ b/host/lib/usrp/n230/n230_clk_pps_ctrl.cpp
@@ -19,7 +19,7 @@
#include <uhd/utils/msg.hpp>
#include <uhd/utils/safe_call.hpp>
-#include <boost/cstdint.hpp>
+#include <stdint.h>
#include <boost/format.hpp>
#include <boost/foreach.hpp>
#include <stdexcept>
diff --git a/host/lib/usrp/n230/n230_cores.cpp b/host/lib/usrp/n230/n230_cores.cpp
index 58c702ec1..26e69e14d 100644
--- a/host/lib/usrp/n230/n230_cores.cpp
+++ b/host/lib/usrp/n230/n230_cores.cpp
@@ -33,10 +33,10 @@ n230_core_spi_core::n230_core_spi_core(
change_perif(default_perif);
}
-boost::uint32_t n230_core_spi_core::transact_spi(
+uint32_t n230_core_spi_core::transact_spi(
int which_slave,
const spi_config_t &config,
- boost::uint32_t data,
+ uint32_t data,
size_t num_bits,
bool readback)
{
diff --git a/host/lib/usrp/n230/n230_cores.hpp b/host/lib/usrp/n230/n230_cores.hpp
index 3f56c1889..db92658f1 100644
--- a/host/lib/usrp/n230/n230_cores.hpp
+++ b/host/lib/usrp/n230/n230_cores.hpp
@@ -35,10 +35,10 @@ public:
n230_core_spi_core(uhd::wb_iface::sptr iface, perif_t default_perif);
- virtual boost::uint32_t transact_spi(
+ virtual uint32_t transact_spi(
int which_slave,
const spi_config_t &config,
- boost::uint32_t data,
+ uint32_t data,
size_t num_bits,
bool readback);
diff --git a/host/lib/usrp/n230/n230_eeprom_manager.cpp b/host/lib/usrp/n230/n230_eeprom_manager.cpp
index b19deb23a..d9d02c58c 100644
--- a/host/lib/usrp/n230/n230_eeprom_manager.cpp
+++ b/host/lib/usrp/n230/n230_eeprom_manager.cpp
@@ -65,13 +65,13 @@ const mboard_eeprom_t& n230_eeprom_manager::read_mb_eeprom()
const n230_eeprom_map_t* map_ptr = reinterpret_cast<const n230_eeprom_map_t*>(_response.data);
const n230_eeprom_map_t& map = *map_ptr;
- uint16_t ver_major = uhd::htonx<boost::uint16_t>(map.data_version_major);
- uint16_t ver_minor = uhd::htonx<boost::uint16_t>(map.data_version_minor);
+ uint16_t ver_major = uhd::htonx<uint16_t>(map.data_version_major);
+ uint16_t ver_minor = uhd::htonx<uint16_t>(map.data_version_minor);
_mb_eeprom["product"] = boost::lexical_cast<std::string>(
- uhd::htonx<boost::uint16_t>(map.hw_product));
+ uhd::htonx<uint16_t>(map.hw_product));
_mb_eeprom["revision"] = boost::lexical_cast<std::string>(
- uhd::htonx<boost::uint16_t>(map.hw_revision));
+ uhd::htonx<uint16_t>(map.hw_revision));
//The revision_compat field does not exist in version 1.0
//EEPROM version 1.0 will only exist on HW revision 1 so it is safe to set
//revision_compat = revision
@@ -79,20 +79,20 @@ const mboard_eeprom_t& n230_eeprom_manager::read_mb_eeprom()
_mb_eeprom["revision_compat"] = _mb_eeprom["revision"];
} else {
_mb_eeprom["revision_compat"] = boost::lexical_cast<std::string>(
- uhd::htonx<boost::uint16_t>(map.hw_revision_compat));
+ uhd::htonx<uint16_t>(map.hw_revision_compat));
}
_mb_eeprom["serial"] = _bytes_to_string(
map.serial, N230_EEPROM_SERIAL_LEN);
//Extract ethernet info
_mb_eeprom["gateway"] = boost::asio::ip::address_v4(
- uhd::htonx<boost::uint32_t>(map.gateway)).to_string();
+ uhd::htonx<uint32_t>(map.gateway)).to_string();
for (size_t i = 0; i < N230_MAX_NUM_ETH_PORTS; i++) {
const std::string n(1, i+'0');
_mb_eeprom["ip-addr"+n] = boost::asio::ip::address_v4(
- uhd::htonx<boost::uint32_t>(map.eth_info[i].ip_addr)).to_string();
+ uhd::htonx<uint32_t>(map.eth_info[i].ip_addr)).to_string();
_mb_eeprom["subnet"+n] = boost::asio::ip::address_v4(
- uhd::htonx<boost::uint32_t>(map.eth_info[i].subnet)).to_string();
+ uhd::htonx<uint32_t>(map.eth_info[i].subnet)).to_string();
byte_vector_t mac_addr(map.eth_info[i].mac_addr, map.eth_info[i].mac_addr + 6);
_mb_eeprom["mac-addr"+n] = mac_addr_t::from_bytes(mac_addr).to_string();
}
@@ -117,28 +117,28 @@ void n230_eeprom_manager::write_mb_eeprom(const mboard_eeprom_t& eeprom)
n230_eeprom_map_t& map = *map_ptr;
// Automatic version upgrade handling
- uint16_t old_ver_major = uhd::htonx<boost::uint16_t>(map.data_version_major);
- uint16_t old_ver_minor = uhd::htonx<boost::uint16_t>(map.data_version_minor);
+ uint16_t old_ver_major = uhd::htonx<uint16_t>(map.data_version_major);
+ uint16_t old_ver_minor = uhd::htonx<uint16_t>(map.data_version_minor);
//The revision_compat field does not exist for version 1.0 so force write it
//EEPROM version 1.0 will only exist on HW revision 1 so it is safe to set
//revision_compat = revision for the upgrade
bool force_write_version_compat = (old_ver_major == 1 and old_ver_minor == 0);
- map.data_version_major = uhd::htonx<boost::uint16_t>(N230_EEPROM_VER_MAJOR);
- map.data_version_minor = uhd::htonx<boost::uint16_t>(N230_EEPROM_VER_MINOR);
+ map.data_version_major = uhd::htonx<uint16_t>(N230_EEPROM_VER_MAJOR);
+ map.data_version_minor = uhd::htonx<uint16_t>(N230_EEPROM_VER_MINOR);
if (_mb_eeprom.has_key("product")) {
- map.hw_product = uhd::htonx<boost::uint16_t>(
- boost::lexical_cast<boost::uint16_t>(_mb_eeprom["product"]));
+ map.hw_product = uhd::htonx<uint16_t>(
+ boost::lexical_cast<uint16_t>(_mb_eeprom["product"]));
}
if (_mb_eeprom.has_key("revision")) {
- map.hw_revision = uhd::htonx<boost::uint16_t>(
- boost::lexical_cast<boost::uint16_t>(_mb_eeprom["revision"]));
+ map.hw_revision = uhd::htonx<uint16_t>(
+ boost::lexical_cast<uint16_t>(_mb_eeprom["revision"]));
}
if (_mb_eeprom.has_key("revision_compat")) {
- map.hw_revision_compat = uhd::htonx<boost::uint16_t>(
- boost::lexical_cast<boost::uint16_t>(_mb_eeprom["revision_compat"]));
+ map.hw_revision_compat = uhd::htonx<uint16_t>(
+ boost::lexical_cast<uint16_t>(_mb_eeprom["revision_compat"]));
} else if (force_write_version_compat) {
map.hw_revision_compat = map.hw_revision;
}
@@ -148,17 +148,17 @@ void n230_eeprom_manager::write_mb_eeprom(const mboard_eeprom_t& eeprom)
//Push ethernet info
if (_mb_eeprom.has_key("gateway")){
- map.gateway = uhd::htonx<boost::uint32_t>(
+ map.gateway = uhd::htonx<uint32_t>(
boost::asio::ip::address_v4::from_string(_mb_eeprom["gateway"]).to_ulong());
}
for (size_t i = 0; i < N230_MAX_NUM_ETH_PORTS; i++) {
const std::string n(1, i+'0');
if (_mb_eeprom.has_key("ip-addr"+n)){
- map.eth_info[i].ip_addr = uhd::htonx<boost::uint32_t>(
+ map.eth_info[i].ip_addr = uhd::htonx<uint32_t>(
boost::asio::ip::address_v4::from_string(_mb_eeprom["ip-addr"+n]).to_ulong());
}
if (_mb_eeprom.has_key("subnet"+n)){
- map.eth_info[i].subnet = uhd::htonx<boost::uint32_t>(
+ map.eth_info[i].subnet = uhd::htonx<uint32_t>(
boost::asio::ip::address_v4::from_string(_mb_eeprom["subnet"+n]).to_ulong());
}
if (_mb_eeprom.has_key("mac-addr"+n)) {
@@ -175,11 +175,11 @@ void n230_eeprom_manager::write_mb_eeprom(const mboard_eeprom_t& eeprom)
_transact(N230_FLASH_COMM_CMD_WRITE_NV_DATA);
}
-void n230_eeprom_manager::_transact(const boost::uint32_t command)
+void n230_eeprom_manager::_transact(const uint32_t command)
{
//Load request struct
- _request.flags = uhd::htonx<boost::uint32_t>(N230_FLASH_COMM_FLAGS_ACK | command);
- _request.seq = uhd::htonx<boost::uint32_t>(_seq_num++);
+ _request.flags = uhd::htonx<uint32_t>(N230_FLASH_COMM_FLAGS_ACK | command);
+ _request.seq = uhd::htonx<uint32_t>(_seq_num++);
//Send request
_flush_xport();
@@ -190,7 +190,7 @@ void n230_eeprom_manager::_transact(const boost::uint32_t command)
if (nbytes == 0) throw uhd::io_error("n230_eeprom_manager::_transact failure");
//Sanity checks
- const size_t flags = uhd::ntohx<boost::uint32_t>(_response.flags);
+ const size_t flags = uhd::ntohx<uint32_t>(_response.flags);
UHD_ASSERT_THROW(nbytes == sizeof(_response));
UHD_ASSERT_THROW(_response.seq == _request.seq);
UHD_ASSERT_THROW(flags & command);
diff --git a/host/lib/usrp/n230/n230_eeprom_manager.hpp b/host/lib/usrp/n230/n230_eeprom_manager.hpp
index cc5aee9f3..190ed943f 100644
--- a/host/lib/usrp/n230/n230_eeprom_manager.hpp
+++ b/host/lib/usrp/n230/n230_eeprom_manager.hpp
@@ -39,7 +39,7 @@ public:
}
private: //Functions
- void _transact(const boost::uint32_t command);
+ void _transact(const uint32_t command);
void _flush_xport();
private: //Members
@@ -47,7 +47,7 @@ private: //Members
transport::udp_simple::sptr _udp_xport;
n230_flash_prog_t _request;
n230_flash_prog_t _response;
- boost::uint32_t _seq_num;
+ uint32_t _seq_num;
boost::mutex _mutex;
static const double UDP_TIMEOUT_IN_SEC;
diff --git a/host/lib/usrp/n230/n230_fpga_defs.h b/host/lib/usrp/n230/n230_fpga_defs.h
index 3aa96643f..3fa0451e7 100644
--- a/host/lib/usrp/n230/n230_fpga_defs.h
+++ b/host/lib/usrp/n230/n230_fpga_defs.h
@@ -55,9 +55,9 @@ enum xb_endpoint_t {
N230_XB_DST_UART = 5
};
-static const boost::uint8_t RADIO_CTRL_SUFFIX = 0x00;
-static const boost::uint8_t RADIO_FC_SUFFIX = 0x01;
-static const boost::uint8_t RADIO_DATA_SUFFIX = 0x02;
+static const uint8_t RADIO_CTRL_SUFFIX = 0x00;
+static const uint8_t RADIO_FC_SUFFIX = 0x01;
+static const uint8_t RADIO_DATA_SUFFIX = 0x02;
/*******************************************************************
* Seting Register Base addresses
diff --git a/host/lib/usrp/n230/n230_frontend_ctrl.cpp b/host/lib/usrp/n230/n230_frontend_ctrl.cpp
index e0820d9b2..3d81721ec 100644
--- a/host/lib/usrp/n230/n230_frontend_ctrl.cpp
+++ b/host/lib/usrp/n230/n230_frontend_ctrl.cpp
@@ -27,29 +27,29 @@
namespace uhd { namespace usrp { namespace n230 {
/* ATR Control Bits */
-static const boost::uint32_t TX_ENABLE = (1 << 7);
-static const boost::uint32_t SFDX_RX = (1 << 6);
-static const boost::uint32_t SFDX_TX = (1 << 5);
-static const boost::uint32_t SRX_RX = (1 << 4);
-static const boost::uint32_t SRX_TX = (1 << 3);
-static const boost::uint32_t LED_RX = (1 << 2);
-static const boost::uint32_t LED_TXRX_RX = (1 << 1);
-static const boost::uint32_t LED_TXRX_TX = (1 << 0);
+static const uint32_t TX_ENABLE = (1 << 7);
+static const uint32_t SFDX_RX = (1 << 6);
+static const uint32_t SFDX_TX = (1 << 5);
+static const uint32_t SRX_RX = (1 << 4);
+static const uint32_t SRX_TX = (1 << 3);
+static const uint32_t LED_RX = (1 << 2);
+static const uint32_t LED_TXRX_RX = (1 << 1);
+static const uint32_t LED_TXRX_TX = (1 << 0);
/* ATR State Definitions. */
-static const boost::uint32_t STATE_OFF = 0x00;
-static const boost::uint32_t STATE_RX_RX2 = (SFDX_RX
+static const uint32_t STATE_OFF = 0x00;
+static const uint32_t STATE_RX_RX2 = (SFDX_RX
| SFDX_TX
| LED_RX);
-static const boost::uint32_t STATE_RX_TXRX = (SRX_RX
+static const uint32_t STATE_RX_TXRX = (SRX_RX
| SRX_TX
| LED_TXRX_RX);
-static const boost::uint32_t STATE_FDX_TXRX = (TX_ENABLE
+static const uint32_t STATE_FDX_TXRX = (TX_ENABLE
| SFDX_RX
| SFDX_TX
| LED_TXRX_TX
| LED_RX);
-static const boost::uint32_t STATE_TX_TXRX = (TX_ENABLE
+static const uint32_t STATE_TX_TXRX = (TX_ENABLE
| SFDX_RX
| SFDX_TX
| LED_TXRX_TX);
diff --git a/host/lib/usrp/n230/n230_image_loader.cpp b/host/lib/usrp/n230/n230_image_loader.cpp
index 9dd4a252d..25f498a73 100644
--- a/host/lib/usrp/n230/n230_image_loader.cpp
+++ b/host/lib/usrp/n230/n230_image_loader.cpp
@@ -40,23 +40,23 @@ struct xil_bitfile_hdr_t {
{}
bool valid;
- boost::uint32_t userid;
+ uint32_t userid;
std::string product;
std::string fpga;
std::string timestamp;
- boost::uint32_t filesize;
+ uint32_t filesize;
};
-static inline boost::uint16_t _to_uint16(boost::uint8_t* buf) {
- return (static_cast<boost::uint16_t>(buf[0]) << 8) |
- (static_cast<boost::uint16_t>(buf[1]) << 0);
+static inline uint16_t _to_uint16(uint8_t* buf) {
+ return (static_cast<uint16_t>(buf[0]) << 8) |
+ (static_cast<uint16_t>(buf[1]) << 0);
}
-static inline boost::uint32_t _to_uint32(boost::uint8_t* buf) {
- return (static_cast<boost::uint32_t>(buf[0]) << 24) |
- (static_cast<boost::uint32_t>(buf[1]) << 16) |
- (static_cast<boost::uint32_t>(buf[2]) << 8) |
- (static_cast<boost::uint32_t>(buf[3]) << 0);
+static inline uint32_t _to_uint32(uint8_t* buf) {
+ return (static_cast<uint32_t>(buf[0]) << 24) |
+ (static_cast<uint32_t>(buf[1]) << 16) |
+ (static_cast<uint32_t>(buf[2]) << 8) |
+ (static_cast<uint32_t>(buf[3]) << 0);
}
static void _parse_bitfile_header(const std::string& filepath, xil_bitfile_hdr_t& hdr) {
@@ -70,9 +70,9 @@ static void _parse_bitfile_header(const std::string& filepath, xil_bitfile_hdr_t
//Parse header
size_t ptr = 0;
- boost::uint8_t* buf = reinterpret_cast<boost::uint8_t*>(hdr_buf.get()); //Shortcut
+ uint8_t* buf = reinterpret_cast<uint8_t*>(hdr_buf.get()); //Shortcut
- boost::uint8_t signature[10] = {0x00, 0x09, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0};
+ uint8_t signature[10] = {0x00, 0x09, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0};
if (memcmp(buf, signature, 10) == 0) { //Validate signature
ptr += _to_uint16(buf + ptr) + 2;
ptr += _to_uint16(buf + ptr) + 1;
@@ -80,7 +80,7 @@ static void _parse_bitfile_header(const std::string& filepath, xil_bitfile_hdr_t
std::string fields[4];
for (size_t i = 0; i < 4; i++) {
size_t key = buf[ptr++] - 'a';
- boost::uint16_t len = _to_uint16(buf + ptr); ptr += 2;
+ uint16_t len = _to_uint16(buf + ptr); ptr += 2;
fields[key] = std::string(reinterpret_cast<char*>(buf + ptr), size_t(len)); ptr += len;
}
@@ -108,11 +108,11 @@ static size_t _send_and_recv(
udp_simple::sptr xport,
n230_flash_prog_t& out, n230_flash_prog_t& in)
{
- static boost::uint32_t seqno = 0;
- out.seq = htonx<boost::uint32_t>(++seqno);
+ static uint32_t seqno = 0;
+ out.seq = htonx<uint32_t>(++seqno);
xport->send(boost::asio::buffer(&out, sizeof(n230_flash_prog_t)));
size_t len = xport->recv(boost::asio::buffer(&in, udp_simple::mtu), 0.5);
- if (len != sizeof(n230_flash_prog_t) or ntohx<boost::uint32_t>(in.seq) != seqno) {
+ if (len != sizeof(n230_flash_prog_t) or ntohx<uint32_t>(in.seq) != seqno) {
throw uhd::io_error("Error communicating with the device.");
}
return len;
@@ -173,17 +173,17 @@ static bool n230_image_loader(const image_loader::image_loader_args_t &loader_ar
while (bytes_written < image_size) {
size_t payload_size = std::min<size_t>(image_size - bytes_written, N230_FLASH_COMM_MAX_PAYLOAD_SIZE);
if (bytes_written % SECTOR_SIZE == 0) {
- out.flags = htonx<boost::uint32_t>(N230_FLASH_COMM_FLAGS_ACK|N230_FLASH_COMM_CMD_ERASE_FPGA);
- out.offset = htonx<boost::uint32_t>(bytes_written + IMAGE_BASE);
- out.size = htonx<boost::uint32_t>(payload_size);
+ out.flags = htonx<uint32_t>(N230_FLASH_COMM_FLAGS_ACK|N230_FLASH_COMM_CMD_ERASE_FPGA);
+ out.offset = htonx<uint32_t>(bytes_written + IMAGE_BASE);
+ out.size = htonx<uint32_t>(payload_size);
_send_and_recv(udp_xport, out, in);
}
- out.flags = htonx<boost::uint32_t>(N230_FLASH_COMM_FLAGS_ACK|N230_FLASH_COMM_CMD_WRITE_FPGA);
- out.offset = htonx<boost::uint32_t>(bytes_written + IMAGE_BASE);
- out.size = htonx<boost::uint32_t>(payload_size);
+ out.flags = htonx<uint32_t>(N230_FLASH_COMM_FLAGS_ACK|N230_FLASH_COMM_CMD_WRITE_FPGA);
+ out.offset = htonx<uint32_t>(bytes_written + IMAGE_BASE);
+ out.size = htonx<uint32_t>(payload_size);
image.read((char*)out.data, payload_size);
_send_and_recv(udp_xport, out, in);
- bytes_written += ntohx<boost::uint32_t>(in.size);
+ bytes_written += ntohx<uint32_t>(in.size);
std::cout << boost::format("\r-- Loading FPGA image: %d%%")
% (int(double(bytes_written) / double(image_size) * 100.0))
<< std::flush;
diff --git a/host/lib/usrp/n230/n230_impl.cpp b/host/lib/usrp/n230/n230_impl.cpp
index 5e8aa37b7..24ef5d97d 100644
--- a/host/lib/usrp/n230/n230_impl.cpp
+++ b/host/lib/usrp/n230/n230_impl.cpp
@@ -214,8 +214,8 @@ n230_impl::n230_impl(const uhd::device_addr_t& dev_addr)
"checks.\nOperating in this mode may cause hardware damage and unstable "
"radio performance!"<< std::endl;
}
- boost::uint16_t hw_rev = boost::lexical_cast<boost::uint16_t>(mb_eeprom["revision"]);
- boost::uint16_t hw_rev_compat = boost::lexical_cast<boost::uint16_t>(mb_eeprom["revision_compat"]);
+ uint16_t hw_rev = boost::lexical_cast<uint16_t>(mb_eeprom["revision"]);
+ uint16_t hw_rev_compat = boost::lexical_cast<uint16_t>(mb_eeprom["revision_compat"]);
if (not recover_mb_eeprom) {
if (hw_rev_compat > N230_HW_REVISION_COMPAT) {
throw uhd::runtime_error(str(boost::format(
@@ -411,25 +411,25 @@ void n230_impl::_initialize_property_tree(const fs_path& mb_path)
//------------------------------------------------------------------
// MiniSAS GPIO
//------------------------------------------------------------------
- _tree->create<boost::uint32_t>(mb_path / "gpio" / "FP0" / "DDR")
+ _tree->create<uint32_t>(mb_path / "gpio" / "FP0" / "DDR")
.set(0)
.add_coerced_subscriber(boost::bind(&gpio_atr::gpio_atr_3000::set_gpio_attr,
_resource_mgr->get_minisas_gpio_ctrl_sptr(0), gpio_atr::GPIO_DDR, _1));
- _tree->create<boost::uint32_t>(mb_path / "gpio" / "FP1" / "DDR")
+ _tree->create<uint32_t>(mb_path / "gpio" / "FP1" / "DDR")
.set(0)
.add_coerced_subscriber(boost::bind(&gpio_atr::gpio_atr_3000::set_gpio_attr,
_resource_mgr->get_minisas_gpio_ctrl_sptr(1), gpio_atr::GPIO_DDR, _1));
- _tree->create<boost::uint32_t>(mb_path / "gpio" / "FP0" / "OUT")
+ _tree->create<uint32_t>(mb_path / "gpio" / "FP0" / "OUT")
.set(0)
.add_coerced_subscriber(boost::bind(&gpio_atr::gpio_atr_3000::set_gpio_attr,
_resource_mgr->get_minisas_gpio_ctrl_sptr(0), gpio_atr::GPIO_OUT, _1));
- _tree->create<boost::uint32_t>(mb_path / "gpio" / "FP1" / "OUT")
+ _tree->create<uint32_t>(mb_path / "gpio" / "FP1" / "OUT")
.set(0)
.add_coerced_subscriber(boost::bind(&gpio_atr::gpio_atr_3000::set_gpio_attr,
_resource_mgr->get_minisas_gpio_ctrl_sptr(1), gpio_atr::GPIO_OUT, _1));
- _tree->create<boost::uint32_t>(mb_path / "gpio" / "FP0" / "READBACK")
+ _tree->create<uint32_t>(mb_path / "gpio" / "FP0" / "READBACK")
.set_publisher(boost::bind(&gpio_atr::gpio_atr_3000::read_gpio, _resource_mgr->get_minisas_gpio_ctrl_sptr(0)));
- _tree->create<boost::uint32_t>(mb_path / "gpio" / "FP1" / "READBACK")
+ _tree->create<uint32_t>(mb_path / "gpio" / "FP1" / "READBACK")
.set_publisher(boost::bind(&gpio_atr::gpio_atr_3000::read_gpio, _resource_mgr->get_minisas_gpio_ctrl_sptr(1)));
//------------------------------------------------------------------
diff --git a/host/lib/usrp/n230/n230_resource_manager.cpp b/host/lib/usrp/n230/n230_resource_manager.cpp
index f13dd0b33..826db5ed2 100644
--- a/host/lib/usrp/n230/n230_resource_manager.cpp
+++ b/host/lib/usrp/n230/n230_resource_manager.cpp
@@ -89,7 +89,7 @@ n230_resource_manager::n230_resource_manager(
n230_eth_conn_t conn_iface;
conn_iface.ip_addr = addr;
- boost::uint32_t iface_id = 0xFFFFFFFF;
+ uint32_t iface_id = 0xFFFFFFFF;
try {
iface_id = usrp3::usrp3_fw_ctrl_iface::get_iface_id(
conn_iface.ip_addr, BOOST_STRINGIZE(N230_FW_COMMS_UDP_PORT), N230_FW_PRODUCT_ID);
@@ -360,16 +360,16 @@ void n230_resource_manager::_initialize_radio(size_t instance)
}
}
-boost::uint8_t xb_ep_to_sid(fpga::xb_endpoint_t ep) {
- return static_cast<boost::uint8_t>(ep) << 4;
+uint8_t xb_ep_to_sid(fpga::xb_endpoint_t ep) {
+ return static_cast<uint8_t>(ep) << 4;
}
const sid_t n230_resource_manager::_generate_sid(const n230_endpoint_t type, const n230_eth_port_t xport, size_t instance)
{
fpga::xb_endpoint_t xb_dest_ep;
- boost::uint8_t sid_dest_ep = 0;
+ uint8_t sid_dest_ep = 0;
fpga::xb_endpoint_t xb_ret_ep = (xport == ETH1) ? fpga::N230_XB_DST_E1 : fpga::N230_XB_DST_E0;
- boost::uint8_t sid_ret_addr = (xport == ETH1) ? N230_HOST_SRC_ADDR_ETH1 : N230_HOST_SRC_ADDR_ETH0;
+ uint8_t sid_ret_addr = (xport == ETH1) ? N230_HOST_SRC_ADDR_ETH1 : N230_HOST_SRC_ADDR_ETH0;
if (type == CORE or type == GPS_UART) {
//Non-radio endpoints
@@ -399,10 +399,10 @@ const sid_t n230_resource_manager::_generate_sid(const n230_endpoint_t type, con
_fw_ctrl->poke32(fw::reg_addr(fw::WB_SBRB_BASE, fw::SR_ZPU_XB_LOCAL), sid.get_dst_addr());
// Program CAM entry for returning packets to us
// This type of packet does not match the XB_LOCAL address and is looked up in the lower half of the CAM
- _fw_ctrl->poke32(fw::reg_addr(fw::WB_XB_SBRB_BASE, sid.get_src_addr()), static_cast<boost::uint32_t>(xb_ret_ep));
+ _fw_ctrl->poke32(fw::reg_addr(fw::WB_XB_SBRB_BASE, sid.get_src_addr()), static_cast<uint32_t>(xb_ret_ep));
// Program CAM entry for outgoing packets matching a N230 resource (for example a Radio)
// This type of packet does matches the XB_LOCAL address and is looked up in the upper half of the CAM
- _fw_ctrl->poke32(fw::reg_addr(fw::WB_XB_SBRB_BASE, 256 + sid.get_dst_endpoint()), static_cast<boost::uint32_t>(xb_dest_ep));
+ _fw_ctrl->poke32(fw::reg_addr(fw::WB_XB_SBRB_BASE, 256 + sid.get_dst_endpoint()), static_cast<uint32_t>(xb_dest_ep));
return sid;
}
@@ -434,8 +434,8 @@ void n230_resource_manager::_program_dispatcher(
//Send a mini packet with SID into the ZPU
//ZPU will reprogram the ethernet framer
transport::managed_send_buffer::sptr buff = xport.get_send_buff();
- buff->cast<boost::uint32_t *>()[0] = 0; //eth dispatch looks for != 0
- buff->cast<boost::uint32_t *>()[1] = uhd::htonx(sid.get());
+ buff->cast<uint32_t *>()[0] = 0; //eth dispatch looks for != 0
+ buff->cast<uint32_t *>()[1] = uhd::htonx(sid.get());
buff->commit(8);
buff.reset();
@@ -466,8 +466,8 @@ bool n230_resource_manager::_radio_register_loopback_self_test(wb_iface::sptr if
size_t hash = static_cast<size_t>(time(NULL));
for (size_t i = 0; i < 100; i++) {
boost::hash_combine(hash, i);
- iface->poke32(fpga::sr_addr(fpga::SR_RADIO_TEST), boost::uint32_t(hash));
- test_fail = iface->peek32(fpga::rb_addr(fpga::RB_RADIO_TEST)) != boost::uint32_t(hash);
+ iface->poke32(fpga::sr_addr(fpga::SR_RADIO_TEST), uint32_t(hash));
+ test_fail = iface->peek32(fpga::rb_addr(fpga::RB_RADIO_TEST)) != uint32_t(hash);
if (test_fail) break; //exit loop on any failure
}
return !test_fail;
@@ -479,13 +479,13 @@ bool n230_resource_manager::_radio_data_loopback_self_test(wb_iface::sptr iface)
size_t hash = size_t(time(NULL));
for (size_t i = 0; i < 100; i++) {
boost::hash_combine(hash, i);
- const boost::uint32_t word32 = boost::uint32_t(hash) & (IF_DATA_I_MASK | IF_DATA_Q_MASK);
+ const uint32_t word32 = uint32_t(hash) & (IF_DATA_I_MASK | IF_DATA_Q_MASK);
iface->poke32(fpga::sr_addr(fpga::SR_RADIO_CODEC_IDLE), word32);
iface->peek64(fpga::rb_addr(fpga::RB_RADIO_CODEC_DATA)); //block until request completes
boost::this_thread::sleep(boost::posix_time::microseconds(100)); //wait for loopback to propagate through codec
- const boost::uint64_t rb_word64 = iface->peek64(fpga::rb_addr(fpga::RB_RADIO_CODEC_DATA));
- const boost::uint32_t rb_tx = boost::uint32_t(rb_word64 >> 32);
- const boost::uint32_t rb_rx = boost::uint32_t(rb_word64 & 0xffffffff);
+ const uint64_t rb_word64 = iface->peek64(fpga::rb_addr(fpga::RB_RADIO_CODEC_DATA));
+ const uint32_t rb_tx = uint32_t(rb_word64 >> 32);
+ const uint32_t rb_rx = uint32_t(rb_word64 & 0xffffffff);
test_fail = word32 != rb_tx or word32 != rb_rx;
if (test_fail)
UHD_MSG(fastpath) << boost::format("mismatch (exp:%x, got:%x and %x)... ") % word32 % rb_tx % rb_rx;
@@ -514,7 +514,7 @@ std::string n230_resource_manager::_get_fpga_upgrade_msg() {
void n230_resource_manager::_check_fw_compat()
{
- boost::uint32_t compat_num = _fw_ctrl->peek32(N230_FW_HOST_SHMEM_OFFSET(fw_compat_num));
+ uint32_t compat_num = _fw_ctrl->peek32(N230_FW_HOST_SHMEM_OFFSET(fw_compat_num));
_fw_version.compat_major = compat_num >> 16;
_fw_version.compat_minor = compat_num;
_fw_version.version_hash = _fw_ctrl->peek32(N230_FW_HOST_SHMEM_OFFSET(fw_version_hash));
@@ -524,23 +524,23 @@ void n230_resource_manager::_check_fw_compat()
"Expected firmware compatibility number %d.x, but got %d.%d\n"
"The firmware build is not compatible with the host code build.\n"
"%s"
- ) % static_cast<boost::uint32_t>(N230_FW_COMPAT_NUM_MAJOR)
- % static_cast<boost::uint32_t>(_fw_version.compat_major)
- % static_cast<boost::uint32_t>(_fw_version.compat_minor)
+ ) % static_cast<uint32_t>(N230_FW_COMPAT_NUM_MAJOR)
+ % static_cast<uint32_t>(_fw_version.compat_major)
+ % static_cast<uint32_t>(_fw_version.compat_minor)
% _get_fpga_upgrade_msg()));
}
}
void n230_resource_manager::_check_fpga_compat()
{
- const boost::uint64_t compat = _core_ctrl->peek64(fpga::rb_addr(fpga::RB_CORE_SIGNATUE));
- const boost::uint32_t signature = boost::uint32_t(compat >> 32);
- const boost::uint16_t product_id = boost::uint8_t(compat >> 24);
- _fpga_version.compat_major = static_cast<boost::uint8_t>(compat >> 16);
- _fpga_version.compat_minor = static_cast<boost::uint16_t>(compat);
+ const uint64_t compat = _core_ctrl->peek64(fpga::rb_addr(fpga::RB_CORE_SIGNATUE));
+ const uint32_t signature = uint32_t(compat >> 32);
+ const uint16_t product_id = uint8_t(compat >> 24);
+ _fpga_version.compat_major = static_cast<uint8_t>(compat >> 16);
+ _fpga_version.compat_minor = static_cast<uint16_t>(compat);
- const boost::uint64_t version_hash = _core_ctrl->peek64(fpga::rb_addr(fpga::RB_CORE_VERSION_HASH));
- _fpga_version.version_hash = boost::uint32_t(version_hash);
+ const uint64_t version_hash = _core_ctrl->peek64(fpga::rb_addr(fpga::RB_CORE_VERSION_HASH));
+ _fpga_version.version_hash = uint32_t(version_hash);
if (signature != 0x0ACE0BA5E || product_id != fpga::RB_N230_PRODUCT_ID)
throw uhd::runtime_error("Signature check failed. Please contact support.");
@@ -559,9 +559,9 @@ void n230_resource_manager::_check_fpga_compat()
"Expected FPGA compatibility number %d.x, but got %d.%d:\n"
"The FPGA build is not compatible with the host code build.\n"
"%s"
- ) % static_cast<boost::uint32_t>(fpga::RB_N230_COMPAT_MAJOR)
- % static_cast<boost::uint32_t>(_fpga_version.compat_major)
- % static_cast<boost::uint32_t>(_fpga_version.compat_minor)
+ ) % static_cast<uint32_t>(fpga::RB_N230_COMPAT_MAJOR)
+ % static_cast<uint32_t>(_fpga_version.compat_major)
+ % static_cast<uint32_t>(_fpga_version.compat_minor)
% _get_fpga_upgrade_msg()));
}
}
diff --git a/host/lib/usrp/n230/n230_resource_manager.hpp b/host/lib/usrp/n230/n230_resource_manager.hpp
index 0a1178bd2..180f4f437 100644
--- a/host/lib/usrp/n230/n230_resource_manager.hpp
+++ b/host/lib/usrp/n230/n230_resource_manager.hpp
@@ -108,7 +108,7 @@ public: //Methods
}
}
- inline boost::uint32_t get_version(n230_ver_src_t src, n230_version_t type) {
+ inline uint32_t get_version(n230_ver_src_t src, n230_version_t type) {
switch (src) {
case FPGA: return _fpga_version.get(type);
case FIRMWARE: return _fw_version.get(type);
@@ -210,11 +210,11 @@ public: //Methods
private:
struct ver_info_t {
- boost::uint8_t compat_major;
- boost::uint16_t compat_minor;
- boost::uint32_t version_hash;
+ uint8_t compat_major;
+ uint16_t compat_minor;
+ uint32_t version_hash;
- boost::uint32_t get(n230_version_t type) {
+ uint32_t get(n230_version_t type) {
switch (type) {
case COMPAT_MAJOR: return compat_major;
case COMPAT_MINOR: return compat_minor;
@@ -281,7 +281,7 @@ private:
static boost::mutex _claimer_mutex; //All claims and checks in this process are serialized
//Transport
- boost::uint8_t _last_host_enpoint;
+ uint8_t _last_host_enpoint;
//Radio settings interface
radio_ctrl_core_3000::sptr _core_ctrl;
diff --git a/host/lib/usrp/n230/n230_stream_manager.cpp b/host/lib/usrp/n230/n230_stream_manager.cpp
index e7624ecd6..0528212d0 100644
--- a/host/lib/usrp/n230/n230_stream_manager.cpp
+++ b/host/lib/usrp/n230/n230_stream_manager.cpp
@@ -33,7 +33,7 @@ static const size_t N230_TX_MAX_ASYNC_MESSAGES = 1000;
static const size_t N230_TX_MAX_SPP = 4092;
static const size_t N230_TX_FC_RESPONSE_FREQ = 10; //per flow-control window
-static const boost::uint32_t N230_EVENT_CODE_FLOW_CTRL = 0;
+static const uint32_t N230_EVENT_CODE_FLOW_CTRL = 0;
namespace uhd { namespace usrp { namespace n230 {
@@ -97,7 +97,7 @@ rx_streamer::sptr n230_stream_manager::get_rx_stream(const uhd::stream_args_t &a
//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) //no longer using 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
@@ -224,8 +224,8 @@ tx_streamer::sptr n230_stream_manager::get_tx_stream(const uhd::stream_args_t &a
//calculate packet size
static const size_t hdr_size = 0
- + vrt::num_vrl_words32*sizeof(boost::uint32_t)
- + vrt::max_if_hdr_words32*sizeof(boost::uint32_t)
+ + vrt::num_vrl_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().cid) //no class id ever used
- sizeof(vrt::if_packet_info_t().tsi) //no int time ever used
@@ -424,7 +424,7 @@ void n230_stream_manager::_handle_rx_flowctrl(
if (not buff) {
throw uhd::runtime_error("handle_rx_flowctrl timed out getting a send buffer");
}
- boost::uint32_t *pkt = buff->cast<boost::uint32_t *>();
+ uint32_t *pkt = buff->cast<uint32_t *>();
//recover seq32
size_t& seq_sw = fc_cache->last_seq_in;
@@ -437,7 +437,7 @@ void n230_stream_manager::_handle_rx_flowctrl(
vrt::if_packet_info_t packet_info;
packet_info.packet_type = vrt::if_packet_info_t::PACKET_TYPE_CONTEXT;
packet_info.num_payload_words32 = RXFC_PACKET_LEN_IN_WORDS;
- packet_info.num_payload_bytes = packet_info.num_payload_words32*sizeof(boost::uint32_t);
+ packet_info.num_payload_bytes = packet_info.num_payload_words32*sizeof(uint32_t);
packet_info.packet_count = seq_sw;
packet_info.sob = false;
packet_info.eob = false;
@@ -452,11 +452,11 @@ void n230_stream_manager::_handle_rx_flowctrl(
_cvita_hdr_pack(pkt, packet_info);
//load payload
- pkt[packet_info.num_header_words32 + RXFC_CMD_CODE_OFFSET] = uhd::htonx<boost::uint32_t>(N230_EVENT_CODE_FLOW_CTRL);
- pkt[packet_info.num_header_words32 + RXFC_SEQ_NUM_OFFSET] = uhd::htonx<boost::uint32_t>(seq_sw);
+ pkt[packet_info.num_header_words32 + RXFC_CMD_CODE_OFFSET] = uhd::htonx<uint32_t>(N230_EVENT_CODE_FLOW_CTRL);
+ pkt[packet_info.num_header_words32 + RXFC_SEQ_NUM_OFFSET] = uhd::htonx<uint32_t>(seq_sw);
//send the buffer over the interface
- buff->commit(sizeof(boost::uint32_t)*(packet_info.num_packet_words32));
+ buff->commit(sizeof(uint32_t)*(packet_info.num_packet_words32));
}
void n230_stream_manager::_handle_tx_async_msgs(
@@ -469,8 +469,8 @@ void n230_stream_manager::_handle_tx_async_msgs(
//extract packet info
vrt::if_packet_info_t if_packet_info;
- if_packet_info.num_packet_words32 = buff->size()/sizeof(boost::uint32_t);
- const boost::uint32_t *packet_buff = buff->cast<const boost::uint32_t *>();
+ if_packet_info.num_packet_words32 = buff->size()/sizeof(uint32_t);
+ const uint32_t *packet_buff = buff->cast<const uint32_t *>();
//unpacking can fail
uint32_t (*endian_conv)(uint32_t) = uhd::ntohx;
@@ -544,7 +544,7 @@ double n230_stream_manager::_get_tick_rate()
}
void n230_stream_manager::_cvita_hdr_unpack(
- const boost::uint32_t *packet_buff,
+ const uint32_t *packet_buff,
vrt::if_packet_info_t &if_packet_info)
{
if_packet_info.link_type = vrt::if_packet_info_t::LINK_TYPE_CHDR;
@@ -552,7 +552,7 @@ void n230_stream_manager::_cvita_hdr_unpack(
}
void n230_stream_manager::_cvita_hdr_pack(
- boost::uint32_t *packet_buff,
+ uint32_t *packet_buff,
vrt::if_packet_info_t &if_packet_info)
{
if_packet_info.link_type = vrt::if_packet_info_t::LINK_TYPE_CHDR;
diff --git a/host/lib/usrp/n230/n230_stream_manager.hpp b/host/lib/usrp/n230/n230_stream_manager.hpp
index 7a496c4e9..c3588474e 100644
--- a/host/lib/usrp/n230/n230_stream_manager.hpp
+++ b/host/lib/usrp/n230/n230_stream_manager.hpp
@@ -123,11 +123,11 @@ private:
size_t hw_buff_size);
static void _cvita_hdr_unpack(
- const boost::uint32_t *packet_buff,
+ const uint32_t *packet_buff,
transport::vrt::if_packet_info_t &if_packet_info);
static void _cvita_hdr_pack(
- boost::uint32_t *packet_buff,
+ uint32_t *packet_buff,
transport::vrt::if_packet_info_t &if_packet_info);
const n230_device_args_t _dev_args;
@@ -143,7 +143,7 @@ private:
stream_args_t _tx_stream_cached_args[fpga::NUM_RADIOS];
stream_args_t _rx_stream_cached_args[fpga::NUM_RADIOS];
- static const boost::uint32_t HW_SEQ_NUM_MASK = 0xFFF;
+ static const uint32_t HW_SEQ_NUM_MASK = 0xFFF;
};
}}} //namespace
diff --git a/host/lib/usrp/n230/n230_uart.cpp b/host/lib/usrp/n230/n230_uart.cpp
index 20936c303..7291a7276 100644
--- a/host/lib/usrp/n230/n230_uart.cpp
+++ b/host/lib/usrp/n230/n230_uart.cpp
@@ -31,7 +31,7 @@ namespace uhd { namespace usrp { namespace n230 {
struct n230_uart_impl : n230_uart
{
- n230_uart_impl(zero_copy_if::sptr xport, const boost::uint32_t sid):
+ n230_uart_impl(zero_copy_if::sptr xport, const uint32_t sid):
_xport(xport),
_sid(sid),
_count(0),
@@ -53,7 +53,7 @@ struct n230_uart_impl : n230_uart
packet_info.link_type = vrt::if_packet_info_t::LINK_TYPE_CHDR;
packet_info.packet_type = vrt::if_packet_info_t::PACKET_TYPE_CONTEXT;
packet_info.num_payload_words32 = 2;
- packet_info.num_payload_bytes = packet_info.num_payload_words32*sizeof(boost::uint32_t);
+ packet_info.num_payload_bytes = packet_info.num_payload_words32*sizeof(uint32_t);
packet_info.packet_count = _count++;
packet_info.sob = false;
packet_info.eob = false;
@@ -64,11 +64,11 @@ struct n230_uart_impl : n230_uart
packet_info.has_tsf = false;
packet_info.has_tlr = false;
- boost::uint32_t *packet_buff = buff->cast<boost::uint32_t *>();
+ uint32_t *packet_buff = buff->cast<uint32_t *>();
vrt::if_hdr_pack_le(packet_buff, packet_info);
- packet_buff[packet_info.num_header_words32+0] = uhd::htonx(boost::uint32_t(_baud_div));
- packet_buff[packet_info.num_header_words32+1] = uhd::htonx(boost::uint32_t(ch));
- buff->commit(packet_info.num_packet_words32*sizeof(boost::uint32_t));
+ packet_buff[packet_info.num_header_words32+0] = uhd::htonx(uint32_t(_baud_div));
+ packet_buff[packet_info.num_header_words32+1] = uhd::htonx(uint32_t(ch));
+ buff->commit(packet_info.num_packet_words32*sizeof(uint32_t));
}
void write_uart(const std::string &buff)
@@ -100,10 +100,10 @@ struct n230_uart_impl : n230_uart
managed_recv_buffer::sptr buff = _xport->get_recv_buff();
if (not buff)
return;
- const boost::uint32_t *packet_buff = buff->cast<const boost::uint32_t *>();
+ const uint32_t *packet_buff = buff->cast<const uint32_t *>();
vrt::if_packet_info_t packet_info;
packet_info.link_type = vrt::if_packet_info_t::LINK_TYPE_CHDR;
- packet_info.num_packet_words32 = buff->size()/sizeof(boost::uint32_t);
+ packet_info.num_packet_words32 = buff->size()/sizeof(uint32_t);
vrt::if_hdr_unpack_be(packet_buff, packet_info);
const char ch = char(uhd::ntohx(packet_buff[packet_info.num_header_words32+1]));
_char_queue.push_with_pop_on_full(ch);
@@ -115,7 +115,7 @@ struct n230_uart_impl : n230_uart
}
const zero_copy_if::sptr _xport;
- const boost::uint32_t _sid;
+ const uint32_t _sid;
size_t _count;
size_t _baud_div;
bounded_buffer<char> _char_queue;
@@ -123,7 +123,7 @@ struct n230_uart_impl : n230_uart
};
-n230_uart::sptr n230_uart::make(zero_copy_if::sptr xport, const boost::uint32_t sid)
+n230_uart::sptr n230_uart::make(zero_copy_if::sptr xport, const uint32_t sid)
{
return n230_uart::sptr(new n230_uart_impl(xport, sid));
}
diff --git a/host/lib/usrp/n230/n230_uart.hpp b/host/lib/usrp/n230/n230_uart.hpp
index 0bde12ab2..168399f50 100644
--- a/host/lib/usrp/n230/n230_uart.hpp
+++ b/host/lib/usrp/n230/n230_uart.hpp
@@ -29,7 +29,7 @@ class n230_uart: boost::noncopyable, public uhd::uart_iface
{
public:
typedef boost::shared_ptr<n230_uart> sptr;
- static sptr make(uhd::transport::zero_copy_if::sptr, const boost::uint32_t sid);
+ static sptr make(uhd::transport::zero_copy_if::sptr, const uint32_t sid);
virtual void set_baud_divider(const double baud_div) = 0;
};
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 02:58:47 +0000