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

Commit 45a2acc1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Remove unused BTM_SEC and BTU_HH defines"

parents c4ec18e6 d29c6425

system/btif/src/btif_hh.cc

+1 −6
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ static int btif_hh_keylockstates = 0; // The current key state of each key 
#define BTUI_HH_SECURITY (BTA_SEC_AUTHENTICATE | BTA_SEC_ENCRYPT)

#endif



#ifndef BTUI_HH_MOUSE_SECURITY

#define BTUI_HH_MOUSE_SECURITY (BTA_SEC_NONE)

#endif



/* HH request events */

typedef enum {

  BTIF_HH_CONNECT_REQ_EVT = 0,
@@ -613,10 +609,9 @@ bt_status_t btif_hh_connect(const RawAddress* bd_addr) { 
   request from host, for subsequent user initiated connection. If the remote is

   not in

   pagescan mode, we will do 2 retries to connect before giving up */

  tBTA_SEC sec_mask = BTUI_HH_SECURITY;

  btif_hh_cb.status = BTIF_HH_DEV_CONNECTING;

  btif_hh_cb.pending_conn_address = *bd_addr;

  BTA_HhOpen(*bd_addr, BTA_HH_PROTO_RPT_MODE, sec_mask);

  BTA_HhOpen(*bd_addr, BTA_HH_PROTO_RPT_MODE, BTUI_HH_SECURITY);



  // TODO(jpawlowski); make cback accept const and remove tmp!

  auto tmp = *bd_addr;

system/stack/include/btm_api_types.h

+0 −59
Original line number Diff line number Diff line
@@ -1045,9 +1045,6 @@ typedef void(tBTM_ESCO_CBACK)(tBTM_ESCO_EVT event, tBTM_ESCO_EVT_DATA* p_data); 
#define BTM_SEC_MODE_SP_DEBUG 5

#define BTM_SEC_MODE_SC 6



/* Maximum Number of BTM Security Modes */

#define BTM_SEC_MODES_MAX 7



/* Security Service Levels [bit mask] (BTM_SetSecurityLevel)

 * Encryption should not be used without authentication

*/
@@ -1234,62 +1231,6 @@ typedef uint8_t tBTM_LINK_KEY_TYPE; 
      ((uint32_t*)(p_dst))[trst] = 0;                         \

  }



/* Following bits can be provided by host in the trusted_mask array */

/* 0..31 bits of mask[0] (Least Significant Word) */

#define BTM_SEC_TRUST_SDP_SERVER (1 << BTM_SEC_SERVICE_SDP_SERVER)

#define BTM_SEC_TRUST_SERIAL_PORT (1 << BTM_SEC_SERVICE_SERIAL_PORT)

#define BTM_SEC_TRUST_LAN_ACCESS (1 << BTM_SEC_SERVICE_LAN_ACCESS)

#define BTM_SEC_TRUST_DUN (1 << BTM_SEC_SERVICE_DUN)

#define BTM_SEC_TRUST_IRMC_SYNC (1 << BTM_SEC_SERVICE_IRMC_SYNC)

#define BTM_SEC_TRUST_IRMC_SYNC_CMD (1 << BTM_SEC_SERVICE_IRMC_SYNC_CMD)

#define BTM_SEC_TRUST_OBEX (1 << BTM_SEC_SERVICE_OBEX)

#define BTM_SEC_TRUST_OBEX_FTP (1 << BTM_SEC_SERVICE_OBEX_FTP)

#define BTM_SEC_TRUST_HEADSET (1 << BTM_SEC_SERVICE_HEADSET)

#define BTM_SEC_TRUST_CORDLESS (1 << BTM_SEC_SERVICE_CORDLESS)

#define BTM_SEC_TRUST_INTERCOM (1 << BTM_SEC_SERVICE_INTERCOM)

#define BTM_SEC_TRUST_FAX (1 << BTM_SEC_SERVICE_FAX)

#define BTM_SEC_TRUST_HEADSET_AG (1 << BTM_SEC_SERVICE_HEADSET_AG)

#define BTM_SEC_TRUST_PNP_INFO (1 << BTM_SEC_SERVICE_PNP_INFO)

#define BTM_SEC_TRUST_GEN_NET (1 << BTM_SEC_SERVICE_GEN_NET)

#define BTM_SEC_TRUST_GEN_FILE (1 << BTM_SEC_SERVICE_GEN_FILE)

#define BTM_SEC_TRUST_GEN_AUDIO (1 << BTM_SEC_SERVICE_GEN_AUDIO)

#define BTM_SEC_TRUST_GEN_TEL (1 << BTM_SEC_SERVICE_GEN_TEL)

#define BTM_SEC_TRUST_CTP_DATA (1 << BTM_SEC_SERVICE_CTP_DATA)

#define BTM_SEC_TRUST_HCRP_CTRL (1 << BTM_SEC_SERVICE_HCRP_CTRL)

#define BTM_SEC_TRUST_HCRP_DATA (1 << BTM_SEC_SERVICE_HCRP_DATA)

#define BTM_SEC_TRUST_HCRP_NOTIF (1 << BTM_SEC_SERVICE_HCRP_NOTIF)

#define BTM_SEC_TRUST_BPP_JOB (1 << BTM_SEC_SERVICE_JOB)

#define BTM_SEC_TRUST_BPP_STATUS (1 << BTM_SEC_SERVICE_STATUS)

#define BTM_SEC_TRUST_BPP_REF (1 << BTM_SEC_SERVICE_REF)

#define BTM_SEC_TRUST_BNEP_PANU (1 << BTM_SEC_SERVICE_BNEP_PANU)

#define BTM_SEC_TRUST_BNEP_GN (1 << BTM_SEC_SERVICE_BNEP_GN)

#define BTM_SEC_TRUST_BNEP_NAP (1 << BTM_SEC_SERVICE_BNEP_NAP)

#define BTM_SEC_TRUST_HFP_HF (1 << BTM_SEC_SERVICE_HF_HANDSFREE)

#define BTM_SEC_TRUST_HFP_AG (1 << BTM_SEC_SERVICE_AG_HANDSFREE)

#define BTM_SEC_TRUST_TE_PHONE_ACCESS (1 << BTM_SEC_SERVICE_TE_PHONE_ACCESS)

#define BTM_SEC_TRUST_ME_PHONE_ACCESS (1 << BTM_SEC_SERVICE_ME_PHONE_ACCESS)



/* 0..31 bits of mask[1] (Most Significant Word) */

#define BTM_SEC_TRUST_HIDH_CTRL (1 << (BTM_SEC_SERVICE_HIDH_SEC_CTRL - 32))

#define BTM_SEC_TRUST_HIDH_NOSEC_CTRL \

  (1 << (BTM_SEC_SERVICE_HIDH_NOSEC_CTRL - 32))

#define BTM_SEC_TRUST_HIDH_INTR (1 << (BTM_SEC_SERVICE_HIDH_INTR - 32))

#define BTM_SEC_TRUST_BIP (1 << (BTM_SEC_SERVICE_BIP - 32))

#define BTM_SEC_TRUST_BIP_REF (1 << (BTM_SEC_SERVICE_BIP_REF - 32))

#define BTM_SEC_TRUST_AVDTP (1 << (BTM_SEC_SERVICE_AVDTP - 32))

#define BTM_SEC_TRUST_AVDTP_NOSEC (1 << (BTM_SEC_SERVICE_AVDTP_NOSEC - 32))

#define BTM_SEC_TRUST_AVCTP (1 << (BTM_SEC_SERVICE_AVCTP - 32))

#define BTM_SEC_TRUST_SAP (1 << (BTM_SEC_SERVICE_SAP - 32))

#define BTM_SEC_TRUST_PBAP (1 << (BTM_SEC_SERVICE_PBAP - 32))

#define BTM_SEC_TRUST_RFC_MUX (1 << (BTM_SEC_SERVICE_RFC_MUX - 32))

#define BTM_SEC_TRUST_AVCTP_BROWSE (1 << (BTM_SEC_SERVICE_AVCTP_BROWSE - 32))

#define BTM_SEC_TRUST_MAP (1 << (BTM_SEC_SERVICE_MAP - 32))

#define BTM_SEC_TRUST_MAP_NOTIF (1 << (BTM_SEC_SERVICE_MAP_NOTIF - 32))

#define BTM_SEC_TRUST_MCAP_CTRL (1 << (BTM_SEC_SERVICE_MCAP_CTRL - 32))

#define BTM_SEC_TRUST_MCAP_DATA (1 << (BTM_SEC_SERVICE_MCAP_DATA - 32))

#define BTM_SEC_TRUST_HDP_SNK (1 << (BTM_SEC_SERVICE_HDP_SNK - 32))

#define BTM_SEC_TRUST_HDP_SRC (1 << (BTM_SEC_SERVICE_HDP_SRC - 32))



#define BTM_SEC_TRUST_ALL 0xFFFFFFFF /* for each array element */



/****************************************

system/stack/include/profiles_api.h

+0 −45
Original line number Diff line number Diff line
@@ -19,57 +19,12 @@ 
#ifndef PROFILES_API_H

#define PROFILES_API_H



#include "bt_target.h"

#include "btm_api.h"



/*****************************************************************************

 *  Constants

 ****************************************************************************/

#define BT_PASS 0 /* Used for general successful function returns */



/*** Port entity passes back 8 bit errors; will use upper byte offset ***/

#define PORT_ERR_GRP 0x0000  /* base offset for port entity */

#define GAP_ERR_GRP 0x0100   /* base offset for GAP profile */

#define SPP_ERR_GRP 0x0200   /* base offset for serial port profile */

#define HCRP_ERR_GRP 0x0300  /* base offset for HCRP */

#define HCRPM_ERR_GRP 0x0400 /* base offset for HCRPM */



/* #define HSP2_ERR_GRP 0x0F00 */



/* security level definitions (tBT_SECURITY) */

#define BT_USE_DEF_SECURITY 0

#define BT_SEC_MODE_NONE BTM_SEC_MODE_NONE

#define BT_SEC_MODE_SERVICE BTM_SEC_MODE_SERVICE

#define BT_SEC_MODE_LINK BTM_SEC_MODE_LINK



/* security mask definitions (tBT_SECURITY) */

/* The following definitions are OR'd together to form the security

 * requirements */

/* Inbound call requires authorization */

#define BT_SEC_IN_AUTHORIZE BTM_SEC_IN_AUTHORIZE

/* Inbound call requires authentication */

#define BT_SEC_IN_AUTHENTICATE BTM_SEC_IN_AUTHENTICATE

/* Inbound call requires encryption */

#define BT_SEC_IN_ENCRYPT BTM_SEC_IN_ENCRYPT

/* Outbound call requires authorization */

#define BT_SEC_OUT_AUTHORIZE BTM_SEC_OUT_AUTHORIZE

/* Outbound call requires authentication */

#define BT_SEC_OUT_AUTHENTICATE BTM_SEC_OUT_AUTHENTICATE

/* Outbound call requires encryption */

#define BT_SEC_OUT_ENCRYPT BTM_SEC_OUT_ENCRYPT



/*****************************************************************************

 *  Type Definitions

 ****************************************************************************/



/*

 * Security Definitions

 *      This following definitions are used to indicate the security

 *      requirements for a service.

*/

typedef struct {

  uint8_t level;

  uint8_t mask;

} tBT_SECURITY;



#endif /* PROFILES_API_H */