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

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

Introduce btm client interface 

Eventually replace compile-time deps with interfaces

Towards modular code

Bug: 163134718
Tag: #refactor
Test: gd/cert/run --host

Change-Id: If50e41e9f4c2c7bff4eabebe34df9e485972928c
parent 89ca763b

system/stack/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ cc_library_static { 
        "btm/btm_ble_gap.cc",

        "btm/btm_ble_multi_adv.cc",

        "btm/btm_ble_privacy.cc",

        "btm/btm_client_interface.cc",

        "btm/btm_dev.cc",

        "btm/btm_devctl.cc",

        "btm/btm_inq.cc",

system/stack/acl/btm_acl.cc

+8 −0
Original line number Diff line number Diff line
@@ -3009,3 +3009,11 @@ void acl_process_extended_features(uint16_t handle, uint8_t current_page_number, 
    NotifyAclFeaturesReadComplete(*p_acl, max_page_number);

  }

}



void ACL_RegisterClient(struct acl_client_callback_s* callbacks) {

  LOG_DEBUG("UNIMPLEMENTED");

}



void ACL_UnregisterClient(struct acl_client_callback_s* callbacks) {

  LOG_DEBUG("UNIMPLEMENTED");

}

system/stack/btm/btm_client_interface.cc

0 → 100644
+149 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "stack/include/btm_client_interface.h"

#include <cstdint>

#include "main/shim/btm_api.h"

#include "stack/include/acl_api.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/hci_error_code.h"

#include "stack/include/hcidefs.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"



struct btm_client_interface_s btm_client_interface = {

    .lifecycle =

        {

            .BTM_GetHCIConnHandle = BTM_GetHCIConnHandle,

            .BTM_PmRegister = BTM_PmRegister,

            .BTM_VendorSpecificCommand = BTM_VendorSpecificCommand,

            .ACL_RegisterClient = ACL_RegisterClient,

            .ACL_UnregisterClient = ACL_UnregisterClient,

        },



    .scn =

        {

            .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,

        },



    // Acl peer and lifecycle

    .peer =

        {

            .BTM_CancelRemoteDeviceName = BTM_CancelRemoteDeviceName,

            .BTM_IsAclConnectionUp = BTM_IsAclConnectionUp,

            .BTM_ReadConnectedTransportAddress =

                BTM_ReadConnectedTransportAddress,

            .BTM_ReadDevInfo = BTM_ReadDevInfo,

            .BTM_ReadRemoteDeviceName = BTM_ReadRemoteDeviceName,

            .BTM_ReadRemoteFeatures = BTM_ReadRemoteFeatures,

            .BTM_SetEncryption = BTM_SetEncryption,

        },



    .link_policy =

        {

            .BTM_GetRole = BTM_GetRole,

            .BTM_SetPowerMode = BTM_SetPowerMode,

            .BTM_SetSsrParams = BTM_SetSsrParams,

            .BTM_SwitchRoleToCentral = BTM_SwitchRoleToCentral,

            .BTM_WritePageTimeout = BTM_WritePageTimeout,

            .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,

        },



    .link_controller =

        {

            .BTM_GetLinkSuperTout = BTM_GetLinkSuperTout,

            .BTM_ReadRSSI = BTM_ReadRSSI,

            .BTM_SetDefaultLinkSuperTout = BTM_SetDefaultLinkSuperTout,

        },



    .security =

