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

Commit b0bf1256 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge "Remove btsnd_hcic_ble_remove_from_acceptlist"

parents c35fdc5e 158816c0

system/stack/hcic/hciblecmds.cc

+0 −13
Original line number Diff line number Diff line
@@ -324,19 +324,6 @@ void btsnd_hcic_ble_create_conn_cancel(void) { 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_ble_remove_from_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  uint8_t param[HCIC_PARAM_SIZE_REMOVE_ACCEPTLIST];

  uint8_t* pp = param;



  UINT8_TO_STREAM(pp, addr_type);

  BDADDR_TO_STREAM(pp, bda);



  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_REMOVE_ACCEPTLIST, param,

                            HCIC_PARAM_SIZE_REMOVE_ACCEPTLIST, std::move(cb));

}



void btsnd_hcic_ble_upd_ll_conn_params(uint16_t handle, uint16_t conn_int_min,

                                       uint16_t conn_int_max,

                                       uint16_t conn_latency,

system/stack/include/hcimsgs.h

+0 −4
Original line number Diff line number Diff line
@@ -349,10 +349,6 @@ extern void btsnd_hcic_ble_create_conn_cancel(void); 


extern void btsnd_hcic_ble_read_acceptlist_size(void);



extern void btsnd_hcic_ble_remove_from_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb);



extern void btsnd_hcic_ble_upd_ll_conn_params(

    uint16_t handle, uint16_t conn_int_min, uint16_t conn_int_max,

    uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_len,

system/test/mock/mock_stack_hcic_hciblecmds.cc

+0 −9
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ struct btsnd_hcic_ble_read_resolvable_addr_local 
    btsnd_hcic_ble_read_resolvable_addr_local;

struct btsnd_hcic_ble_read_resolvable_addr_peer

    btsnd_hcic_ble_read_resolvable_addr_peer;

struct btsnd_hcic_ble_remove_from_acceptlist

    btsnd_hcic_ble_remove_from_acceptlist;

struct btsnd_hcic_ble_set_addr_resolution_enable

    btsnd_hcic_ble_set_addr_resolution_enable;

struct btsnd_hcic_ble_set_adv_data btsnd_hcic_ble_set_adv_data;
@@ -302,13 +300,6 @@ void btsnd_hcic_ble_read_resolvable_addr_peer(uint8_t addr_type_peer, 
  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_read_resolvable_addr_peer(

      addr_type_peer, bda_peer);

}

void btsnd_hcic_ble_remove_from_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

    base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_remove_from_acceptlist(

      addr_type, bda, std::move(cb));

}

void btsnd_hcic_ble_set_addr_resolution_enable(uint8_t addr_resolution_enable) {

  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_set_addr_resolution_enable(

system/test/mock/mock_stack_hcic_hciblecmds.h

+0 −17
Original line number Diff line number Diff line
@@ -464,23 +464,6 @@ struct btsnd_hcic_ble_read_resolvable_addr_peer { 
};

extern struct btsnd_hcic_ble_read_resolvable_addr_peer

    btsnd_hcic_ble_read_resolvable_addr_peer;



// Name: btsnd_hcic_ble_remove_from_acceptlist

// Params: tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

// base::OnceCallback<void(uint8_t*, uint16_t Return: void

struct btsnd_hcic_ble_remove_from_acceptlist {

  std::function<void(tBLE_ADDR_TYPE, const RawAddress&,

                     base::OnceCallback<void(uint8_t*, uint16_t)>)>

      body{[](tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

              base::OnceCallback<void(uint8_t*, uint16_t)> cb) {}};

  void operator()(tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

                  base::OnceCallback<void(uint8_t*, uint16_t)> cb) {

    body(addr_type, bda, std::move(cb));

  };

};

extern struct btsnd_hcic_ble_remove_from_acceptlist

    btsnd_hcic_ble_remove_from_acceptlist;



// Name: btsnd_hcic_ble_rm_device_resolving_list

// Params: uint8_t addr_type_peer, const RawAddress& bda_peer

// Return: void