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

Commit 2595c154 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "Remove l2cble_conn_comp_from_address_with_type" into main

parents 4f464bf2 ad94a99f

system/stack/include/l2cap_hci_link_interface.h

+1 −4
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <cstdint>



#include "stack/include/hci_error_code.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"



// This header contains functions for HCI-LinkManagement to invoke
@@ -33,10 +34,6 @@ bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda, 
                      tBLE_ADDR_TYPE type, uint16_t conn_interval,

                      uint16_t conn_latency, uint16_t conn_timeout);



bool l2cble_conn_comp_from_address_with_type(

    uint16_t handle, uint8_t role, const tBLE_BD_ADDR& address_with_type,

    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout);



void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status,

                                    uint16_t interval, uint16_t latency,

                                    uint16_t timeout);

system/stack/l2cap/l2c_ble.cc

+0 −8
Original line number Diff line number Diff line
@@ -295,14 +295,6 @@ bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda, 
  return true;

}



bool l2cble_conn_comp_from_address_with_type(

    uint16_t handle, uint8_t role, const tBLE_BD_ADDR& address_with_type,

    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout) {

  return l2cble_conn_comp(handle, role, address_with_type.bda,

                          address_with_type.type, conn_interval, conn_latency,

                          conn_timeout);

}



/*******************************************************************************

 *

 *  Function        l2cble_start_conn_update

system/test/mock/mock_stack_l2cap_ble.cc

+0 −10
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ struct L2CA_ConsolidateParams L2CA_ConsolidateParams; 
struct L2CA_GetBleConnRole L2CA_GetBleConnRole;

struct l2cble_notify_le_connection l2cble_notify_le_connection;

struct l2cble_conn_comp l2cble_conn_comp;

struct l2cble_conn_comp_from_address_with_type

    l2cble_conn_comp_from_address_with_type;

struct l2cble_process_conn_update_evt l2cble_process_conn_update_evt;

struct l2cble_process_sig_cmd l2cble_process_sig_cmd;

struct l2cble_create_conn l2cble_create_conn;
@@ -101,14 +99,6 @@ bool l2cble_conn_comp(uint16_t handle, uint8_t role, const RawAddress& bda, 
  return test::mock::stack_l2cap_ble::l2cble_conn_comp(

      handle, role, bda, type, conn_interval, conn_latency, conn_timeout);

}

bool l2cble_conn_comp_from_address_with_type(

    uint16_t handle, uint8_t role, const tBLE_BD_ADDR& address_with_type,

    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout) {

  inc_func_call_count(__func__);

  return test::mock::stack_l2cap_ble::l2cble_conn_comp_from_address_with_type(

      handle, role, address_with_type, conn_interval, conn_latency,

      conn_timeout);

}

void l2cble_process_conn_update_evt(uint16_t handle, uint8_t status,

                                    uint16_t interval, uint16_t latency,

                                    uint16_t timeout) {

system/test/mock/mock_stack_l2cap_ble.h

+0 −21
Original line number Diff line number Diff line
@@ -117,27 +117,6 @@ struct l2cble_conn_comp { 
  };

};

extern struct l2cble_conn_comp l2cble_conn_comp;

// Name: l2cble_conn_comp_from_address_with_type

// Params:  uint16_t handle, uint8_t role, const tBLE_BD_ADDR&

// address_with_type, uint16_t conn_interval, uint16_t conn_latency, uint16_t

// conn_timeout Returns: bool

struct l2cble_conn_comp_from_address_with_type {

  std::function<bool(

      uint16_t handle, uint8_t role, const tBLE_BD_ADDR& address_with_type,

      uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout)>

      body{[](uint16_t /* handle */, uint8_t /* role */,

              const tBLE_BD_ADDR& /* address_with_type */,

              uint16_t /* conn_interval */, uint16_t /* conn_latency */,

              uint16_t /* conn_timeout */) { return false; }};

  bool operator()(uint16_t handle, uint8_t role,

                  const tBLE_BD_ADDR& address_with_type, uint16_t conn_interval,

                  uint16_t conn_latency, uint16_t conn_timeout) {

    return body(handle, role, address_with_type, conn_interval, conn_latency,

                conn_timeout);

  };

};

extern struct l2cble_conn_comp_from_address_with_type

    l2cble_conn_comp_from_address_with_type;

// Name: l2cble_process_conn_update_evt

// Params: uint16_t handle, uint8_t status, uint16_t interval, uint16_t latency,

// uint16_t timeout Returns: void