OSDN Git Service

Remove bta_gattc_incl_srvc_disc_cmpl
authorJakub Pawlowski <jpawlowski@google.com>
Tue, 17 Oct 2017 18:03:58 +0000 (11:03 -0700)
committerJakub Pawlowski <jpawlowski@google.com>
Tue, 17 Oct 2017 18:22:08 +0000 (11:22 -0700)
Bug: 67057055
Test: compilation
Change-Id: I6ff0c0dc203232f9fa2b43ccbacb015106d2b6d1

bta/gatt/bta_gattc_cache.cc

index 632320d..0e46d03 100644 (file)
@@ -453,22 +453,7 @@ static void bta_gattc_explore_srvc(uint16_t conn_id,
 
   bta_gattc_reset_discover_st(p_clcb->p_srcb, GATT_SUCCESS);
 }
-/*******************************************************************************
- *
- * Function         bta_gattc_incl_srvc_disc_cmpl
- *
- * Description      process the relationship discovery complete event
- *
- * Returns          status
- *
- ******************************************************************************/
-static void bta_gattc_incl_srvc_disc_cmpl(uint16_t conn_id,
-                                          tBTA_GATTC_SERV* p_srvc_cb) {
-  p_srvc_cb->cur_char_idx = p_srvc_cb->total_srvc;
 
-  /* start discoverying characteristic */
-  bta_gattc_start_disc_char(conn_id, p_srvc_cb);
-}
 /*******************************************************************************
  *
  * Function         bta_gattc_char_disc_cmpl
@@ -795,7 +780,10 @@ void bta_gattc_disc_cmpl_cback(uint16_t conn_id, tGATT_DISC_TYPE disc_type,
       break;
 
     case GATT_DISC_INC_SRVC:
-      bta_gattc_incl_srvc_disc_cmpl(conn_id, p_srvc_cb);
+      p_srvc_cb->cur_char_idx = p_srvc_cb->total_srvc;
+
+      /* start discoverying characteristic */
+      bta_gattc_start_disc_char(conn_id, p_srvc_cb);
       break;
 
     case GATT_DISC_CHAR: