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

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

legacy: Use proper rfcomm event types am: 5eb98b71 am: 18c87944 am:... 

legacy: Use proper rfcomm event types am: 5eb98b71 am: 18c87944 am: e32919b5 am: a75f9aa4 am: ebc3ab20

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

Change-Id: Ieb4efb14ba5cb4ac5fa18f774b24233312968556
parents 66f147d5 ebc3ab20

system/stack/rfcomm/rfc_int.h

+4 −3
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ extern uint8_t rfc_calc_fcs(uint16_t len, uint8_t* p); 


#endif



extern void rfc_mx_sm_execute(tRFC_MCB* p_mcb, uint16_t event, void* p_data);

extern void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event,

                              void* p_data);



/*

 * Functions provided by the rfc_port_fsm.cc
@@ -354,7 +355,7 @@ extern void rfc_send_fcoff(tRFC_MCB* p_mcb, bool is_command); 
extern void rfc_send_buf_uih(tRFC_MCB* p_rfc_mcb, uint8_t dlci, BT_HDR* p_buf);

extern void rfc_send_credit(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t credit);

extern void rfc_process_mx_message(tRFC_MCB* p_rfc_mcb, BT_HDR* p_buf);

extern uint8_t rfc_parse_data(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame,

extern tRFC_EVENT rfc_parse_data(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame,

                                 BT_HDR* p_buf);



/* Call back functions from RFCOMM */

system/stack/rfcomm/rfc_l2cap_if.cc

+2 −2
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { 
    return;

  }



  uint8_t event = rfc_parse_data(p_mcb, &rfc_cb.rfc.rx_frame, p_buf);

  tRFC_EVENT event = rfc_parse_data(p_mcb, &rfc_cb.rfc.rx_frame, p_buf);



  /* If the frame did not pass validation just ignore it */

  if (event == RFC_EVENT_BAD_FRAME) {
@@ -273,7 +273,7 @@ void RFCOMM_BufDataInd(uint16_t lcid, BT_HDR* p_buf) { 
    }



    /* Other multiplexer events go to state machine */

    rfc_mx_sm_execute(p_mcb, event, nullptr);

    rfc_mx_sm_execute(p_mcb, static_cast<tRFC_MX_EVENT>(event), nullptr);

    osi_free(p_buf);

    return;

  }

system/stack/rfcomm/rfc_mx_fsm.cc

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void rfc_mx_conf_cnf(tRFC_MCB* p_mcb, uint16_t result); 
 * Returns          void

 *

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

void rfc_mx_sm_execute(tRFC_MCB* p_mcb, uint16_t event, void* p_data) {

void rfc_mx_sm_execute(tRFC_MCB* p_mcb, tRFC_MX_EVENT event, void* p_data) {

  CHECK(p_mcb != nullptr) << __func__ << ": NULL mcb for event " << event;



  LOG_INFO(

system/stack/rfcomm/rfc_ts_frames.cc

+1 −1
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ void rfc_send_credit(tRFC_MCB* p_mcb, uint8_t dlci, uint8_t credit) { 
 * Description      This function processes data packet received from L2CAP

 *

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

uint8_t rfc_parse_data(tRFC_MCB* p_mcb, MX_FRAME* p_frame, BT_HDR* p_buf) {

tRFC_EVENT rfc_parse_data(tRFC_MCB* p_mcb, MX_FRAME* p_frame, BT_HDR* p_buf) {

  uint8_t ead, eal, fcs;

  uint8_t* p_data = (uint8_t*)(p_buf + 1) + p_buf->offset;

  uint8_t* p_start = p_data;