diff options
author | Martin Braun <martin.braun@ettus.com> | 2016-06-22 20:01:42 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2016-06-23 09:58:20 -0700 |
commit | ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d (patch) | |
tree | 6342382f3d1c45fc5c83ca36fed24a2d4a173aff /host/lib/convert/convert_unpack_sc12.cpp | |
parent | fd9dc3f2be1e8056a1355351b97c7d40e9bd2d1f (diff) | |
parent | 9caf20c29956be283b032110096a81f99a121da7 (diff) | |
download | uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.tar.gz uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.tar.bz2 uhd-ef57ffcbbf33f16d4fecb73749e3bb0fc4cd473d.zip |
Merge branch 'maint'
Conflicts:
host/lib/usrp/b200/b200_impl.cpp
Diffstat (limited to 'host/lib/convert/convert_unpack_sc12.cpp')
-rw-r--r-- | host/lib/convert/convert_unpack_sc12.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/host/lib/convert/convert_unpack_sc12.cpp b/host/lib/convert/convert_unpack_sc12.cpp index 94b415355..9f7a84300 100644 --- a/host/lib/convert/convert_unpack_sc12.cpp +++ b/host/lib/convert/convert_unpack_sc12.cpp @@ -25,6 +25,11 @@ using namespace uhd::convert; typedef boost::uint32_t (*tohost32_type)(boost::uint32_t); +/* C language specification requires this to be packed + * (i.e., line0, line1, line2 will be in adjacent memory locations). + * If this was not true, we'd need compiler flags here to specify + * alignment/packing. + */ struct item32_sc12_3x { item32_t line0; |