diff options
| author | Philip Balister <philip@opensdr.com> | 2010-08-19 21:24:51 +0000 |
|---|---|---|
| committer | Philip Balister <philip@opensdr.com> | 2010-08-19 21:24:51 +0000 |
| commit | 10f6e1aeec082c6b5ef0485e232266921a3adbc7 (patch) | |
| tree | 627e5f6391588b349bc14c47bfb10b1cf6c3f0ad /host/lib/usrp/usrp2/fw_common.h | |
| parent | 38722979512f0f6d57db9fd5e314b94cad1f188e (diff) | |
| parent | b84f2da152eb65afe89240941bd02d67b3582eae (diff) | |
| download | uhd-10f6e1aeec082c6b5ef0485e232266921a3adbc7.tar.gz uhd-10f6e1aeec082c6b5ef0485e232266921a3adbc7.tar.bz2 uhd-10f6e1aeec082c6b5ef0485e232266921a3adbc7.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Conflicts:
host/examples/CMakeLists.txt
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; |