diff options
| author | Philip Balister <philip@opensdr.com> | 2010-08-19 21:24:51 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-08-19 21:24:51 +0000 |
| commit | 10f6e1aeec082c6b5ef0485e232266921a3adbc7 (patch) | |
| tree | 627e5f6391588b349bc14c47bfb10b1cf6c3f0ad /host/lib/usrp/usrp2/usrp2_iface.cpp | |
| parent | 38722979512f0f6d57db9fd5e314b94cad1f188e (diff) | |
| parent | b84f2da152eb65afe89240941bd02d67b3582eae (diff) | |
| download | uhd-10f6e1aeec082c6b5ef0485e232266921a3adbc7.tar.gz uhd-10f6e1aeec082c6b5ef0485e232266921a3adbc7.tar.bz2 uhd-10f6e1aeec082c6b5ef0485e232266921a3adbc7.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Conflicts:
host/examples/CMakeLists.txt
Diffstat (limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_iface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp index 4124221ef..2d450bfc6 100644 --- a/host/lib/usrp/usrp2/usrp2_iface.cpp +++ b/host/lib/usrp/usrp2/usrp2_iface.cpp @@ -115,7 +115,7 @@ public: //setup the out data usrp2_ctrl_data_t out_data; out_data.id = htonl(USRP2_CTRL_ID_TRANSACT_ME_SOME_SPI_BRO); - out_data.data.spi_args.dev = which_slave; + out_data.data.spi_args.dev = htonl(which_slave); out_data.data.spi_args.miso_edge = spi_edge_to_otw[config.miso_edge]; out_data.data.spi_args.mosi_edge = spi_edge_to_otw[config.mosi_edge]; out_data.data.spi_args.readback = (readback)? 1 : 0; |