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

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

Merge "Remove unused btsnd_hcic_big_create_sync"

parents 055f7284 fd33288e

system/stack/hcic/hciblecmds.cc

+0 −33
Original line number Diff line number Diff line
@@ -971,39 +971,6 @@ void btsnd_hcic_term_big(uint8_t big_handle, uint8_t reason) { 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_big_create_sync(uint8_t big_handle, uint16_t sync_handle,

                                uint8_t enc, std::array<uint8_t, 16> bcst_code,

                                uint8_t mse, uint16_t big_sync_timeout,

                                std::vector<uint8_t> bis) {

  BT_HDR* p = (BT_HDR*)osi_malloc(HCI_CMD_BUF_SIZE);

  uint8_t* pp = (uint8_t*)(p + 1);

  uint8_t num_bis = bis.size();



  const int param_len = 24 + num_bis;

  p->len = HCIC_PREAMBLE_SIZE + param_len;

  p->offset = 0;



  UINT16_TO_STREAM(pp, HCI_LE_BIG_CREATE_SYNC);

  UINT8_TO_STREAM(pp, param_len);



  UINT8_TO_STREAM(pp, big_handle);

  UINT16_TO_STREAM(pp, sync_handle);

  UINT8_TO_STREAM(pp, enc);



  uint8_t* buf_ptr = bcst_code.data();

  ARRAY_TO_STREAM(pp, buf_ptr, 16);



  UINT8_TO_STREAM(pp, mse);

  UINT16_TO_STREAM(pp, big_sync_timeout);

  UINT8_TO_STREAM(pp, num_bis);



  for (int i = 0; i < num_bis; i++) {

    UINT8_TO_STREAM(pp, bis[i]);

  }



  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



void btsnd_hcic_big_term_sync(uint8_t big_handle,

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

  const int params_len = 1;

system/stack/include/hcimsgs.h

+0 −6
Original line number Diff line number Diff line
@@ -573,12 +573,6 @@ extern void btsnd_hcic_create_big(uint8_t big_handle, uint8_t adv_handle, 


extern void btsnd_hcic_term_big(uint8_t big_handle, uint8_t reason);



extern void btsnd_hcic_big_create_sync(uint8_t big_handle, uint16_t sync_handle,

                                       uint8_t enc,

                                       std::array<uint8_t, 16> bcst_code,

                                       uint8_t mse, uint16_t big_sync_timeout,

                                       std::vector<uint8_t> bis);



extern void btsnd_hcic_big_term_sync(

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

system/test/mock/mock_stack_hcic_hciblecmds.cc

+0 −9
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct btsnd_hci_ble_read_periodic_advertiser_list_size 
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_create_sync btsnd_hcic_big_create_sync;

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_clear_acceptlist btsnd_hcic_ble_clear_acceptlist;
@@ -168,14 +167,6 @@ void btsnd_hcic_accept_cis_req(uint16_t conn_handle) { 
  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_accept_cis_req(conn_handle);

}

void btsnd_hcic_big_create_sync(uint8_t big_handle, uint16_t sync_handle,

                                uint8_t enc, std::array<uint8_t, 16> bcst_code,

                                uint8_t mse, uint16_t big_sync_timeout,

                                std::vector<uint8_t> bis) {

  mock_function_count_map[__func__]++;

  test::mock::stack_hcic_hciblecmds::btsnd_hcic_big_create_sync(

      big_handle, sync_handle, enc, bcst_code, mse, big_sync_timeout, bis);

}

void btsnd_hcic_big_term_sync(uint8_t big_handle,

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

  mock_function_count_map[__func__]++;

system/test/mock/mock_stack_hcic_hciblecmds.h

+0 −18
Original line number Diff line number Diff line
@@ -128,24 +128,6 @@ struct btsnd_hcic_accept_cis_req { 
};

extern struct btsnd_hcic_accept_cis_req btsnd_hcic_accept_cis_req;



// Name: btsnd_hcic_big_create_sync

// Params: uint8_t big_handle, uint16_t sync_handle, uint8_t enc,

// std::array<uint8_t, 16> bcst_code, uint8_t mse, uint16_t big_sync_timeout,

// std::vector<uint8_t> bis Return: void

struct btsnd_hcic_big_create_sync {

  std::function<void(uint8_t, uint16_t, uint8_t, std::array<uint8_t, 16>,

                     uint8_t, uint16_t, std::vector<uint8_t>)>

      body{[](uint8_t big_handle, uint16_t sync_handle, uint8_t enc,

              std::array<uint8_t, 16> bcst_code, uint8_t mse,

              uint16_t big_sync_timeout, std::vector<uint8_t> bis) {}};

  void operator()(uint8_t big_handle, uint16_t sync_handle, uint8_t enc,

                  std::array<uint8_t, 16> bcst_code, uint8_t mse,

                  uint16_t big_sync_timeout, std::vector<uint8_t> bis) {

    body(big_handle, sync_handle, enc, bcst_code, mse, big_sync_timeout, bis);

  };

};

extern struct btsnd_hcic_big_create_sync btsnd_hcic_big_create_sync;



// Name: btsnd_hcic_big_term_sync

// Params: uint8_t big_handle, base::OnceCallback<void(uint8_t*, uint16_t

// Return: void