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

Commit c249638b authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Properly type rfc events am: c24b0257 am: 49dabc12 am: 97dc243c... 

legacy: Properly type rfc events am: c24b0257 am: 49dabc12 am: 97dc243c am: d83da39a am: c7a2363f

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1817470

Change-Id: I073e585268202d35d0cd9d02c53cec1ec5a6ac3f
parents 0d22b59e c7a2363f

system/stack/rfcomm/rfc_l2cap_if.cc

+2 −2
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { 
    RFCOMM_TRACE_DEBUG("%s: Handling UIH event, buf_len=%u, credit=%u",

                       __func__, p_buf->len, rfc_cb.rfc.rx_frame.credit);

    if (p_buf->len > 0) {

      rfc_port_sm_execute(p_port, event, p_buf);

      rfc_port_sm_execute(p_port, static_cast<tRFC_PORT_EVENT>(event), p_buf);

    } else {

      osi_free(p_buf);

    }
@@ -331,7 +331,7 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { 


    return;

  }

  rfc_port_sm_execute(p_port, event, nullptr);

  rfc_port_sm_execute(p_port, static_cast<tRFC_PORT_EVENT>(event), nullptr);

  osi_free(p_buf);

}

system/stack/rfcomm/rfc_utils.cc

+2 −2
Original line number Diff line number Diff line
@@ -296,13 +296,13 @@ void rfc_check_mcb_active(tRFC_MCB* p_mcb) { 
void rfcomm_port_timer_timeout(void* data) {

  tPORT* p_port = (tPORT*)data;



  rfc_port_sm_execute(p_port, RFC_EVENT_TIMEOUT, NULL);

  rfc_port_sm_execute(p_port, RFC_PORT_EVENT_TIMEOUT, NULL);

}



void rfcomm_mcb_timer_timeout(void* data) {

  tRFC_MCB* p_mcb = (tRFC_MCB*)data;



  rfc_mx_sm_execute(p_mcb, RFC_EVENT_TIMEOUT, NULL);

  rfc_mx_sm_execute(p_mcb, RFC_MX_EVENT_TIMEOUT, NULL);

}



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