diff options
| author | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2011-01-04 16:49:34 -0800 |
| commit | fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda (patch) | |
| tree | 107e43e35008e6df0d33b0e8a8f5f52d28a91493 /host/lib/usrp/usrp2/fw_common.h | |
| parent | 4711829f03ee2fcd1c4e9dc2a353af0e35497180 (diff) | |
| parent | 7b0b2924d52bbbcb4660cad5d8070074426011ce (diff) | |
| download | uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.gz uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.tar.bz2 uhd-fabfa8d9dd6670afb9c621b9ee12f8d602d7ccda.zip | |
Merge branch 'cordic_policy' into next
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
Diffstat (limited to 'host/lib/usrp/usrp2/fw_common.h')
| -rw-r--r-- | host/lib/usrp/usrp2/fw_common.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/host/lib/usrp/usrp2/fw_common.h b/host/lib/usrp/usrp2/fw_common.h index ee7fc3882..2cdfdc359 100644 --- a/host/lib/usrp/usrp2/fw_common.h +++ b/host/lib/usrp/usrp2/fw_common.h @@ -127,9 +127,8 @@ typedef struct{ struct { __stdint(uint32_t) addr; __stdint(uint32_t) data; - __stdint(uint32_t) addrhi; - __stdint(uint32_t) datahi; - __stdint(uint8_t) num_bytes; //1, 2, 4, 8 + __stdint(uint32_t) _pad[2]; + __stdint(uint8_t) num_bytes; //1, 2, 4 } poke_args; struct { __stdint(uint8_t) dev; |