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

Commit 9247062b authored by Aritra Sen's avatar Aritra Sen Committed by Automerger Merge Worker
Browse files

Merge "Port_TimeOutCloseMux to PORT_TimeOutCloseMux" into main am: a5028f3e 

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



Change-Id: Ic6b621619bcb9c7c69876c2387cb3652f2782435
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c9e5f38 a5028f3e

system/stack/rfcomm/port_rfc.cc

+3 −3
Original line number Diff line number Diff line
@@ -749,17 +749,17 @@ void PORT_CloseInd(tRFC_MCB* p_mcb) { 


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

 *

 * Function         Port_TimeOutCloseMux

 * Function         PORT_TimeOutCloseMux

 *

 * Description      This function is called when RFCOMM timesout on a command

 *                  as a result multiplexer connection is closed.

 *

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

void Port_TimeOutCloseMux(tRFC_MCB* p_mcb) {

void PORT_TimeOutCloseMux(tRFC_MCB* p_mcb) {

  tPORT* p_port;

  int i;



  RFCOMM_TRACE_EVENT("Port_TimeOutCloseMux");

  RFCOMM_TRACE_EVENT("PORT_TimeOutCloseMux");



  p_port = &rfc_cb.port.port[0];

  for (i = 0; i < MAX_RFC_PORTS; i++, p_port++) {

system/stack/rfcomm/rfc_int.h

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ void PORT_StartInd(tRFC_MCB* p_mcb); 
void PORT_StartCnf(tRFC_MCB* p_mcb, uint16_t result);



void PORT_CloseInd(tRFC_MCB* p_mcb);

void Port_TimeOutCloseMux(tRFC_MCB* p_mcb);

void PORT_TimeOutCloseMux(tRFC_MCB* p_mcb);



void PORT_DlcEstablishInd(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu);

void PORT_DlcEstablishCnf(tRFC_MCB* p_mcb, uint8_t dlci, uint16_t mtu,

system/stack/rfcomm/rfc_port_fsm.cc

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void rfc_port_sm_state_closed(tPORT* p_port, tRFC_PORT_EVENT event, 
      return;



    case RFC_PORT_EVENT_TIMEOUT:

      Port_TimeOutCloseMux(p_port->rfc.p_mcb);

      PORT_TimeOutCloseMux(p_port->rfc.p_mcb);

      RFCOMM_TRACE_ERROR("Port error state %d event %d", p_port->rfc.state,

                         event);

      return;
@@ -539,7 +539,7 @@ void rfc_port_sm_opened(tPORT* p_port, tRFC_PORT_EVENT event, void* p_data) { 
      return;



    case RFC_PORT_EVENT_TIMEOUT:

      Port_TimeOutCloseMux(p_port->rfc.p_mcb);

      PORT_TimeOutCloseMux(p_port->rfc.p_mcb);

      RFCOMM_TRACE_ERROR("Port error state %d event %d", p_port->rfc.state,

                         event);

      return;