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

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

Merge "avdt_ad: Minor refactor to reduce code nesting" into main am: 3c02bcbd 

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



Change-Id: Ibeec97c712cab637dedd7e37d73de30042220881
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7b307097 3c02bcbd

system/bta/av/bta_av_int.h

+1 −1
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ typedef struct { 
} tBTA_AV_SEP;



enum : uint8_t {

  /* initiator/acceptor role for adaption */

  /* initiator/acceptor role for adaptation */

  BTA_AV_ROLE_AD_INT = 0x00, /* initiator */

  BTA_AV_ROLE_AD_ACP = 0x01, /* acceptor */

system/stack/avdt/avdt_ad.cc

+31 −42
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


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

 *

 *  This module contains the AVDTP adaption layer.

 *  This module contains the AVDTP adaptation layer.

 *

 ******************************************************************************/
@@ -74,9 +74,7 @@ uint8_t avdt_ad_type_to_tcid(uint8_t type, AvdtpScb* p_scb) { 
  uint8_t scb_idx = (avdt_scb_to_hdl(p_scb) - 1) % AVDT_NUM_LINKS;

  // There are AVDT_CHAN_NUM_TYPES channel types per SEP. Here we compute

  // the type index (TCID) from the SEP index and the type itself.

  uint8_t tcid = (scb_idx * (AVDT_CHAN_NUM_TYPES - 1)) + type;

  log::verbose("type:{}, tcid: {}", type, tcid);

  return tcid;

  return (scb_idx * (AVDT_CHAN_NUM_TYPES - 1)) + type;

}



/*******************************************************************************
@@ -90,27 +88,22 @@ uint8_t avdt_ad_type_to_tcid(uint8_t type, AvdtpScb* p_scb) { 
 *

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

static uint8_t avdt_ad_tcid_to_type(uint8_t tcid) {

  uint8_t type;



  if (tcid == 0) {

    type = AVDT_CHAN_SIG;

  } else {

    return AVDT_CHAN_SIG;

  }

  /* tcid translates to type based on number of channels, as follows:

  ** only media channel   :  tcid=1,2,3,4,5,6...  type=1,1,1,1,1,1...

  ** media and report     :  tcid=1,2,3,4,5,6...  type=1,2,1,2,1,2...

  ** media, report, recov :  tcid=1,2,3,4,5,6...  type=1,2,3,1,2,3...

  */

    type = ((tcid + AVDT_CHAN_NUM_TYPES - 2) % (AVDT_CHAN_NUM_TYPES - 1)) + 1;

  }

  log::verbose("tcid: {}, type: {}", tcid, type);

  return type;

  return ((tcid + AVDT_CHAN_NUM_TYPES - 2) % (AVDT_CHAN_NUM_TYPES - 1)) + 1;

}



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

 *

 * Function         avdt_ad_init

 *

 * Description      Initialize adaption layer.

 * Description      Initialize adaptation layer.

 *

 *

 * Returns          Nothing.
