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

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

legacy: Propagate RFC_MX_EVENT names am: ae488fec am: acd914ab am: b4b2f9cc 

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

Change-Id: I0a19f07090c0bef31e0cfdd722e9f716955b6a40
parents 8be1a7c4 b4b2f9cc

system/stack/rfcomm/rfc_mx_fsm.cc

+19 −19
Original line number Diff line number Diff line
@@ -150,18 +150,18 @@ void rfc_mx_sm_state_idle(tRFC_MCB* p_mcb, uint16_t event, void* p_data) { 
      p_mcb->state = RFC_MX_STATE_CONFIGURE;

      return;



    case RFC_EVENT_SABME:

    case RFC_MX_EVENT_SABME:

      break;



    case RFC_EVENT_UA:

    case RFC_EVENT_DM:

    case RFC_MX_EVENT_UA:

    case RFC_MX_EVENT_DM:

      return;



    case RFC_EVENT_DISC:

    case RFC_MX_EVENT_DISC:

      rfc_send_dm(p_mcb, RFCOMM_MX_DLCI, true);

      return;



    case RFC_EVENT_UIH:

    case RFC_MX_EVENT_UIH:

      rfc_send_dm(p_mcb, RFCOMM_MX_DLCI, false);

      return;
@@ -214,7 +214,7 @@ void rfc_mx_sm_state_wait_conn_cnf(tRFC_MCB* p_mcb, uint16_t event, 
      PORT_CloseInd(p_mcb);

      return;



    case RFC_EVENT_TIMEOUT:

    case RFC_MX_EVENT_TIMEOUT:

      p_mcb->state = RFC_MX_STATE_IDLE;

      L2CA_DisconnectReq(p_mcb->lcid);
@@ -288,7 +288,7 @@ void rfc_mx_sm_state_configure(tRFC_MCB* p_mcb, uint16_t event, void* p_data) { 
      PORT_CloseInd(p_mcb);

      return;



    case RFC_EVENT_TIMEOUT:

    case RFC_MX_EVENT_TIMEOUT:

      LOG(ERROR) << __func__ << ": L2CAP configuration timeout for "

                 << p_mcb->bd_addr;

      p_mcb->state = RFC_MX_STATE_IDLE;
@@ -336,7 +336,7 @@ void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, uint16_t event, 
      PORT_CloseInd(p_mcb);

      return;



    case RFC_EVENT_UA:

    case RFC_MX_EVENT_UA:

      rfc_timer_stop(p_mcb);



      p_mcb->state = RFC_MX_STATE_CONNECTED;
@@ -345,13 +345,13 @@ void rfc_mx_sm_sabme_wait_ua(tRFC_MCB* p_mcb, uint16_t event, 
      PORT_StartCnf(p_mcb, RFCOMM_SUCCESS);

      return;



    case RFC_EVENT_DM:

    case RFC_MX_EVENT_DM:

      rfc_timer_stop(p_mcb);

      FALLTHROUGH_INTENDED; /* FALLTHROUGH */



    case RFC_MX_EVENT_CONF_IND: /* workaround: we don't support reconfig */

    case RFC_MX_EVENT_CONF_CNF: /* workaround: we don't support reconfig */

    case RFC_EVENT_TIMEOUT:

    case RFC_MX_EVENT_TIMEOUT:

      p_mcb->state = RFC_MX_STATE_IDLE;

      L2CA_DisconnectReq(p_mcb->lcid);
@@ -380,7 +380,7 @@ void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, uint16_t event, void* p_data) { 
      PORT_CloseInd(p_mcb);

      return;



    case RFC_EVENT_SABME:

    case RFC_MX_EVENT_SABME:

      /* if we gave up outgoing connection request */

      if (p_mcb->pending_lcid) {

        p_mcb->pending_lcid = 0;
@@ -413,7 +413,7 @@ void rfc_mx_sm_state_wait_sabme(tRFC_MCB* p_mcb, uint16_t event, void* p_data) { 


    case RFC_MX_EVENT_CONF_IND: /* workaround: we don't support reconfig */

    case RFC_MX_EVENT_CONF_CNF: /* workaround: we don't support reconfig */

    case RFC_EVENT_TIMEOUT:

    case RFC_MX_EVENT_TIMEOUT:

      p_mcb->state = RFC_MX_STATE_IDLE;

      L2CA_DisconnectReq(p_mcb->lcid);
@@ -439,7 +439,7 @@ void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, uint16_t event, 
  RFCOMM_TRACE_EVENT("%s: event %d", __func__, event);



  switch (event) {

    case RFC_EVENT_TIMEOUT:

    case RFC_MX_EVENT_TIMEOUT:

    case RFC_MX_EVENT_CLOSE_REQ:

      rfc_timer_start(p_mcb, RFC_DISC_TIMEOUT);

      p_mcb->state = RFC_MX_STATE_DISC_WAIT_UA;
@@ -451,7 +451,7 @@ void rfc_mx_sm_state_connected(tRFC_MCB* p_mcb, uint16_t event, 
      PORT_CloseInd(p_mcb);

      return;



    case RFC_EVENT_DISC:

    case RFC_MX_EVENT_DISC:

      /* Reply with UA.  If initiator bring down L2CAP connection */

      /* If server wait for some time if client decide to reinitiate channel */

      rfc_send_ua(p_mcb, RFCOMM_MX_DLCI);
@@ -482,9 +482,9 @@ void rfc_mx_sm_state_disc_wait_ua(tRFC_MCB* p_mcb, uint16_t event, 


  RFCOMM_TRACE_EVENT("%s: event %d", __func__, event);

  switch (event) {

    case RFC_EVENT_UA:

    case RFC_EVENT_DM:

    case RFC_EVENT_TIMEOUT:

    case RFC_MX_EVENT_UA:

    case RFC_MX_EVENT_DM:

    case RFC_MX_EVENT_TIMEOUT:

      L2CA_DisconnectReq(p_mcb->lcid);



      if (p_mcb->restart_required) {
@@ -515,11 +515,11 @@ void rfc_mx_sm_state_disc_wait_ua(tRFC_MCB* p_mcb, uint16_t event, 
      rfc_release_multiplexer_channel(p_mcb);

      return;



    case RFC_EVENT_DISC:

    case RFC_MX_EVENT_DISC:

      rfc_send_ua(p_mcb, RFCOMM_MX_DLCI);

      return;



    case RFC_EVENT_UIH:

    case RFC_MX_EVENT_UIH:

      osi_free(p_data);

      rfc_send_dm(p_mcb, RFCOMM_MX_DLCI, false);

      return;