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

Commit 9ceb083c authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Use proper types tHCI_STATUS am: 9fb389fd am: 50608eeb am: f098f3de 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1534840

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic35dc370b7200b191f6ede3093fb73540857d197
parents 8b95f121 f098f3de

system/bta/dm/bta_dm_int.h

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ struct sBTA_DM_PEER_DEVICE { 
  friend void bta_dm_acl_up(const RawAddress& bd_addr, tBT_TRANSPORT transport);

  friend void bta_dm_pm_btm_status(const RawAddress& bd_addr,

                                   tBTM_PM_STATUS status, uint16_t value,

                                   uint8_t hci_status);

                                   tHCI_STATUS hci_status);

  friend void bta_dm_pm_sniff(struct sBTA_DM_PEER_DEVICE* p_peer_dev,

                              uint8_t index);

  friend void bta_dm_rm_cback(tBTA_SYS_CONN_STATUS status, uint8_t id,
@@ -467,7 +467,7 @@ extern void bta_dm_remove_device(const RawAddress& bd_addr); 
extern void bta_dm_close_acl(const RawAddress&, bool, tBT_TRANSPORT);



extern void bta_dm_pm_btm_status(const RawAddress&, tBTM_PM_STATUS, uint16_t,

                                 uint8_t);

                                 tHCI_STATUS);

extern void bta_dm_pm_timer(const RawAddress&, tBTA_DM_PM_ACTION);

extern void bta_dm_add_ampkey(tBTA_DM_MSG* p_data);

system/bta/dm/bta_dm_pm.cc

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static void bta_dm_pm_set_mode(const RawAddress& peer_addr, 
static void bta_dm_pm_timer_cback(void* data);

static void bta_dm_pm_btm_cback(const RawAddress& bd_addr,

                                tBTM_PM_STATUS status, uint16_t value,

                                uint8_t hci_status);

                                tHCI_STATUS hci_status);

static bool bta_dm_pm_park(const RawAddress& peer_addr);

void bta_dm_pm_sniff(tBTA_DM_PEER_DEVICE* p_peer_dev, uint8_t index);

static bool bta_dm_pm_is_sco_active();
@@ -895,7 +895,7 @@ void bta_dm_pm_active(const RawAddress& peer_addr) { 
/** BTM power manager callback */

static void bta_dm_pm_btm_cback(const RawAddress& bd_addr,

                                tBTM_PM_STATUS status, uint16_t value,

                                uint8_t hci_status) {

                                tHCI_STATUS hci_status) {

  do_in_main_thread(FROM_HERE, base::Bind(bta_dm_pm_btm_status, bd_addr, status,

                                          value, hci_status));

}

system/stack/acl/acl.h

+5 −3
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ typedef struct { 
  uint16_t max_lat;

  uint16_t min_loc_to;

  uint16_t min_rmt_to;

  void Init() { state = BTM_PM_ST_ACTIVE; }

} tBTM_PM_MCB;



typedef struct {
@@ -310,9 +311,10 @@ typedef struct { 
  friend void btm_acl_process_sca_cmpl_pkt(uint8_t evt_len, uint8_t* p);

  friend void btm_acl_role_changed(tHCI_STATUS hci_status,

                                   const RawAddress& bd_addr, uint8_t new_role);

  friend void btm_pm_proc_cmd_status(uint8_t status);

  friend void btm_pm_proc_mode_change(uint8_t hci_status, uint16_t hci_handle,

                                      tHCI_MODE mode, uint16_t interval);

  friend void btm_pm_proc_cmd_status(tHCI_STATUS status);

  friend void btm_pm_proc_mode_change(tHCI_STATUS hci_status,

                                      uint16_t hci_handle, tHCI_MODE mode,

                                      uint16_t interval);

  friend void btm_pm_proc_ssr_evt(uint8_t* p, uint16_t evt_len);

  friend void btm_pm_reset(void);

  friend void btm_pm_sm_alloc(uint8_t ind);

system/stack/acl/btm_pm.cc

+2 −2
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ void btm_pm_reset(void) { 
  if (cb != NULL && btm_cb.acl_cb_.pm_pend_link < MAX_L2CAP_LINKS) {

    const RawAddress raw_address =

        btm_cb.acl_cb_.acl_db[btm_cb.acl_cb_.pm_pend_link].remote_addr;

    (*cb)(raw_address, BTM_PM_STS_ERROR, BTM_DEV_RESET, 0);

    (*cb)(raw_address, BTM_PM_STS_ERROR, BTM_DEV_RESET, HCI_SUCCESS);

  }

  /* no command pending */

  btm_cb.acl_cb_.pm_pend_link = MAX_L2CAP_LINKS;
@@ -681,7 +681,7 @@ void btm_pm_proc_cmd_status(uint8_t status) { 
 * Returns          none.

 *

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

void btm_pm_proc_mode_change(uint8_t hci_status, uint16_t hci_handle,

void btm_pm_proc_mode_change(tHCI_STATUS hci_status, uint16_t hci_handle,

                             tHCI_MODE hci_mode, uint16_t interval) {

  tBTM_PM_STATUS mode = static_cast<tBTM_PM_STATUS>(hci_mode);

  int xx, yy, zz;

system/stack/btu/btu_hcif.cc

+1 −1
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ static void btu_hcif_hdl_command_status(uint16_t opcode, uint8_t status, 
    case HCI_HOLD_MODE:

    case HCI_SNIFF_MODE:

    case HCI_PARK_MODE:

      btm_pm_proc_cmd_status(status);

      btm_pm_proc_cmd_status(static_cast<tHCI_STATUS>(status));

      break;



    default: