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

Commit 37323964 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge changes I9f76c7f7,Id5863a3c,I070cc0c0,I09f31af5,I4d4f2b79, ... 

* changes:
  btm_log: Add pairing state changes
  Move stack/include/bt_types::FLOW_SPEC => stack/l2c
  Move stack/include/::btm_api into btm_ble_api
  Include security_client_callbacks
  Break out security callbacks stack/include/security_client_callbacks
  Introduce stack/include/sco_client_callbacks
  Add stack/acl/btm_acl::SupportTransparentSynchronousData
  Expand stack/include/btm_client_interface
  Add explict FALLTHROUGH_INTENDED to package
  Re-log stack/rfcomm/rfc_mx_fsm::rfc_mx_sm_execute
  Re-log stack/btm/btm_sec::BTM_SetSecurityLevel
  Re-log stack/btm/btm_sec::btm_sec_mx_access_request
  Re-log stack/btm/btm_sco::BTM_SetEScoMode
  Re-log stack/btm/btm_sco::btm_send_connect_request
  Re-log stack/btm/btm_ble_gap::BTM_BleGetVendorCapabilities
  Re-log stack/btm/btm_ble::btm_ble_set_random_address
  Re-log stack/acl/btm_pm::
  Re-log bta/av/bta_av_api::BTA_AvStart
  Re-log bta/ag/bta_ag_main::bta_ag_api_result
  Add stack/include/btm_api_types::security_mode_text
  Add stack/btm/security_device_record::security_state_text
  Streamline stack/btm/btm_sco::btm_sco_connected
  Enum-ify bta/include/bta_api::tBTA_DM_PM_ACTION_BITMASK
  Canonicalize stack/gatt/bta_gattc_act::bta_gattc_cl_cback
  Use proper types btm_sco_connected tHCI_STATUS
  Use tBTA_AG_SCB::ToString
  Re-log stack/btm/btm_sec::btm_sec_disconnected
  Streamline stack/btm/btm_sec::btm_sec_disconnect
  Stat-ify stack/gatt/att_protocol
parents 99e0fa6c 50b609cb

system/bta/ag/bta_ag_main.cc

