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

Commit ed128230 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Remove unused parameter in avdt_ad_tc_close_ind 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I888bb41bc28378406d441856ac1e615eb8c970a2
parent c688cb8a

system/stack/avdt/avdt_ad.cc

+3 −4
Original line number Diff line number Diff line
@@ -298,8 +298,7 @@ uint8_t avdt_ad_tc_tbl_to_idx(AvdtpTransportChannel* p_tbl) { 
 * Returns          Nothing.

 *

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

void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl,

                          UNUSED_ATTR uint16_t reason) {

void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl) {

  AvdtpCcb* p_ccb;

  AvdtpScb* p_scb;

  tAVDT_SCB_TC_CLOSE close;
@@ -567,7 +566,7 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, 
                       avdt_ccb_to_idx(p_ccb), p_tbl->tcid, lcid);

    } else {

      /* if connect req failed, call avdt_ad_tc_close_ind() */

      avdt_ad_tc_close_ind(p_tbl, 0);

      avdt_ad_tc_close_ind(p_tbl);

    }

  }

}
@@ -597,7 +596,7 @@ void avdt_ad_close_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb) { 
      break;

    case AVDT_AD_ST_ACP:

      /* if we're listening on this channel, send ourselves a close ind */

      avdt_ad_tc_close_ind(p_tbl, 0);

      avdt_ad_tc_close_ind(p_tbl);

      break;

    default:

      /* get tcid from type, scb */

system/stack/avdt/avdt_int.h

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ extern AvdtpTransportChannel* avdt_ad_tc_tbl_by_st(uint8_t type, 
extern AvdtpTransportChannel* avdt_ad_tc_tbl_by_lcid(uint16_t lcid);

extern AvdtpTransportChannel* avdt_ad_tc_tbl_alloc(AvdtpCcb* p_ccb);

extern uint8_t avdt_ad_tc_tbl_to_idx(AvdtpTransportChannel* p_tbl);

extern void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl, uint16_t reason);

extern void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl);

extern void avdt_ad_tc_open_ind(AvdtpTransportChannel* p_tbl);

extern void avdt_ad_tc_cong_ind(AvdtpTransportChannel* p_tbl,

                                bool is_congested);

system/stack/avdt/avdt_l2c.cc

+5 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static void avdt_sec_check_complete_term(const RawAddress* bd_addr, 
  } else {

    L2CA_ConnectRsp(*bd_addr, p_tbl->id, p_tbl->lcid, L2CAP_CONN_SECURITY_BLOCK,

                    L2CAP_CONN_OK);

    avdt_ad_tc_close_ind(p_tbl, L2CAP_CONN_SECURITY_BLOCK);

    avdt_ad_tc_close_ind(p_tbl);

  }

}
@@ -146,7 +146,7 @@ static void avdt_sec_check_complete_orig(const RawAddress* bd_addr, 
    L2CA_ConfigReq(p_tbl->lcid, &cfg);

  } else {

    L2CA_DisconnectReq(p_tbl->lcid);

    avdt_ad_tc_close_ind(p_tbl, L2CAP_CONN_SECURITY_BLOCK);

    avdt_ad_tc_close_ind(p_tbl);

  }

}

/*******************************************************************************
@@ -320,7 +320,7 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, uint16_t result) { 


      /* failure; notify adaption that channel closed */

      if (result != L2CAP_CONN_OK) {

        avdt_ad_tc_close_ind(p_tbl, result);

        avdt_ad_tc_close_ind(p_tbl);

      }

    }

  }
@@ -430,7 +430,7 @@ void avdt_l2c_disconnect_ind_cback(uint16_t lcid, bool ack_needed) { 
  /* look up info for this channel */

  p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);

  if (p_tbl != NULL) {

    avdt_ad_tc_close_ind(p_tbl, 0);

    avdt_ad_tc_close_ind(p_tbl);

  }

}
@@ -452,7 +452,7 @@ void avdt_l2c_disconnect_cfm_cback(uint16_t lcid, uint16_t result) { 
  /* look up info for this channel */

  p_tbl = avdt_ad_tc_tbl_by_lcid(lcid);

  if (p_tbl != NULL) {

    avdt_ad_tc_close_ind(p_tbl, result);

    avdt_ad_tc_close_ind(p_tbl);

  }

}