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

Commit 1b4c5a4b authored by Jakub Rotkiewicz's avatar Jakub Rotkiewicz
Browse files

avdt: remove redundant states and functions 

Bug: 329809288
Flag: EXEMPT - minor refactor
Test: atest avatar:'A2dpTest' -v
Change-Id: I68ffaacc684c8000da410bf052e52ee423ccb0ff
parent 063a6a5d

system/stack/avdt/avdt_int.h

+6 −10
Original line number Diff line number Diff line
@@ -314,8 +314,6 @@ enum tTRANSPORT_CHANNEL_STATE : uint8_t { 
  AVDT_AD_ST_CONN = 4,   /* Waiting for connection confirm */

  AVDT_AD_ST_CFG = 5,    /* Waiting for configuration complete */

  AVDT_AD_ST_OPEN = 6,   /* Channel opened */

  AVDT_AD_ST_SEC_INT = 7, /* Security process as INT */

  AVDT_AD_ST_SEC_ACP = 8, /* Security process as ACP */

};



inline std::string tc_state_text(uint8_t state) {
@@ -327,8 +325,6 @@ inline std::string tc_state_text(uint8_t state) { 
    CASE_RETURN_TEXT(AVDT_AD_ST_CONN);

    CASE_RETURN_TEXT(AVDT_AD_ST_CFG);

    CASE_RETURN_TEXT(AVDT_AD_ST_OPEN);

    CASE_RETURN_TEXT(AVDT_AD_ST_SEC_INT);

    CASE_RETURN_TEXT(AVDT_AD_ST_SEC_ACP);

    default:

      RETURN_UNKNOWN_TYPE_STRING(tTRANSPORT_CHANNEL_STATE, state_);

  }

system/stack/avdt/avdt_l2c.cc

+5 −62
Original line number Diff line number Diff line
@@ -69,61 +69,6 @@ const tL2CAP_APPL_INFO avdt_l2c_appl = {avdt_l2c_connect_ind_cback, 
                                        NULL,

                                        NULL};



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

 *

 * Function         avdt_l2c_sec_check_complete_term

 *

 * Description      The function called when Security Manager finishes

 *                  verification of the service side connection

 *

 * Returns          void

 *

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

static void avdt_l2c_sec_check_complete_term(const RawAddress& bd_addr) {

  AvdtpCcb* p_ccb = NULL;

  AvdtpTransportChannel* p_tbl;



  p_ccb = avdt_ccb_by_bd(bd_addr);

  p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_SIG, p_ccb, AVDT_AD_ST_SEC_ACP);

  if (p_tbl == NULL) {

    log::warn("Adaptation layer transport channel table is NULL");

    return;

  }



  /* store idx in LCID table, store LCID in routing table */

  avdtp_cb.ad.lcid_tbl[p_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 = p_tbl->lcid;

  log::verbose("lcid: 0x{:04x}, bd_addr: {}", p_tbl->lcid, bd_addr);



  /* transition to configuration state */

  p_tbl->state = AVDT_AD_ST_CFG;

}



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

 *

 * Function         avdt_l2c_sec_check_complete_orig

 *

 * Description      The function called when Security Manager finishes

 *                  verification of the service side connection

 *

 * Returns          void

 *

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

static void avdt_l2c_sec_check_complete_orig(const RawAddress& bd_addr) {

  AvdtpCcb* p_ccb = NULL;

  AvdtpTransportChannel* p_tbl;



  p_ccb = avdt_ccb_by_bd(bd_addr);

  p_tbl = avdt_ad_tc_tbl_by_st(AVDT_CHAN_SIG, p_ccb, AVDT_AD_ST_SEC_INT);

  if (p_tbl == NULL) {

    log::warn("Adaptation layer transport channel table is NULL");

    return;

  }



  log::verbose("lcid: 0x{:04x}, bd_addr: {}", p_tbl->lcid, bd_addr);

  /* set channel state */

  p_tbl->state = AVDT_AD_ST_CFG;

}

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

 *

 * Function         avdt_l2c_connect_ind_cback
@@ -162,7 +107,7 @@ void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, uint16 
      p_tbl->my_mtu = kAvdtpMtu;

      p_tbl->tcid = AVDT_CHAN_SIG;

      p_tbl->lcid = lcid;

      p_tbl->state = AVDT_AD_ST_SEC_ACP;

      p_tbl->state = AVDT_AD_ST_CFG;

      p_tbl->role = tAVDT_ROLE::AVDT_ACP;



      if (interop_match_addr(INTEROP_2MBPS_LINK_ONLY, &bd_addr)) {
@@ -171,8 +116,9 @@ void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid, uint16 
                bd_addr, (acl_get_supported_packet_types() | HCI_PKT_TYPES_MASK_NO_3_DH1 |

                          HCI_PKT_TYPES_MASK_NO_3_DH3 | HCI_PKT_TYPES_MASK_NO_3_DH5));

      }

      /* Assume security check is complete */

      avdt_l2c_sec_check_complete_term(p_ccb->peer_addr);

      /* store idx in LCID table, store LCID in routing table */

      avdtp_cb.ad.lcid_tbl[p_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 = p_tbl->lcid;

      return;

    }

  } else {
@@ -284,7 +230,7 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, tL2CAP_CONN result) { 
    return;

  }



  p_tbl->state = AVDT_AD_ST_SEC_INT;

  p_tbl->state = AVDT_AD_ST_CFG;

  p_tbl->lcid = lcid;

  p_tbl->role = tAVDT_ROLE::AVDT_INT;
@@ -294,9 +240,6 @@ void avdt_l2c_connect_cfm_cback(uint16_t lcid, tL2CAP_CONN result) { 
            p_ccb->peer_addr, (acl_get_supported_packet_types() | HCI_PKT_TYPES_MASK_NO_3_DH1 |

                               HCI_PKT_TYPES_MASK_NO_3_DH3 | HCI_PKT_TYPES_MASK_NO_3_DH5));

  }



  /* Assume security check is complete */

  avdt_l2c_sec_check_complete_orig(p_ccb->peer_addr);

}



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