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

Commit 2418e0ac authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Clean up the use of special defined const" am: 31086b05 am:... 

Merge "Clean up the use of special defined const" am: 31086b05 am: cb7da3c7 am: 3118d511 am: 78d05271

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



Change-Id: I7badf5e47323ea4a085e70a1ed3c4fabeaceded4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9ca9dbed 78d05271

system/main/shim/controller.cc

+5 −11
Original line number Diff line number Diff line
@@ -38,13 +38,6 @@ constexpr int kMaxSupportedCodecs = 8; // MAX_LOCAL_SUPPORTED_CODECS_SIZE 


constexpr uint8_t kPhyLe1M = 0x01;



/**

 * Interesting commands supported by controller

 */

constexpr int kReadRemoteExtendedFeatures = 0x41c;

constexpr int kLeSetPrivacyMode = 0x204e;

constexpr int kConfigureDataPath = 0x0c83;



constexpr int kHciDataPreambleSize = 4;  // #define HCI_DATA_PREAMBLE_SIZE 4



// Module lifecycle functions
@@ -215,11 +208,12 @@ MAP_TO_GD(supports_synchronized_receiver, SupportsBleSynchronizedReceiver) 


FORWARD_IF_RUST(

    supports_configure_data_path,

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

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



FORWARD_IF_RUST(supports_reading_remote_extended_features,

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

                                                 kReadRemoteExtendedFeatures))

                GetController()->IsSupported(

                    bluetooth::hci::OpCode::READ_REMOTE_EXTENDED_FEATURES))



FORWARD_IF_RUST(

    supports_enhanced_setup_synchronous_connection,

    GetController()->IsSupported(
@@ -232,7 +226,7 @@ FORWARD_IF_RUST( 


FORWARD_IF_RUST(

    supports_ble_set_privacy_mode,

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

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



#define FORWARD_GETTER_IF_RUST(type, legacy, gd)                         \

  static type legacy(void) {                                             \