diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-17 17:52:17 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-17 17:52:17 -0700 |
| commit | ea86054d7203ab4d2b55d88fb22afeeb421f4f9d (patch) | |
| tree | de7522e955cec723415306e04548f88f0236d830 /host/lib/usrp/usrp2/fw_common.h | |
| parent | 6c8260dcb5c73aaef38b7473acc9a332a93c5fa5 (diff) | |
| parent | 864de41af536de1a4e86aa4542e2cfeb21f2d309 (diff) | |
| download | uhd-ea86054d7203ab4d2b55d88fb22afeeb421f4f9d.tar.gz uhd-ea86054d7203ab4d2b55d88fb22afeeb421f4f9d.tar.bz2 uhd-ea86054d7203ab4d2b55d88fb22afeeb421f4f9d.zip | |
Merge branch 'master' into usrp1
Diffstat (limited to 'host/lib/usrp/usrp2/fw_common.h')
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index a781c1a21..cc6c41ba7 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -34,7 +34,7 @@ extern "C" { //fpga and firmware compatibility numbers #define USRP2_FPGA_COMPAT_NUM 1 -#define USRP2_FW_COMPAT_NUM 5 +#define USRP2_FW_COMPAT_NUM 6 //used to differentiate control packets over data port #define USRP2_INVALID_VRT_HEADER 0 @@ -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; |