summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2017-07-22 15:51:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-07-22 15:51:40 +0000
commitad6b1eb846d2aa24088ee9817a67c0b469e14f9c (patch)
tree1a102853877c7a9dc62b0259c51eaa7414ea7dfd
parentb36443a8644924bb54ab3d1117b145257ec11480 (diff)
parent5c98115486efada50017b8222b129bb4b9bef81d (diff)
downloadandroid_hardware_interfaces-ad6b1eb846d2aa24088ee9817a67c0b469e14f9c.tar.gz
android_hardware_interfaces-ad6b1eb846d2aa24088ee9817a67c0b469e14f9c.tar.bz2
android_hardware_interfaces-ad6b1eb846d2aa24088ee9817a67c0b469e14f9c.zip
Merge "Fixed the HCI ACL Header definitions for PB and BC Flags" into oc-dev
-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";