diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-07-28 14:48:45 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-28 14:48:45 -0700 |
| commit | b82b3f7a6ff2302b357397e8b72d43aff5644896 (patch) | |
| tree | cfbf04d43d6ea13d4ae2e61be7ce0b0b297228d5 | |
| parent | c348a98c8004e7ac9d28231ae80dadef415440ef (diff) | |
| download | uhd-b82b3f7a6ff2302b357397e8b72d43aff5644896.tar.gz uhd-b82b3f7a6ff2302b357397e8b72d43aff5644896.tar.bz2 uhd-b82b3f7a6ff2302b357397e8b72d43aff5644896.zip | |
Widened SPI slave select bus to 16 bits in host and firmware.
| -rw-r--r-- | firmware/microblaze/lib/spi.c | 2 | ||||
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/firmware/microblaze/lib/spi.c b/firmware/microblaze/lib/spi.c index 937397df6..bef808e57 100644 --- a/firmware/microblaze/lib/spi.c +++ b/firmware/microblaze/lib/spi.c @@ -43,7 +43,7 @@ spi_transact(bool readback, int slave, uint32_t data, int length, uint32_t flags spi_wait(); // Tell it which SPI slave device to access - spi_regs->ss = slave & 0xff; + spi_regs->ss = slave & 0xffff; // Data we will send spi_regs->txrx0 = data; diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index c4dabf5bc..389ac9892 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -104,12 +104,12 @@ typedef struct{ union{ __stdint(uint32_t) ip_addr; struct { - __stdint(uint8_t) dev; + __stdint(uint32_t) dev; + __stdint(uint32_t) data; __stdint(uint8_t) miso_edge; __stdint(uint8_t) mosi_edge; - __stdint(uint8_t) readback; - __stdint(uint32_t) data; __stdint(uint8_t) num_bits; + __stdint(uint8_t) readback; } spi_args; struct { __stdint(uint8_t) addr; |