commit 198cf26910edd0a9b689c841436a64b01fe1ec38
author Marie Janssen <jamuraa@google.com> Fri Apr 02 23:47:41 2021 +0000
committer releases-try-builder <releases-try-builder@fuchsia-infra.iam.gserviceaccount.com> Sat Apr 03 00:26:30 2021 +0000
tree 21bea65392af999e0849672b6f8cde3b9f3fed0f
parent 08c431a179cfff5ad4d9736444998756eefa58c2

[bt][hci] Fix kWriteAutomaticFlushTimeout opcode

The Write Automatic Flush Timeout opcode was incorrectly transcribed
into the "Link Control" section instead of the "Controller and Baseband"
section.

Bug: 71877
Test: constant changes only, confirm fix on wireshark

Change-Id: Ic0ae9d0466a10965fcd955c52cafff8bc8a35390
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/510639
Commit-Queue: Auto-Submit <auto-submit@fuchsia-infra.iam.gserviceaccount.com>
Reviewed-by: Ben Lawson <benlawson@google.com>
Fuchsia-Auto-Submit: Marie Janssen 💖 <jamuraa@google.com>

src/connectivity/bluetooth/core/bt-host/hci/hci.h

diff --git a/src/connectivity/bluetooth/core/bt-host/hci/hci.h b/src/connectivity/bluetooth/core/bt-host/hci/hci.h
index f4acca6..534293c 100644
--- a/src/connectivity/bluetooth/core/bt-host/hci/hci.h
+++ b/src/connectivity/bluetooth/core/bt-host/hci/hci.h
@@ -398,25 +398,6 @@
 // command has been completed.
 
 // =============================================
-// Write Automatic Flush Timeout Command (BR/EDR)
-
-constexpr OpCode kWriteAutomaticFlushTimeout = LinkControlOpCode(0x0028);
-
-struct WriteAutomaticFlushTimeoutCommandParams {
-  // Connection_Handle (only the lower 12-bits are meaningful).
-  //   Range: 0x0000 to kConnectionHandleMax in hci_constants.h
-  ConnectionHandle connection_handle;
-
-  // The value for the Flush_Timeout configuration parameter (Core Spec v5.2, Vol 4, Part E,
-  // Sec 6.19).
-  // Range: 0x0000 to 0x07FF. 0x0000 indicated infinite flush timeout (no automatic
-  // flush).
-  // Time = flush_timeout * 0.625ms.
-  // Time Range: 0.625ms to 1279.375ms.
-  uint16_t flush_timeout;
-} __PACKED;
-
-// =============================================
 // Reject Synchronous Connection Command (BR/EDR)
 constexpr OpCode kRejectSynchronousConnectionRequest = LinkControlOpCode(0x002A);
 
@@ -778,6 +759,26 @@
   DeviceClass class_of_device;
 } __PACKED;
 
+// =============================================
+// Write Automatic Flush Timeout Command (v1.1) (BR/EDR)
+
+constexpr OpCode kWriteAutomaticFlushTimeout = ControllerAndBasebandOpCode(0x0028);
+
+struct WriteAutomaticFlushTimeoutCommandParams {
+  // Connection_Handle (only the lower 12-bits are meaningful).
+  //   Range: 0x0000 to kConnectionHandleMax in hci_constants.h
+  ConnectionHandle connection_handle;
+
+  // The value for the Flush_Timeout configuration parameter (Core Spec v5.2, Vol 4, Part E,
+  // Sec 6.19).
+  // Range: 0x0000 to 0x07FF. 0x0000 indicated infinite flush timeout (no automatic
+  // flush).
+  // Time = flush_timeout * 0.625ms.
+  // Time Range: 0.625ms to 1279.375ms.
+  uint16_t flush_timeout;
+} __PACKED;
+
+
 // ===============================================================
 // Read Transmit Transmit Power Level Command (v1.1) (BR/EDR & LE)
 constexpr OpCode kReadTransmitPowerLevel = ControllerAndBasebandOpCode(0x002D);