diff options
Diffstat (limited to 'host/include')
34 files changed, 203 insertions, 203 deletions
diff --git a/host/include/uhd/rfnoc/block_ctrl_base.hpp b/host/include/uhd/rfnoc/block_ctrl_base.hpp index fa3ceadc5..725f0d966 100644 --- a/host/include/uhd/rfnoc/block_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/block_ctrl_base.hpp @@ -29,7 +29,6 @@ #include <uhd/rfnoc/stream_sig.hpp> #include <uhd/rfnoc/blockdef.hpp> #include <uhd/rfnoc/constants.hpp> -#include <boost/cstdint.hpp> #include <boost/shared_ptr.hpp> #include <boost/lexical_cast.hpp> #include <stdint.h> @@ -142,7 +141,7 @@ public: * \param noc_id The 64-Bit NoC-ID. * \return a shared pointer to a new device instance */ - static sptr make(const make_args_t &make_args, boost::uint64_t noc_id = ~0); + static sptr make(const make_args_t &make_args, uint64_t noc_id = ~0); /*********************************************************************** * Block Communication and Control @@ -152,7 +151,7 @@ public: /*! Returns the 16-Bit address for this block. */ - boost::uint32_t get_address(size_t block_port=0); + uint32_t get_address(size_t block_port=0); /*! Returns the unique block ID for this block (e.g. "0/FFT_1"). */ @@ -178,7 +177,7 @@ public: * \param reg The settings register to write to. * \param data New value of this register. */ - void sr_write(const boost::uint32_t reg, const boost::uint32_t data, const size_t port = 0); + void sr_write(const uint32_t reg, const uint32_t data, const size_t port = 0); /*! Allows setting one register on the settings bus. * @@ -190,7 +189,7 @@ public: * \throw uhd::key_error if \p reg is not a valid register name * */ - void sr_write(const std::string ®, const boost::uint32_t data, const size_t port = 0); + void sr_write(const std::string ®, const uint32_t data, const size_t port = 0); /*! Allows reading one register on the settings bus (64-Bit version). * @@ -199,7 +198,7 @@ public: * * Returns the readback value. */ - boost::uint64_t sr_read64(const settingsbus_reg_t reg, const size_t port = 0); + uint64_t sr_read64(const settingsbus_reg_t reg, const size_t port = 0); /*! Allows reading one register on the settings bus (32-Bit version). * @@ -208,7 +207,7 @@ public: * * Returns the readback value. */ - boost::uint32_t sr_read32(const settingsbus_reg_t reg, const size_t port = 0); + uint32_t sr_read32(const settingsbus_reg_t reg, const size_t port = 0); /*! Allows reading one user-defined register (64-Bit version). * @@ -220,7 +219,7 @@ public: * \param port Port on which to read * \returns the readback value. */ - boost::uint64_t user_reg_read64(const boost::uint32_t addr, const size_t port = 0); + uint64_t user_reg_read64(const uint32_t addr, const size_t port = 0); /*! Allows reading one user-defined register (64-Bit version). * @@ -233,7 +232,7 @@ public: * \returns the readback value. * \throws uhd::key_error if \p reg is not a valid register name */ - boost::uint64_t user_reg_read64(const std::string ®, const size_t port = 0); + uint64_t user_reg_read64(const std::string ®, const size_t port = 0); /*! Allows reading one user-defined register (32-Bit version). * @@ -245,7 +244,7 @@ public: * \param port Port on which to read * \returns the readback value. */ - boost::uint32_t user_reg_read32(const boost::uint32_t addr, const size_t port = 0); + uint32_t user_reg_read32(const uint32_t addr, const size_t port = 0); /*! Allows reading one user-defined register (32-Bit version). * @@ -257,7 +256,7 @@ public: * \returns the readback value. * \throws uhd::key_error if \p reg is not a valid register name */ - boost::uint32_t user_reg_read32(const std::string ®, const size_t port = 0); + uint32_t user_reg_read32(const std::string ®, const size_t port = 0); /*! Sets a command time for all future command packets. diff --git a/host/include/uhd/rfnoc/block_id.hpp b/host/include/uhd/rfnoc/block_id.hpp index a8f2aec5a..e731f20f8 100644 --- a/host/include/uhd/rfnoc/block_id.hpp +++ b/host/include/uhd/rfnoc/block_id.hpp @@ -18,7 +18,7 @@ #define INCLUDED_UHD_TYPES_BLOCK_ID_HPP #include <uhd/config.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/shared_ptr.hpp> #include <iostream> #include <string> diff --git a/host/include/uhd/rfnoc/blockdef.hpp b/host/include/uhd/rfnoc/blockdef.hpp index fc3505d3c..6af8c340c 100644 --- a/host/include/uhd/rfnoc/blockdef.hpp +++ b/host/include/uhd/rfnoc/blockdef.hpp @@ -18,7 +18,7 @@ #ifndef INCLUDED_LIBUHD_RFNOC_BLOCKDEF_HPP #define INCLUDED_LIBUHD_RFNOC_BLOCKDEF_HPP -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/enable_shared_from_this.hpp> #include <uhd/config.hpp> #include <uhd/types/device_addr.hpp> @@ -85,7 +85,7 @@ public: * Note: If nothing is found, returns an * empty sptr. Does not throw. */ - static sptr make_from_noc_id(boost::uint64_t noc_id); + static sptr make_from_noc_id(uint64_t noc_id); //! Returns true if this represents a NoC block virtual bool is_block() const = 0; @@ -100,7 +100,7 @@ public: virtual std::string get_name() const = 0; //! Return the one NoC that is valid for this block - virtual boost::uint64_t noc_id() const = 0; + virtual uint64_t noc_id() const = 0; virtual ports_t get_input_ports() = 0; virtual ports_t get_output_ports() = 0; diff --git a/host/include/uhd/rfnoc/constants.hpp b/host/include/uhd/rfnoc/constants.hpp index 14e0da55c..4135d44e3 100644 --- a/host/include/uhd/rfnoc/constants.hpp +++ b/host/include/uhd/rfnoc/constants.hpp @@ -20,7 +20,7 @@ #include <uhd/types/dict.hpp> #include <boost/assign/list_of.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <string> namespace uhd { @@ -34,7 +34,7 @@ static const std::string XML_PATH_ENV = "UHD_RFNOC_DIR"; //! If the block name can't be automatically detected, this name is used static const std::string DEFAULT_BLOCK_NAME = "Block"; -static const boost::uint64_t DEFAULT_NOC_ID = 0xFFFFFFFFFFFFFFFF; +static const uint64_t DEFAULT_NOC_ID = 0xFFFFFFFFFFFFFFFF; static const size_t MAX_PACKET_SIZE = 8000; // bytes static const size_t DEFAULT_PACKET_SIZE = 1456; // bytes @@ -56,21 +56,21 @@ static const size_t DEFAULT_FC_TX_RESPONSE_FREQ = 8; // ACKs per flow control wi static const double DEFAULT_FC_RX_SW_BUFF_FULL_FACTOR = 0.80; // Common settings registers. -static const boost::uint32_t SR_FLOW_CTRL_CYCS_PER_ACK = 0; -static const boost::uint32_t SR_FLOW_CTRL_PKTS_PER_ACK = 1; -static const boost::uint32_t SR_FLOW_CTRL_WINDOW_SIZE = 2; -static const boost::uint32_t SR_FLOW_CTRL_WINDOW_EN = 3; -static const boost::uint32_t SR_ERROR_POLICY = 4; -static const boost::uint32_t SR_BLOCK_SID = 5; // TODO rename to SRC_SID -static const boost::uint32_t SR_NEXT_DST_SID = 6; -static const boost::uint32_t SR_RESP_IN_DST_SID = 7; -static const boost::uint32_t SR_RESP_OUT_DST_SID = 8; - -static const boost::uint32_t SR_READBACK_ADDR = 124; -static const boost::uint32_t SR_READBACK = 127; - -static const boost::uint32_t SR_CLEAR_RX_FC = 125; -static const boost::uint32_t SR_CLEAR_TX_FC = 126; +static const uint32_t SR_FLOW_CTRL_CYCS_PER_ACK = 0; +static const uint32_t SR_FLOW_CTRL_PKTS_PER_ACK = 1; +static const uint32_t SR_FLOW_CTRL_WINDOW_SIZE = 2; +static const uint32_t SR_FLOW_CTRL_WINDOW_EN = 3; +static const uint32_t SR_ERROR_POLICY = 4; +static const uint32_t SR_BLOCK_SID = 5; // TODO rename to SRC_SID +static const uint32_t SR_NEXT_DST_SID = 6; +static const uint32_t SR_RESP_IN_DST_SID = 7; +static const uint32_t SR_RESP_OUT_DST_SID = 8; + +static const uint32_t SR_READBACK_ADDR = 124; +static const uint32_t SR_READBACK = 127; + +static const uint32_t SR_CLEAR_RX_FC = 125; +static const uint32_t SR_CLEAR_TX_FC = 126; //! Settings register readback enum settingsbus_reg_t { @@ -84,12 +84,12 @@ enum settingsbus_reg_t { }; // AXI stream configuration bus (output master bus of axi wrapper) registers -static const boost::uint32_t AXI_WRAPPER_BASE = 128; -static const boost::uint32_t AXIS_CONFIG_BUS = AXI_WRAPPER_BASE+1; // tdata with tvalid asserted -static const boost::uint32_t AXIS_CONFIG_BUS_TLAST = AXI_WRAPPER_BASE+2; // tdata with tvalid & tlast asserted +static const uint32_t AXI_WRAPPER_BASE = 128; +static const uint32_t AXIS_CONFIG_BUS = AXI_WRAPPER_BASE+1; // tdata with tvalid asserted +static const uint32_t AXIS_CONFIG_BUS_TLAST = AXI_WRAPPER_BASE+2; // tdata with tvalid & tlast asserted // Named settings registers -static const uhd::dict<std::string, boost::uint32_t> DEFAULT_NAMED_SR = boost::assign::map_list_of +static const uhd::dict<std::string, uint32_t> DEFAULT_NAMED_SR = boost::assign::map_list_of ("AXIS_CONFIG_BUS", AXIS_CONFIG_BUS) ("AXIS_CONFIG_BUS_TLAST", AXIS_CONFIG_BUS_TLAST) ; diff --git a/host/include/uhd/rfnoc/node_ctrl_base.hpp b/host/include/uhd/rfnoc/node_ctrl_base.hpp index bf799d2c2..6fd6fd288 100644 --- a/host/include/uhd/rfnoc/node_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/node_ctrl_base.hpp @@ -21,7 +21,7 @@ #include <uhd/types/device_addr.hpp> #include <uhd/rfnoc/constants.hpp> #include <uhd/utils/log.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/shared_ptr.hpp> #include <boost/utility.hpp> #include <boost/enable_shared_from_this.hpp> diff --git a/host/include/uhd/rfnoc/source_block_ctrl_base.hpp b/host/include/uhd/rfnoc/source_block_ctrl_base.hpp index 02882307c..7d90bb2f0 100644 --- a/host/include/uhd/rfnoc/source_block_ctrl_base.hpp +++ b/host/include/uhd/rfnoc/source_block_ctrl_base.hpp @@ -95,7 +95,7 @@ public: * have bit 16 set to 1, since some blocks require this to respect this value. */ virtual void set_destination( - boost::uint32_t next_address, + uint32_t next_address, size_t output_block_port = 0 ); diff --git a/host/include/uhd/transport/chdr.hpp b/host/include/uhd/transport/chdr.hpp index 5e8cd58a9..fa2ae074e 100644 --- a/host/include/uhd/transport/chdr.hpp +++ b/host/include/uhd/transport/chdr.hpp @@ -59,7 +59,7 @@ namespace chdr{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_pack_be( - boost::uint32_t *packet_buff, + uint32_t *packet_buff, if_packet_info_t &if_packet_info ); @@ -73,7 +73,7 @@ namespace chdr{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_unpack_be( - const boost::uint32_t *packet_buff, + const uint32_t *packet_buff, if_packet_info_t &if_packet_info ); @@ -87,7 +87,7 @@ namespace chdr{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_pack_le( - boost::uint32_t *packet_buff, + uint32_t *packet_buff, if_packet_info_t &if_packet_info ); @@ -101,7 +101,7 @@ namespace chdr{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_unpack_le( - const boost::uint32_t *packet_buff, + const uint32_t *packet_buff, if_packet_info_t &if_packet_info ); diff --git a/host/include/uhd/transport/nirio/rpc/rpc_client.hpp b/host/include/uhd/transport/nirio/rpc/rpc_client.hpp index f90034e37..78761c1fc 100644 --- a/host/include/uhd/transport/nirio/rpc/rpc_client.hpp +++ b/host/include/uhd/transport/nirio/rpc/rpc_client.hpp @@ -30,14 +30,14 @@ namespace uhd { namespace usrprio_rpc { class rpc_client : private boost::noncopyable { public: - static const boost::uint32_t CURRENT_VERSION = 1; - static const boost::uint32_t OLDEST_COMPATIBLE_VERSION = 1; + static const uint32_t CURRENT_VERSION = 1; + static const uint32_t OLDEST_COMPATIBLE_VERSION = 1; rpc_client( const std::string& server, const std::string& port, - boost::uint32_t process_id, - boost::uint32_t host_id); + uint32_t process_id, + uint32_t host_id); ~rpc_client(); const boost::system::error_code& call( diff --git a/host/include/uhd/transport/nirio/rpc/rpc_common.hpp b/host/include/uhd/transport/nirio/rpc/rpc_common.hpp index ea5b3337d..578ff2fe1 100644 --- a/host/include/uhd/transport/nirio/rpc/rpc_common.hpp +++ b/host/include/uhd/transport/nirio/rpc/rpc_common.hpp @@ -31,25 +31,26 @@ #include <boost/archive/text_oarchive.hpp> #include <boost/archive/text_iarchive.hpp> #endif +#include <stdint.h> namespace uhd { namespace usrprio_rpc { //[Over-the-wire] IDs -typedef boost::int32_t func_id_t; -typedef boost::uint64_t client_id_t; +typedef int32_t func_id_t; +typedef uint64_t client_id_t; #define build_client_id(host_id, process_id) \ - ((static_cast<boost::uint64_t>(host_id) << 32) | static_cast<boost::uint64_t>(process_id)) + ((static_cast<uint64_t>(host_id) << 32) | static_cast<uint64_t>(process_id)) #define get_process_id_from_client_id(client_id) \ - (static_cast<boost::int32_t>(client_id)) + (static_cast<int32_t>(client_id)) #define get_host_id_from_client_id(client_id) \ - (static_cast<boost::uint32_t>(client_id >> 32)) + (static_cast<uint32_t>(client_id >> 32)) //[Over-the-wire] Handshake format struct hshake_args_t { - boost::uint32_t version; - boost::uint32_t oldest_comp_version; - boost::int32_t boost_archive_version; + uint32_t version; + uint32_t oldest_comp_version; + int32_t boost_archive_version; client_id_t client_id; }; @@ -58,7 +59,7 @@ class func_args_header_t { public: func_id_t func_id; client_id_t client_id; - boost::uint32_t func_args_size; + uint32_t func_args_size; static bool match_function(const func_args_header_t& a, const func_args_header_t& b) { return ((a.func_id == b.func_id) && (a.client_id == b.client_id)); @@ -139,7 +140,7 @@ private: class boost_serialization_archive_utils { public: - static boost::int32_t get_version() { + static int32_t get_version() { #if (USE_BINARY_ARCHIVE) typedef boost::archive::binary_oarchive archive_t; #else @@ -147,7 +148,7 @@ public: #endif std::ostringstream stream; archive_t dummy_archive(stream, boost::archive::no_header); - return static_cast<boost::int32_t>(dummy_archive.get_library_version()); + return static_cast<int32_t>(dummy_archive.get_library_version()); } }; diff --git a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp index 4b205cceb..b9600f99f 100644 --- a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp +++ b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_client.hpp @@ -55,7 +55,7 @@ public: nirio_status niusrprio_download_fpga_to_flash( NIUSRPRIO_DOWNLOAD_FPGA_TO_FLASH_ARGS); - static const boost::int64_t DEFAULT_TIMEOUT_IN_MS = 5000; + static const int64_t DEFAULT_TIMEOUT_IN_MS = 5000; private: static nirio_status _boost_error_to_nirio_status(const boost::system::error_code& err); diff --git a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp index 362d9a174..23b260a89 100644 --- a/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp +++ b/host/include/uhd/transport/nirio/rpc/usrprio_rpc_common.hpp @@ -37,7 +37,7 @@ static const func_id_t NIUSRPRIO_DOWNLOAD_FPGA_TO_FLASH = NIUSRPRIO_FUNC_BAS //Function Args struct usrprio_device_info { - boost::uint32_t interface_num; + uint32_t interface_num; std::string resource_name; std::string pcie_serial_num; std::string interface_path; @@ -62,7 +62,7 @@ typedef std::vector<usrprio_device_info> usrprio_device_info_vtr; const std::string& resource, \ const std::string& path, \ const std::string& signature, \ - const boost::uint16_t& download_fpga + const uint16_t& download_fpga #define NIUSRPRIO_CLOSE_SESSION_ARGS \ const std::string& resource diff --git a/host/include/uhd/transport/usb_control.hpp b/host/include/uhd/transport/usb_control.hpp index 4576d6e92..5576b29a5 100644 --- a/host/include/uhd/transport/usb_control.hpp +++ b/host/include/uhd/transport/usb_control.hpp @@ -56,13 +56,13 @@ public: * \param timeout 4-byte (timeout, default is infinite wait) * \return number of bytes submitted or error code */ - virtual int submit(boost::uint8_t request_type, - boost::uint8_t request, - boost::uint16_t value, - boost::uint16_t index, + virtual int submit(uint8_t request_type, + uint8_t request, + uint16_t value, + uint16_t index, unsigned char *buff, - boost::uint16_t length, - boost::uint32_t timeout = 0) = 0; + uint16_t length, + uint32_t timeout = 0) = 0; }; }} //namespace diff --git a/host/include/uhd/transport/usb_device_handle.hpp b/host/include/uhd/transport/usb_device_handle.hpp index a8bbfc965..06f24371c 100644 --- a/host/include/uhd/transport/usb_device_handle.hpp +++ b/host/include/uhd/transport/usb_device_handle.hpp @@ -21,7 +21,7 @@ #include <uhd/config.hpp> #include <boost/utility.hpp> #include <boost/shared_ptr.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <vector> namespace uhd { namespace transport { @@ -41,7 +41,7 @@ namespace uhd { namespace transport { class UHD_API usb_device_handle : boost::noncopyable { public: typedef boost::shared_ptr<usb_device_handle> sptr; - typedef std::pair<boost::uint16_t, boost::uint16_t> vid_pid_pair_t; + typedef std::pair<uint16_t, uint16_t> vid_pid_pair_t; virtual ~usb_device_handle(void); @@ -67,13 +67,13 @@ public: * Return the device's Vendor ID (usually assigned by the USB-IF) * \return a Vendor ID */ - virtual boost::uint16_t get_vendor_id() const = 0; + virtual uint16_t get_vendor_id() const = 0; /*! * Return the device's Product ID (usually assigned by manufacturer) * \return a Product ID */ - virtual boost::uint16_t get_product_id() const = 0; + virtual uint16_t get_product_id() const = 0; /*! * Test whether the firmware is loaded on the device. @@ -85,7 +85,7 @@ public: * Return a vector of USB devices on this host * \return a vector of USB device handles that match vid and pid */ - static std::vector<usb_device_handle::sptr> get_device_list(boost::uint16_t vid, boost::uint16_t pid); + static std::vector<usb_device_handle::sptr> get_device_list(uint16_t vid, uint16_t pid); static std::vector<usb_device_handle::sptr> get_device_list(const std::vector<usb_device_handle::vid_pid_pair_t>& vid_pid_pair_list); diff --git a/host/include/uhd/transport/vrt_if_packet.hpp b/host/include/uhd/transport/vrt_if_packet.hpp index 0150e7f13..7d0123c42 100644 --- a/host/include/uhd/transport/vrt_if_packet.hpp +++ b/host/include/uhd/transport/vrt_if_packet.hpp @@ -19,7 +19,7 @@ #define INCLUDED_UHD_TRANSPORT_VRT_IF_PACKET_HPP #include <uhd/config.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <cstddef> //size_t namespace uhd{ namespace transport{ @@ -81,15 +81,15 @@ namespace vrt{ //optional fields //! Stream ID (SID). See uhd::sid_t - bool has_sid; boost::uint32_t sid; + bool has_sid; uint32_t sid; //! Class ID. - bool has_cid; boost::uint64_t cid; + bool has_cid; uint64_t cid; //! Integer timestamp - bool has_tsi; boost::uint32_t tsi; + bool has_tsi; uint32_t tsi; //! Fractional timestamp - bool has_tsf; boost::uint64_t tsf; + bool has_tsf; uint64_t tsf; //! Trailer - bool has_tlr; boost::uint32_t tlr; + bool has_tlr; uint32_t tlr; }; /*! @@ -118,7 +118,7 @@ namespace vrt{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_pack_be( - boost::uint32_t *packet_buff, + uint32_t *packet_buff, if_packet_info_t &if_packet_info ); @@ -156,7 +156,7 @@ namespace vrt{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_unpack_be( - const boost::uint32_t *packet_buff, + const uint32_t *packet_buff, if_packet_info_t &if_packet_info ); @@ -169,7 +169,7 @@ namespace vrt{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_pack_le( - boost::uint32_t *packet_buff, + uint32_t *packet_buff, if_packet_info_t &if_packet_info ); @@ -182,7 +182,7 @@ namespace vrt{ * \param if_packet_info the if packet info (read/write) */ UHD_API void if_hdr_unpack_le( - const boost::uint32_t *packet_buff, + const uint32_t *packet_buff, if_packet_info_t &if_packet_info ); diff --git a/host/include/uhd/types/byte_vector.hpp b/host/include/uhd/types/byte_vector.hpp index b7637fb5d..619a74d61 100644 --- a/host/include/uhd/types/byte_vector.hpp +++ b/host/include/uhd/types/byte_vector.hpp @@ -23,14 +23,14 @@ #include <vector> #include <boost/assign.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <uhd/config.hpp> namespace uhd{ //! Byte vector used for I2C data passing and EEPROM parsing. - typedef std::vector<boost::uint8_t> byte_vector_t; + typedef std::vector<uint8_t> byte_vector_t; template<typename RangeSrc, typename RangeDst> UHD_INLINE void byte_copy(const RangeSrc &src, RangeDst &dst){ diff --git a/host/include/uhd/types/filters.hpp b/host/include/uhd/types/filters.hpp index 2c30c1007..e3756b7a5 100644 --- a/host/include/uhd/types/filters.hpp +++ b/host/include/uhd/types/filters.hpp @@ -21,7 +21,7 @@ #include <uhd/config.hpp> #include <uhd/utils/log.hpp> #include <uhd/utils/msg.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/shared_ptr.hpp> #include <boost/scoped_array.hpp> #include <string> @@ -151,10 +151,10 @@ namespace uhd{ { protected: double _rate; - boost::uint32_t _interpolation; - boost::uint32_t _decimation; + uint32_t _interpolation; + uint32_t _decimation; tap_t _tap_full_scale; - boost::uint32_t _max_num_taps; + uint32_t _max_num_taps; std::vector<tap_t> _taps; public: diff --git a/host/include/uhd/types/metadata.hpp b/host/include/uhd/types/metadata.hpp index c4fe00271..53d633f83 100644 --- a/host/include/uhd/types/metadata.hpp +++ b/host/include/uhd/types/metadata.hpp @@ -20,7 +20,7 @@ #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <string> namespace uhd{ @@ -199,7 +199,7 @@ namespace uhd{ /*! * A special payload populated by custom FPGA fabric. */ - boost::uint32_t user_payload[4]; + uint32_t user_payload[4]; }; diff --git a/host/include/uhd/types/serial.hpp b/host/include/uhd/types/serial.hpp index cb90d7c71..caa95adf9 100644 --- a/host/include/uhd/types/serial.hpp +++ b/host/include/uhd/types/serial.hpp @@ -20,7 +20,7 @@ #include <uhd/config.hpp> #include <boost/shared_ptr.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <vector> namespace uhd{ @@ -28,7 +28,7 @@ namespace uhd{ /*! * Byte vector typedef for passing data in and out of I2C interfaces. */ - typedef std::vector<boost::uint8_t> byte_vector_t; + typedef std::vector<uint8_t> byte_vector_t; /*! * The i2c interface class: @@ -57,7 +57,7 @@ namespace uhd{ * \param buf the vector of bytes */ virtual void write_i2c( - boost::uint16_t addr, + uint16_t addr, const byte_vector_t &buf ) = 0; @@ -68,7 +68,7 @@ namespace uhd{ * \return a vector of bytes */ virtual byte_vector_t read_i2c( - boost::uint16_t addr, + uint16_t addr, size_t num_bytes ) = 0; @@ -79,8 +79,8 @@ namespace uhd{ * \param buf the vector of bytes */ virtual void write_eeprom( - boost::uint16_t addr, - boost::uint16_t offset, + uint16_t addr, + uint16_t offset, const byte_vector_t &buf ); @@ -92,8 +92,8 @@ namespace uhd{ * \return a vector of bytes */ virtual byte_vector_t read_eeprom( - boost::uint16_t addr, - boost::uint16_t offset, + uint16_t addr, + uint16_t offset, size_t num_bytes ); }; @@ -150,10 +150,10 @@ namespace uhd{ * \param readback true to readback a value * \return spi data if readback set */ - 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 ) = 0; @@ -166,10 +166,10 @@ namespace uhd{ * \param num_bits how many bits in data * \return spi data */ - virtual boost::uint32_t read_spi( + virtual uint32_t read_spi( int which_slave, const spi_config_t &config, - boost::uint32_t data, + uint32_t data, size_t num_bits ); @@ -183,7 +183,7 @@ namespace uhd{ virtual void write_spi( int which_slave, const spi_config_t &config, - boost::uint32_t data, + uint32_t data, size_t num_bits ); }; diff --git a/host/include/uhd/types/wb_iface.hpp b/host/include/uhd/types/wb_iface.hpp index e24e9363e..95f8392a9 100644 --- a/host/include/uhd/types/wb_iface.hpp +++ b/host/include/uhd/types/wb_iface.hpp @@ -20,7 +20,7 @@ #include <uhd/config.hpp> #include <uhd/types/time_spec.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/shared_ptr.hpp> namespace uhd @@ -30,7 +30,7 @@ class UHD_API wb_iface { public: typedef boost::shared_ptr<wb_iface> sptr; - typedef boost::uint32_t wb_addr_type; + typedef uint32_t wb_addr_type; virtual ~wb_iface(void); @@ -39,42 +39,42 @@ public: * \param addr the address * \param data the 64bit data */ - virtual void poke64(const wb_addr_type addr, const boost::uint64_t data); + virtual void poke64(const wb_addr_type addr, const uint64_t data); /*! * Read a register (64 bits) * \param addr the address * \return the 64bit data */ - virtual boost::uint64_t peek64(const wb_addr_type addr); + virtual uint64_t peek64(const wb_addr_type addr); /*! * Write a register (32 bits) * \param addr the address * \param data the 32bit data */ - virtual void poke32(const wb_addr_type addr, const boost::uint32_t data); + virtual void poke32(const wb_addr_type addr, const uint32_t data); /*! * Read a register (32 bits) * \param addr the address * \return the 32bit data */ - virtual boost::uint32_t peek32(const wb_addr_type addr); + virtual uint32_t peek32(const wb_addr_type addr); /*! * Write a register (16 bits) * \param addr the address * \param data the 16bit data */ - virtual void poke16(const wb_addr_type addr, const boost::uint16_t data); + virtual void poke16(const wb_addr_type addr, const uint16_t data); /*! * Read a register (16 bits) * \param addr the address * \return the 16bit data */ - virtual boost::uint16_t peek16(const wb_addr_type addr); + virtual uint16_t peek16(const wb_addr_type addr); }; class UHD_API timed_wb_iface : public wb_iface diff --git a/host/include/uhd/usrp/dboard_eeprom.hpp b/host/include/uhd/usrp/dboard_eeprom.hpp index 93fc5ac7d..6565130e5 100644 --- a/host/include/uhd/usrp/dboard_eeprom.hpp +++ b/host/include/uhd/usrp/dboard_eeprom.hpp @@ -46,14 +46,14 @@ struct UHD_API dboard_eeprom_t{ * \param iface the serial interface with i2c * \param addr the i2c address for the eeprom */ - void load(i2c_iface &iface, boost::uint8_t addr); + void load(i2c_iface &iface, uint8_t addr); /*! * Store the object to bytes in the eeprom. * \param iface the serial interface with i2c * \param addr the i2c address for the eeprom */ - void store(i2c_iface &iface, boost::uint8_t addr) const; + void store(i2c_iface &iface, uint8_t addr) const; }; diff --git a/host/include/uhd/usrp/dboard_id.hpp b/host/include/uhd/usrp/dboard_id.hpp index 1fda8182e..52d0e7d73 100644 --- a/host/include/uhd/usrp/dboard_id.hpp +++ b/host/include/uhd/usrp/dboard_id.hpp @@ -19,7 +19,7 @@ #define INCLUDED_UHD_USRP_DBOARD_ID_HPP #include <uhd/config.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/operators.hpp> #include <string> @@ -31,7 +31,7 @@ namespace uhd{ namespace usrp{ * Create a dboard id from an integer. * \param id the integer representation */ - dboard_id_t(boost::uint16_t id = 0xffff); + dboard_id_t(uint16_t id = 0xffff); /*! * Obtain a dboard id that represents no dboard. @@ -44,13 +44,13 @@ namespace uhd{ namespace usrp{ * \param uint16 an unsigned 16 bit integer * \return a new dboard id containing the integer */ - static dboard_id_t from_uint16(boost::uint16_t uint16); + static dboard_id_t from_uint16(uint16_t uint16); /*! * Get the dboard id represented as an integer. * \return an unsigned 16 bit integer representation */ - boost::uint16_t to_uint16(void) const; + uint16_t to_uint16(void) const; /*! * Create a new dboard id from a string representation. @@ -79,7 +79,7 @@ namespace uhd{ namespace usrp{ std::string to_pp_string(void) const; private: - boost::uint16_t _id; //internal representation + uint16_t _id; //internal representation }; /*! diff --git a/host/include/uhd/usrp/dboard_iface.hpp b/host/include/uhd/usrp/dboard_iface.hpp index 7c730f59d..0c4e45f1d 100644 --- a/host/include/uhd/usrp/dboard_iface.hpp +++ b/host/include/uhd/usrp/dboard_iface.hpp @@ -25,7 +25,7 @@ #include <uhd/usrp/fe_connection.hpp> #include <uhd/usrp/gpio_defs.hpp> #include <boost/shared_ptr.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/thread/thread.hpp> #include <string> #include <vector> @@ -123,7 +123,7 @@ public: * \param mask 16-bits, 0=do not change, 1=change value */ virtual void set_pin_ctrl( - unit_t unit, boost::uint32_t value, boost::uint32_t mask = 0xffff + unit_t unit, uint32_t value, uint32_t mask = 0xffff ) = 0; /*! @@ -132,7 +132,7 @@ public: * \param unit which unit rx or tx * \return the 16-bit settings value */ - virtual boost::uint32_t get_pin_ctrl(unit_t unit) = 0; + virtual uint32_t get_pin_ctrl(unit_t unit) = 0; /*! * Set a daughterboard ATR register. @@ -143,7 +143,7 @@ public: * \param mask 16-bits, 0=do not change, 1=change value */ virtual void set_atr_reg( - unit_t unit, atr_reg_t reg, boost::uint32_t value, boost::uint32_t mask = 0xffff + unit_t unit, atr_reg_t reg, uint32_t value, uint32_t mask = 0xffff ) = 0; /*! @@ -153,7 +153,7 @@ public: * \param reg which ATR register * \return the 16-bit settings value */ - virtual boost::uint32_t get_atr_reg(unit_t unit, atr_reg_t reg) = 0; + virtual uint32_t get_atr_reg(unit_t unit, atr_reg_t reg) = 0; /*! * Set daughterboard GPIO data direction setting. @@ -163,7 +163,7 @@ public: * \param mask 16-bits, 0=do not change, 1=change value */ virtual void set_gpio_ddr( - unit_t unit, boost::uint32_t value, boost::uint32_t mask = 0xffff + unit_t unit, uint32_t value, uint32_t mask = 0xffff ) = 0; /*! @@ -172,7 +172,7 @@ public: * \param unit which unit rx or tx * \return the 16-bit settings value */ - virtual boost::uint32_t get_gpio_ddr(unit_t unit) = 0; + virtual uint32_t get_gpio_ddr(unit_t unit) = 0; /*! * Set daughterboard GPIO pin output setting. @@ -182,7 +182,7 @@ public: * \param mask 16-bits, 0=do not change, 1=change value */ virtual void set_gpio_out( - unit_t unit, boost::uint32_t value, boost::uint32_t mask = 0xffff + unit_t unit, uint32_t value, uint32_t mask = 0xffff ) = 0; /*! @@ -191,7 +191,7 @@ public: * \param unit which unit rx or tx * \return the 16-bit settings value */ - virtual boost::uint32_t get_gpio_out(unit_t unit) = 0; + virtual uint32_t get_gpio_out(unit_t unit) = 0; /*! * Read daughterboard GPIO pin values. @@ -199,7 +199,7 @@ public: * \param unit which unit rx or tx * \return the value of the gpio unit */ - virtual boost::uint32_t read_gpio(unit_t unit) = 0; + virtual uint32_t read_gpio(unit_t unit) = 0; /*! * Write data to SPI bus peripheral. @@ -212,7 +212,7 @@ public: virtual void write_spi( unit_t unit, const spi_config_t &config, - boost::uint32_t data, + uint32_t data, size_t num_bits ) = 0; @@ -225,10 +225,10 @@ public: * \param num_bits the number of bits in data * \return the data that was read */ - virtual boost::uint32_t read_write_spi( + virtual uint32_t read_write_spi( unit_t unit, const spi_config_t &config, - boost::uint32_t data, + uint32_t data, size_t num_bits ) = 0; diff --git a/host/include/uhd/usrp/multi_usrp.hpp b/host/include/uhd/usrp/multi_usrp.hpp index f0029c1af..1a64a8f3a 100644 --- a/host/include/uhd/usrp/multi_usrp.hpp +++ b/host/include/uhd/usrp/multi_usrp.hpp @@ -405,7 +405,7 @@ public: * \param data 32-bit register value * \param mboard which motherboard to set the user register */ - virtual void set_user_register(const boost::uint8_t addr, const boost::uint32_t data, size_t mboard = ALL_MBOARDS) = 0; + virtual void set_user_register(const uint8_t addr, const uint32_t data, size_t mboard = ALL_MBOARDS) = 0; /******************************************************************* * RX methods @@ -1051,7 +1051,7 @@ public: * \param mask the bit mask to effect which pins are changed * \param mboard the motherboard index 0 to M-1 */ - virtual void set_gpio_attr(const std::string &bank, const std::string &attr, const boost::uint32_t value, const boost::uint32_t mask = 0xffffffff, const size_t mboard = 0) = 0; + virtual void set_gpio_attr(const std::string &bank, const std::string &attr, const uint32_t value, const uint32_t mask = 0xffffffff, const size_t mboard = 0) = 0; /*! * Get a GPIO attribute on a particular GPIO bank. @@ -1069,7 +1069,7 @@ public: * \param mboard the motherboard index 0 to M-1 * \return the value set for this attribute */ - virtual boost::uint32_t get_gpio_attr(const std::string &bank, const std::string &attr, const size_t mboard = 0) = 0; + virtual uint32_t get_gpio_attr(const std::string &bank, const std::string &attr, const size_t mboard = 0) = 0; /******************************************************************* * Register IO methods @@ -1102,7 +1102,7 @@ public: * \param value the value to write to the register field * \param mboard the motherboard index 0 to M-1 */ - virtual void write_register(const std::string &path, const boost::uint32_t field, const boost::uint64_t value, const size_t mboard = 0) = 0; + virtual void write_register(const std::string &path, const uint32_t field, const uint64_t value, const size_t mboard = 0) = 0; /*! * Read a low-level register field from a register in the USRP hardware @@ -1111,7 +1111,7 @@ public: * \param mboard the motherboard index 0 to M-1 * \return the value of the register field */ - virtual boost::uint64_t read_register(const std::string &path, const boost::uint32_t field, const size_t mboard = 0) = 0; + virtual uint64_t read_register(const std::string &path, const uint32_t field, const size_t mboard = 0) = 0; /******************************************************************* * Filter API methods diff --git a/host/include/uhd/usrp_clock/multi_usrp_clock.hpp b/host/include/uhd/usrp_clock/multi_usrp_clock.hpp index 48d433d71..0fbaa3136 100644 --- a/host/include/uhd/usrp_clock/multi_usrp_clock.hpp +++ b/host/include/uhd/usrp_clock/multi_usrp_clock.hpp @@ -83,7 +83,7 @@ public: virtual size_t get_num_boards(void) = 0; //! Get time from device - virtual boost::uint32_t get_time(size_t board = 0) = 0; + virtual uint32_t get_time(size_t board = 0) = 0; /*! * Get a USRP Clock sensor value. diff --git a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp index aaa6296ae..6cd551e7f 100644 --- a/host/include/uhd/usrp_clock/octoclock_eeprom.hpp +++ b/host/include/uhd/usrp_clock/octoclock_eeprom.hpp @@ -42,7 +42,7 @@ public: * \param transport the UDP transport to the OctoClock * \param proto_ver firmware protocol version */ - octoclock_eeprom_t(transport::udp_simple::sptr transport, boost::uint32_t proto_ver); + octoclock_eeprom_t(transport::udp_simple::sptr transport, uint32_t proto_ver); /*! * Write the contents of this object to the EEPROM. @@ -51,7 +51,7 @@ public: private: transport::udp_simple::sptr xport; - boost::uint32_t _proto_ver; + uint32_t _proto_ver; void _load(); void _store() const; diff --git a/host/include/uhd/utils/algorithm.hpp b/host/include/uhd/utils/algorithm.hpp index 6c6cdf033..1c4d7101c 100644 --- a/host/include/uhd/utils/algorithm.hpp +++ b/host/include/uhd/utils/algorithm.hpp @@ -19,7 +19,7 @@ #define INCLUDED_UHD_UTILS_ALGORITHM_HPP #include <algorithm> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/range/begin.hpp> #include <boost/range/end.hpp> diff --git a/host/include/uhd/utils/atomic.hpp b/host/include/uhd/utils/atomic.hpp index 8da71b359..f37fb4395 100644 --- a/host/include/uhd/utils/atomic.hpp +++ b/host/include/uhd/utils/atomic.hpp @@ -40,31 +40,31 @@ namespace uhd{ } //! Compare with cmp, swap with newval if same, return old value - UHD_INLINE boost::uint32_t cas(boost::uint32_t newval, boost::uint32_t cmp){ + UHD_INLINE uint32_t cas(uint32_t newval, uint32_t cmp){ return BOOST_IPC_DETAIL::atomic_cas32(&_num, newval, cmp); } //! Sets the atomic integer to a new value - UHD_INLINE void write(const boost::uint32_t newval){ + UHD_INLINE void write(const uint32_t newval){ BOOST_IPC_DETAIL::atomic_write32(&_num, newval); } //! Gets the current value of the atomic integer - UHD_INLINE boost::uint32_t read(void){ + UHD_INLINE uint32_t read(void){ return BOOST_IPC_DETAIL::atomic_read32(&_num); } //! Increment by 1 and return the old value - UHD_INLINE boost::uint32_t inc(void){ + UHD_INLINE uint32_t inc(void){ return BOOST_IPC_DETAIL::atomic_inc32(&_num); } //! Decrement by 1 and return the old value - UHD_INLINE boost::uint32_t dec(void){ + UHD_INLINE uint32_t dec(void){ return BOOST_IPC_DETAIL::atomic_dec32(&_num); } - private: volatile boost::uint32_t _num; + private: volatile uint32_t _num; }; /*! @@ -76,7 +76,7 @@ namespace uhd{ */ UHD_INLINE bool spin_wait_with_timeout( atomic_uint32_t &cond, - boost::uint32_t value, + uint32_t value, const double timeout ){ if (cond.read() == value) return true; diff --git a/host/include/uhd/utils/byteswap.hpp b/host/include/uhd/utils/byteswap.hpp index 8e3b7dc8a..bd2fb05de 100644 --- a/host/include/uhd/utils/byteswap.hpp +++ b/host/include/uhd/utils/byteswap.hpp @@ -19,7 +19,7 @@ #define INCLUDED_UHD_UTILS_BYTESWAP_HPP #include <uhd/config.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> /*! \file byteswap.hpp * @@ -29,13 +29,13 @@ namespace uhd{ //! perform a byteswap on a 16 bit integer - boost::uint16_t byteswap(boost::uint16_t); + uint16_t byteswap(uint16_t); //! perform a byteswap on a 32 bit integer - boost::uint32_t byteswap(boost::uint32_t); + uint32_t byteswap(uint32_t); //! perform a byteswap on a 64 bit integer - boost::uint64_t byteswap(boost::uint64_t); + uint64_t byteswap(uint64_t); //! network to host: short, long, or long-long template<typename T> T ntohx(T); diff --git a/host/include/uhd/utils/byteswap.ipp b/host/include/uhd/utils/byteswap.ipp index f6c9407b6..fc15d8a0a 100644 --- a/host/include/uhd/utils/byteswap.ipp +++ b/host/include/uhd/utils/byteswap.ipp @@ -24,74 +24,74 @@ #if defined(BOOST_MSVC) //http://msdn.microsoft.com/en-us/library/a3140177%28VS.80%29.aspx #include <cstdlib> - UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){ + UHD_INLINE uint16_t uhd::byteswap(uint16_t x){ return _byteswap_ushort(x); } - UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){ + UHD_INLINE uint32_t uhd::byteswap(uint32_t x){ return _byteswap_ulong(x); } - UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){ + UHD_INLINE uint64_t uhd::byteswap(uint64_t x){ return _byteswap_uint64(x); } #elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 3 - UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){ + UHD_INLINE uint16_t uhd::byteswap(uint16_t x){ return (x>>8) | (x<<8); //DNE return __builtin_bswap16(x); } - UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){ + UHD_INLINE uint32_t uhd::byteswap(uint32_t x){ return __builtin_bswap32(x); } - UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){ + UHD_INLINE uint64_t uhd::byteswap(uint64_t x){ return __builtin_bswap64(x); } #elif defined(UHD_PLATFORM_MACOS) #include <libkern/OSByteOrder.h> - UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){ + UHD_INLINE uint16_t uhd::byteswap(uint16_t x){ return OSSwapInt16(x); } - UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){ + UHD_INLINE uint32_t uhd::byteswap(uint32_t x){ return OSSwapInt32(x); } - UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){ + UHD_INLINE uint64_t uhd::byteswap(uint64_t x){ return OSSwapInt64(x); } #elif defined(UHD_PLATFORM_LINUX) #include <byteswap.h> - UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){ + UHD_INLINE uint16_t uhd::byteswap(uint16_t x){ return bswap_16(x); } - UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){ + UHD_INLINE uint32_t uhd::byteswap(uint32_t x){ return bswap_32(x); } - UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){ + UHD_INLINE uint64_t uhd::byteswap(uint64_t x){ return bswap_64(x); } #else //http://www.koders.com/c/fidB93B34CD44F0ECF724F1A4EAE3854BA2FE692F59.aspx - UHD_INLINE boost::uint16_t uhd::byteswap(boost::uint16_t x){ + UHD_INLINE uint16_t uhd::byteswap(uint16_t x){ return (x>>8) | (x<<8); } - UHD_INLINE boost::uint32_t uhd::byteswap(boost::uint32_t x){ - return (boost::uint32_t(uhd::byteswap(boost::uint16_t(x&0xfffful)))<<16) | (uhd::byteswap(boost::uint16_t(x>>16))); + UHD_INLINE uint32_t uhd::byteswap(uint32_t x){ + return (uint32_t(uhd::byteswap(uint16_t(x&0xfffful)))<<16) | (uhd::byteswap(uint16_t(x>>16))); } - UHD_INLINE boost::uint64_t uhd::byteswap(boost::uint64_t x){ - return (boost::uint64_t(uhd::byteswap(boost::uint32_t(x&0xffffffffull)))<<32) | (uhd::byteswap(boost::uint32_t(x>>32))); + UHD_INLINE uint64_t uhd::byteswap(uint64_t x){ + return (uint64_t(uhd::byteswap(uint32_t(x&0xffffffffull)))<<32) | (uhd::byteswap(uint32_t(x>>32))); } #endif diff --git a/host/include/uhd/utils/cast.hpp b/host/include/uhd/utils/cast.hpp index 869d53053..471e89bfe 100644 --- a/host/include/uhd/utils/cast.hpp +++ b/host/include/uhd/utils/cast.hpp @@ -26,7 +26,7 @@ namespace uhd{ namespace cast{ //! Convert a hexadecimal string into a value. // // Example: - // boost::uint16_t x = hexstr_cast<boost::uint16_t>("0xDEADBEEF"); + // uint16_t x = hexstr_cast<uint16_t>("0xDEADBEEF"); // Uses stringstream. template<typename T> UHD_INLINE T hexstr_cast(const std::string &in) { diff --git a/host/include/uhd/utils/math.hpp b/host/include/uhd/utils/math.hpp index 0b35f1f17..5039aa82e 100644 --- a/host/include/uhd/utils/math.hpp +++ b/host/include/uhd/utils/math.hpp @@ -20,7 +20,7 @@ #include <cmath> #include <uhd/config.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/numeric/conversion/bounds.hpp> namespace uhd { diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp index 8ae789d72..b36cf4b2a 100644 --- a/host/include/uhd/utils/msg_task.hpp +++ b/host/include/uhd/utils/msg_task.hpp @@ -24,15 +24,15 @@ #include <boost/function.hpp> #include <boost/utility.hpp> #include <boost/optional/optional.hpp> -#include <boost/cstdint.hpp> +#include <stdint.h> #include <vector> namespace uhd{ class UHD_API msg_task : boost::noncopyable{ public: typedef boost::shared_ptr<msg_task> sptr; - typedef std::vector<boost::uint8_t> msg_payload_t; - typedef std::pair<boost::uint32_t, msg_payload_t > msg_type_t; + typedef std::vector<uint8_t> msg_payload_t; + typedef std::pair<uint32_t, msg_payload_t > msg_type_t; typedef boost::function<boost::optional<msg_type_t>(void)> task_fcn_type; /* @@ -40,15 +40,15 @@ namespace uhd{ * Such stranded messages get pushed into a dump queue. * With this function radio_ctrl_core can check if one of the messages meant for it got stranded. */ - virtual msg_payload_t get_msg_from_dump_queue(boost::uint32_t sid) = 0; + virtual msg_payload_t get_msg_from_dump_queue(uint32_t sid) = 0; - UHD_INLINE static std::vector<boost::uint8_t> buff_to_vector(boost::uint8_t* p, size_t n) { + UHD_INLINE static std::vector<uint8_t> buff_to_vector(uint8_t* p, size_t n) { if(p and n > 0){ - std::vector<boost::uint8_t> v(n); + std::vector<uint8_t> v(n); memcpy(&v.front(), p, n); return v; } - return std::vector<boost::uint8_t>(); + return std::vector<uint8_t>(); } virtual ~msg_task(void) = 0; diff --git a/host/include/uhd/utils/platform.hpp b/host/include/uhd/utils/platform.hpp index de778f61c..58eec360d 100644 --- a/host/include/uhd/utils/platform.hpp +++ b/host/include/uhd/utils/platform.hpp @@ -18,18 +18,18 @@ #ifndef INCLUDED_UHD_UTILS_PLATFORM_HPP #define INCLUDED_UHD_UTILS_PLATFORM_HPP -#include <boost/cstdint.hpp> +#include <stdint.h> namespace uhd { /* Returns the process ID of the current process */ - boost::int32_t get_process_id(); + int32_t get_process_id(); /* Returns a unique identifier for the current machine */ - boost::uint32_t get_host_id(); + uint32_t get_host_id(); /* Get a unique identifier for the current machine and process */ - boost::uint32_t get_process_hash(); + uint32_t get_process_hash(); } //namespace uhd diff --git a/host/include/uhd/utils/soft_register.hpp b/host/include/uhd/utils/soft_register.hpp index 22c3a0ff0..2870ad595 100644 --- a/host/include/uhd/utils/soft_register.hpp +++ b/host/include/uhd/utils/soft_register.hpp @@ -18,7 +18,7 @@ #ifndef INCLUDED_UHD_UTILS_SOFT_REGISTER_HPP #define INCLUDED_UHD_UTILS_SOFT_REGISTER_HPP -#include <boost/cstdint.hpp> +#include <stdint.h> #include <boost/noncopyable.hpp> #include <uhd/types/wb_iface.hpp> #include <uhd/exception.hpp> @@ -83,7 +83,7 @@ UHD_INLINE bool unlikely(bool expr) * of this type because it will get optimized out by the compiler and * will result in zero memory overhead */ -typedef boost::uint32_t soft_reg_field_t; +typedef uint32_t soft_reg_field_t; namespace soft_reg_field { UHD_INLINE size_t width(const soft_reg_field_t field) { @@ -212,11 +212,11 @@ public: //out by the compiler because it is never read if (_flush_mode == ALWAYS_FLUSH || _soft_copy.is_dirty()) { if (get_bitwidth() <= 16) { - _iface->poke16(_wr_addr, static_cast<boost::uint16_t>(_soft_copy)); + _iface->poke16(_wr_addr, static_cast<uint16_t>(_soft_copy)); } else if (get_bitwidth() <= 32) { - _iface->poke32(_wr_addr, static_cast<boost::uint32_t>(_soft_copy)); + _iface->poke32(_wr_addr, static_cast<uint32_t>(_soft_copy)); } else if (get_bitwidth() <= 64) { - _iface->poke64(_wr_addr, static_cast<boost::uint64_t>(_soft_copy)); + _iface->poke64(_wr_addr, static_cast<uint64_t>(_soft_copy)); } else { throw uhd::not_implemented_error("soft_register only supports up to 64 bits."); } @@ -380,26 +380,26 @@ private: */ //16-bit shortcuts -typedef soft_register_t<boost::uint16_t, false, true> soft_reg16_wo_t; -typedef soft_register_t<boost::uint16_t, true, false> soft_reg16_ro_t; -typedef soft_register_t<boost::uint16_t, true, true> soft_reg16_rw_t; -typedef soft_register_sync_t<boost::uint16_t, false, true> soft_reg16_wo_sync_t; -typedef soft_register_sync_t<boost::uint16_t, true, false> soft_reg16_ro_sync_t; -typedef soft_register_sync_t<boost::uint16_t, true, true> soft_reg16_rw_sync_t; +typedef soft_register_t<uint16_t, false, true> soft_reg16_wo_t; +typedef soft_register_t<uint16_t, true, false> soft_reg16_ro_t; +typedef soft_register_t<uint16_t, true, true> soft_reg16_rw_t; +typedef soft_register_sync_t<uint16_t, false, true> soft_reg16_wo_sync_t; +typedef soft_register_sync_t<uint16_t, true, false> soft_reg16_ro_sync_t; +typedef soft_register_sync_t<uint16_t, true, true> soft_reg16_rw_sync_t; //32-bit shortcuts -typedef soft_register_t<boost::uint32_t, false, true> soft_reg32_wo_t; -typedef soft_register_t<boost::uint32_t, true, false> soft_reg32_ro_t; -typedef soft_register_t<boost::uint32_t, true, true> soft_reg32_rw_t; -typedef soft_register_sync_t<boost::uint32_t, false, true> soft_reg32_wo_sync_t; -typedef soft_register_sync_t<boost::uint32_t, true, false> soft_reg32_ro_sync_t; -typedef soft_register_sync_t<boost::uint32_t, true, true> soft_reg32_rw_sync_t; +typedef soft_register_t<uint32_t, false, true> soft_reg32_wo_t; +typedef soft_register_t<uint32_t, true, false> soft_reg32_ro_t; +typedef soft_register_t<uint32_t, true, true> soft_reg32_rw_t; +typedef soft_register_sync_t<uint32_t, false, true> soft_reg32_wo_sync_t; +typedef soft_register_sync_t<uint32_t, true, false> soft_reg32_ro_sync_t; +typedef soft_register_sync_t<uint32_t, true, true> soft_reg32_rw_sync_t; //64-bit shortcuts -typedef soft_register_t<boost::uint64_t, false, true> soft_reg64_wo_t; -typedef soft_register_t<boost::uint64_t, true, false> soft_reg64_ro_t; -typedef soft_register_t<boost::uint64_t, true, true> soft_reg64_rw_t; -typedef soft_register_sync_t<boost::uint64_t, false, true> soft_reg64_wo_sync_t; -typedef soft_register_sync_t<boost::uint64_t, true, false> soft_reg64_ro_sync_t; -typedef soft_register_sync_t<boost::uint64_t, true, true> soft_reg64_rw_sync_t; +typedef soft_register_t<uint64_t, false, true> soft_reg64_wo_t; +typedef soft_register_t<uint64_t, true, false> soft_reg64_ro_t; +typedef soft_register_t<uint64_t, true, true> soft_reg64_rw_t; +typedef soft_register_sync_t<uint64_t, false, true> soft_reg64_wo_sync_t; +typedef soft_register_sync_t<uint64_t, true, false> soft_reg64_ro_sync_t; +typedef soft_register_sync_t<uint64_t, true, true> soft_reg64_rw_sync_t; /* |