diff options
| author | Devin Moore <devinmoore@google.com> | 2020-08-17 17:00:42 -0700 |
|---|---|---|
| committer | Devin Moore <devinmoore@google.com> | 2020-08-18 15:24:41 -0700 |
| commit | 12c8b0b6bad4d96d9f8c4a3e4f12b03b8e5a45f0 (patch) | |
| tree | 03bd7abff077630266beca20d636681b75f0bb44 | |
| parent | f9893e8017114796e6e94756cfebee8270548ed0 (diff) | |
| download | platform_system_libhidl-12c8b0b6bad4d96d9f8c4a3e4f12b03b8e5a45f0.tar.gz platform_system_libhidl-12c8b0b6bad4d96d9f8c4a3e4f12b03b8e5a45f0.tar.bz2 platform_system_libhidl-12c8b0b6bad4d96d9f8c4a3e4f12b03b8e5a45f0.zip | |
Move GrantorDescriptor definition out of MQDescriptor
The definition is being moved to MQDescriptorBase in libfmq.
Test: atest fmq_unit_tests &&
system/tools/hidl/tests/run_all_device_tests.sh && m -j64
Bug: 142326204
Change-Id: I40469c76cdd544b496a284219190424ed7e049d9
| -rw-r--r-- | base/include/hidl/MQDescriptor.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/base/include/hidl/MQDescriptor.h b/base/include/hidl/MQDescriptor.h index 6a0bc257..786c1bea 100644 --- a/base/include/hidl/MQDescriptor.h +++ b/base/include/hidl/MQDescriptor.h @@ -27,20 +27,6 @@ namespace android { namespace hardware { -struct GrantorDescriptor { - uint32_t flags __attribute__ ((aligned(4))); - uint32_t fdIndex __attribute__ ((aligned(4))); - uint32_t offset __attribute__ ((aligned(4))); - uint64_t extent __attribute__ ((aligned(8))); -}; - -static_assert(offsetof(GrantorDescriptor, flags) == 0, "wrong offset"); -static_assert(offsetof(GrantorDescriptor, fdIndex) == 4, "wrong offset"); -static_assert(offsetof(GrantorDescriptor, offset) == 8, "wrong offset"); -static_assert(offsetof(GrantorDescriptor, extent) == 16, "wrong offset"); -static_assert(sizeof(GrantorDescriptor) == 24, "wrong size"); -static_assert(__alignof(GrantorDescriptor) == 8, "wrong alignment"); - template <typename T, MQFlavor flavor> struct MQDescriptor { // Takes ownership of handle |