@@ -131,7 +124,7 @@ void avdt_ad_init(void) { 
 *

 * Function         avdt_ad_tc_tbl_by_st

 *

 * Description      Find adaption layer transport channel table entry matching

 * Description      Find adaptation layer transport channel table entry matching

 *                  the given state.

 *

 *
@@ -183,7 +176,7 @@ AvdtpTransportChannel* avdt_ad_tc_tbl_by_st(uint8_t type, AvdtpCcb* p_ccb, uint8 
 *

 * Function         avdt_ad_tc_tbl_by_lcid

 *

 * Description      Find adaption layer transport channel table entry by LCID.

 * Description      Find adaptation layer transport channel table entry by LCID.

 *

 *

 * Returns          Pointer to entry.
@@ -302,8 +295,7 @@ void avdt_ad_tc_close_ind(AvdtpTransportChannel* p_tbl) { 
  p_tbl->cfg_flags = 0;

  p_tbl->peer_mtu = L2CAP_DEFAULT_MTU;



  log::verbose("tcid: {}, old: {}", p_tbl->tcid, close.old_tc_state);

  /* if signaling channel, notify ccb that channel open */

  /* if signaling channel, notify ccb that channel close */

  if (p_tbl->tcid == 0) {

    p_ccb = avdt_ccb_by_idx(p_tbl->ccb_idx);

    avdt_ccb_event(p_ccb, AVDT_CCB_LL_CLOSE_EVT, NULL);
@@ -511,27 +503,22 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, uint8_t ro 
  }



  p_tbl->tcid = avdt_ad_type_to_tcid(type, p_scb);

  log::verbose("avdt_ad_open_req: type: {}, role: {}, tcid:{}", type, role, p_tbl->tcid);



  if (type == AVDT_CHAN_SIG) {

    /* if signaling, get mtu from registration control block */

    p_tbl->my_mtu = kAvdtpMtu;

  } else {

    /* otherwise get mtu from scb */

  p_tbl->my_mtu = kAvdtpMtu;

  log::verbose("p_tbl: {} state: {} tcid: {} type: {} role: {} my_mtu: {}", fmt::ptr(p_tbl),

               tc_state_text(p_tbl->state), p_tbl->tcid, tc_type_text(type), role, p_tbl->my_mtu);



  if (type != AVDT_CHAN_SIG) {

    /* also set scb_hdl in rt_tbl */

    avdtp_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][p_tbl->tcid].scb_hdl = avdt_scb_to_hdl(p_scb);

    log::verbose("avdtp_cb.ad.rt_tbl[{}][{}].scb_hdl = {}", avdt_ccb_to_idx(p_ccb), p_tbl->tcid,

                 avdt_scb_to_hdl(p_scb));

  }



  /* if we're acceptor, we're done; just sit back and listen */

  if (role == AVDT_ACP) {

    /* if we're acceptor, we're done; just sit back and listen */

    p_tbl->state = AVDT_AD_ST_ACP;

  }

  } else {

    /* else we're inititator, start the L2CAP connection */

  else {

    p_tbl->state = AVDT_AD_ST_CONN;



    /* call l2cap connect req */
@@ -542,18 +529,20 @@ void avdt_ad_open_req(uint8_t type, AvdtpCcb* p_ccb, AvdtpScb* p_scb, uint8_t ro 
      lcid = stack::l2cap::get_interface().L2CA_ConnectReqWithSecurity(AVDT_PSM, p_ccb->peer_addr,

                                                                       BTM_SEC_OUT_AUTHENTICATE);

    }

    if (lcid != 0) {

      /* if connect req ok, store tcid in lcid table  */

      avdtp_cb.ad.lcid_tbl[lcid] = avdt_ad_tc_tbl_to_idx(p_tbl);

      log::verbose("avdtp_cb.ad.lcid_tbl[{}] = {}", lcid, avdt_ad_tc_tbl_to_idx(p_tbl));



      avdtp_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][p_tbl->tcid].lcid = lcid;

      log::verbose("avdtp_cb.ad.rt_tbl[{}][{}].lcid = 0x{:x}", avdt_ccb_to_idx(p_ccb), p_tbl->tcid,

                   lcid);

    } else {

    if (lcid == 0) {

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

      avdt_ad_tc_close_ind(p_tbl);

      return;

    }



    /* if connect req ok, store tcid in lcid table  */

    avdtp_cb.ad.lcid_tbl[lcid] = avdt_ad_tc_tbl_to_idx(p_tbl);

    log::verbose("For lcid: 0x{:x} store table index: {}", lcid, avdt_ad_tc_tbl_to_idx(p_tbl));



    avdtp_cb.ad.rt_tbl[avdt_ccb_to_idx(p_ccb)][p_tbl->tcid].lcid = lcid;

    log::verbose("For ccb index: {} and tcid: {} store lcid 0x{:x}", avdt_ccb_to_idx(p_ccb),

                 p_tbl->tcid, lcid);

  }

}

system/stack/avdt/avdt_int.h

+6 −6
Original line number Diff line number Diff line
@@ -307,11 +307,11 @@ enum { 
  AVDT_SCB_CC_CLOSE_EVT

};



/* adaption layer number of stream routing table entries */

/* Adaptation layer number of stream routing table entries */

/* 2 channels(1 media, 1 report) for each SEP and one for signalling */

#define AVDT_NUM_RT_TBL (AVDT_NUM_SEPS * AVDT_CHAN_NUM_TYPES + 1)



/* adaption layer number of transport channel table entries - moved to target.h

/* Adaptation layer number of transport channel table entries - moved to target.h

#define AVDT_NUM_TC_TBL     (AVDT_NUM_SEPS + AVDT_NUM_LINKS) */



/* Configuration flags. AvdtpTransportChannel.cfg_flags */
@@ -705,7 +705,7 @@ public: 


/**

 * AVDTP stream routing entry.

 * Used in the routing table in the adaption layer.

 * Used in the routing table in the Adaptation layer.

 */

class AvdtpRoutingEntry {

public:
@@ -721,7 +721,7 @@ public: 
};



/**

 * AVDTP adaption layer control block.

 * AVDTP Adaptation layer control block.

 */

class AvdtpAdaptationLayer {

public:
@@ -782,7 +782,7 @@ public: 


  AvdtpRcb rcb;                       // Registration control block

  AvdtpCcb ccb[AVDT_NUM_LINKS];       // Channel control blocks

  AvdtpAdaptationLayer ad;            // Adaption layer control block

  AvdtpAdaptationLayer ad;            // Adaptation layer control block

  tAVDTC_CTRL_CBACK* p_conf_cback;    // Conformance callback function

  const tAVDT_CCB_ACTION* p_ccb_act;  // Pointer to CCB action functions

  const tAVDT_SCB_ACTION* p_scb_act;  // Pointer to SCB action functions
@@ -943,7 +943,7 @@ void avdt_msg_send_rej(AvdtpCcb* p_ccb, uint8_t sig_id, tAVDT_MSG* p_params); 
void avdt_msg_send_grej(AvdtpCcb* p_ccb, uint8_t sig_id, tAVDT_MSG* p_params);

void avdt_msg_ind(AvdtpCcb* p_ccb, BT_HDR* p_buf);



/* adaption layer function declarations */

/* Adaptation layer function declarations */

void avdt_ad_init(void);

uint8_t avdt_ad_type_to_tcid(uint8_t type, AvdtpScb* p_scb);

AvdtpTransportChannel* avdt_ad_tc_tbl_by_st(uint8_t type, AvdtpCcb* p_ccb, uint8_t state);

system/stack/avdt/avdt_msg.cc

+1 −1
Original line number Diff line number Diff line
@@ -1479,7 +1479,7 @@ void avdt_msg_send_grej(AvdtpCcb* p_ccb, uint8_t sig_id, tAVDT_MSG* p_params) { 
 *

 * Function         avdt_msg_ind

 *

 * Description      This function is called by the adaption layer when an

 * Description      This function is called by the adaptation layer when an

 *                  incoming message is received on the signaling channel.

 *                  It parses the message and sends an event to the appropriate

 *                  SCB or CCB for the message.

system/stack/avdt/avdt_scb_act.cc

+1 −1
Original line number Diff line number Diff line
@@ -1148,7 +1148,7 @@ void avdt_scb_snd_open_req(AvdtpScb* p_scb, tAVDT_SCB_EVT* /* p_data */) { 
 *

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

void avdt_scb_snd_open_rsp(AvdtpScb* p_scb, tAVDT_SCB_EVT* p_data) {

  /* notify adaption that we're waiting for transport channel open */

  /* notify adaptation that we're waiting for transport channel open */

  p_scb->role = AVDT_OPEN_ACP;

  avdt_ad_open_req(AVDT_CHAN_MEDIA, p_scb->p_ccb, p_scb, AVDT_ACP);