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

Commit d2007473 authored by Chris Manton's avatar Chris Manton
Browse files

stack::btm Interface should explicitly refer to global namespace 

Bug: 343772650
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Iba4039ba3a9e1c4d5566e2a1452991336c40c9e0
parent af302719

system/stack/btm/btm_client_interface.cc

+69 −59
Original line number Diff line number Diff line
@@ -26,101 +26,111 @@ 
struct btm_client_interface_t btm_client_interface = {

    .lifecycle =

        {

            .BTM_PmRegister = BTM_PmRegister,

            .BTM_GetHCIConnHandle = BTM_GetHCIConnHandle,

            .BTM_VendorSpecificCommand = BTM_VendorSpecificCommand,

            .ACL_RegisterClient = ACL_RegisterClient,

            .ACL_UnregisterClient = ACL_UnregisterClient,

            .btm_init = btm_init,

            .btm_free = btm_free,

            .btm_ble_init = btm_ble_init,

            .btm_ble_free = btm_ble_free,

            .BTM_reset_complete = BTM_reset_complete,

            .BTM_PmRegister = ::BTM_PmRegister,

            .BTM_GetHCIConnHandle = ::BTM_GetHCIConnHandle,

            .BTM_VendorSpecificCommand = ::BTM_VendorSpecificCommand,

            .ACL_RegisterClient = ::ACL_RegisterClient,

            .ACL_UnregisterClient = ::ACL_UnregisterClient,

            .btm_init = ::btm_init,

            .btm_free = ::btm_free,

            .btm_ble_init = ::btm_ble_init,

            .btm_ble_free = ::btm_ble_free,

            .BTM_reset_complete = ::BTM_reset_complete,

        },



    // Acl peer and lifecycle

    .peer =

        {

            .BTM_IsAclConnectionUp = BTM_IsAclConnectionUp,

            .BTM_IsAclConnectionUp = ::BTM_IsAclConnectionUp,

            .BTM_ReadConnectedTransportAddress =

                BTM_ReadConnectedTransportAddress,

            .BTM_CancelRemoteDeviceName = BTM_CancelRemoteDeviceName,

            .BTM_ReadRemoteDeviceName = BTM_ReadRemoteDeviceName,

            .BTM_ReadRemoteFeatures = BTM_ReadRemoteFeatures,

            .BTM_ReadDevInfo = BTM_ReadDevInfo,

            .BTM_GetMaxPacketSize = BTM_GetMaxPacketSize,

            .BTM_ReadRemoteVersion = BTM_ReadRemoteVersion,

                ::BTM_ReadConnectedTransportAddress,

            .BTM_CancelRemoteDeviceName = ::BTM_CancelRemoteDeviceName,

            .BTM_ReadRemoteDeviceName = ::BTM_ReadRemoteDeviceName,

            .BTM_ReadRemoteFeatures = ::BTM_ReadRemoteFeatures,

            .BTM_ReadDevInfo = ::BTM_ReadDevInfo,

            .BTM_GetMaxPacketSize = ::BTM_GetMaxPacketSize,

            .BTM_ReadRemoteVersion = ::BTM_ReadRemoteVersion,

            .BTM_GetPeerDeviceTypeFromFeatures =

                ::BTM_GetPeerDeviceTypeFromFeatures,

            .BTM_RequestPeerSCA = ::BTM_RequestPeerSCA,

            .BTM_GetPeerSCA = ::BTM_GetPeerSCA,

            .BTM_IsPhy2mSupported = ::BTM_IsPhy2mSupported,

        },



    .link_policy =

        {

            .BTM_GetRole = BTM_GetRole,

            .BTM_SetPowerMode = BTM_SetPowerMode,

            .BTM_SetSsrParams = BTM_SetSsrParams,

            .BTM_SwitchRoleToCentral = BTM_SwitchRoleToCentral,

            .BTM_block_role_switch_for = BTM_block_role_switch_for,

            .BTM_block_sniff_mode_for = BTM_block_sniff_mode_for,

            .BTM_default_unblock_role_switch = BTM_default_unblock_role_switch,

            .BTM_unblock_role_switch_for = BTM_unblock_role_switch_for,

            .BTM_unblock_sniff_mode_for = BTM_unblock_sniff_mode_for,

            .BTM_WritePageTimeout = BTM_WritePageTimeout,

            .BTM_GetRole = ::BTM_GetRole,

            .BTM_SetPowerMode = ::BTM_SetPowerMode,

            .BTM_SetSsrParams = ::BTM_SetSsrParams,

            .BTM_SwitchRoleToCentral = ::BTM_SwitchRoleToCentral,

            .BTM_block_role_switch_for = ::BTM_block_role_switch_for,

            .BTM_block_sniff_mode_for = ::BTM_block_sniff_mode_for,

            .BTM_default_unblock_role_switch =

                ::BTM_default_unblock_role_switch,

            .BTM_unblock_role_switch_for = ::BTM_unblock_role_switch_for,

            .BTM_unblock_sniff_mode_for = ::BTM_unblock_sniff_mode_for,

            .BTM_WritePageTimeout = ::BTM_WritePageTimeout,

        },



    .link_controller =

        {

            .BTM_GetLinkSuperTout = BTM_GetLinkSuperTout,

            .BTM_ReadRSSI = BTM_ReadRSSI,

            .BTM_GetLinkSuperTout = ::BTM_GetLinkSuperTout,

            .BTM_ReadRSSI = ::BTM_ReadRSSI,

        },



    .security = get_security_client_interface(),



    .ble =

        {

            .BTM_BleGetEnergyInfo = BTM_BleGetEnergyInfo,

            .BTM_BleObserve = BTM_BleObserve,

            .BTM_SetBleDataLength = BTM_SetBleDataLength,

            .BTM_BleReadControllerFeatures = BTM_BleReadControllerFeatures,

            .BTM_BleSetPhy = BTM_BleSetPhy,

            .BTM_BleSetPrefConnParams = BTM_BleSetPrefConnParams,

            .BTM_UseLeLink = BTM_UseLeLink,

            .BTM_BleGetEnergyInfo = ::BTM_BleGetEnergyInfo,

            .BTM_BleObserve = ::BTM_BleObserve,

            .BTM_SetBleDataLength = ::BTM_SetBleDataLength,

            .BTM_BleReadControllerFeatures = ::BTM_BleReadControllerFeatures,

            .BTM_BleSetPhy = ::BTM_BleSetPhy,

            .BTM_BleSetPrefConnParams = ::BTM_BleSetPrefConnParams,

            .BTM_UseLeLink = ::BTM_UseLeLink,

            .BTM_IsRemoteVersionReceived = ::BTM_IsRemoteVersionReceived,

            .BTM_SetConsolidationCallback = ::BTM_SetConsolidationCallback,

        },



    .sco =

        {

            .BTM_CreateSco = BTM_CreateSco,

            .BTM_RegForEScoEvts = BTM_RegForEScoEvts,

            .BTM_RemoveSco = BTM_RemoveSco,

            .BTM_WriteVoiceSettings = BTM_WriteVoiceSettings,

            .BTM_EScoConnRsp = BTM_EScoConnRsp,

            .BTM_GetNumScoLinks = BTM_GetNumScoLinks,

            .BTM_SetEScoMode = BTM_SetEScoMode,

            .BTM_CreateSco = ::BTM_CreateSco,

            .BTM_RegForEScoEvts = ::BTM_RegForEScoEvts,

            .BTM_RemoveSco = ::BTM_RemoveSco,

            .BTM_WriteVoiceSettings = ::BTM_WriteVoiceSettings,

            .BTM_EScoConnRsp = ::BTM_EScoConnRsp,

            .BTM_GetNumScoLinks = ::BTM_GetNumScoLinks,

            .BTM_SetEScoMode = ::BTM_SetEScoMode,

            .BTM_GetScoDebugDump = ::BTM_GetScoDebugDump,

            .BTM_IsScoActiveByBdaddr = ::BTM_IsScoActiveByBdaddr,

        },



    .local =

