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

Commit d0937a29 authored by Chris Manton's avatar Chris Manton
Browse files

Class-ify enum stack::btm::tBTM_INQUIRY_STATE 

Bug: 323223822
Test: m .
Flag: EXEMPT, mechanical refactor
Change-Id: I853332994c6e1364f21ba813a41fc8cb03061fc0
parent 08ffdf81

system/btif/src/btif_dm.cc

+3 −3
Original line number Diff line number Diff line
@@ -2152,15 +2152,15 @@ static void btif_dm_update_allowlisted_media_players() { 
}



void BTIF_dm_report_inquiry_status_change(tBTM_INQUIRY_STATE status) {

  if (status == BTM_INQUIRY_STARTED) {

  if (status == tBTM_INQUIRY_STATE::BTM_INQUIRY_STARTED) {

    GetInterfaceToProfiles()->events->invoke_discovery_state_changed_cb(

        BT_DISCOVERY_STARTED);

    btif_dm_inquiry_in_progress = true;

  } else if (status == BTM_INQUIRY_CANCELLED) {

  } else if (status == tBTM_INQUIRY_STATE::BTM_INQUIRY_CANCELLED) {

    GetInterfaceToProfiles()->events->invoke_discovery_state_changed_cb(

        BT_DISCOVERY_STOPPED);

    btif_dm_inquiry_in_progress = false;

  } else if (status == BTM_INQUIRY_COMPLETE) {

  } else if (status == tBTM_INQUIRY_STATE::BTM_INQUIRY_COMPLETE) {

    btif_dm_inquiry_in_progress = false;

  }

}

system/stack/btm/btm_inq.cc

+8 −4
Original line number Diff line number Diff line
@@ -679,7 +679,8 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
  if (btm_cb.btm_inq_vars.inq_active & BTM_SSP_INQUIRY_ACTIVE) {

    LOG_INFO("Not starting inquiry as SSP is in progress");

    // Report the status here because inq_complete will cancel it below

    BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_STARTED);

    BTIF_dm_report_inquiry_status_change(

        tBTM_INQUIRY_STATE::BTM_INQUIRY_STARTED);



    btm_process_inq_complete(HCI_ERR_MAX_NUM_OF_CONNECTIONS,

                             BTM_GENERAL_INQUIRY);
@@ -702,7 +703,8 @@ tBTM_STATUS BTM_StartInquiry(tBTM_INQ_RESULTS_CB* p_results_cb, 
            ASSERT(status_view.IsValid());

            auto status = status_view.GetStatus();

            if (status == bluetooth::hci::ErrorCode::SUCCESS) {

              BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_STARTED);

              BTIF_dm_report_inquiry_status_change(

                  tBTM_INQUIRY_STATE::BTM_INQUIRY_STARTED);

            } else {

              LOG_INFO("Inquiry failed to start status: %s",

                       bluetooth::hci::ErrorCodeText(status).c_str());
@@ -1495,7 +1497,8 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) { 
  btm_cb.btm_inq_vars.inqparms.mode &= ~(mode);

  const auto inq_active = btm_cb.btm_inq_vars.inq_active;



  BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_COMPLETE);

  BTIF_dm_report_inquiry_status_change(

      tBTM_INQUIRY_STATE::BTM_INQUIRY_COMPLETE);



  if (status != HCI_SUCCESS) {

    LOG_WARN("Received unexpected hci status:%s",
@@ -1589,7 +1592,8 @@ void btm_process_inq_complete(tHCI_STATUS status, uint8_t mode) { 
 *

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

void btm_process_cancel_complete(tHCI_STATUS status, uint8_t mode) {

  BTIF_dm_report_inquiry_status_change(BTM_INQUIRY_CANCELLED);

  BTIF_dm_report_inquiry_status_change(

      tBTM_INQUIRY_STATE::BTM_INQUIRY_CANCELLED);

  btm_process_inq_complete(status, mode);

}

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

system/stack/include/acl_api_types.h

+2 −2
Original line number Diff line number Diff line
@@ -85,8 +85,8 @@ typedef struct { 
  uint8_t link_quality;

} tBTM_LINK_QUALITY_RESULT;



typedef enum : uint8_t {

enum class tBTM_INQUIRY_STATE : uint8_t {

  BTM_INQUIRY_STARTED = 1,

  BTM_INQUIRY_CANCELLED = 2,

  BTM_INQUIRY_COMPLETE = 3,

} tBTM_INQUIRY_STATE;
 
};