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

Commit a17619d7 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Get rid of GAP_CONN_INCLUDED 

Change-Id: I2c0926c7c935b6efe1f0ea35a86ed89edb746096
parent 118a49f6

system/include/bt_target.h

+0 −5
Original line number Diff line number Diff line
@@ -1206,11 +1206,6 @@ 
#define GAP_INCLUDED TRUE

#endif



/* This is set to enable use of GAP L2CAP connections. */

#ifndef GAP_CONN_INCLUDED

#define GAP_CONN_INCLUDED TRUE

#endif



/* The maximum number of simultaneous GAP L2CAP connections. */

#ifndef GAP_MAX_CONNECTIONS

#define GAP_MAX_CONNECTIONS 30

system/stack/gap/gap_api.cc

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ void GAP_Init(void) { 
  gap_cb.trace_level = BT_TRACE_LEVEL_NONE; /* No traces */

#endif



#if (GAP_CONN_INCLUDED == TRUE)

  gap_conn_init();

#endif



  gap_attr_db_init();

}

system/stack/gap/gap_conn.cc

+0 −3
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "l2cdefs.h"

#include "osi/include/mutex.h"

#include "osi/include/osi.h"

#if (GAP_CONN_INCLUDED == TRUE)

#include "btm_int.h"



/******************************************************************************/
@@ -1133,5 +1132,3 @@ static void gap_release_ccb(tGAP_CCB* p_ccb) { 
  if (p_ccb->transport == BT_TRANSPORT_BR_EDR) L2CA_DEREGISTER(p_ccb->psm);

  if (p_ccb->transport == BT_TRANSPORT_LE) L2CA_DEREGISTER_COC(p_ccb->psm);

}
 


#endif /* GAP_CONN_INCLUDED */

system/stack/gap/gap_int.h

+0 −4
Original line number Diff line number Diff line
@@ -81,14 +81,10 @@ typedef struct { 


typedef struct {

  uint8_t trace_level;

#if (GAP_CONN_INCLUDED == TRUE)

  tGAP_CONN conn;

#endif

} tGAP_CB;



extern tGAP_CB gap_cb;

#if (GAP_CONN_INCLUDED == TRUE)

extern void gap_conn_init(void);

#endif

extern void gap_attr_db_init(void);

#endif