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

Commit 0aa15f6d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Complete stack/include/btm_client_interface::<BTM interface> am: 605c5662... 

Complete stack/include/btm_client_interface::<BTM interface> am: 605c5662 am: fda25ade am: ed8a514b

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1545113

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbd785688c84c958b9605939b8fd589748d829fa
parents 69c63133 ed8a514b

system/stack/btm/btm_client_interface.cc

+19 −0
Original line number Diff line number Diff line
@@ -38,10 +38,14 @@ struct btm_client_interface_s btm_client_interface = { 
            .btm_free = btm_free,

            .btm_ble_init = btm_ble_init,

            .btm_ble_free = btm_ble_free,

            .BTM_db_reset = BTM_db_reset,

            .BTM_reset_complete = BTM_reset_complete,

        },



    .scn =

        {

            .BTM_AllocateSCN = BTM_AllocateSCN,

            .BTM_TryAllocateSCN = BTM_TryAllocateSCN,

            .BTM_FreeSCN = BTM_FreeSCN,

        },
@@ -52,6 +56,11 @@ struct btm_client_interface_s btm_client_interface = { 
            .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
@@ -66,6 +75,7 @@ struct btm_client_interface_s btm_client_interface = { 
            .BTM_ReadRemoteFeatures = BTM_ReadRemoteFeatures,

            .BTM_SetEncryption = BTM_SetEncryption,

            .BTM_GetMaxPacketSize = BTM_GetMaxPacketSize,

            .BTM_ReadRemoteVersion = BTM_ReadRemoteVersion,

        },



    .link_policy =
@@ -139,6 +149,8 @@ struct btm_client_interface_s btm_client_interface = { 
                BTM_ReadLocalDeviceNameFromController,

            .BTM_SetDeviceClass = BTM_SetDeviceClass,

            .BTM_SetLocalDeviceName = BTM_SetLocalDeviceName,

            .BTM_IsDeviceUp = BTM_IsDeviceUp,

            .BTM_ReadDeviceClass = BTM_ReadDeviceClass,

        },



    .eir =
@@ -148,6 +160,13 @@ struct btm_client_interface_s btm_client_interface = { 
            .BTM_RemoveEirService = BTM_RemoveEirService,

            .BTM_WriteEIR = BTM_WriteEIR,

        },

    .db =

        {

            .BTM_InqDbRead = BTM_InqDbRead,

            .BTM_InqDbFirst = BTM_InqDbFirst,

            .BTM_InqDbNext = BTM_InqDbNext,

            .BTM_ClearInqDb = BTM_ClearInqDb,

        },

};



struct btm_client_interface_s& get_btm_client_interface() {

system/stack/include/btm_client_interface.h

+22 −0
Original line number Diff line number Diff line
@@ -42,10 +42,14 @@ struct btm_client_interface_s { 
    void (*btm_free)();

    void (*btm_ble_init)();

    void (*btm_ble_free)();

    void (*BTM_db_reset)();

    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;
@@ -56,6 +60,12 @@ struct btm_client_interface_s { 
    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
@@ -78,6 +88,9 @@ struct btm_client_interface_s { 
                            tBT_DEVICE_TYPE* p_dev_type,

                            tBLE_ADDR_TYPE* p_addr_type);

    uint16_t (*BTM_GetMaxPacketSize)(const RawAddress& bd_addr);

    bool (*BTM_ReadRemoteVersion)(const RawAddress& addr, uint8_t* lmp_version,

                                  uint16_t* manufacturer,

                                  uint16_t* lmp_sub_version);

  } peer;



  struct {
@@ -181,6 +194,8 @@ struct btm_client_interface_s { 
        tBTM_CMPL_CB* p_rln_cmpl_cback);

    tBTM_STATUS (*BTM_SetLocalDeviceName)(char* p_name);

    tBTM_STATUS (*BTM_SetDeviceClass)(DEV_CLASS dev_class);

    bool (*BTM_IsDeviceUp)();

    uint8_t* (*BTM_ReadDeviceClass)();

  } local;



  struct {
@@ -193,6 +208,13 @@ struct btm_client_interface_s { 
                                  uint8_t* p_uuid_list, uint8_t max_num_uuid);

    void (*BTM_RemoveEirService)(uint32_t* p_eir_uuid, uint16_t uuid16);

  } eir;



  struct {

    tBTM_INQ_INFO* (*BTM_InqDbRead)(const RawAddress& p_bda);

    tBTM_INQ_INFO* (*BTM_InqDbFirst)();

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

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

  } db;

};



struct btm_client_interface_s& get_btm_client_interface();