+9 −4
Original line number Diff line number Diff line
@@ -503,8 +503,6 @@ void bta_ag_api_register(tBTA_SERVICE_MASK services, tBTA_AG_FEAT features, 
 ******************************************************************************/

void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result,

                       const tBTA_AG_RES_DATA& result_data) {

  LOG_DEBUG("Handle AG API result handle:0x%04x", handle);



  tBTA_AG_DATA event_data = {};

  event_data.api_result.result = result;

  event_data.api_result.data = result_data;
@@ -512,16 +510,23 @@ void bta_ag_api_result(uint16_t handle, tBTA_AG_RES result, 
  if (handle != BTA_AG_HANDLE_ALL) {

    p_scb = bta_ag_scb_by_idx(handle);

    if (p_scb) {

      LOG_DEBUG("AG event scb:%s", p_scb->ToString().c_str());

      LOG_DEBUG("Audio gateway event for one client handle:%hu scb:%s", handle,

                p_scb->ToString().c_str());

      bta_ag_sm_execute(p_scb, static_cast<uint16_t>(BTA_AG_API_RESULT_EVT),

                        event_data);

    } else {

      LOG_WARN(

          "Received audio gateway event for unknown AG control block "

          "handle:%hu",

          handle);

    }

  } else {

    int i;

    for (i = 0, p_scb = &bta_ag_cb.scb[0]; i < BTA_AG_MAX_NUM_CLIENTS;

         i++, p_scb++) {

      if (p_scb->in_use && p_scb->svc_conn) {

        LOG_DEBUG("AG event for all scb:%s", p_scb->ToString().c_str());

        LOG_DEBUG("Audio gateway event for all clients scb:%s",

                  p_scb->ToString().c_str());

        bta_ag_sm_execute(p_scb, static_cast<uint16_t>(BTA_AG_API_RESULT_EVT),

                          event_data);

      }

system/bta/ag/bta_ag_sco.cc

+2 −12
Original line number Diff line number Diff line
@@ -358,12 +358,7 @@ static void bta_ag_cback_sco(tBTA_AG_SCB* p_scb, tBTA_AG_EVT event) { 
 *

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

static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) {

  APPL_TRACE_DEBUG(

      "%s: BEFORE codec_updated=%d, codec_fallback=%d, "

      "sco_codec=%d, peer_codec=%d, msbc_settings=%d, device=%s",

      __func__, p_scb->codec_updated, p_scb->codec_fallback, p_scb->sco_codec,

      p_scb->peer_codecs, p_scb->codec_msbc_settings,

      p_scb->peer_addr.ToString().c_str());

  LOG_DEBUG("BEFORE %s", p_scb->ToString().c_str());

  tBTA_AG_PEER_CODEC esco_codec = BTA_AG_CODEC_CVSD;



  if (!bta_ag_sco_is_active_device(p_scb->peer_addr)) {
@@ -451,12 +446,7 @@ static void bta_ag_create_sco(tBTA_AG_SCB* p_scb, bool is_orig) { 
              p_scb->sco_idx, btm_status_text(btm_status).c_str(),

              params.packet_types);

  }

  APPL_TRACE_DEBUG(

      "%s: AFTER codec_updated=%d, codec_fallback=%d, "

      "sco_codec=%d, peer_codec=%d, msbc_settings=%d, device=%s",

      __func__, p_scb->codec_updated, p_scb->codec_fallback, p_scb->sco_codec,

      p_scb->peer_codecs, p_scb->codec_msbc_settings,

      p_scb->peer_addr.ToString().c_str());

  LOG_DEBUG("AFTER %s", p_scb->ToString().c_str());

}



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

system/bta/av/bta_av_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ void BTA_AvDisconnect(const RawAddress& bd_addr) { 
 *

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

void BTA_AvStart(tBTA_AV_HNDL handle) {

  LOG_INFO("%s: bta_handle=0x%x", __func__, handle);

  LOG_INFO("Starting audio/video stream data transfer bta_handle:%hhu", handle);



  BT_HDR* p_buf = (BT_HDR*)osi_malloc(sizeof(BT_HDR));

system/bta/gatt/bta_gattc_act.cc

+10 −9
Original line number Diff line number Diff line
@@ -69,15 +69,16 @@ static void bta_gattc_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id, 
                                        uint16_t interval, uint16_t latency,

                                        uint16_t timeout, tGATT_STATUS status);



static tGATT_CBACK bta_gattc_cl_cback = {bta_gattc_conn_cback,

                                         bta_gattc_cmpl_cback,

                                         bta_gattc_disc_res_cback,

                                         bta_gattc_disc_cmpl_cback,

                                         NULL,

                                         bta_gattc_enc_cmpl_cback,

                                         bta_gattc_cong_cback,

                                         bta_gattc_phy_update_cback,

                                         bta_gattc_conn_update_cback};

static tGATT_CBACK bta_gattc_cl_cback = {

    .p_conn_cb = bta_gattc_conn_cback,

    .p_cmpl_cb = bta_gattc_cmpl_cback,

    .p_disc_res_cb = bta_gattc_disc_res_cback,

    .p_disc_cmpl_cb = bta_gattc_disc_cmpl_cback,

    .p_req_cb = nullptr,

    .p_enc_cmpl_cb = bta_gattc_enc_cmpl_cback,

    .p_congestion_cb = bta_gattc_cong_cback,

    .p_phy_update_cb = bta_gattc_phy_update_cback,

    .p_conn_update_cb = bta_gattc_conn_update_cback};



/* opcode(tGATTC_OPTYPE) order has to be comply with internal event order */

static uint16_t bta_gattc_opcode_to_int_evt[] = {

system/bta/include/bta_api.h

+3 −2
Original line number Diff line number Diff line
@@ -458,7 +458,7 @@ typedef void(tBTA_BLE_ENERGY_INFO_CBACK)(tBTM_BLE_TX_TIME_MS tx_time, 
/* Maximum service name length */

#define BTA_SERVICE_NAME_LEN 35



enum : uint8_t {

typedef enum : uint8_t {

  /* power mode actions  */

  BTA_DM_PM_NO_ACTION = 0x00, /* no change to the current pm setting */

  BTA_DM_PM_PARK = 0x10,      /* prefers park mode */
@@ -479,7 +479,8 @@ enum : uint8_t { 
  BTA_DM_PM_SUSPEND = 0x04, /* prefers suspend mode */

  BTA_DM_PM_NO_PREF = 0x01, /* service has no preference on power mode setting.

                               eg. connection to \ service got closed */

};

  BTA_DM_PM_SNIFF_MASK = 0x0f,  // Masks the sniff submode

} tBTA_DM_PM_ACTION_BITMASK;

typedef uint8_t tBTA_DM_PM_ACTION;



/* index to bta_dm_ssr_spec */