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

Commit 51a0aef7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Use conventional naming struct btm_client_interface_t" am: 7d56486f 

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

Change-Id: Ia40b59d65ad14c14940047bf8964bd15b66a1334
parents 518d3e28 7d56486f

system/bta/test/bta_dm_test.cc

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 


std::map<std::string, int> mock_function_count_map;



extern struct btm_client_interface_s btm_client_interface;

extern struct btm_client_interface_t btm_client_interface;



void LogMsg(uint32_t trace_set_mask, const char* fmt_str, ...) {}

system/stack/btm/btm_client_interface.cc

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include "types/bt_transport.h"

#include "types/raw_address.h"



struct btm_client_interface_s btm_client_interface = {

struct btm_client_interface_t btm_client_interface = {

    .lifecycle =

        {

            .BTM_GetHCIConnHandle = BTM_GetHCIConnHandle,
@@ -181,6 +181,6 @@ struct btm_client_interface_s btm_client_interface = { 
        },

};



struct btm_client_interface_s& get_btm_client_interface() {

struct btm_client_interface_t& get_btm_client_interface() {

  return btm_client_interface;

}

system/stack/include/btm_client_interface.h

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#include "types/bt_transport.h"

#include "types/raw_address.h"



struct btm_client_interface_s {

struct btm_client_interface_t {

  struct {

    tBTM_STATUS (*BTM_PmRegister)(uint8_t mask, uint8_t* p_pm_id,

                                  tBTM_PM_STATUS_CBACK* p_cback);
@@ -231,4 +231,4 @@ struct btm_client_interface_s { 
  } db;

};



struct btm_client_interface_s& get_btm_client_interface();
 
struct btm_client_interface_t& get_btm_client_interface();

system/stack/test/common/mock_btm_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -53,13 +53,13 @@ uint16_t BTM_GetMaxPacketSize(const RawAddress& addr) { 
  return RFCOMM_DEFAULT_MTU;

}



struct btm_client_interface_s btm_client_interface = {

struct btm_client_interface_t btm_client_interface = {

    .peer =

        {

            .BTM_GetMaxPacketSize = BTM_GetMaxPacketSize,

        },

};



struct btm_client_interface_s& get_btm_client_interface() {

struct btm_client_interface_t& get_btm_client_interface() {

  return btm_client_interface;

}

system/test/mock/mock_stack_btm.cc

+2 −2
Original line number Diff line number Diff line
@@ -30,13 +30,13 @@ void BTM_BleBackgroundObserve(bool enable, tBTM_INQ_RESULTS_CB* p_results_cb) {} 
void BTM_BleReadControllerFeatures(tBTM_BLE_CTRL_FEATURES_CBACK* p_vsc_cback) {}

uint8_t BTM_GetAcceptlistSize() { return 0; }



struct btm_client_interface_s btm_client_interface = {

struct btm_client_interface_t btm_client_interface = {

    .eir =

        {

            .BTM_GetEirSupportedServices = BTM_GetEirSupportedServices,

        },

};



struct btm_client_interface_s& get_btm_client_interface() {

struct btm_client_interface_t& get_btm_client_interface() {

  return btm_client_interface;

}