From 4a99f3afaeac33ead57e3351fc05a6572e4820ec Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Tue, 30 Aug 2016 12:23:59 -0700 Subject: [PATCH] WireMQDescriptor => MQDescriptor b/31091383 Adding WireMQDescriptor as a hidl type Change-Id: Iff23c833e8ab232ad37fd9bfbfe4d49fbc06b369 --- benchmarks/msgq/1.0/IBenchmarkMsgQ.hal | 23 ++--------------------- tests/msgq/1.0/ITestMsgQ.hal | 21 +-------------------- 2 files changed, 3 insertions(+), 41 deletions(-) diff --git a/benchmarks/msgq/1.0/IBenchmarkMsgQ.hal b/benchmarks/msgq/1.0/IBenchmarkMsgQ.hal index 234865e7b8..a3ed72b71a 100644 --- a/benchmarks/msgq/1.0/IBenchmarkMsgQ.hal +++ b/benchmarks/msgq/1.0/IBenchmarkMsgQ.hal @@ -17,27 +17,8 @@ package android.hardware.benchmarks.msgq@1.0; interface IBenchmarkMsgQ { - - struct shm_t { - uint32_t fdIndex; - uint32_t offset; - uint32_t extent; - }; - struct WireGrantorDescriptor { - uint32_t flags; - shm_t shm; - }; - - struct WireMQDescriptor { - vec grantors; - handle mq_handle; - uint32_t quantum; - uint32_t nQuanta; - uint32_t flags; - }; - - ConfigureClientInbox() generates ( WireMQDescriptor mq_desc_in ); - ConfigureClientOutbox() generates ( WireMQDescriptor mq_desc_out ); + ConfigureClientInbox() generates (int32_t ret, MQDescriptor mq_desc_in ); + ConfigureClientOutbox() generates ( int32_t ret, MQDescriptor mq_desc_out ); RequestWrite (int32_t count) generates (int32_t ret); RequestRead(int32_t count) generates (int32_t ret); BenchmarkPingPong(uint32_t numIter); diff --git a/tests/msgq/1.0/ITestMsgQ.hal b/tests/msgq/1.0/ITestMsgQ.hal index caaa154222..1aeb26e435 100644 --- a/tests/msgq/1.0/ITestMsgQ.hal +++ b/tests/msgq/1.0/ITestMsgQ.hal @@ -18,26 +18,7 @@ package android.hardware.tests.msgq@1.0; interface ITestMsgQ { - struct shm_t { - uint32_t fdIndex; - uint32_t offset; - uint32_t extent; - }; - struct WireGrantorDescriptor { - uint32_t flags; - shm_t shm; - }; - - struct WireMQDescriptor { - vec grantors; - handle mq_handle; - uint32_t quantum; - uint32_t nQuanta; - uint32_t flags; - }; - - - configure() generates (int32_t ret, WireMQDescriptor mq_desc); + configure() generates (int32_t ret, MQDescriptor mq_desc); requestWrite (int32_t count) generates (int32_t ret); requestRead(int32_t count) generates (int32_t ret);