        {

            .BTM_ReadLocalDeviceName = BTM_ReadLocalDeviceName,

            .BTM_ReadLocalDeviceName = ::BTM_ReadLocalDeviceName,

            .BTM_ReadLocalDeviceNameFromController =

                BTM_ReadLocalDeviceNameFromController,

            .BTM_SetLocalDeviceName = BTM_SetLocalDeviceName,

            .BTM_SetDeviceClass = BTM_SetDeviceClass,

            .BTM_IsDeviceUp = BTM_IsDeviceUp,

            .BTM_ReadDeviceClass = BTM_ReadDeviceClass,

                ::BTM_ReadLocalDeviceNameFromController,

            .BTM_SetLocalDeviceName = ::BTM_SetLocalDeviceName,

            .BTM_SetDeviceClass = ::BTM_SetDeviceClass,

            .BTM_IsDeviceUp = ::BTM_IsDeviceUp,

            .BTM_ReadDeviceClass = ::BTM_ReadDeviceClass,

        },



    .eir =

        {

            .BTM_WriteEIR = BTM_WriteEIR,

            .BTM_GetEirSupportedServices = BTM_GetEirSupportedServices,

            .BTM_GetEirUuidList = BTM_GetEirUuidList,

            .BTM_AddEirService = BTM_AddEirService,

            .BTM_RemoveEirService = BTM_RemoveEirService,

            .BTM_WriteEIR = ::BTM_WriteEIR,

            .BTM_GetEirSupportedServices = ::BTM_GetEirSupportedServices,

            .BTM_GetEirUuidList = ::BTM_GetEirUuidList,

            .BTM_AddEirService = ::BTM_AddEirService,

            .BTM_RemoveEirService = ::BTM_RemoveEirService,

        },

    .db =

        {

            .BTM_InqDbRead = BTM_InqDbRead,

            .BTM_InqDbFirst = BTM_InqDbFirst,

            .BTM_InqDbNext = BTM_InqDbNext,

            .BTM_ClearInqDb = BTM_ClearInqDb,

            .BTM_InqDbRead = ::BTM_InqDbRead,

            .BTM_InqDbFirst = ::BTM_InqDbFirst,

            .BTM_InqDbNext = ::BTM_InqDbNext,

            .BTM_ClearInqDb = ::BTM_ClearInqDb,

        },

};

system/stack/include/btm_client_interface.h

+14 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "stack/btm/power_mode.h"

#include "stack/include/acl_client_callbacks.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/btm_status.h"
@@ -67,6 +68,14 @@ struct btm_client_interface_t { 
                                                uint8_t* lmp_version,

                                                uint16_t* manufacturer,

                                                uint16_t* lmp_sub_version);

    [[nodiscard]] tBT_DEVICE_TYPE (*BTM_GetPeerDeviceTypeFromFeatures)(

        const RawAddress& bd_addr);

    void (*BTM_RequestPeerSCA)(const RawAddress& remote_bda,

                               tBT_TRANSPORT transport);

    [[nodiscard]] uint8_t (*BTM_GetPeerSCA)(const RawAddress& remote_bda,

                                            tBT_TRANSPORT transport);

    [[nodiscard]] bool (*BTM_IsPhy2mSupported)(const RawAddress& remote_bda,

                                               tBT_TRANSPORT transport);

  } peer;



  struct {
@@ -115,6 +124,9 @@ struct btm_client_interface_t { 
                                     uint16_t peripheral_latency,

                                     uint16_t supervision_tout);

    [[nodiscard]] bool (*BTM_UseLeLink)(const RawAddress& bd_addr);

    [[nodiscard]] bool (*BTM_IsRemoteVersionReceived)(

        const RawAddress& remote_bda);

    void (*BTM_SetConsolidationCallback)(BTM_CONSOLIDATION_CB* cb);

  } ble;



  struct {
@@ -131,6 +143,8 @@ struct btm_client_interface_t { 
                            enh_esco_params_t* p_parms);

    [[nodiscard]] uint8_t (*BTM_GetNumScoLinks)();

    [[nodiscard]] tBTM_STATUS (*BTM_SetEScoMode)(enh_esco_params_t* p_parms);

    [[nodiscard]] tBTM_SCO_DEBUG_DUMP (*BTM_GetScoDebugDump)(void);

    [[nodiscard]] bool (*BTM_IsScoActiveByBdaddr)(const RawAddress& remote_bda);

  } sco;



  struct {