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

Commit f746a3eb authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign2] define tSMP_OOB_DATA_TYPE as enum" into main am: 384d9ff9 am: db28010c 

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



Change-Id: Iccde2739ca65ce7825f4ec0397729f61daad1635
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0d9f040e db28010c

system/stack/include/smp_api_types.h

+6 −2
Original line number Original line Diff line number Diff line
@@ -92,8 +92,12 @@ enum { SMP_OOB_NONE, SMP_OOB_PRESENT, SMP_OOB_UNKNOWN }; 
typedef uint8_t tSMP_OOB_FLAG;

typedef uint8_t tSMP_OOB_FLAG;





/* type of OOB data required from application */

/* type of OOB data required from application */

enum { SMP_OOB_INVALID_TYPE, SMP_OOB_PEER, SMP_OOB_LOCAL, SMP_OOB_BOTH };

typedef enum : uint8_t {

typedef uint8_t tSMP_OOB_DATA_TYPE;

  SMP_OOB_INVALID_TYPE,

  SMP_OOB_PEER,

  SMP_OOB_LOCAL,

  SMP_OOB_BOTH,

} tSMP_OOB_DATA_TYPE;





enum : uint8_t {

enum : uint8_t {

  SMP_AUTH_NO_BOND = 0x00,

  SMP_AUTH_NO_BOND = 0x00,