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

Commit abda19e9 authored by Oleh Cherpak's avatar Oleh Cherpak Committed by android-build-merger
Browse files

HCI: Change commands naming to avoid misunderstanding am: 84ef6ba9 am: 5c8f95f0 

am: 979df45a

Change-Id: I539d3cde26d38614f312c7dd31a4e5dc6bf48b5f
parents f1d8f820 979df45a

system/bta/av/bta_av_aact.cc

+2 −2
Original line number Diff line number Diff line
@@ -3107,7 +3107,7 @@ void bta_av_vendor_offload_start(tBTA_AV_SCB* p_scb, 
  ARRAY_TO_STREAM(p_param, offload_start->codec_info,

                  (int8_t)sizeof(offload_start->codec_info));

  p_scb->offload_started = true;

  BTM_VendorSpecificCommand(HCI_CONTROLLER_A2DP_OPCODE_OCF, p_param - param,

  BTM_VendorSpecificCommand(HCI_CONTROLLER_A2DP, p_param - param,

                            param, offload_vendor_callback);

}
@@ -3115,7 +3115,7 @@ void bta_av_vendor_offload_stop() { 
  uint8_t param[sizeof(tBT_A2DP_OFFLOAD)];

  APPL_TRACE_DEBUG("%s", __func__);

  param[0] = VS_HCI_A2DP_OFFLOAD_STOP;

  BTM_VendorSpecificCommand(HCI_CONTROLLER_A2DP_OPCODE_OCF, 1, param,

  BTM_VendorSpecificCommand(HCI_CONTROLLER_A2DP, 1, param,

                            offload_vendor_callback);

}

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

system/btif/src/btif_bqr.cc

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ void ConfigureBqr(const BqrConfiguration& bqr_config) { 
  UINT32_TO_STREAM(p_param, bqr_config.quality_event_mask);

  UINT16_TO_STREAM(p_param, bqr_config.minimum_report_interval_ms);



  BTM_VendorSpecificCommand(HCI_CONTROLLER_BQR_OPCODE_OCF, p_param - param,

  BTM_VendorSpecificCommand(HCI_CONTROLLER_BQR, p_param - param,

                            param, BqrVscCompleteCallback);

}

system/hci/src/hci_layer.cc

+1 −2
Original line number Diff line number Diff line
@@ -510,8 +510,7 @@ static void command_timed_out(void* original_wait_entry) { 


  uint8_t* hci_packet = reinterpret_cast<uint8_t*>(bt_hdr + 1);



  UINT16_TO_STREAM(hci_packet,

                   HCI_GRP_VENDOR_SPECIFIC | HCI_CONTROLLER_DEBUG_INFO_OCF);

  UINT16_TO_STREAM(hci_packet, HCI_CONTROLLER_DEBUG_INFO);

  UINT8_TO_STREAM(hci_packet, 0);  // No parameters



  hci_firmware_log_fd = hci_open_firmware_log_file();

system/stack/btm/ble_advertiser_hci_interface.cc

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ void known_tx_pwr(BleAdvertiserHciInterface::parameters_cb cb, int8_t tx_power, 
class BleAdvertiserVscHciInterfaceImpl : public BleAdvertiserHciInterface {

  void SendAdvCmd(const base::Location& posted_from, uint8_t param_len,

                  uint8_t* param_buf, status_cb command_complete) {

    btu_hcif_send_cmd_with_cb(posted_from, HCI_BLE_MULTI_ADV_OCF, param_buf,

    btu_hcif_send_cmd_with_cb(posted_from, HCI_BLE_MULTI_ADV, param_buf,

                              param_len,

                              base::Bind(&btm_ble_multi_adv_vsc_cmpl_cback,

                                         param_buf[0], command_complete));

system/stack/btm/btm_ble_adv_filter.cc

+10 −10
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ void BTM_LE_PF_local_name(tBTM_BLE_SCAN_COND_OP action, 


  /* send local name filter */

  btu_hcif_send_cmd_with_cb(

      FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

      FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

      base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_LOCAL_NAME, cb));



  memset(&btm_ble_adv_filt_cb.cur_filter_target, 0, sizeof(tBLE_BD_ADDR));
@@ -379,7 +379,7 @@ void BTM_LE_PF_manu_data(tBTM_BLE_SCAN_COND_OP action, 
  }



  btu_hcif_send_cmd_with_cb(

      FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

      FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

      base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_MANU_DATA, cb));



  memset(&btm_ble_adv_filt_cb.cur_filter_target, 0, sizeof(tBLE_BD_ADDR));
@@ -417,7 +417,7 @@ void BTM_LE_PF_srvc_data_pattern(tBTM_BLE_SCAN_COND_OP action, 
  }



  btu_hcif_send_cmd_with_cb(

      FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

      FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

      base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_SRVC_DATA, cb));



  memset(&btm_ble_adv_filt_cb.cur_filter_target, 0, sizeof(tBLE_BD_ADDR));
@@ -520,7 +520,7 @@ void BTM_LE_PF_addr_filter(tBTM_BLE_SCAN_COND_OP action, 


  /* send address filter */

  btu_hcif_send_cmd_with_cb(

      FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

      FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

      base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_ADDR, cb));



  memset(&btm_ble_adv_filt_cb.cur_filter_target, 0, sizeof(tBLE_BD_ADDR));
@@ -591,7 +591,7 @@ void BTM_LE_PF_uuid_filter(tBTM_BLE_SCAN_COND_OP action, 
  }



  /* send UUID filter update */

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

                            base::Bind(&btm_flt_update_cb, evt_type, cb));

  memset(&btm_ble_adv_filt_cb.cur_filter_target, 0, sizeof(tBLE_BD_ADDR));

}
@@ -716,7 +716,7 @@ void BTM_LE_PF_clear(tBTM_BLE_PF_FILT_INDEX filt_index, 
  UINT8_TO_STREAM(p, BTM_BLE_PF_LOGIC_OR);



  btu_hcif_send_cmd_with_cb(

      FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

      FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

      base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_FEAT_SEL, cb));



  memset(&btm_ble_adv_filt_cb.cur_filter_target, 0, sizeof(tBLE_BD_ADDR));
@@ -801,7 +801,7 @@ void BTM_BleAdvFilterParamSetup( 
            BTM_BLE_ADV_FILT_TRACK_NUM;



    btu_hcif_send_cmd_with_cb(

        FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param, len,

        FROM_HERE, HCI_BLE_ADV_FILTER, param, len,

        base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_FEAT_SEL, cb));

  } else if (BTM_BLE_SCAN_COND_DELETE == action) {

    /* select feature based on control block settings */
@@ -811,7 +811,7 @@ void BTM_BleAdvFilterParamSetup( 
    UINT8_TO_STREAM(p, filt_index);



    btu_hcif_send_cmd_with_cb(

        FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param,

        FROM_HERE, HCI_BLE_ADV_FILTER, param,

        (uint8_t)(BTM_BLE_ADV_FILT_META_HDR_LENGTH),

        base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_FEAT_SEL, cb));

  } else if (BTM_BLE_SCAN_COND_CLEAR == action) {
@@ -823,7 +823,7 @@ void BTM_BleAdvFilterParamSetup( 
    UINT8_TO_STREAM(p, BTM_BLE_SCAN_COND_CLEAR);



    btu_hcif_send_cmd_with_cb(

        FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param,

        FROM_HERE, HCI_BLE_ADV_FILTER, param,

        (uint8_t)(BTM_BLE_ADV_FILT_META_HDR_LENGTH - 1),

        base::Bind(&btm_flt_update_cb, BTM_BLE_META_PF_FEAT_SEL, cb));

  }
@@ -874,7 +874,7 @@ void BTM_BleEnableDisableFilterFeature(uint8_t enable, 
  UINT8_TO_STREAM(p, BTM_BLE_META_PF_ENABLE);

  UINT8_TO_STREAM(p, enable);



  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_ADV_FILTER_OCF, param,

  btu_hcif_send_cmd_with_cb(FROM_HERE, HCI_BLE_ADV_FILTER, param,

                            BTM_BLE_PCF_ENABLE_LEN,

                            base::Bind(&enable_cmpl_cback, p_stat_cback));

}