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

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

Merge "Remove btsnd_hcic_ble_add_acceptlist"

parents f6ff986e b0ed7ba9

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_add_acceptlist(

    uint8_t addr_type, const RawAddress& bda,

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

  uint8_t param[HCIC_PARAM_SIZE_ADD_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_ADD_ACCEPTLIST, param,

                            HCIC_PARAM_SIZE_ADD_ACCEPTLIST, std::move(cb));

}



void btsnd_hcic_ble_remove_from_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

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

system/stack/include/hcimsgs.h

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


extern void btsnd_hcic_ble_read_acceptlist_size(void);



extern void btsnd_hcic_ble_add_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

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



extern void btsnd_hcic_ble_remove_from_acceptlist(

    tBLE_ADDR_TYPE addr_type, const RawAddress& bda,

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

system/test/mock/mock_stack_hcic_hciblecmds.cc

+0 −8
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct btsnd_hci_ble_remove_device_from_periodic_advertiser_list 
    btsnd_hci_ble_remove_device_from_periodic_advertiser_list;

struct btsnd_hcic_accept_cis_req btsnd_hcic_accept_cis_req;

struct btsnd_hcic_big_term_sync btsnd_hcic_big_term_sync;

struct btsnd_hcic_ble_add_acceptlist btsnd_hcic_ble_add_acceptlist;

struct btsnd_hcic_ble_create_conn_cancel btsnd_hcic_ble_create_conn_cancel;

struct btsnd_hcic_ble_create_ll_conn btsnd_hcic_ble_create_ll_conn;

struct btsnd_hcic_ble_enh_rx_test btsnd_hcic_ble_enh_rx_test;
@@ -169,13 +168,6 @@ void btsnd_hcic_big_term_sync(uint8_t big_handle, 
  test::mock::stack_hcic_hciblecmds::btsnd_hcic_big_term_sync(big_handle,

                                                              std::move(cb));

}

void btsnd_hcic_ble_add_acceptlist(

    uint8_t 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_add_acceptlist(

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

}

void btsnd_hcic_ble_create_conn_cancel(void) {

  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_ble_create_conn_cancel();

system/test/mock/mock_stack_hcic_hciblecmds.h

+0 −15
Original line number Diff line number Diff line
@@ -142,21 +142,6 @@ struct btsnd_hcic_big_term_sync { 
};

extern struct btsnd_hcic_big_term_sync btsnd_hcic_big_term_sync;



// Name: btsnd_hcic_ble_add_acceptlist

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

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

struct btsnd_hcic_ble_add_acceptlist {

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

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

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

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

  void operator()(uint8_t 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_add_acceptlist btsnd_hcic_ble_add_acceptlist;



// Name: btsnd_hcic_ble_add_device_resolving_list

// Params: uint8_t addr_type_peer, const RawAddress& bda_peer, const Octet16&

// irk_peer, const Octet16& irk_local Return: void