diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-16 19:51:20 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-16 19:51:20 -0700 |
| commit | 0541029e4ecd06e840966b4005af316b92eeb9e5 (patch) | |
| tree | 8d78c73a451634c7db7c04c861ff3654dc8797f4 /host/lib/usrp/usrp2/fw_common.h | |
| parent | ef6953024f1075a729e85f2511c75de337879888 (diff) | |
| parent | 230368da5c55c0eb587960db50f68e1b618f271c (diff) | |
| download | uhd-0541029e4ecd06e840966b4005af316b92eeb9e5.tar.gz uhd-0541029e4ecd06e840966b4005af316b92eeb9e5.tar.bz2 uhd-0541029e4ecd06e840966b4005af316b92eeb9e5.zip | |
Merge branch 'premerge'
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; |