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

Commit 2438329b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I6097d567,I58ba01cf into main am: 0a72614a am: 7309ac03 

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



Change-Id: Ic6b995f99e584d88c270b0095e43dd7bec75a385
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95dcd43c 7309ac03

system/stack/include/l2cdefs.h

+17 −20
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ 


/* Define the LE L2CAP Connection Response Result codes

 */

typedef enum : uint8_t {

enum tL2CAP_LE_RESULT_CODE : uint16_t {

  L2CAP_LE_RESULT_CONN_OK = 0,

  L2CAP_LE_RESULT_NO_PSM = 2,

  L2CAP_LE_RESULT_NO_RESOURCES = 4,
@@ -127,10 +127,10 @@ typedef enum : uint8_t { 
  L2CAP_LE_RESULT_SOURCE_CID_ALREADY_ALLOCATED = 0x0A,

  L2CAP_LE_RESULT_UNACCEPTABLE_PARAMETERS = 0x0B,

  L2CAP_LE_RESULT_INVALID_PARAMETERS = 0x0C

} tL2CAP_LE_RESULT_CODE;

};



/* Define the L2CAP connection result codes */

typedef enum : uint16_t {

enum tL2CAP_CONN : uint16_t {

  L2CAP_CONN_OK = 0,

  L2CAP_CONN_PENDING = 1,

  L2CAP_CONN_NO_PSM = 2,
@@ -142,8 +142,7 @@ typedef enum : uint16_t { 
  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_CANCEL = L2CAP_CONN_INTERNAL_MASK + 4, /* 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,
@@ -151,17 +150,13 @@ typedef enum : uint16_t { 
          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_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,

} tL2CAP_CONN;

  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,

};



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

  switch (result) {
@@ -314,13 +309,13 @@ inline std::string l2cap_cid_fixed_text(const tL2CAP_CID_FIXED& cid) { 


/* Define the L2CAP configuration result codes

*/

typedef enum : uint16_t {

enum tL2CAP_CFG_RESULT : uint16_t {

  L2CAP_CFG_OK = 0,

  L2CAP_CFG_UNACCEPTABLE_PARAMS = 1,

  L2CAP_CFG_FAILED_NO_REASON = 2,

  L2CAP_CFG_UNKNOWN_OPTIONS = 3,

  L2CAP_CFG_PENDING = 4,

} tL2CAP_CFG_RESULT;

};



/* Define the L2CAP configuration option types

*/
@@ -501,6 +496,8 @@ template <> 
struct formatter<tL2CAP_CONN> : enum_formatter<tL2CAP_CONN> {};

template <>

struct formatter<tL2CAP_CID_FIXED> : enum_formatter<tL2CAP_CID_FIXED> {};

template <>

struct formatter<tL2CAP_LE_RESULT_CODE> : enum_formatter<tL2CAP_LE_RESULT_CODE> {};

}  // namespace fmt



#endif