diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-03-29 17:58:58 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-03-29 17:58:58 -0700 |
| commit | 0cf918a3d42743c0bb2586e308c1275dbeffbd74 (patch) | |
| tree | 39aa83de5dfa5fcc2b55f121c886cf8fd34cda69 | |
| parent | da00dad1c9497edd5762d6653c9db4dcef03a11c (diff) | |
| parent | acb0a2eaee94e467db2970cfdf868be3f06a8265 (diff) | |
| download | uhd-0cf918a3d42743c0bb2586e308c1275dbeffbd74.tar.gz uhd-0cf918a3d42743c0bb2586e308c1275dbeffbd74.tar.bz2 uhd-0cf918a3d42743c0bb2586e308c1275dbeffbd74.zip | |
Merge branch 'maint'
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | host/docs/images.dox | 3 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_ubx.cpp | 2 |
3 files changed, 3 insertions, 4 deletions
@@ -30,7 +30,7 @@ UHD is primarily developed on Linux, but we also test and support the following operating systems. * Linux (Fedora and Ubuntu) -* Mac OS X (PPC and Intel) +* Mac OS X (Intel) * Windows 7 Other operating systems will most likely work, too, but are not officially diff --git a/host/docs/images.dox b/host/docs/images.dox index 1ff9fa7c3..c6f48bc65 100644 --- a/host/docs/images.dox +++ b/host/docs/images.dox @@ -24,8 +24,7 @@ The methods of loading images into the device vary among devices: Pre-built images are available for download. -- <a href="http://files.ettus.com/binaries/master_images/">Master Branch images</a> -- <a href="http://files.ettus.com/binaries/maint_images/">Maint Branch images</a> +- <a href="http://files.ettus.com/binaries/images/">Images</a> The pre-built images come in two forms: diff --git a/host/lib/usrp/dboard/db_ubx.cpp b/host/lib/usrp/dboard/db_ubx.cpp index 88c8d93c9..3334c2cd0 100644 --- a/host/lib/usrp/dboard/db_ubx.cpp +++ b/host/lib/usrp/dboard/db_ubx.cpp @@ -1168,6 +1168,7 @@ private: boost::mutex _mutex; ubx_cpld_reg_t _cpld_reg; uint32_t _prev_cpld_value; + std::map<ubx_gpio_field_id_t,ubx_gpio_field_info_t> _gpio_map; boost::shared_ptr<max287x_iface> _txlo1; boost::shared_ptr<max287x_iface> _txlo2; boost::shared_ptr<max287x_iface> _rxlo1; @@ -1192,7 +1193,6 @@ private: size_t _rev; double _prev_tx_freq; double _prev_rx_freq; - std::map<ubx_gpio_field_id_t,ubx_gpio_field_info_t> _gpio_map; ubx_gpio_reg_t _tx_gpio_reg; ubx_gpio_reg_t _rx_gpio_reg; int64_t _tx_sync_delay; |