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

Commit 7ee705f8 authored by Hui Peng's avatar Hui Peng
Browse files

[Invisalign2] Move tSMP_OPCODE to smp_int.h 

Bug: 301661850
Test: mma packages/modules/Bluetooth
Change-Id: I47460ebec98276e44d9bfeef412646604cac2a41
parent 783dbfb6

system/stack/include/smp_api_types.h

+0 −45
Original line number Diff line number Diff line
@@ -23,57 +23,12 @@ 


#include <cstdint>



#include "macros.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btm_status.h"

#include "stack/include/smp_status.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"



/* SMP command code */

typedef enum : uint8_t {

  SMP_OPCODE_PAIRING_REQ = 0x01,

  SMP_OPCODE_PAIRING_RSP = 0x02,

  SMP_OPCODE_CONFIRM = 0x03,

  SMP_OPCODE_RAND = 0x04,

  SMP_OPCODE_PAIRING_FAILED = 0x05,

  SMP_OPCODE_ENCRYPT_INFO = 0x06,

  SMP_OPCODE_CENTRAL_ID = 0x07,

  SMP_OPCODE_IDENTITY_INFO = 0x08,

  SMP_OPCODE_ID_ADDR = 0x09,

  SMP_OPCODE_SIGN_INFO = 0x0A,

  SMP_OPCODE_SEC_REQ = 0x0B,

  SMP_OPCODE_PAIR_PUBLIC_KEY = 0x0C,

  SMP_OPCODE_PAIR_DHKEY_CHECK = 0x0D,

  SMP_OPCODE_PAIR_KEYPR_NOTIF = 0x0E,

  SMP_OPCODE_MAX = SMP_OPCODE_PAIR_KEYPR_NOTIF,

  SMP_OPCODE_MIN = SMP_OPCODE_PAIRING_REQ,

  // NOTE: For some reason this is outside the MAX/MIN values

  SMP_OPCODE_PAIR_COMMITM = 0x0F,

} tSMP_OPCODE;



inline std::string smp_opcode_text(const tSMP_OPCODE& opcode) {

  switch (opcode) {

    CASE_RETURN_TEXT(SMP_OPCODE_PAIRING_REQ);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIRING_RSP);

    CASE_RETURN_TEXT(SMP_OPCODE_CONFIRM);

    CASE_RETURN_TEXT(SMP_OPCODE_RAND);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIRING_FAILED);

    CASE_RETURN_TEXT(SMP_OPCODE_ENCRYPT_INFO);

    CASE_RETURN_TEXT(SMP_OPCODE_CENTRAL_ID);

    CASE_RETURN_TEXT(SMP_OPCODE_IDENTITY_INFO);

    CASE_RETURN_TEXT(SMP_OPCODE_ID_ADDR);

    CASE_RETURN_TEXT(SMP_OPCODE_SIGN_INFO);

    CASE_RETURN_TEXT(SMP_OPCODE_SEC_REQ);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_PUBLIC_KEY);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_DHKEY_CHECK);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_KEYPR_NOTIF);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_COMMITM);

    default:

      return base::StringPrintf("UNKNOWN[%hhu]", opcode);

  }

}



/* SMP event type */

typedef enum : uint8_t {

  SMP_EVT_NONE = 0,           /* Default no event */

system/stack/smp/smp_int.h

+45 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#ifndef SMP_INT_H

#define SMP_INT_H



#include "macros.h"

#include "osi/include/alarm.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_octets.h"
@@ -65,6 +66,50 @@ typedef enum : uint8_t { 


#define SMP_OPCODE_INIT 0x04



/* SMP command code */

typedef enum : uint8_t {

  SMP_OPCODE_PAIRING_REQ = 0x01,

  SMP_OPCODE_PAIRING_RSP = 0x02,

  SMP_OPCODE_CONFIRM = 0x03,

  SMP_OPCODE_RAND = 0x04,

  SMP_OPCODE_PAIRING_FAILED = 0x05,

  SMP_OPCODE_ENCRYPT_INFO = 0x06,

  SMP_OPCODE_CENTRAL_ID = 0x07,

  SMP_OPCODE_IDENTITY_INFO = 0x08,

  SMP_OPCODE_ID_ADDR = 0x09,

  SMP_OPCODE_SIGN_INFO = 0x0A,

  SMP_OPCODE_SEC_REQ = 0x0B,

  SMP_OPCODE_PAIR_PUBLIC_KEY = 0x0C,

  SMP_OPCODE_PAIR_DHKEY_CHECK = 0x0D,

  SMP_OPCODE_PAIR_KEYPR_NOTIF = 0x0E,

  SMP_OPCODE_MAX = SMP_OPCODE_PAIR_KEYPR_NOTIF,

  SMP_OPCODE_MIN = SMP_OPCODE_PAIRING_REQ,

  // NOTE: For some reason this is outside the MAX/MIN values

  SMP_OPCODE_PAIR_COMMITM = 0x0F,

} tSMP_OPCODE;



inline std::string smp_opcode_text(const tSMP_OPCODE opcode) {

  switch (opcode) {

    CASE_RETURN_TEXT(SMP_OPCODE_PAIRING_REQ);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIRING_RSP);

    CASE_RETURN_TEXT(SMP_OPCODE_CONFIRM);

    CASE_RETURN_TEXT(SMP_OPCODE_RAND);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIRING_FAILED);

    CASE_RETURN_TEXT(SMP_OPCODE_ENCRYPT_INFO);

    CASE_RETURN_TEXT(SMP_OPCODE_CENTRAL_ID);

    CASE_RETURN_TEXT(SMP_OPCODE_IDENTITY_INFO);

    CASE_RETURN_TEXT(SMP_OPCODE_ID_ADDR);

    CASE_RETURN_TEXT(SMP_OPCODE_SIGN_INFO);

    CASE_RETURN_TEXT(SMP_OPCODE_SEC_REQ);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_PUBLIC_KEY);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_DHKEY_CHECK);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_KEYPR_NOTIF);

    CASE_RETURN_TEXT(SMP_OPCODE_PAIR_COMMITM);

    default:

      return base::StringPrintf("UNKNOWN[%hhu]", opcode);

  }

}



/* SMP events */

typedef enum : uint8_t {

  SMP_NOP_EVT = 0,

system/stack/smp/smp_utils.cc

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/l2c_api.h"

#include "stack/include/smp_api_types.h"

#include "stack/include/smp_status.h"

#include "stack/include/stack_metrics_logging.h"

#include "types/raw_address.h"