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

Commit 0a2a1f58 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "stack::l2cap Cleanly define tL2CAP_CONN" into main am: 73579aa9 am: ec37a528 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3218532



Change-Id: I6273e02bd5a39e4fcb1527c8d03d54de9405096b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f20bff6 ec37a528

system/stack/include/l2cdefs.h

+18 −22
Original line number Diff line number Diff line
@@ -154,31 +154,27 @@ inline std::string l2cap_le_result_code_text(const tL2CAP_LE_RESULT_CODE& code) 


/* Define the L2CAP connection result codes */

enum tL2CAP_CONN : uint16_t {

  L2CAP_CONN_OK = 0,

  L2CAP_CONN_PENDING = 1,

  L2CAP_CONN_NO_PSM = 2,

  L2CAP_CONN_SECURITY_BLOCK = 3,

  L2CAP_CONN_NO_RESOURCES = 4,

  L2CAP_CONN_OK = 0x0000,

  L2CAP_CONN_PENDING = 0x0001,

  L2CAP_CONN_NO_PSM = 0x0002,

  L2CAP_CONN_SECURITY_BLOCK = 0x0003,

  L2CAP_CONN_NO_RESOURCES = 0x0004,

  L2CAP_CONN_TIMEOUT = 0xEEEE,

  /* Generic L2CAP conn failure reasons */

  L2CAP_CONN_OTHER_ERROR = L2CAP_CONN_INTERNAL_MASK,

  L2CAP_CONN_ACL_CONNECTION_FAILED = L2CAP_CONN_INTERNAL_MASK + 1,

  L2CAP_CONN_CLIENT_SECURITY_CLEARANCE_FAILED = L2CAP_CONN_INTERNAL_MASK + 2,

  L2CAP_CONN_NO_LINK = L2CAP_CONN_INTERNAL_MASK + 3,

  L2CAP_CONN_CANCEL = L2CAP_CONN_INTERNAL_MASK + 4, /* L2CAP connection cancelled */

  L2CAP_CONN_OTHER_ERROR = 0xF000,

  L2CAP_CONN_ACL_CONNECTION_FAILED = 0xF001,

  L2CAP_CONN_CLIENT_SECURITY_CLEARANCE_FAILED = 0xF002,

  L2CAP_CONN_NO_LINK = 0xF003,

  L2CAP_CONN_CANCEL = 0xF004, /* L2CAP connection cancelled */

  /* For LE result codes converted to L2CAP conn failure code */

  L2CAP_CONN_INSUFFICIENT_AUTHENTICATION =

          L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_INSUFFICIENT_AUTHENTICATION,

  L2CAP_CONN_INSUFFICIENT_AUTHORIZATION =

          L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_INSUFFICIENT_AUTHORIZATION,

  L2CAP_CONN_INSUFFICIENT_ENCRYP_KEY_SIZE =

          L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP_KEY_SIZE,

  L2CAP_CONN_INSUFFICIENT_ENCRYP = L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_INSUFFICIENT_ENCRYP,

  L2CAP_CONN_INVALID_SOURCE_CID = L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_INVALID_SOURCE_CID,

  L2CAP_CONN_SOURCE_CID_ALREADY_ALLOCATED =

          L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_SOURCE_CID_ALREADY_ALLOCATED,

  L2CAP_CONN_UNACCEPTABLE_PARAMETERS = L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_UNACCEPTABLE_PARAMETERS,

  L2CAP_CONN_INVALID_PARAMETERS = L2CAP_CONN_LE_MASK + L2CAP_LE_RESULT_INVALID_PARAMETERS,

  L2CAP_CONN_INSUFFICIENT_AUTHENTICATION = 0xFF05,

  L2CAP_CONN_INSUFFICIENT_AUTHORIZATION = 0xFF06,

  L2CAP_CONN_INSUFFICIENT_ENCRYP_KEY_SIZE = 0xFF07,

  L2CAP_CONN_INSUFFICIENT_ENCRYP = 0xFF08,

  L2CAP_CONN_INVALID_SOURCE_CID = 0xFF09,

  L2CAP_CONN_SOURCE_CID_ALREADY_ALLOCATED = 0xFF0A,

  L2CAP_CONN_UNACCEPTABLE_PARAMETERS = 0xFF0B,

  L2CAP_CONN_INVALID_PARAMETERS = 0xFF0C,

};



inline std::string l2cap_result_code_text(const tL2CAP_CONN& result) {