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

Commit 5df466a6 authored by Chris Manton's avatar Chris Manton
Browse files

Streamline enum stack::l2cap::tL2CAP_DW_RESULT

Bug: 344992630
Test: m .
Flag: EXEMPT, Mechanical Refactor
Change-Id: I58c45c5c40e155e0e4c5b6bb3bc50333ca798037
parent eee44c7d
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -216,11 +216,11 @@ bool L2CA_DisconnectLECocReq(uint16_t cid);
 *
 * Description      Higher layers call this function to write data.
 *
 * Returns          tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS, if data accepted, else
 * Returns          tL2CAP_DW_RESULT::SUCCESS, if data accepted, else
 *                  false
 *                  tL2CAP_DW_RESULT::L2CAP_DW_CONGESTED, if data accepted
 *                  tL2CAP_DW_RESULT::CONGESTED, if data accepted
 *                  and the channel is congested
 *                  tL2CAP_DW_RESULT::L2CAP_DW_FAILED, if error
 *                  tL2CAP_DW_RESULT::FAILED, if error
 *
 ******************************************************************************/
uint8_t L2CA_DataWrite(uint16_t cid, BT_HDR* p_data);
@@ -355,8 +355,8 @@ bool L2CA_ConnectFixedChnl(uint16_t fixed_cid, const RawAddress& bd_addr);
 *                  BD Address of remote
 *                  Pointer to buffer of type BT_HDR
 *
 * Return value     tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS, if data accepted
 *                  tL2CAP_DW_RESULT::L2CAP_DW_FAILED,  if error
 * Return value     tL2CAP_DW_RESULT::SUCCESS, if data accepted
 *                  tL2CAP_DW_RESULT::FAILED,  if error
 *
 ******************************************************************************/
uint16_t L2CA_SendFixedChnlData(uint16_t fixed_cid, const RawAddress& rem_bda,
+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ void AclArbiter::SendPacketToPeer(uint8_t tcb_idx,
    p_buf->offset = L2CAP_MIN_OFFSET;
    p_buf->len = buffer.size();
    if (L2CA_SendFixedChnlData(L2CAP_ATT_CID, p_tcb->peer_bda, p_buf) !=
        tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS) {
        tL2CAP_DW_RESULT::SUCCESS) {
      log::warn("Unable to send L2CAP data peer:{} fixed_cid:{} len:{}",
                p_tcb->peer_bda, L2CAP_ATT_CID, p_buf->len);
    }
+2 −4
Original line number Diff line number Diff line
@@ -476,8 +476,7 @@ void avct_bcb_send_msg(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data) {
  p_buf->layer_specific = AVCT_DATA_BROWSE;

  /* send message to L2CAP */
  if (L2CA_DataWrite(p_bcb->ch_lcid, p_buf) !=
      tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS) {
  if (L2CA_DataWrite(p_bcb->ch_lcid, p_buf) != tL2CAP_DW_RESULT::SUCCESS) {
    log::warn("Unable to write L2CAP data peer:{} cid:{}", p_bcb->peer_addr,
              p_bcb->ch_lcid);
  }
@@ -583,8 +582,7 @@ void avct_bcb_msg_ind(tAVCT_BCB* p_bcb, tAVCT_LCB_EVT* p_data) {
    AVCT_BUILD_HDR(p, label, AVCT_PKT_TYPE_SINGLE, AVCT_REJ);
    UINT16_TO_BE_STREAM(p, pid);
    p_buf->layer_specific = AVCT_DATA_BROWSE;
    if (L2CA_DataWrite(p_bcb->ch_lcid, p_buf) !=
        tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS) {
    if (L2CA_DataWrite(p_bcb->ch_lcid, p_buf) != tL2CAP_DW_RESULT::SUCCESS) {
      log::warn("Unable to write L2CAP data peer:{} cid:{}", p_bcb->peer_addr,
                p_bcb->ch_lcid);
    }
+3 −4
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ void avct_lcb_cong_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data) {
    while (!p_lcb->cong &&
           (p_buf = (BT_HDR*)fixed_queue_try_dequeue(p_lcb->tx_q)) != NULL) {
      if (L2CA_DataWrite(p_lcb->ch_lcid, p_buf) ==
          tL2CAP_DW_RESULT::L2CAP_DW_CONGESTED) {
          tL2CAP_DW_RESULT::CONGESTED) {
        p_lcb->cong = true;
      }
    }
@@ -621,7 +621,7 @@ void avct_lcb_send_msg(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data) {
    /* send message to L2CAP */
    else {
      if (L2CA_DataWrite(p_lcb->ch_lcid, p_buf) ==
          tL2CAP_DW_RESULT::L2CAP_DW_CONGESTED) {
          tL2CAP_DW_RESULT::CONGESTED) {
        p_lcb->cong = true;
      }
    }
@@ -725,8 +725,7 @@ void avct_lcb_msg_ind(tAVCT_LCB* p_lcb, tAVCT_LCB_EVT* p_data) {
    p = (uint8_t*)(p_buf + 1) + p_buf->offset;
    AVCT_BUILD_HDR(p, label, AVCT_PKT_TYPE_SINGLE, AVCT_REJ);
    UINT16_TO_BE_STREAM(p, pid);
    if (L2CA_DataWrite(p_lcb->ch_lcid, p_buf) !=
        tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS) {
    if (L2CA_DataWrite(p_lcb->ch_lcid, p_buf) != tL2CAP_DW_RESULT::SUCCESS) {
      log::warn("Unable to write L2CAP data peer:{} cid:{} len:{}",
                p_lcb->peer_addr, p_lcb->ch_lcid, p_buf->len);
    }
+1 −2
Original line number Diff line number Diff line
@@ -304,8 +304,7 @@ static void bnep_congestion_ind(uint16_t l2cap_cid, bool is_congested) {

      if (!p_buf) break;

      if (L2CA_DataWrite(l2cap_cid, p_buf) !=
          tL2CAP_DW_RESULT::L2CAP_DW_SUCCESS) {
      if (L2CA_DataWrite(l2cap_cid, p_buf) != tL2CAP_DW_RESULT::SUCCESS) {
        log::warn("Unable to write L2CAP data peer:{} cid:{} len:{}",
                  p_bcb->rem_bda, l2cap_cid, p_buf->len);
      }
Loading