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

Commit 1d867771 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

BLE_LLT_INCLUDED is always true am: 10fe6d6b am: c8e72c38 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1549414

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66da993eb465b46e0d6c5a05f272c3701d67385e
parents ec0cb9b1 c8e72c38

system/internal_include/bt_target.h

+0 −4
Original line number Diff line number Diff line
@@ -563,10 +563,6 @@ 
 * ATT/GATT Protocol/Profile Settings

 *

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

#ifndef BLE_LLT_INCLUDED

#define BLE_LLT_INCLUDED TRUE

#endif



#ifndef BLE_DELAY_REQUEST_ENC

/* This flag is to work around IPHONE problem, We need to wait for iPhone ready

   before send encryption request to iPhone */

system/stack/btu/btu_hcif.cc

+0 −6
Original line number Diff line number Diff line
@@ -90,9 +90,7 @@ static void btu_ble_ll_conn_param_upd_evt(uint8_t* p, uint16_t evt_len); 
static void btu_ble_proc_ltk_req(uint8_t* p);

static void btu_hcif_encryption_key_refresh_cmpl_evt(uint8_t* p);

static void btu_ble_data_length_change_evt(uint8_t* p, uint16_t evt_len);

#if (BLE_LLT_INCLUDED == TRUE)

static void btu_ble_rc_param_req_evt(uint8_t* p);

#endif



/**

 * Log HCI event metrics that are not handled in special functions
@@ -400,11 +398,9 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, BT_HDR* p_msg) { 
        case HCI_BLE_ENHANCED_CONN_COMPLETE_EVT:

          btm_ble_conn_complete(p, hci_evt_len, true);

          break;

#if (BLE_LLT_INCLUDED == TRUE)

        case HCI_BLE_RC_PARAM_REQ_EVT:

          btu_ble_rc_param_req_evt(p);

          break;

#endif

        case HCI_BLE_DATA_LENGTH_CHANGE_EVT:

          btu_ble_data_length_change_evt(p, hci_evt_len);

          break;
@@ -1761,7 +1757,6 @@ static void btu_ble_data_length_change_evt(uint8_t* p, uint16_t evt_len) { 
/**********************************************

 * End of BLE Events Handler

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

#if (BLE_LLT_INCLUDED == TRUE)

static void btu_ble_rc_param_req_evt(uint8_t* p) {

  uint16_t handle;

  uint16_t int_min, int_max, latency, timeout;
@@ -1775,4 +1770,3 @@ static void btu_ble_rc_param_req_evt(uint8_t* p) { 
  l2cble_process_rc_param_request_evt(handle, int_min, int_max, latency,

                                      timeout);

}
 
#endif /* BLE_LLT_INCLUDED */

system/stack/hcic/hciblecmds.cc

+0 −3
Original line number Diff line number Diff line
@@ -570,8 +570,6 @@ void btsnd_hcic_ble_read_host_supported(void) { 
  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}



#if (BLE_LLT_INCLUDED == TRUE)



void btsnd_hcic_ble_rc_param_req_reply(uint16_t handle, uint16_t conn_int_min,

                                       uint16_t conn_int_max,

                                       uint16_t conn_latency,
@@ -613,7 +611,6 @@ void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle, uint8_t reason) { 


  btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);

}

#endif



void btsnd_hcic_ble_add_device_resolving_list(uint8_t addr_type_peer,

                                              const RawAddress& bda_peer,

system/stack/include/hcimsgs.h

+0 −4
Original line number Diff line number Diff line
@@ -615,8 +615,6 @@ extern void btsnd_hcic_ble_transmitter_test(uint8_t tx_freq, 
                                            uint8_t payload);

extern void btsnd_hcic_ble_test_end(void);



#if (BLE_LLT_INCLUDED == TRUE)



extern void btsnd_hcic_ble_rc_param_req_reply(

    uint16_t handle, uint16_t conn_int_min, uint16_t conn_int_max,

    uint16_t conn_latency, uint16_t conn_timeout, uint16_t min_ce_len,
@@ -625,8 +623,6 @@ extern void btsnd_hcic_ble_rc_param_req_reply( 
extern void btsnd_hcic_ble_rc_param_req_neg_reply(uint16_t handle,

                                                  uint8_t reason);



#endif /* BLE_LLT_INCLUDED */



extern void btsnd_hcic_ble_set_data_length(uint16_t conn_handle,

                                           uint16_t tx_octets,

                                           uint16_t tx_time);

system/stack/include/l2cap_hci_link_interface.h

+0 −2
Original line number Diff line number Diff line
@@ -48,13 +48,11 @@ extern void l2cble_notify_le_connection(const RawAddress& bda); 


void l2cble_use_preferred_conn_params(const RawAddress& bda);



#if (BLE_LLT_INCLUDED == TRUE)

extern void l2cble_process_rc_param_request_evt(uint16_t handle,

                                                uint16_t int_min,

                                                uint16_t int_max,

                                                uint16_t latency,

                                                uint16_t timeout);

#endif



// Invoked when HCI mode is changed to HCI_MODE_ACTIVE or HCI_MODE_SNIFF

extern void l2c_OnHciModeChangeSendPendingPackets(RawAddress remote);