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

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

Move stack/acl/acl::tBTM_PM_STATE earlier in header am: b9c1f523 am: eb246d50 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8864166dee2694ed05adcf9d25df6a450b0a4111
parents e6e1410c eb246d50

system/stack/acl/acl.h

+37 −37
Original line number Diff line number Diff line
@@ -69,6 +69,43 @@ inline std::string link_policy_text(tLINK_POLICY policy) { 
  return s;

}



// Power mode states.

// Used as both value and bitmask

enum : uint8_t {

  BTM_PM_ST_ACTIVE = HCI_MODE_ACTIVE,      // 0x00

  BTM_PM_ST_HOLD = HCI_MODE_HOLD,          // 0x01

  BTM_PM_ST_SNIFF = HCI_MODE_SNIFF,        // 0x02

  BTM_PM_ST_PARK = HCI_MODE_PARK,          // 0x03

  BTM_PM_ST_UNUSED,                        // 0x04

  BTM_PM_ST_PENDING = BTM_PM_STS_PENDING,  // 0x05

  BTM_PM_ST_INVALID = 0x7F,

  BTM_PM_STORED_MASK = 0x80, /* set this mask if the command is stored */

};

typedef uint8_t tBTM_PM_STATE;



inline std::string power_mode_state_text(tBTM_PM_STATE state) {

  std::string s =

      std::string((state & BTM_PM_STORED_MASK) ? "stored:" : "immediate:");

  switch (state & ~BTM_PM_STORED_MASK) {

    case BTM_PM_ST_ACTIVE:

      return s + std::string("active");

    case BTM_PM_ST_HOLD:

      return s + std::string("hold");

    case BTM_PM_ST_SNIFF:

      return s + std::string("sniff");

    case BTM_PM_ST_PARK:

      return s + std::string("park");

    case BTM_PM_ST_UNUSED:

      return s + std::string("WARN:UNUSED");

    case BTM_PM_ST_PENDING:

      return s + std::string("pending");

    case BTM_PM_ST_INVALID:

      return s + std::string("invalid");

    default:

      return s + std::string("UNKNOWN");

  }

}



/* Structure returned with Role Switch information (in tBTM_CMPL_CB callback

 * function) in response to BTM_SwitchRoleToCentral call.

 */
@@ -208,43 +245,6 @@ typedef struct { 
  uint8_t sca; /* Sleep clock accuracy */

} tACL_CONN;



// Power mode states.

// Used as both value and bitmask

enum : uint8_t {

  BTM_PM_ST_ACTIVE = HCI_MODE_ACTIVE,      // 0x00

  BTM_PM_ST_HOLD = HCI_MODE_HOLD,          // 0x01

  BTM_PM_ST_SNIFF = HCI_MODE_SNIFF,        // 0x02

  BTM_PM_ST_PARK = HCI_MODE_PARK,          // 0x03

  BTM_PM_ST_UNUSED,                        // 0x04

  BTM_PM_ST_PENDING = BTM_PM_STS_PENDING,  // 0x05

  BTM_PM_ST_INVALID = 0x7F,

  BTM_PM_STORED_MASK = 0x80, /* set this mask if the command is stored */

};

typedef uint8_t tBTM_PM_STATE;



inline std::string power_mode_state_text(tBTM_PM_STATE state) {

  std::string s =

      std::string((state & BTM_PM_STORED_MASK) ? "stored:" : "immediate:");

  switch (state & ~BTM_PM_STORED_MASK) {

    case BTM_PM_ST_ACTIVE:

      return s + std::string("active");

    case BTM_PM_ST_HOLD:

      return s + std::string("hold");

    case BTM_PM_ST_SNIFF:

      return s + std::string("sniff");

    case BTM_PM_ST_PARK:

      return s + std::string("park");

    case BTM_PM_ST_UNUSED:

      return s + std::string("WARN:UNUSED");

    case BTM_PM_ST_PENDING:

      return s + std::string("pending");

    case BTM_PM_ST_INVALID:

      return s + std::string("invalid");

    default:

      return s + std::string("UNKNOWN");

  }

}



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

 **      ACL Management API

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