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

Commit 920f6a2a authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gatt: Remove confusing GATT_CL_MAX_LCB" into main am: 183a5225 am: d2eff1b2 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2967330



Change-Id: I1c628bb8a6b7e13a2cafabb6f6387d4623513793
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6deaed0e d2eff1b2

system/stack/gatt/gatt_utils.cc

+0 −9
Original line number Diff line number Diff line
@@ -1074,15 +1074,6 @@ tGATT_CLCB* gatt_clcb_alloc(uint16_t conn_id) { 
  gatt_cb.clcb_queue.emplace_back(clcb);

  auto p_clcb = &(gatt_cb.clcb_queue.back());



  if (gatt_cb.clcb_queue.size() > GATT_CL_MAX_LCB) {

    /* GATT_CL_MAX_LCB is here from the historical reasons. We believe this

     * limitation is not needed. In addition, number of clcb should not be

     * bigger than that and also if it is bigger, we  believe it should not

     * cause the problem. This WARN is just to monitor number of CLCB and will

     * help in debugging in case we are wrong */

    log::warn("Number of CLCB: {} > {}", gatt_cb.clcb_queue.size(),

              GATT_CL_MAX_LCB);

  }

  return p_clcb;

}

system/stack/include/gatt_api.h

+0 −4
Original line number Diff line number Diff line
@@ -313,10 +313,6 @@ inline std::string gatt_disconnection_reason_text( 
*/

#define GATT_INVALID_CONN_ID 0xFFFF



#ifndef GATT_CL_MAX_LCB

#define GATT_CL_MAX_LCB 22

#endif



/* GATT notification caching timer, default to be three seconds

*/

#ifndef GATTC_NOTIF_TIMEOUT

system/stack/srvc/srvc_eng_int.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "srvc_api.h"

#include "types/raw_address.h"



#define SRVC_MAX_APPS GATT_CL_MAX_LCB

#define SRVC_MAX_APPS GATT_MAX_APPS



#define SRVC_ID_NONE 0

#define SRVC_ID_DIS 1