summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanley Tng <stng@google.com>2017-07-20 18:24:07 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-20 18:24:07 +0000
commit81775f2adbcbd90af891408b6ba0575c04cef1b6 (patch)
treec49b07b20db36c3b1636d7810715d8fad48a1787
parent6fdd9fad11b34d9a26ca0d7d6da8d6b1f13ce170 (diff)
parentcd762d90e8f139407c53eb63fde9ca7ccf9c5c40 (diff)
downloadandroid_hardware_interfaces-81775f2adbcbd90af891408b6ba0575c04cef1b6.tar.gz
android_hardware_interfaces-81775f2adbcbd90af891408b6ba0575c04cef1b6.tar.bz2
android_hardware_interfaces-81775f2adbcbd90af891408b6ba0575c04cef1b6.zip
Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" am: adda0e8721
am: cd762d90e8 Change-Id: Ie928aff644005c58792d3fd94a317e0e758c11aa
-rw-r--r--bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp
index d699f2114..fb53366c2 100644
--- a/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp
+++ b/bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.cpp
@@ -88,8 +88,14 @@ using ::android::sp;
#define EVENT_NUMBER_OF_COMPLETED_PACKETS_NUM_HANDLES 2
-#define ACL_BROADCAST_ACTIVE_SLAVE (0x1 << 4)
-#define ACL_PACKET_BOUNDARY_COMPLETE (0x3 << 6)
+#define ACL_BROADCAST_FLAG_OFFSET 6
+#define ACL_BROADCAST_FLAG_ACTIVE_SLAVE 0x1
+#define ACL_BROADCAST_ACTIVE_SLAVE (ACL_BROADCAST_FLAG_ACTIVE_SLAVE << ACL_BROADCAST_FLAG_OFFSET)
+
+#define ACL_PACKET_BOUNDARY_FLAG_OFFSET 4
+#define ACL_PACKET_BOUNDARY_FLAG_COMPLETE 0x3
+#define ACL_PACKET_BOUNDARY_COMPLETE \
+ (ACL_PACKET_BOUNDARY_FLAG_COMPLETE << ACL_PACKET_BOUNDARY_FLAG_OFFSET)
constexpr char kCallbackNameAclEventReceived[] = "aclDataReceived";
constexpr char kCallbackNameHciEventReceived[] = "hciEventReceived";