        {

            .BTM_ConfirmReqReply = BTM_ConfirmReqReply,

            .BTM_PINCodeReply = BTM_PINCodeReply,

            .BTM_RemoteOobDataReply = BTM_RemoteOobDataReply,

            .BTM_SecAddBleDevice = BTM_SecAddBleDevice,

            .BTM_SecAddBleKey = BTM_SecAddBleKey,

            .BTM_SecAddDevice = BTM_SecAddDevice,

            .BTM_SecAddRmtNameNotifyCallback = BTM_SecAddRmtNameNotifyCallback,

            .BTM_SecBond = BTM_SecBond,

            .BTM_SecBondCancel = BTM_SecBondCancel,

            .BTM_SecClearSecurityFlags = BTM_SecClearSecurityFlags,

            .BTM_SecClrServiceByPsm = BTM_SecClrServiceByPsm,

            .BTM_SecDeleteDevice = BTM_SecDeleteDevice,

            .BTM_SecDeleteRmtNameNotifyCallback =

                BTM_SecDeleteRmtNameNotifyCallback,

            .BTM_SecReadDevName = BTM_SecReadDevName,

            .BTM_SecRegister = BTM_SecRegister,

        },



    .ble =

        {

            .BTM_BleConfirmReply = BTM_BleConfirmReply,

            .BTM_BleGetEnergyInfo = BTM_BleGetEnergyInfo,

            .BTM_BleLoadLocalKeys = BTM_BleLoadLocalKeys,

            .BTM_BleObserve = BTM_BleObserve,

            .BTM_BlePasskeyReply = BTM_BlePasskeyReply,

            .BTM_BleReadControllerFeatures = BTM_BleReadControllerFeatures,

            .BTM_BleSetPhy = BTM_BleSetPhy,

            .BTM_BleSetPrefConnParams = BTM_BleSetPrefConnParams,

            .BTM_SetBleDataLength = BTM_SetBleDataLength,

        },



    .sco =

        {

            .BTM_CreateSco = BTM_CreateSco,

            .BTM_EScoConnRsp = BTM_EScoConnRsp,

            .BTM_GetNumScoLinks = BTM_GetNumScoLinks,

            .BTM_RegForEScoEvts = BTM_RegForEScoEvts,

            .BTM_RemoveSco = BTM_RemoveSco,

            .BTM_SetEScoMode = BTM_SetEScoMode,

            .BTM_WriteVoiceSettings = BTM_WriteVoiceSettings,

        },



    .local =

        {

            .BTM_ReadLocalDeviceNameFromController =

                BTM_ReadLocalDeviceNameFromController,

            .BTM_SetDeviceClass = BTM_SetDeviceClass,

            .BTM_SetLocalDeviceName = BTM_SetLocalDeviceName,

        },



    .eir =

        {

            .BTM_GetEirSupportedServices = BTM_GetEirSupportedServices,

            .BTM_GetEirUuidList = BTM_GetEirUuidList,

            .BTM_RemoveEirService = BTM_RemoveEirService,

            .BTM_WriteEIR = BTM_WriteEIR,

        },

};



struct btm_client_interface_s& get_btm_client_interface() {

  return btm_client_interface;

}

system/stack/include/acl_api.h

+3 −0
Original line number Diff line number Diff line
@@ -354,3 +354,6 @@ extern tBTM_STATUS btm_remove_acl(const RawAddress& bd_addr, 


void btm_acl_device_down(void);

void btm_acl_update_inquiry_status(uint8_t status);



void ACL_RegisterClient(struct acl_client_callback_s* callbacks);

void ACL_UnregisterClient(struct acl_client_callback_s* callbacks);

system/stack/include/acl_client_callbacks.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2020 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#pragma once



#include <cstdint>

#include "stack/include/hci_error_code.h"

#include "stack/include/hcidefs.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"



struct acl_client_callback_s {

  virtual void on_acl_link_down(const RawAddress bd_addr,

                                tBT_TRANSPORT transport) = 0;

  virtual void on_acl_link_up(const RawAddress bd_addr,

                              tBT_TRANSPORT transport) = 0;

  virtual void on_acl_remote_features_complete(const RawAddress bd_addr) = 0;

  virtual void on_acl_role_change(const RawAddress bd_addr, hci_role_t new_role,

                                  tHCI_STATUS hci_status) = 0;



  virtual ~acl_client_callback_s() = default;

};