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

Commit c5dcd7e7 authored by Pomai Ahlo's avatar Pomai Ahlo Committed by Automerger Merge Worker
Browse files

Merge "Remove unused interface SCN" into main am: 7bd7ab11 

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



Change-Id: Ie3f882def08bd4af31574fa28ba0867d63dc3920
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a8c31ed9 7bd7ab11

system/stack/btm/btm_client_interface.cc

+0 −7
Original line number Diff line number Diff line
@@ -44,13 +44,6 @@ struct btm_client_interface_t btm_client_interface = { 
            .BTM_reset_complete = BTM_reset_complete,

        },



    .scn =

        {

            .BTM_AllocateSCN = BTM_AllocateSCN,

            .BTM_TryAllocateSCN = BTM_TryAllocateSCN,

            .BTM_FreeSCN = BTM_FreeSCN,

        },



    // Acl peer and lifecycle

    .peer =

        {

system/stack/include/btm_client_interface.h

+0 −7
Original line number Diff line number Diff line
@@ -50,13 +50,6 @@ struct btm_client_interface_t { 
    void (*BTM_reset_complete)();

  } lifecycle;



  struct {

    // Server channel number

    uint8_t (*BTM_AllocateSCN)(void);

    bool (*BTM_TryAllocateSCN)(uint8_t scn);

    bool (*BTM_FreeSCN)(uint8_t scn);

  } scn;



  // Acl peer and lifecycle

  struct {

    struct {

system/test/mock/mock_stack_btm.cc

+0 −6
Original line number Diff line number Diff line
@@ -53,12 +53,6 @@ struct btm_client_interface_t btm_client_interface = { 
        .btm_ble_free = []() {},

        .BTM_reset_complete = []() {},

    },

    .scn =

        {

            .BTM_AllocateSCN = BTM_AllocateSCN,

            .BTM_TryAllocateSCN = BTM_TryAllocateSCN,

            .BTM_FreeSCN = BTM_FreeSCN,

        },

    .peer = {

        .features =

            {