diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-11-08 08:41:46 -0800 |
| commit | 9b852f5f243e5cf68662b7152b5fa331a83e55fb (patch) | |
| tree | 159ffe0761f78dd87e2ecc97abea14494abab4ff /host/lib/usrp/b200/b200_cores.cpp | |
| parent | c66cb1bad0d881394f3519bd94f4693cceab4c64 (diff) | |
| parent | 99c2730bc9db270560671f2d7d173768465ed51f (diff) | |
| download | uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.gz uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.tar.bz2 uhd-9b852f5f243e5cf68662b7152b5fa331a83e55fb.zip | |
Merge branch 'maint'
Diffstat (limited to 'host/lib/usrp/b200/b200_cores.cpp')
| -rw-r--r-- | host/lib/usrp/b200/b200_cores.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_cores.cpp b/host/lib/usrp/b200/b200_cores.cpp index 19e637ef4..dcfd41825 100644 --- a/host/lib/usrp/b200/b200_cores.cpp +++ b/host/lib/usrp/b200/b200_cores.cpp @@ -29,10 +29,10 @@ b200_local_spi_core::b200_local_spi_core( change_perif(default_perif); } -boost::uint32_t b200_local_spi_core::transact_spi( +uint32_t b200_local_spi_core::transact_spi( int which_slave, const uhd::spi_config_t &config, - boost::uint32_t data, + uint32_t data, size_t num_bits, bool readback) { |