diff options
| author | Devin Moore <devinmoore@google.com> | 2020-08-25 23:30:54 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-25 23:30:54 +0000 |
| commit | 44f931b130c726cda5005e3679295f711b734c61 (patch) | |
| tree | 03bd7abff077630266beca20d636681b75f0bb44 | |
| parent | 215a30b8baa628531d1d8f1374ce1470f835d182 (diff) | |
| parent | cf7bb8f437f0a79cb6665e5e615057f453a08648 (diff) | |
| download | platform_system_libhidl-44f931b130c726cda5005e3679295f711b734c61.tar.gz platform_system_libhidl-44f931b130c726cda5005e3679295f711b734c61.tar.bz2 platform_system_libhidl-44f931b130c726cda5005e3679295f711b734c61.zip | |
Merge "Move GrantorDescriptor definition out of MQDescriptor" am: cf7bb8f437
Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1403103
Change-Id: I0cd894733fb504356e9ecf0ec40e77cdad5b9e27
| -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 |