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

Commit 3b498b4b authored by Chris Manton's avatar Chris Manton
Browse files

Remove HCI_DISCONNECTION_COMP_EVT 

Bug: 261272012
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: Ia705adbdb30e9e87485b4eb2192cea5e0d061348
parent 99a33cec

system/stack/btu/btu_hcif.cc

+2 −39
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ void acl_disconnect_from_handle(uint16_t handle, tHCI_STATUS reason, 
/******************************************************************************/

static void btu_hcif_inquiry_comp_evt(uint8_t* p);



static void btu_hcif_disconnection_comp_evt(uint8_t* p);

static void btu_hcif_authentication_comp_evt(uint8_t* p);

static void btu_hcif_rmt_name_request_comp_evt(const uint8_t* p,

                                               uint16_t evt_len);
@@ -148,17 +147,6 @@ void btu_hcif_log_event_metrics(uint8_t evt_code, const uint8_t* p_event) { 
                                encryption_enabled);

      break;

    }

    case HCI_DISCONNECTION_COMP_EVT: {

      STREAM_TO_UINT8(status, p_event);

      STREAM_TO_UINT16(handle, p_event);

      STREAM_TO_UINT8(reason, p_event);

      handle = HCID_GET_HANDLE(handle);

      log_link_layer_connection_event(

          nullptr, handle, android::bluetooth::DIRECTION_UNKNOWN,

          android::bluetooth::LINK_TYPE_UNKNOWN, cmd, evt_code,

          android::bluetooth::hci::BLE_EVT_UNKNOWN, status, reason);

      break;

    }

    case HCI_ESCO_CONNECTION_COMP_EVT: {

      uint8_t link_type;

      STREAM_TO_UINT8(status, p_event);
@@ -186,6 +174,7 @@ void btu_hcif_log_event_metrics(uint8_t evt_code, const uint8_t* p_event) { 
    }

    case HCI_CONNECTION_COMP_EVT:  // EventCode::CONNECTION_COMPLETE

    case HCI_CONNECTION_REQUEST_EVT:  // EventCode::CONNECTION_REQUEST

    case HCI_DISCONNECTION_COMP_EVT:  // EventCode::DISCONNECTION_COMPLETE

    default:

      LOG_ERROR(

          "Unexpectedly received event_code:0x%02x that should not be "
@@ -235,9 +224,6 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
    case HCI_EXTENDED_INQUIRY_RESULT_EVT:

      btm_process_inq_results(p, hci_evt_len, BTM_INQ_RESULT_EXTENDED);

      break;

    case HCI_DISCONNECTION_COMP_EVT:

      btu_hcif_disconnection_comp_evt(p);

      break;

    case HCI_AUTHENTICATION_COMP_EVT:

      btu_hcif_authentication_comp_evt(p);

      break;
@@ -413,6 +399,7 @@ void btu_hcif_process_event(UNUSED_ATTR uint8_t controller_id, 
    case HCI_READ_RMT_FEATURES_COMP_EVT:  // EventCode::READ_REMOTE_SUPPORTED_FEATURES_COMPLETE

    case HCI_READ_RMT_VERSION_COMP_EVT:  // EventCode::READ_REMOTE_VERSION_INFORMATION_COMPLETE

    case HCI_ROLE_CHANGE_EVT:            // EventCode::ROLE_CHANGE

    case HCI_DISCONNECTION_COMP_EVT:     // EventCode::DISCONNECTION_COMPLETE

    default:

      LOG_ERROR(

          "Unexpectedly received event_code:0x%02x that should not be "
@@ -857,30 +844,6 @@ static void btu_hcif_inquiry_comp_evt(uint8_t* p) { 
  btm_process_inq_complete(to_hci_status_code(status), BTM_BR_INQUIRY_MASK);

}



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

 *

 * Function         btu_hcif_disconnection_comp_evt

 *

 * Description      Process event HCI_DISCONNECTION_COMP_EVT

 *

 * Returns          void

 *

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

static void btu_hcif_disconnection_comp_evt(uint8_t* p) {

  uint8_t status;

  uint16_t handle;

  uint8_t reason;



  STREAM_TO_UINT8(status, p);

  STREAM_TO_UINT16(handle, p);

  STREAM_TO_UINT8(reason, p);



  handle = HCID_GET_HANDLE(handle);



  btm_acl_disconnected(static_cast<tHCI_STATUS>(status), handle,

                       static_cast<tHCI_STATUS>(reason));

}



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

 *

 * Function         btu_hcif_authentication_comp_evt