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

Commit ac1f6897 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Properly add typedef for gatt status am: c6deaabd 

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

Change-Id: Iaebf9ecfbcd5eb72c58ff5059b503ee32174ac5f
parents 99386c3b c6deaabd

system/bta/gatt/bta_gattc_act.cc

+5 −5
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ static void bta_gattc_enc_cmpl_cback(tGATT_IF gattc_if, const RawAddress& bda); 
static void bta_gattc_cong_cback(uint16_t conn_id, bool congested);

static void bta_gattc_phy_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                       uint8_t tx_phy, uint8_t rx_phy,

                                       uint8_t status);

                                       tGATT_STATUS status);

static void bta_gattc_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                        uint16_t interval, uint16_t latency,

                                        uint16_t timeout, uint8_t status);

                                        uint16_t timeout, tGATT_STATUS status);



static tGATT_CBACK bta_gattc_cl_cback = {bta_gattc_conn_cback,

                                         bta_gattc_cmpl_cback,
@@ -544,7 +544,7 @@ void bta_gattc_close(tBTA_GATTC_CLCB* p_clcb, tBTA_GATTC_DATA* p_data) { 
  if (p_data->hdr.event == BTA_GATTC_API_CLOSE_EVT) {

    cb_data.close.status = GATT_Disconnect(p_data->hdr.layer_specific);

  } else if (p_data->hdr.event == BTA_GATTC_INT_DISCONN_EVT) {

    cb_data.close.status = p_data->int_conn.reason;

    cb_data.close.status = static_cast<tGATT_STATUS>(p_data->int_conn.reason);

    cb_data.close.reason = p_data->int_conn.reason;

  }
@@ -1327,7 +1327,7 @@ static void bta_gattc_cong_cback(uint16_t conn_id, bool congested) { 


static void bta_gattc_phy_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                       uint8_t tx_phy, uint8_t rx_phy,

                                       uint8_t status) {

                                       tGATT_STATUS status) {

  tBTA_GATTC_RCB* p_clreg = bta_gattc_cl_get_regcb(gatt_if);



  if (!p_clreg || !p_clreg->p_cback) {
@@ -1346,7 +1346,7 @@ static void bta_gattc_phy_update_cback(tGATT_IF gatt_if, uint16_t conn_id, 


static void bta_gattc_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                        uint16_t interval, uint16_t latency,

                                        uint16_t timeout, uint8_t status) {

                                        uint16_t timeout, tGATT_STATUS status) {

  tBTA_GATTC_RCB* p_clreg = bta_gattc_cl_get_regcb(gatt_if);



  if (!p_clreg || !p_clreg->p_cback) {

system/bta/gatt/bta_gatts_act.cc

+4 −4
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ static void bta_gatts_send_request_cback(uint16_t conn_id, uint32_t trans_id, 
static void bta_gatts_cong_cback(uint16_t conn_id, bool congested);

static void bta_gatts_phy_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                       uint8_t tx_phy, uint8_t rx_phy,

                                       uint8_t status);

                                       tGATT_STATUS status);

static void bta_gatts_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                        uint16_t interval, uint16_t latency,

                                        uint16_t timeout, uint8_t status);

                                        uint16_t timeout, tGATT_STATUS status);



static tGATT_CBACK bta_gatts_cback = {bta_gatts_conn_cback,

                                      NULL,
@@ -625,7 +625,7 @@ static void bta_gatts_conn_cback(tGATT_IF gatt_if, const RawAddress& bdaddr, 


static void bta_gatts_phy_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                       uint8_t tx_phy, uint8_t rx_phy,

                                       uint8_t status) {

                                       tGATT_STATUS status) {

  tBTA_GATTS_RCB* p_reg = bta_gatts_find_app_rcb_by_app_if(gatt_if);

  if (!p_reg || !p_reg->p_cback) {

    LOG(ERROR) << __func__ << ": server_if=" << +gatt_if << " not found";
@@ -643,7 +643,7 @@ static void bta_gatts_phy_update_cback(tGATT_IF gatt_if, uint16_t conn_id, 


static void bta_gatts_conn_update_cback(tGATT_IF gatt_if, uint16_t conn_id,

                                        uint16_t interval, uint16_t latency,

                                        uint16_t timeout, uint8_t status) {

                                        uint16_t timeout, tGATT_STATUS status) {

  tBTA_GATTS_RCB* p_reg = bta_gatts_find_app_rcb_by_app_if(gatt_if);

  if (!p_reg || !p_reg->p_cback) {

    LOG(ERROR) << __func__ << ": server_if=" << +gatt_if << " not found";

system/bta/gatt/bta_gatts_api.cc

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ void bta_gatts_add_service_impl(tGATT_IF server_if, 
    return;

  }



  uint16_t status = GATTS_AddService(server_if, service.data(), service.size());

  tGATT_STATUS status =

      GATTS_AddService(server_if, service.data(), service.size());

  if (status != GATT_SERVICE_STARTED) {

    memset(&bta_gatts_cb.srvc_cb[srvc_idx], 0, sizeof(tBTA_GATTS_SRVC_CB));

    LOG(ERROR) << __func__ << ": service creation failed.";

system/bta/include/bta_gatt_api.h

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ extern void BTA_GATTS_AppDeregister(tGATT_IF server_if); 
 *                  service cannot be added.

 *

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

typedef base::Callback<void(uint8_t status, int server_if,

typedef base::Callback<void(tGATT_STATUS status, int server_if,

                            std::vector<btgatt_db_element_t> service)>

    BTA_GATTS_AddServiceCb;

system/btif/src/btif_gatt_server.cc

+3 −2
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ static bt_status_t btif_gatts_close(int server_if, const RawAddress& bd_addr, 
      Bind(&btif_gatts_close_impl, server_if, bd_addr, conn_id));

}



static void on_service_added_cb(uint8_t status, int server_if,

static void on_service_added_cb(tGATT_STATUS status, int server_if,

                                vector<btgatt_db_element_t> service) {

  HAL_CBACK(bt_gatt_callbacks, server->service_added_cb, status, server_if,

            std::move(service));
@@ -405,7 +405,8 @@ static void btif_gatts_send_response_impl(int conn_id, int trans_id, int status, 
  tGATTS_RSP rsp_struct;

  btif_to_bta_response(&rsp_struct, &response);



  BTA_GATTS_SendRsp(conn_id, trans_id, status, &rsp_struct);

  BTA_GATTS_SendRsp(conn_id, trans_id, static_cast<tGATT_STATUS>(status),

                    &rsp_struct);



  HAL_CBACK(bt_gatt_callbacks, server->response_confirmation_cb, 0,

            rsp_struct.attr_value.handle);