Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2a8ff0e authored by En-Shuo Hsu's avatar En-Shuo Hsu Committed by Automerger Merge Worker
Browse files

Merge "floss: Correct the HCI OpCode" am: af190f9f am: 2d036b3b am: ba32d9e2 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2167848



Change-Id: I3a4b96e87fa83013e2b39da4b897081dfba18108
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 87085e01 ba32d9e2

system/main/shim/controller.cc

+8 −7
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ constexpr uint8_t kPhyLe1M = 0x01; 
 * Interesting commands supported by controller

 */

constexpr int kReadRemoteExtendedFeatures = 0x41c;

constexpr int kEnhancedSetupSynchronousConnection = 0x428;

constexpr int kEnhancedAcceptSynchronousConnection = 0x429;

constexpr int kLeSetPrivacyMode = 0x204e;

constexpr int kConfigureDataPath = 0x0c83;
@@ -222,13 +220,16 @@ FORWARD_IF_RUST( 
FORWARD_IF_RUST(supports_reading_remote_extended_features,

                GetController()->IsSupported((bluetooth::hci::OpCode)

                                                 kReadRemoteExtendedFeatures))

FORWARD_IF_RUST(supports_enhanced_setup_synchronous_connection,

                GetController()->IsSupported((

                    bluetooth::hci::OpCode)kEnhancedSetupSynchronousConnection))

FORWARD_IF_RUST(

    supports_enhanced_setup_synchronous_connection,

    GetController()->IsSupported(

        bluetooth::hci::OpCode::ENHANCED_SETUP_SYNCHRONOUS_CONNECTION))



FORWARD_IF_RUST(

    supports_enhanced_accept_synchronous_connection,

    GetController()->IsSupported((bluetooth::hci::OpCode)

                                     kEnhancedAcceptSynchronousConnection))

    GetController()->IsSupported(

        bluetooth::hci::OpCode::ENHANCED_ACCEPT_SYNCHRONOUS_CONNECTION))



FORWARD_IF_RUST(

    supports_ble_set_privacy_mode,

    GetController()->IsSupported((bluetooth::hci::OpCode)kLeSetPrivacyMode))