diff options
| author | Martin Braun <martin.braun@ettus.com> | 2015-07-08 12:37:26 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-07-08 12:37:26 -0700 |
| commit | 2563456f7d2969dc3af5323564c911f238441781 (patch) | |
| tree | 9518d3cd0792ac7e81a927a039e99bcb12234759 /host/lib/usrp | |
| parent | af93b6884dc9913b0c01a6f4e10434765fd226d3 (diff) | |
| parent | 69bcfba936e49c2825a6d9be677c3150a5c6b70c (diff) | |
| download | uhd-2563456f7d2969dc3af5323564c911f238441781.tar.gz uhd-2563456f7d2969dc3af5323564c911f238441781.tar.bz2 uhd-2563456f7d2969dc3af5323564c911f238441781.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/b200/b200_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/common/ad9361_driver/ad9361_device.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/b200/b200_impl.cpp b/host/lib/usrp/b200/b200_impl.cpp index abddd1747..7c672fd46 100644 --- a/host/lib/usrp/b200/b200_impl.cpp +++ b/host/lib/usrp/b200/b200_impl.cpp @@ -63,7 +63,7 @@ public: digital_interface_delays_t get_digital_interface_timing() { digital_interface_delays_t delays; delays.rx_clk_delay = 0; - delays.rx_data_delay = 0x6; + delays.rx_data_delay = 0xF; delays.tx_clk_delay = 0; delays.tx_data_delay = 0xF; return delays; diff --git a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp index 85e81cf97..527f7031e 100644 --- a/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp +++ b/host/lib/usrp/common/ad9361_driver/ad9361_device.cpp @@ -1559,13 +1559,13 @@ void ad9361_device_t::initialize() * Force TX on one port, RX on the other. */ switch (_client_params->get_digital_interface_mode()) { case AD9361_DDR_FDD_LVCMOS: { - _io_iface->poke8(0x010, 0xc8); + _io_iface->poke8(0x010, 0xc8); // Swap I&Q on Tx, Swap I&Q on Rx, Toggle frame sync mode _io_iface->poke8(0x011, 0x00); _io_iface->poke8(0x012, 0x02); } break; case AD9361_DDR_FDD_LVDS: { - _io_iface->poke8(0x010, 0xcc); + _io_iface->poke8(0x010, 0xcc); // Swap I&Q on Tx, Swap I&Q on Rx, Toggle frame sync mode, 2R2T timing. _io_iface->poke8(0x011, 0x00); _io_iface->poke8(0x012, 0x10); |