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

Commit 83283532 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Allocate/free the SDP connection timers only during stack startup/shutdown"

parents 709c0baa 50baa2ca

system/stack/btu/btu_init.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -89,6 +89,8 @@ void btu_free_core(void) { 
  /* Free the mandatory core stack components */

  /* Free the mandatory core stack components */

  l2c_free();

  l2c_free();





  sdp_free();



  gatt_free();

  gatt_free();

}

}

system/stack/sdp/sdp_main.cc

+11 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,10 @@ void sdp_init(void) { 
  /* Clears all structures and local SDP database (if Server is enabled) */

  /* Clears all structures and local SDP database (if Server is enabled) */

  memset(&sdp_cb, 0, sizeof(tSDP_CB));

  memset(&sdp_cb, 0, sizeof(tSDP_CB));





  for (int i = 0; i < SDP_MAX_CONNECTIONS; i++) {

    sdp_cb.ccb[i].sdp_conn_timer = alarm_new("sdp.sdp_conn_timer");

  }



  /* Initialize the L2CAP configuration. We only care about MTU and flush */

  /* Initialize the L2CAP configuration. We only care about MTU and flush */

  sdp_cb.l2cap_my_cfg.mtu_present = true;

  sdp_cb.l2cap_my_cfg.mtu_present = true;

  sdp_cb.l2cap_my_cfg.mtu = SDP_MTU_SIZE;

  sdp_cb.l2cap_my_cfg.mtu = SDP_MTU_SIZE;
@@ -122,6 +126,13 @@ void sdp_init(void) { 
  }

  }

}

}





void sdp_free(void) {

  for (int i = 0; i < SDP_MAX_CONNECTIONS; i++) {

    alarm_free(sdp_cb.ccb[i].sdp_conn_timer);

    sdp_cb.ccb[i].sdp_conn_timer = NULL;

  }

}



#if (SDP_DEBUG == TRUE)

#if (SDP_DEBUG == TRUE)

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

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

 *

 *

system/stack/sdp/sdp_utils.cc

+3 −3
Original line number Original line Diff line number Diff line
@@ -109,8 +109,9 @@ tCONN_CB* sdpu_allocate_ccb(void) { 
  /* Look through each connection control block for a free one */

  /* Look through each connection control block for a free one */

  for (xx = 0, p_ccb = sdp_cb.ccb; xx < SDP_MAX_CONNECTIONS; xx++, p_ccb++) {

  for (xx = 0, p_ccb = sdp_cb.ccb; xx < SDP_MAX_CONNECTIONS; xx++, p_ccb++) {

    if (p_ccb->con_state == SDP_STATE_IDLE) {

    if (p_ccb->con_state == SDP_STATE_IDLE) {

      alarm_t* alarm = p_ccb->sdp_conn_timer;

      memset(p_ccb, 0, sizeof(tCONN_CB));

      memset(p_ccb, 0, sizeof(tCONN_CB));

      p_ccb->sdp_conn_timer = alarm_new("sdp.sdp_conn_timer");

      p_ccb->sdp_conn_timer = alarm;

      return (p_ccb);

      return (p_ccb);

    }

    }

  }

  }
@@ -130,8 +131,7 @@ tCONN_CB* sdpu_allocate_ccb(void) { 
 ******************************************************************************/

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

void sdpu_release_ccb(tCONN_CB* p_ccb) {

void sdpu_release_ccb(tCONN_CB* p_ccb) {

  /* Ensure timer is stopped */

  /* Ensure timer is stopped */

  alarm_free(p_ccb->sdp_conn_timer);

  alarm_cancel(p_ccb->sdp_conn_timer);

  p_ccb->sdp_conn_timer = NULL;





  /* Drop any response pointer we may be holding */

  /* Drop any response pointer we may be holding */

  p_ccb->con_state = SDP_STATE_IDLE;

  p_ccb->con_state = SDP_STATE_IDLE;

system/stack/sdp/sdpint.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -223,6 +223,7 @@ extern tSDP_CB sdp_cb; 




/* Functions provided by sdp_main.cc */

/* Functions provided by sdp_main.cc */

extern void sdp_init(void);

extern void sdp_init(void);

extern void sdp_free(void);

extern void sdp_disconnect(tCONN_CB* p_ccb, uint16_t reason);

extern void sdp_disconnect(tCONN_CB* p_ccb, uint16_t reason);





#if (SDP_DEBUG == TRUE)

#if (SDP_DEBUG == TRUE)