diff options
| author | Josh Blum <josh@joshknows.com> | 2011-04-19 17:47:36 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-04-19 17:47:36 -0700 |
| commit | fdee3ba82b997c709e6822aa000df8adb61c56a5 (patch) | |
| tree | ed566f55ef024fd2a45d053a719010e1b2c49366 /host/lib/types | |
| parent | ee424d797fc37a8c3c2a82a58218bf1e85456226 (diff) | |
| parent | 290bb75de236cb53c54bb4599cc2dde924f9800e (diff) | |
| download | uhd-fdee3ba82b997c709e6822aa000df8adb61c56a5.tar.gz uhd-fdee3ba82b997c709e6822aa000df8adb61c56a5.tar.bz2 uhd-fdee3ba82b997c709e6822aa000df8adb61c56a5.zip | |
Merge branch 'master' into next
Conflicts:
fpga/usrp2/top/u2plus/Makefile.N200
Diffstat (limited to 'host/lib/types')
| -rw-r--r-- | host/lib/types/serial.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/types/serial.cpp b/host/lib/types/serial.cpp index aa1133e72..9e9d32954 100644 --- a/host/lib/types/serial.cpp +++ b/host/lib/types/serial.cpp @@ -58,7 +58,7 @@ byte_vector_t i2c_iface::read_eeprom( boost::uint32_t spi_iface::read_spi( int which_slave, const spi_config_t &config, - boost::uint16_t data, + boost::uint32_t data, size_t num_bits ){ return transact_spi( @@ -69,7 +69,7 @@ boost::uint32_t spi_iface::read_spi( void spi_iface::write_spi( int which_slave, const spi_config_t &config, - boost::uint16_t data, + boost::uint32_t data, size_t num_bits ){ transact_spi( |