diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-10-15 16:19:27 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-10-15 16:19:27 -0700 |
| commit | c41a7fa386a467ba76d5f09f390cb62a1bfa7282 (patch) | |
| tree | 3f458325c74af227b5745ce5390624f8fc94f638 /host/include | |
| parent | 09a69b22ae41ca6b9935508d523ae88df58301f3 (diff) | |
| parent | eb2f57a6241ce04a3d89c5f41557658387440c3f (diff) | |
| download | uhd-c41a7fa386a467ba76d5f09f390cb62a1bfa7282.tar.gz uhd-c41a7fa386a467ba76d5f09f390cb62a1bfa7282.tar.bz2 uhd-c41a7fa386a467ba76d5f09f390cb62a1bfa7282.zip | |
Merge branch 'master' into x300/dram
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/transport/vrt_if_packet.hpp | 8 | ||||
| -rw-r--r-- | host/include/uhd/types/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | host/include/uhd/types/stdint.hpp | 53 | ||||
| -rw-r--r-- | host/include/uhd/usrp_clock/CMakeLists.txt | 4 |
4 files changed, 61 insertions, 5 deletions
diff --git a/host/include/uhd/transport/vrt_if_packet.hpp b/host/include/uhd/transport/vrt_if_packet.hpp index 1e54607c1..0150e7f13 100644 --- a/host/include/uhd/transport/vrt_if_packet.hpp +++ b/host/include/uhd/transport/vrt_if_packet.hpp @@ -97,7 +97,7 @@ namespace vrt{ * * \section vrt_pack_contract Packing contract * - * \subsection Requirements: + * \subsection vrt_pack_contract_reqs Requirements: * - packet_buff points to a valid address space with enough space to write * the entire buffer, regardless of its length. At the very least, it must * be able to hold an entire header. @@ -107,7 +107,7 @@ namespace vrt{ * value (e.g. if `has_sid` is true, `sid` contains a valid SID) * - `num_payload_bytes` and `num_payload_words32` are both set to the correct values * - * \subsection Result: + * \subsection vrt_pack_contract_res Result: * - `packet_buff` now points to a valid header that can be sent over the transport * without further modification * - The following members on `if_packet_info` are set: @@ -127,7 +127,7 @@ namespace vrt{ * * \section vrt_unpack_contract Unpacking contract * - * \subsection Requirements + * \subsection vrt_unpack_contract_reqs Requirements * - `packet_buff` points to a readable address space with a * CHDR packet, starting at the header. `packet_buff[0]` *must* always * point to a valid first word of the header. This implies that num_packet_words32 @@ -138,7 +138,7 @@ namespace vrt{ * readable words from this packet. * - `link_type` * - * \subsection Result + * \subsection vrt_unpack_contract_res Result * - `if_packet_info` now has the following values set to correct values: * - `packet_type` * - `num_payload_bytes` diff --git a/host/include/uhd/types/CMakeLists.txt b/host/include/uhd/types/CMakeLists.txt index 3f34782e2..3af395eeb 100644 --- a/host/include/uhd/types/CMakeLists.txt +++ b/host/include/uhd/types/CMakeLists.txt @@ -33,6 +33,7 @@ UHD_INSTALL(FILES sensors.hpp serial.hpp sid.hpp + stdint.hpp stream_cmd.hpp time_spec.hpp tune_request.hpp diff --git a/host/include/uhd/types/stdint.hpp b/host/include/uhd/types/stdint.hpp new file mode 100644 index 000000000..cccb6b157 --- /dev/null +++ b/host/include/uhd/types/stdint.hpp @@ -0,0 +1,53 @@ +// +// Copyright 2015 Ettus Research LLC +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see <http://www.gnu.org/licenses/>. +// + +#ifndef INCLUDED_UHD_TYPES_STDINT_HPP +#define INCLUDED_UHD_TYPES_STDINT_HPP + +#include <boost/cstdint.hpp> + +using boost::int8_t; +using boost::uint8_t; +using boost::int16_t; +using boost::uint16_t; +using boost::int32_t; +using boost::uint32_t; +using boost::int64_t; +using boost::uint64_t; + +using boost::int_least8_t; +using boost::uint_least8_t; +using boost::int_least16_t; +using boost::uint_least16_t; +using boost::int_least32_t; +using boost::uint_least32_t; +using boost::int_least64_t; +using boost::uint_least64_t; + +using boost::int_fast8_t; +using boost::uint_fast8_t; +using boost::int_fast16_t; +using boost::uint_fast16_t; +using boost::int_fast32_t; +using boost::uint_fast32_t; +using boost::int_fast64_t; +using boost::uint_fast64_t; + +using boost::intptr_t; +using boost::uintptr_t; + +#endif /* INCLUDED_UHD_TYPES_STDINT_HPP */ diff --git a/host/include/uhd/usrp_clock/CMakeLists.txt b/host/include/uhd/usrp_clock/CMakeLists.txt index 518cb7737..c8c0e43fc 100644 --- a/host/include/uhd/usrp_clock/CMakeLists.txt +++ b/host/include/uhd/usrp_clock/CMakeLists.txt @@ -24,6 +24,8 @@ UHD_INSTALL(FILES IF(ENABLE_C_API) UHD_INSTALL(FILES - usrp_clock.h + usrp_clock.h + DESTINATION ${INCLUDE_DIR}/uhd/usrp_clock + COMPONENT headers ) ENDIF(ENABLE_C_API) |