diff options
| author | Josh Blum <josh@joshknows.com> | 2010-04-28 11:25:26 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-04-28 11:25:26 -0700 |
| commit | 1b924876d7d7216504e604137ed0ade36460169f (patch) | |
| tree | 0667a56d9fb77f5c1427bd44ed097997ea825c8a /host/lib/usrp/usrp_e/usrp_e_iface.cpp | |
| parent | cbd9e1da0866893d86320787a99cf4257478c539 (diff) | |
| download | uhd-1b924876d7d7216504e604137ed0ade36460169f.tar.gz uhd-1b924876d7d7216504e604137ed0ade36460169f.tar.bz2 uhd-1b924876d7d7216504e604137ed0ade36460169f.zip | |
usrp-e branch compiling with recent master pulled in
Diffstat (limited to 'host/lib/usrp/usrp_e/usrp_e_iface.cpp')
| -rw-r--r-- | host/lib/usrp/usrp_e/usrp_e_iface.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp_e/usrp_e_iface.cpp b/host/lib/usrp/usrp_e/usrp_e_iface.cpp index d4c988211..f12eee177 100644 --- a/host/lib/usrp/usrp_e/usrp_e_iface.cpp +++ b/host/lib/usrp/usrp_e/usrp_e_iface.cpp @@ -100,7 +100,7 @@ public: ******************************************************************/ boost::uint32_t transact_spi( int which_slave, - const uhd::usrp::spi_config_t &config, + const uhd::spi_config_t &config, boost::uint32_t bits, size_t num_bits, bool readback @@ -114,8 +114,8 @@ public: //load the flags data.flags = 0; - data.flags |= (config.miso_edge == uhd::usrp::spi_config_t::EDGE_RISE)? UE_SPI_LATCH_RISE : UE_SPI_LATCH_FALL; - data.flags |= (config.mosi_edge == uhd::usrp::spi_config_t::EDGE_RISE)? UE_SPI_PUSH_FALL : UE_SPI_PUSH_RISE; + data.flags |= (config.miso_edge == uhd::spi_config_t::EDGE_RISE)? UE_SPI_LATCH_RISE : UE_SPI_LATCH_FALL; + data.flags |= (config.mosi_edge == uhd::spi_config_t::EDGE_RISE)? UE_SPI_PUSH_FALL : UE_SPI_PUSH_RISE; //call the spi ioctl this->ioctl(USRP_E_SPI, &data); |