summaryrefslogtreecommitdiffstats
path: root/host/docs
diff options
context:
space:
mode:
Diffstat (limited to 'host/docs')
-rw-r--r--host/docs/general.rst49
-rw-r--r--host/docs/identification.rst44
-rw-r--r--host/docs/images.rst2
-rw-r--r--host/docs/transport.rst16
4 files changed, 46 insertions, 65 deletions
diff --git a/host/docs/general.rst b/host/docs/general.rst
index 90a880c2e..50ef24d6c 100644
--- a/host/docs/general.rst
+++ b/host/docs/general.rst
@@ -5,55 +5,6 @@ UHD - General Application Notes
.. contents:: Table of Contents
------------------------------------------------------------------------
-Finding devices
-------------------------------------------------------------------------
-
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Device addressing
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Deviced are addressed through key/value string pairs.
-These string pairs can be used to narrow down the search for a specific device or group of devices.
-Most UHD utility applications and examples have a --args parameter that takes a device address;
-where the device address is expressed as a delimited string.
-
-* See the documentation in types/device_addr.hpp for reference.
-* See device-specific application notes for usage.
-
-**Example:**
-::
-
- serial=0x1234, type=usrpx
-
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Device discovery
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Devices attached to your system can be discovered using the "uhd_find_devices" program.
-The find devices program scans your system for supported devices and prints
-out an enumerated list of discovered devices and their addresses.
-The list of discovered devices can be narrowed down by specifying device address args.
-
-**Usage:**
-::
-
- uhd_find_devices
-
- -- OR --
-
- uhd_find_devices --args <device-specific-address-args>
-
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Device properties
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Properties of devices attached to your system can be probed with the "uhd_usrp_probe" program.
-The usrp probe program constructs an instance of the device and prints out its properties;
-properties such as detected daughter-boards, frequency range, gain ranges, etc...
-
-**Usage:**
-::
-
- uhd_usrp_probe --args <device-specific-address-args>
-
-------------------------------------------------------------------------
Misc notes
------------------------------------------------------------------------
diff --git a/host/docs/identification.rst b/host/docs/identification.rst
index 49d36ec1a..90484744c 100644
--- a/host/docs/identification.rst
+++ b/host/docs/identification.rst
@@ -7,20 +7,36 @@ UHD - Device Identification Notes
------------------------------------------------------------------------
Identifying USRPs
------------------------------------------------------------------------
-Every device has several ways of identifying it on the host system:
+Devices are addressed through key/value string pairs.
+These string pairs can be used to narrow down the search for a specific device or group of devices.
+Most UHD utility applications and examples have a --args parameter that takes a device address;
+where the device address is expressed as a delimited string.
+See the documentation in types/device_addr.hpp for reference.
-* **Serial:** A globally unique identifier.
-* **Address:** A unique identifier on a network.
-* **Name:** An optional user-set identifier.
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Common device identifiers
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Every device has several ways of identifying it on the host system:
-The address is only applicable for network-based devices.
-See the USRP2 application notes.
++------------+------------+--------------------------------------------+
+| Identifier | Key | Notes |
++============+============+============================================+
+| Serial | serial | globally unique identifier |
++------------+------------+--------------------------------------------+
+| Address | addr | unique identifier on a network |
++------------+------------+--------------------------------------------+
+| Name | name | optional user-set identifier |
++------------+------------+--------------------------------------------+
+| Type | type | hardware series identifier |
++------------+------------+--------------------------------------------+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Device discovery via command line
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-A "find devices" utility application comes bundled with the UHD.
-The find devices application will search for all devices on the host system and print the results.
+Devices attached to your system can be discovered using the "uhd_find_devices" program.
+The find devices program scans your system for supported devices and prints
+out an enumerated list of discovered devices and their addresses.
+The list of discovered devices can be narrowed down by specifying device address args.
::
@@ -60,6 +76,18 @@ The hint argument can be populated to narrow the scope of the search.
hint["serial"] = "12345678";
uhd::device_addrs_t dev_addrs = uhd::device::find(hint);
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Device properties
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Properties of devices attached to your system can be probed with the "uhd_usrp_probe" program.
+The usrp probe program constructs an instance of the device and prints out its properties;
+properties such as detected daughter-boards, frequency range, gain ranges, etc...
+
+**Usage:**
+::
+
+ uhd_usrp_probe --args <device-specific-address-args>
+
------------------------------------------------------------------------
Naming a USRP
------------------------------------------------------------------------
diff --git a/host/docs/images.rst b/host/docs/images.rst
index 612a00aa5..f5be88a65 100644
--- a/host/docs/images.rst
+++ b/host/docs/images.rst
@@ -12,6 +12,8 @@ The methods of loading images into the device varies among devices:
* **USRP1:** The host code will automatically load the firmware and FPGA at runtime.
* **USRP2:** The user must manually write the images onto the USRP2 SD card.
+* **USRP-N Series:** The user must manually transfer the images over ethernet.
+* **USRP-E Series:** The host code will automatically load the FPGA at runtime.
------------------------------------------------------------------------
Pre-built images
diff --git a/host/docs/transport.rst b/host/docs/transport.rst
index 6b9d28bfa..2371d2497 100644
--- a/host/docs/transport.rst
+++ b/host/docs/transport.rst
@@ -17,13 +17,9 @@ that are known to perform well on a variety of systems.
The transport parameters are defined below for the various transports in the UHD:
------------------------------------------------------------------------
-UDP transport (ASIO)
+UDP transport (sockets)
------------------------------------------------------------------------
-The UDP transport is implemented with Boost's ASIO library.
-ASIO provides an asynchronous API for user-space sockets.
-The transport implementation allocates a number of buffers
-and submits asynchronous requests for send and receive.
-IO service threads run in the background to process these requests.
+The UDP transport is implemented with standard user-space/Berkeley sockets.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Transport parameters
@@ -35,8 +31,12 @@ The following parameters can be used to alter the transport's default behavior:
* **send_frame_size:** The size of a single send buffer in bytes
* **num_send_frames:** The number of send buffers to allocate
-**Note:** num_recv_frames and num_send_frames will not have an effect
-as the asynchronous send implementation is currently unimplemented.
+**Note1:** num_recv_frames and num_send_frames do not affect performance.
+
+**Note2:** recv_frame_size and send_frame_size can be used to
+increase or decrease the maximum number of samples per packet.
+The frame sizes default to an MTU of 1472 bytes per IP/UDP packet,
+and may be increased if permitted by your network hardware.
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Flow control parameters