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

Commit ed5827b4 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes Icc78259a,Icfd4a3d2,Icb3dd850,I581cff84 into main 

* changes:
  bt_target.h: Remove unused LOCAL_BLE_CONTROLLER_ID
  bt_target.h: Remove always TRUE BTM_EIR_DEFAULT_FEC_REQUIRED
  bt_target.h: Remove unused BTM_SEC_SERVICE_NAME_LEN
  bt_target.h: Remove always FALSE BTM_SEC_FORCE_RNR_FOR_DBOND
parents 0ba00909 9460c007

system/bta/dm/bta_dm_act.cc

+0 −4
Original line number Diff line number Diff line
@@ -1076,11 +1076,7 @@ static void bta_dm_set_eir(char* local_name) { 
  uint8_t custom_uuid_idx;

#endif  // BTA_EIR_SERVER_NUM_CUSTOM_UUID

#endif  // BTA_EIR_CANNED_UUID_LIST

#if (BTM_EIR_DEFAULT_FEC_REQUIRED == FALSE)

  uint8_t free_eir_length = HCI_EXT_INQ_RESPONSE_LEN;

#else  // BTM_EIR_DEFAULT_FEC_REQUIRED

  uint8_t free_eir_length = HCI_DM5_PACKET_SIZE;

#endif  // BTM_EIR_DEFAULT_FEC_REQUIRED

  uint8_t num_uuid;

  uint8_t data_type;

  uint8_t local_name_len;

system/bta/dm/bta_dm_cfg.cc

+1 −9
Original line number Diff line number Diff line
@@ -614,7 +614,6 @@ const tBTM_PM_PWR_MD* p_bta_dm_pm_md = &bta_dm_pm_md[0]; 


/* The performance impact of EIR packet size

 *

 * When BTM_EIR_DEFAULT_FEC_REQUIRED is true,

 * 1 to 17 bytes,    DM1 is used and most robust.

 * 18 to 121 bytes,  DM3 is used but impacts inquiry scan time with large number

 *                    of devices.(almost double with 150 users)
@@ -622,13 +621,6 @@ const tBTM_PM_PWR_MD* p_bta_dm_pm_md = &bta_dm_pm_md[0]; 
 *                    small number of users. so it is not recommended.

 * 225 to 240 bytes, DH5 is used without FEC but it not recommended.

 *                    (same reason of DM5)

 *

 * When BTM_EIR_DEFAULT_FEC_REQUIRED is false,

 * 1 to 27 bytes,    DH1 is used but only robust at short range.

 * 28 to 183 bytes,  DH3 is used but only robust at short range and impacts

 * inquiry

 *                    scan time with large number of devices.

 * 184 to 240 bytes, DH5 is used but it not recommended.

 */



#if (BTA_EIR_CANNED_UUID_LIST == TRUE)

system/internal_include/bt_target.h

+0 −19
Original line number Diff line number Diff line
@@ -244,12 +244,6 @@ 
#define BTM_SEC_MAX_SERVICE_RECORDS 32

#endif



/* If True, force a retrieval of remote device name for each bond in case it's

 * changed */

#ifndef BTM_SEC_FORCE_RNR_FOR_DBOND

#define BTM_SEC_FORCE_RNR_FOR_DBOND FALSE

#endif



/* Maximum device name length used in btm database. */

#ifndef BTM_MAX_REM_BD_NAME_LEN

#define BTM_MAX_REM_BD_NAME_LEN 248
@@ -260,11 +254,6 @@ 
#define BTM_MAX_LOC_BD_NAME_LEN 248

#endif



/* Maximum service name stored with security authorization (0 if not needed) */

#ifndef BTM_SEC_SERVICE_NAME_LEN

#define BTM_SEC_SERVICE_NAME_LEN BT_MAX_SERVICE_NAME_LEN

#endif



/* Maximum length of the service name. */

#ifndef BT_MAX_SERVICE_NAME_LEN

#define BT_MAX_SERVICE_NAME_LEN 21
@@ -291,10 +280,6 @@ 
/******************************************

 *    Lisbon Features

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

/* This is set to TRUE if the FEC is required for EIR packet. */

#ifndef BTM_EIR_DEFAULT_FEC_REQUIRED

#define BTM_EIR_DEFAULT_FEC_REQUIRED TRUE

#endif



/* The IO capability of the local device (for Simple Pairing) */

#ifndef BTM_LOCAL_IO_CAPS
@@ -391,10 +376,6 @@ 
 *

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



#ifndef LOCAL_BLE_CONTROLLER_ID

#define LOCAL_BLE_CONTROLLER_ID 1

#endif



/* The maximum number of simultaneous applications that can register with LE

 * L2CAP. */

#ifndef BLE_MAX_L2CAP_CLIENTS

system/stack/btm/btm_inq.cc

+1 −1
Original line number Diff line number Diff line
@@ -2067,7 +2067,7 @@ void btm_inq_rmt_name_failed_cancelled(void) { 
tBTM_STATUS BTM_WriteEIR(BT_HDR* p_buff) {

  if (bluetooth::shim::GetController()->SupportsExtendedInquiryResponse()) {

    log::verbose("Write Extended Inquiry Response to controller");

    btsnd_hcic_write_ext_inquiry_response(p_buff, BTM_EIR_DEFAULT_FEC_REQUIRED);

    btsnd_hcic_write_ext_inquiry_response(p_buff, TRUE);

    return BTM_SUCCESS;

  } else {

    osi_free(p_buff);

system/stack/btm/btm_sec.cc

+0 −4
Original line number Diff line number Diff line
@@ -689,10 +689,6 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
  log::verbose("BTM_SecBond: Remote sm4: 0x{:x}  HCI Handle: 0x{:04x}",

               p_dev_rec->sm4, p_dev_rec->hci_handle);



#if (BTM_SEC_FORCE_RNR_FOR_DBOND == TRUE)

  p_dev_rec->sec_rec.sec_flags &= ~BTM_SEC_NAME_KNOWN;

#endif



  /* If connection already exists... */

  if (BTM_IsAclConnectionUpAndHandleValid(bd_addr, transport)) {

    btm_sec_wait_and_start_authentication(p_dev_rec);