From cea76f5a189615b04b459eca7c2c73670b090c01 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Fri, 4 Sep 2015 15:20:15 -0700 Subject: uhd: Added stdint.hpp --- host/include/uhd/types/CMakeLists.txt | 1 + host/include/uhd/types/stdint.hpp | 53 +++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 host/include/uhd/types/stdint.hpp (limited to 'host/include') 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 . +// + +#ifndef INCLUDED_UHD_TYPES_STDINT_HPP +#define INCLUDED_UHD_TYPES_STDINT_HPP + +#include + +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 */ -- cgit v1.2.3 From fee054dfaf9cf4dc389c8b35ee28c45c2dc63952 Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Wed, 23 Sep 2015 15:16:10 -0700 Subject: uhd: C API wrapper, fix commit 30f87afcba71a07 The uhd/usrp_clock/usrp_clock.h doesn't get properly installed, which isn't a big deal if examples are built in tree, but if someone attempts to build a C application against libuhd, uhd.h pulls in and fails as follows: fatal error: uhd/usrp_clock/usrp_clock.h: No such file or directory Signed-off-by: Moritz Fischer --- host/include/uhd/usrp_clock/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'host/include') 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) -- cgit v1.2.3 From f567b5d818697a5c8fdc9031563fa124329a6768 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Thu, 8 Oct 2015 14:03:21 -0700 Subject: docs: Removed some Doxygen warnings --- host/docs/Doxyfile.in | 12 ------------ host/docs/dboards.dox | 2 +- host/docs/usrp_e3x0.dox | 2 +- host/docs/usrp_x3x0.dox | 2 +- host/include/uhd/transport/vrt_if_packet.hpp | 8 ++++---- 5 files changed, 7 insertions(+), 19 deletions(-) (limited to 'host/include') diff --git a/host/docs/Doxyfile.in b/host/docs/Doxyfile.in index dc4966011..d984b6f6b 100644 --- a/host/docs/Doxyfile.in +++ b/host/docs/Doxyfile.in @@ -1472,18 +1472,6 @@ GENERATE_XML = NO XML_OUTPUT = xml -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_SCHEMA = - -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the -# syntax of the XML files. - -XML_DTD = - # If the XML_PROGRAMLISTING tag is set to YES Doxygen will # dump the program listings (including syntax highlighting # and cross-referencing information) to the XML output. Note that diff --git a/host/docs/dboards.dox b/host/docs/dboards.dox index 812a3a09e..a0188b25c 100644 --- a/host/docs/dboards.dox +++ b/host/docs/dboards.dox @@ -395,7 +395,7 @@ below, and to the left of **R193**. The silkscreen for **R193** is ok, but for **R194**, it is upside down, and partially cut off. If you lose **R193**, you can use anything from 0 to 10 Ohms there. -\subsubsection dboards_dbsrxmod_1 Step 2: Burn a new daughterboard id into the EEPROM +\subsubsection dboards_dbsrxmod_2 Step 2: Burn a new daughterboard id into the EEPROM With the daughterboard plugged-in, run the following commands: diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox index 3c206195d..d49310c2c 100644 --- a/host/docs/usrp_e3x0.dox +++ b/host/docs/usrp_e3x0.dox @@ -215,7 +215,7 @@ again by: In order to upgrade or reinitialize a sd card for the first time, you can use the 'dd' tool. Make sure that you are using the right block device for your sd card as failing to do so can wipe your harddrive. -Replace .direct with your image file name and yoursdcard with your blockdevice e.g. /dev/mmcblk0 or /dev/sdb. +Replace ``.direct with your image file name and yoursdcard with your blockdevice e.g. /dev/mmcblk0 or /dev/sdb. $ sudo dd if=.direct of=/dev/ bs=1M diff --git a/host/docs/usrp_x3x0.dox b/host/docs/usrp_x3x0.dox index 766766c21..f57ec783d 100644 --- a/host/docs/usrp_x3x0.dox +++ b/host/docs/usrp_x3x0.dox @@ -530,7 +530,7 @@ When there is network traffic arriving at the Ethernet port, LEDs will light up. You can use this to make sure the network connection is correctly set up, e.g. by pinging the USRP and making sure the LEDs start to blink. -\section x3x0_hw Hardware Notes +\section x3x0_hw_notes Hardware Notes \subsection x3x0_hw_fpanel Front Panel 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` -- cgit v1.2.3