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

Commit 54784d3f authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Remove unused btm neighbor interface" into main am: de8b7860 

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



Change-Id: Ib93eb7cb426e5bbbb5b9f1c89f8b2ba8b7c1383c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 151118e5 de8b7860

system/stack/btm/btm_client_interface.cc

+0 −14
Original line number Diff line number Diff line
@@ -51,20 +51,6 @@ struct btm_client_interface_t btm_client_interface = { 
            .BTM_FreeSCN = BTM_FreeSCN,

        },



    .neighbor =

        {

            .BTM_CancelInquiry = BTM_CancelInquiry,

            .BTM_ClearInqDb = BTM_ClearInqDb,

            .BTM_InqDbNext = BTM_InqDbNext,

            .BTM_SetConnectability = BTM_SetConnectability,

            .BTM_SetDiscoverability = BTM_SetDiscoverability,

            .BTM_StartInquiry = BTM_StartInquiry,

            .BTM_IsInquiryActive = BTM_IsInquiryActive,

            .BTM_SetInquiryMode = BTM_SetInquiryMode,

            .BTM_EnableInterlacedInquiryScan = BTM_EnableInterlacedInquiryScan,

            .BTM_EnableInterlacedPageScan = BTM_EnableInterlacedPageScan,

        },



    // Acl peer and lifecycle

    .peer =

        {

system/stack/include/btm_client_interface.h

+0 −15
Original line number Diff line number Diff line
@@ -57,21 +57,6 @@ struct btm_client_interface_t { 
    bool (*BTM_FreeSCN)(uint8_t scn);

  } scn;



  // Neighbor

  struct {

    void (*BTM_CancelInquiry)();

    tBTM_INQ_INFO* (*BTM_InqDbNext)(tBTM_INQ_INFO* p_cur);

    tBTM_STATUS (*BTM_ClearInqDb)(const RawAddress* p_bda);

    tBTM_STATUS (*BTM_SetDiscoverability)(uint16_t inq_mode);

    tBTM_STATUS (*BTM_SetConnectability)(uint16_t page_mode);

    tBTM_STATUS (*BTM_StartInquiry)(tBTM_INQ_RESULTS_CB* p_results_cb,

                                    tBTM_CMPL_CB* p_cmpl_cb);

    uint16_t (*BTM_IsInquiryActive)(void);

    tBTM_STATUS (*BTM_SetInquiryMode)(uint8_t mode);

    void (*BTM_EnableInterlacedInquiryScan)();

    void (*BTM_EnableInterlacedPageScan)();

  } neighbor;



  // Acl peer and lifecycle

  struct {

    struct {

system/test/mock/mock_stack_btm.cc

+0 −13
Original line number Diff line number Diff line
@@ -59,19 +59,6 @@ struct btm_client_interface_t btm_client_interface = { 
            .BTM_TryAllocateSCN = BTM_TryAllocateSCN,

            .BTM_FreeSCN = BTM_FreeSCN,

        },

    .neighbor =

        {

            .BTM_CancelInquiry = BTM_CancelInquiry,

            .BTM_InqDbNext = BTM_InqDbNext,

            .BTM_ClearInqDb = BTM_ClearInqDb,

            .BTM_SetDiscoverability = BTM_SetDiscoverability,

            .BTM_SetConnectability = BTM_SetConnectability,

            .BTM_StartInquiry = BTM_StartInquiry,

            .BTM_IsInquiryActive = BTM_IsInquiryActive,

            .BTM_SetInquiryMode = BTM_SetInquiryMode,

            .BTM_EnableInterlacedInquiryScan = BTM_EnableInterlacedInquiryScan,

            .BTM_EnableInterlacedPageScan = BTM_EnableInterlacedPageScan,

        },

    .peer = {

        .features =

            {