diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-10-21 11:18:56 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-10-21 11:18:56 -0700 |
| commit | 53412938fe7c851591026ef4c25233806f4f27a3 (patch) | |
| tree | 0824ac4bab6ff987436093239388c8038a8125a5 /host/docs/coding.rst | |
| parent | 2f6ab109231667ee255d2ba7cba34a0519019dc9 (diff) | |
| parent | e2f76bddae7845024056b479658651c6da2b0f4d (diff) | |
| download | uhd-53412938fe7c851591026ef4c25233806f4f27a3.tar.gz uhd-53412938fe7c851591026ef4c25233806f4f27a3.tar.bz2 uhd-53412938fe7c851591026ef4c25233806f4f27a3.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/CMakeLists.txt
Diffstat (limited to 'host/docs/coding.rst')
| -rw-r--r-- | host/docs/coding.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/docs/coding.rst b/host/docs/coding.rst index d6a19d250..7533445ea 100644 --- a/host/docs/coding.rst +++ b/host/docs/coding.rst @@ -41,13 +41,13 @@ The single usrp provides ways to: See the documentation in *usrp/single_usrp.hpp* for reference. ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -High-Level: The mimo usrp +High-Level: The multi usrp ^^^^^^^^^^^^^^^^^^^^^^^^^^^ -The mimo usrp API provides a wrapper around a device that represents several motherboards. +The multi usrp API provides a wrapper around a device that represents several motherboards. This API provides convenience calls just like the single usrp, however the calls either work across all channels in the configuration, or take a channel argument to specify which channel to configure. -The mimo usrp provides ways to: +The multi usrp provides ways to: * Set and get the sample rate across all channels. * Issue a stream command across all channels. @@ -57,7 +57,7 @@ The mimo usrp provides ways to: * Tune individual DSPs and daughterboards. * Get the underlying device (as discussed above). -See the documentation in *usrp/mimo_usrp.hpp* for reference. +See the documentation in *usrp/multi_usrp.hpp* for reference. ------------------------------------------------------------------------ Integrating custom hardware |