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

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

Enum-ify stack/include/gatt_api::tGATT_DISC_TYPE am: 04040f78 am: fd1fa2ac am: f401980d 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67f0b65addfc1f137502bc169a8742a0d7d4485c
parents f0b9433e f401980d

system/bta/gatt/bta_gattc_cache.cc

+11 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ const Service* bta_gattc_find_matching_service( 
/** Start primary service discovery */

tGATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id,

                                            tBTA_GATTC_SERV* p_server_cb,

                                            uint8_t disc_type) {

                                            tGATT_DISC_TYPE disc_type) {

  tBTA_GATTC_CLCB* p_clcb = bta_gattc_find_clcb_by_conn_id(conn_id);

  if (!p_clcb) return GATT_ERROR;
@@ -446,6 +446,11 @@ void bta_gattc_disc_res_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type, 
    case GATT_DISC_CHAR_DSCPT:

      p_srvc_cb->pending_discovery.AddDescriptor(p_data->handle, p_data->type);

      break;



    case GATT_DISC_MAX:

    default:

      LOG_ERROR("Received illegal discovery item");

      break;

  }

}
@@ -492,6 +497,11 @@ void bta_gattc_disc_cmpl_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type, 
      /* start discovering next characteristic for char descriptor */

      bta_gattc_start_disc_char_dscp(conn_id, p_srvc_cb);

      break;



    case GATT_DISC_MAX:

    default:

      LOG_ERROR("Received illegal discovery item");

      break;

  }

}

system/bta/gatt/bta_gattc_int.h

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ extern void bta_gattc_disc_cmpl_cback(uint16_t conn_id, 
                                      tGATT_STATUS status);

extern tGATT_STATUS bta_gattc_discover_pri_service(uint16_t conn_id,

                                                   tBTA_GATTC_SERV* p_server_cb,

                                                   uint8_t disc_type);

                                                   tGATT_DISC_TYPE disc_type);

extern void bta_gattc_search_service(tBTA_GATTC_CLCB* p_clcb,

                                     bluetooth::Uuid* p_uuid);

extern const std::list<gatt::Service>* bta_gattc_get_services(uint16_t conn_id);

system/btif/src/btif_gatt_test.cc

+5 −2
Original line number Diff line number Diff line
@@ -143,6 +143,9 @@ static void btif_test_discovery_result_cback(UNUSED_ATTR uint16_t conn_id, 
    case GATT_DISC_CHAR_DSCPT:

      LOG_INFO("       Descriptor UUID: %s", p_data->type.ToString().c_str());

      break;

    case GATT_DISC_MAX:

      LOG_ERROR("      Unknown discovery item");

      break;

  }



  LOG_INFO("-----------------------------------------------------------");
@@ -220,8 +223,8 @@ bt_status_t btif_gattc_test_command_impl(int command, 
      LOG_INFO("%s: DISCOVER (%s), conn_id=%d, uuid=%s, handles=0x%04x-0x%04x",

               __func__, disc_name[params->u1], test_cb.conn_id,

               params->uuid1->ToString().c_str(), params->u2, params->u3);

      GATTC_Discover(test_cb.conn_id, params->u1, params->u2, params->u3,

                     *params->uuid1);

      GATTC_Discover(test_cb.conn_id, static_cast<tGATT_DISC_TYPE>(params->u1),

                     params->u2, params->u3, *params->uuid1);

      break;

    }

system/stack/gatt/gatt_attr.cc

+6 −0
Original line number Diff line number Diff line
@@ -449,6 +449,12 @@ static void gatt_disc_res_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type, 
        p_clcb->ccc_result++;

      }

      break;



    case GATT_DISC_SRVC_ALL:

    case GATT_DISC_INC_SRVC:

    case GATT_DISC_MAX:

      LOG_ERROR("Illegal discovery item handled");

      break;

  }

}

system/stack/gatt/gatt_cl.cc

+12 −9
Original line number Diff line number Diff line
@@ -402,8 +402,9 @@ void gatt_process_find_type_value_rsp(UNUSED_ATTR tGATT_TCB& tcb, 
    len -= 4;



    if (p_clcb->p_reg->app_cb.p_disc_res_cb)

      (*p_clcb->p_reg->app_cb.p_disc_res_cb)(p_clcb->conn_id,

                                             p_clcb->op_subtype, &result);

      (*p_clcb->p_reg->app_cb.p_disc_res_cb)(

          p_clcb->conn_id, static_cast<tGATT_DISC_TYPE>(p_clcb->op_subtype),

          &result);

  }



  /* last handle  + 1 */
@@ -459,8 +460,9 @@ void gatt_process_read_info_rsp(UNUSED_ATTR tGATT_TCB& tcb, tGATT_CLCB* p_clcb, 
    len -= (uuid_len + 2);



    if (p_clcb->p_reg->app_cb.p_disc_res_cb)

      (*p_clcb->p_reg->app_cb.p_disc_res_cb)(p_clcb->conn_id,

                                             p_clcb->op_subtype, &result);

      (*p_clcb->p_reg->app_cb.p_disc_res_cb)(

          p_clcb->conn_id, static_cast<tGATT_DISC_TYPE>(p_clcb->op_subtype),

          &result);

  }



  p_clcb->s_handle = (result.handle == 0) ? 0 : (result.handle + 1);
@@ -911,8 +913,9 @@ void gatt_process_read_by_type_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, 
    /* send callback if is discover procedure */

    if (p_clcb->operation == GATTC_OPTYPE_DISCOVERY &&

        p_clcb->p_reg->app_cb.p_disc_res_cb)

      (*p_clcb->p_reg->app_cb.p_disc_res_cb)(p_clcb->conn_id,

                                             p_clcb->op_subtype, &result);

      (*p_clcb->p_reg->app_cb.p_disc_res_cb)(

          p_clcb->conn_id, static_cast<tGATT_DISC_TYPE>(p_clcb->op_subtype),

          &result);

  }



  p_clcb->s_handle = (handle == 0) ? 0 : (handle + 1);
@@ -1001,8 +1004,8 @@ void gatt_process_read_rsp(tGATT_TCB& tcb, tGATT_CLCB* p_clcb, 
        p_clcb->read_uuid128.result.value.incl_service.service_type =

            bluetooth::Uuid::From128BitLE(p);

        if (p_clcb->p_reg->app_cb.p_disc_res_cb)

          (*p_clcb->p_reg->app_cb.p_disc_res_cb)(p_clcb->conn_id,

                                                 p_clcb->op_subtype,

          (*p_clcb->p_reg->app_cb.p_disc_res_cb)(

              p_clcb->conn_id, static_cast<tGATT_DISC_TYPE>(p_clcb->op_subtype),

              &p_clcb->read_uuid128.result);

        gatt_act_discovery(p_clcb);

      } else {