diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-01-07 16:17:26 +0100 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-01-07 16:17:26 +0100 |
| commit | b9b4b942b4715793f751eb2c1ece81bcd924fd89 (patch) | |
| tree | 607ade572a99181c4e1577c1b5e10d4ad3566618 /host/docs/identification.dox | |
| parent | 3c5fe0a201d78a8732aad31a71bf806e00c89db1 (diff) | |
| parent | a520a70c9644e7244b186d9e6089bb25659f6c80 (diff) | |
| download | uhd-b9b4b942b4715793f751eb2c1ece81bcd924fd89.tar.gz uhd-b9b4b942b4715793f751eb2c1ece81bcd924fd89.tar.bz2 uhd-b9b4b942b4715793f751eb2c1ece81bcd924fd89.zip | |
Merge branch 'maint'
Conflicts:
host/docs/usrp_e3x0.dox
Diffstat (limited to 'host/docs/identification.dox')
| -rw-r--r-- | host/docs/identification.dox | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/host/docs/identification.dox b/host/docs/identification.dox index 4ecb5c23d..7bacfea99 100644 --- a/host/docs/identification.dox +++ b/host/docs/identification.dox @@ -10,19 +10,23 @@ devices. Most UHD utility applications and examples have an `--args` parameter that takes a device address, which is expressed as a delimited string. -See device_addr.hpp for reference. +See uhd::device_addr_t for reference. + +Note that the device "address" can also take configuration options. +See \ref page_configuration for a list of those options. \subsection id_identifying_common Common device identifiers Every device has several ways of identifying it on the host system: -Identifier | Key | Notes | Example ------------|----------|-----------------------------------------------------------|--------------------------------- -Serial | serial | globally unique identifier | 12345678 -Address | addr | unique identifier on a network | 192.168.10.2 -Resource | resource | unique identifier for USRP RIO devices (over PCI Express) | RIO0 -Name | name | optional user-set identifier | my_usrp1 (User-defined value) -Type | type | hardware series identifier | usrp1, usrp2, b200, x300, ... +Identifier | Key | Notes | Example +------------------|----------|-----------------------------------------------------------|--------------------------------- +Serial # | serial | globally unique identifier | 12345678 +IP Address | addr | unique identifier on a network | 192.168.10.2 +Resource | resource | unique identifier for USRP RIO devices (over PCI Express) | RIO0 +Name | name | optional user-set identifier | my_usrp1 (User-defined value) +Type | type | hardware series identifier | usrp1, usrp2, b200, x300, ... +Vendor/Product ID | vid,pid | For USB devices. Both must be provided | vid=0x04b4,pid=0x8613 \subsection id_identifying_cmdline Device discovery via command line |