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

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

Move tACL_CB::tBTM_PM_MCB definition before tACL_CONN am: 7a1facc5 am: ef97c673 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8593abf58ce634c6765d6698ef9e4c4ae9885e9e
parents 80291bd6 ef97c673

system/stack/acl/acl.h

+11 −11
Original line number Diff line number Diff line
@@ -78,6 +78,17 @@ typedef struct { 
  uint8_t role;              /* HCI_ROLE_CENTRAL or HCI_ROLE_PERIPHERAL */

} tBTM_ROLE_SWITCH_CMPL;



typedef struct {

  bool chg_ind;

  tBTM_PM_PWR_MD req_mode[BTM_MAX_PM_RECORDS + 1];

  tBTM_PM_PWR_MD set_mode;

  tBTM_PM_STATE state;

  uint16_t interval;

  uint16_t max_lat;

  uint16_t min_loc_to;

  uint16_t min_rmt_to;

} tBTM_PM_MCB;



typedef struct {

  BD_FEATURES peer_le_features;

  bool peer_le_features_valid;
@@ -234,17 +245,6 @@ inline std::string power_mode_state_text(tBTM_PM_STATE state) { 
  }

}



typedef struct {

  bool chg_ind;

  tBTM_PM_PWR_MD req_mode[BTM_MAX_PM_RECORDS + 1];

  tBTM_PM_PWR_MD set_mode;

  tBTM_PM_STATE state;

  uint16_t interval;

  uint16_t max_lat;

  uint16_t min_loc_to;

  uint16_t min_rmt_to;

} tBTM_PM_MCB;



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

 **      ACL Management API

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