diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-21 15:29:03 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-21 15:29:03 -0700 |
| commit | 1e57eec9999e1a9d0a735c04173c78164ce8afcd (patch) | |
| tree | e34b3e52fe4c7a34a6588e15efbb8416b29d81b5 /host/docs | |
| parent | 5bf9e60baf7b85db3da0d41b97d9fe4e9b3e64bd (diff) | |
| parent | e2f76bddae7845024056b479658651c6da2b0f4d (diff) | |
| download | uhd-1e57eec9999e1a9d0a735c04173c78164ce8afcd.tar.gz uhd-1e57eec9999e1a9d0a735c04173c78164ce8afcd.tar.bz2 uhd-1e57eec9999e1a9d0a735c04173c78164ce8afcd.zip | |
Merge branch 'master' into flow_ctrl
Diffstat (limited to 'host/docs')
| -rw-r--r-- | host/docs/coding.rst | 8 | ||||
| -rw-r--r-- | host/docs/usrp2.rst | 2 |
2 files changed, 5 insertions, 5 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 diff --git a/host/docs/usrp2.rst b/host/docs/usrp2.rst index 8fa666a49..181e34223 100644 --- a/host/docs/usrp2.rst +++ b/host/docs/usrp2.rst @@ -157,7 +157,7 @@ The value for the addr key is a white-space separated list of IPv4 addresses or resolvable hostnames. The first address in the list will represent channel 0, the second channel 1, and so on... -Use this addressing scheme with the *mimo_usrp* interface. +Use this addressing scheme with the *multi_usrp* interface. The device address string representation for 2 USRP2s with IPv4 addresses 192.168.10.2 and 192.168.20.2 :: |