commit 5eb98b71754839bb2c4dee1e10ed1710f1057a53
author Chris Manton <cmanton@google.com> Sun Aug 22 22:45:37 2021 -0700
committer Chris Manton <cmanton@google.com> Fri Sep 03 02:12:58 2021 +0000
tree 82cb53dbb542dcfd3a581d9b13041cbff93e8f71
parent 8736c5f1c961521f7747e6660482c0f8058731c5

legacy: Use proper rfcomm event types

Bug: 188297862
Test: gd/cert/run
Tag: #refactor

Change-Id: I4e287f674bbc8313191264b2d2c12b498dd7d7be

system/stack/rfcomm/rfc_int.h

diff --git a/system/stack/rfcomm/rfc_int.h b/system/stack/rfcomm/rfc_int.h
index 2d95550..45d3f31 100644
--- a/system/stack/rfcomm/rfc_int.h
+++ b/system/stack/rfcomm/rfc_int.h
@@ -287,7 +287,8 @@
 
 #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,8 +355,8 @@
 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,
-                              BT_HDR* p_buf);
+extern tRFC_EVENT rfc_parse_data(tRFC_MCB* p_rfc_mcb, MX_FRAME* p_frame,
+                                 BT_HDR* p_buf);
 
 /* Call back functions from RFCOMM */
 extern void rfcomm_l2cap_if_init(void);

system/stack/rfcomm/rfc_l2cap_if.cc

diff --git a/system/stack/rfcomm/rfc_l2cap_if.cc b/system/stack/rfcomm/rfc_l2cap_if.cc
index 1758b09..b49238f 100644
--- a/system/stack/rfcomm/rfc_l2cap_if.cc
+++ b/system/stack/rfcomm/rfc_l2cap_if.cc
@@ -253,7 +253,7 @@
     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 @@
     }
 
     /* 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

diff --git a/system/stack/rfcomm/rfc_mx_fsm.cc b/system/stack/rfcomm/rfc_mx_fsm.cc
index cf1fa8a..ef50b2c 100644
--- a/system/stack/rfcomm/rfc_mx_fsm.cc
+++ b/system/stack/rfcomm/rfc_mx_fsm.cc
@@ -67,7 +67,7 @@
  * 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

diff --git a/system/stack/rfcomm/rfc_ts_frames.cc b/system/stack/rfcomm/rfc_ts_frames.cc
index 54e8501..a272702 100644
--- a/system/stack/rfcomm/rfc_ts_frames.cc
+++ b/system/stack/rfcomm/rfc_ts_frames.cc
@@ -506,7 +506,7 @@
  * 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;