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

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

Re-log stack/include::gatt_disconnection_reason_text am: 99033076 

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

Change-Id: Ifb6c4c286b221d2f84489c83266be6e62010cc35
parents 49ee0545 99033076

system/bta/include/bta_gatt_api.h

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ typedef struct { 
  uint8_t* p_value;

} tBTA_GATT_UNFMT;



#define BTA_GATT_CONN_NONE 0x0101 /* 0x0101 no connection to cancel  */

typedef uint16_t tBTA_GATT_REASON;



#define BTA_GATTC_MULTI_MAX GATT_MAX_READ_MULTI_HANDLES

system/stack/include/gatt_api.h

+16 −13
Original line number Diff line number Diff line
@@ -207,27 +207,30 @@ typedef enum : uint16_t { 
  GATT_CONN_TERMINATE_LOCAL_HOST = HCI_ERR_CONN_CAUSE_LOCAL_HOST,

  /* 0x22 connection fail for LMP response tout */

  GATT_CONN_LMP_TIMEOUT = HCI_ERR_LMP_RESPONSE_TIMEOUT,



  BTA_GATT_CONN_NONE = 0x0101, /* 0x0101 no connection to cancel  */



} tGATT_DISCONN_REASON;



#define CASE_RETURN_TEXT(code) \

  case code:                   \

    return #code



inline std::string gatt_disconnection_reason_text(

    const tGATT_DISCONN_REASON& reason) {

  switch (reason) {

    case GATT_CONN_OK:

      return std::string("ok/unknown");

    case GATT_CONN_L2C_FAILURE:

      return std::string("l2cap_failure");

    case GATT_CONN_TIMEOUT:

      return std::string("timeout");

    case GATT_CONN_TERMINATE_PEER_USER:

      return std::string("remote_terminated");

    case GATT_CONN_TERMINATE_LOCAL_HOST:

      return std::string("local_terminated");

    case GATT_CONN_LMP_TIMEOUT:

      return std::string("lmp_response_timeout");

    CASE_RETURN_TEXT(GATT_CONN_OK);

    CASE_RETURN_TEXT(GATT_CONN_L2C_FAILURE);

    CASE_RETURN_TEXT(GATT_CONN_TIMEOUT);

    CASE_RETURN_TEXT(GATT_CONN_TERMINATE_PEER_USER);

    CASE_RETURN_TEXT(GATT_CONN_TERMINATE_LOCAL_HOST);

    CASE_RETURN_TEXT(GATT_CONN_LMP_TIMEOUT);

    CASE_RETURN_TEXT(BTA_GATT_CONN_NONE);

    default:

      return base::StringPrintf("UNKNOWN:[0x%04hx]", reason);

      return std::string("UNKNOWN[%hu]", reason);

  }

}

#undef CASE_RETURN_TEXT



/* MAX GATT MTU size

*/