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

Commit 0e4ec0e8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Sort local classic feature accessor" am: 69031266 am: 39d6a747 

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



Change-Id: I9f82d1f7d67a520722f61b4f48b93b3a66f22e92
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12b6240a 39d6a747

system/gd/hci/controller.cc

+18 −17
Original line number Diff line number Diff line
@@ -963,35 +963,36 @@ LocalVersionInformation Controller::GetLocalVersionInformation() const { 
    return GetLocalFeatures(page) & BIT(bit);   \

  }



LOCAL_FEATURE_ACCESSOR(SupportsSimplePairing, 0, 51)

LOCAL_FEATURE_ACCESSOR(SupportsSecureConnections, 2, 8)

LOCAL_FEATURE_ACCESSOR(SupportsSimultaneousLeBrEdr, 0, 49)

LOCAL_FEATURE_ACCESSOR(SupportsInterlacedInquiryScan, 0, 28)

LOCAL_FEATURE_ACCESSOR(SupportsRssiWithInquiryResults, 0, 30)

LOCAL_FEATURE_ACCESSOR(SupportsExtendedInquiryResponse, 0, 48)

LOCAL_FEATURE_ACCESSOR(SupportsRoleSwitch, 0, 5)

LOCAL_FEATURE_ACCESSOR(Supports3SlotPackets, 0, 0)

LOCAL_FEATURE_ACCESSOR(Supports5SlotPackets, 0, 1)

LOCAL_FEATURE_ACCESSOR(SupportsClassic2mPhy, 0, 25)

LOCAL_FEATURE_ACCESSOR(SupportsClassic3mPhy, 0, 26)

LOCAL_FEATURE_ACCESSOR(Supports3SlotEdrPackets, 0, 39)

LOCAL_FEATURE_ACCESSOR(Supports5SlotEdrPackets, 0, 40)

LOCAL_FEATURE_ACCESSOR(SupportsRoleSwitch, 0, 5)

LOCAL_FEATURE_ACCESSOR(SupportsHoldMode, 0, 6)

LOCAL_FEATURE_ACCESSOR(SupportsSniffMode, 0, 7)

LOCAL_FEATURE_ACCESSOR(SupportsParkMode, 0, 8)

LOCAL_FEATURE_ACCESSOR(SupportsSco, 0, 11)

LOCAL_FEATURE_ACCESSOR(SupportsHv2Packets, 0, 12)

LOCAL_FEATURE_ACCESSOR(SupportsHv3Packets, 0, 13)

LOCAL_FEATURE_ACCESSOR(SupportsClassic2mPhy, 0, 25)

LOCAL_FEATURE_ACCESSOR(SupportsClassic3mPhy, 0, 26)

LOCAL_FEATURE_ACCESSOR(SupportsInterlacedInquiryScan, 0, 28)

LOCAL_FEATURE_ACCESSOR(SupportsRssiWithInquiryResults, 0, 30)

LOCAL_FEATURE_ACCESSOR(SupportsEv3Packets, 0, 31)

LOCAL_FEATURE_ACCESSOR(SupportsEv4Packets, 0, 32)

LOCAL_FEATURE_ACCESSOR(SupportsEv5Packets, 0, 33)

LOCAL_FEATURE_ACCESSOR(SupportsBle, 0, 38)

LOCAL_FEATURE_ACCESSOR(Supports3SlotEdrPackets, 0, 39)

LOCAL_FEATURE_ACCESSOR(Supports5SlotEdrPackets, 0, 40)

LOCAL_FEATURE_ACCESSOR(SupportsSniffSubrating, 0, 41)

LOCAL_FEATURE_ACCESSOR(SupportsEncryptionPause, 0, 42)

LOCAL_FEATURE_ACCESSOR(SupportsEsco2mPhy, 0, 45)

LOCAL_FEATURE_ACCESSOR(SupportsEsco3mPhy, 0, 46)

LOCAL_FEATURE_ACCESSOR(Supports3SlotEscoEdrPackets, 0, 47)

LOCAL_FEATURE_ACCESSOR(SupportsHoldMode, 0, 6)

LOCAL_FEATURE_ACCESSOR(SupportsSniffMode, 0, 7)

LOCAL_FEATURE_ACCESSOR(SupportsParkMode, 0, 8)

LOCAL_FEATURE_ACCESSOR(SupportsExtendedInquiryResponse, 0, 48)

LOCAL_FEATURE_ACCESSOR(SupportsSimultaneousLeBrEdr, 0, 49)

LOCAL_FEATURE_ACCESSOR(SupportsSimplePairing, 0, 51)

LOCAL_FEATURE_ACCESSOR(SupportsNonFlushablePb, 0, 54)

LOCAL_FEATURE_ACCESSOR(SupportsSniffSubrating, 0, 41)

LOCAL_FEATURE_ACCESSOR(SupportsEncryptionPause, 0, 42)

LOCAL_FEATURE_ACCESSOR(SupportsBle, 0, 38)



LOCAL_FEATURE_ACCESSOR(SupportsSecureConnections, 2, 8)



#define LOCAL_LE_FEATURE_ACCESSOR(name, bit) \

  bool Controller::name() const {            \