From 5eb98b71754839bb2c4dee1e10ed1710f1057a53 Mon Sep 17 00:00:00 2001
From: Chris Manton <cmanton@google.com>
Date: Sun, 22 Aug 2021 22:45:37 -0700
Subject: [PATCH] legacy: Use proper rfcomm event types
Bug: 188297862
Test: gd/cert/run
Tag: #refactor
Change-Id: I4e287f674bbc8313191264b2d2c12b498dd7d7be
---
system/stack/rfcomm/rfc_int.h | 7 ++++---
system/stack/rfcomm/rfc_l2cap_if.cc | 4 ++--
system/stack/rfcomm/rfc_mx_fsm.cc | 2 +-
system/stack/rfcomm/rfc_ts_frames.cc | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/system/stack/rfcomm/rfc_int.h b/system/stack/rfcomm/rfc_int.h
index 2d95550c13e..45d3f31e177 100644
--- a/system/stack/rfcomm/rfc_int.h
+++ b/system/stack/rfcomm/rfc_int.h
@@ -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,8 +355,8 @@ 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,
- 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);
diff --git a/system/stack/rfcomm/rfc_l2cap_if.cc b/system/stack/rfcomm/rfc_l2cap_if.cc
index 1758b09ab16..b49238f2ec4 100644
--- a/system/stack/rfcomm/rfc_l2cap_if.cc
+++ b/system/stack/rfcomm/rfc_l2cap_if.cc
@@ -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;
}
diff --git a/system/stack/rfcomm/rfc_mx_fsm.cc b/system/stack/rfcomm/rfc_mx_fsm.cc
index cf1fa8a1325..ef50b2cc7d8 100644
--- a/system/stack/rfcomm/rfc_mx_fsm.cc
+++ b/system/stack/rfcomm/rfc_mx_fsm.cc
@@ -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(
diff --git a/system/stack/rfcomm/rfc_ts_frames.cc b/system/stack/rfcomm/rfc_ts_frames.cc
index 54e850108cc..a2727023145 100644
--- a/system/stack/rfcomm/rfc_ts_frames.cc
+++ b/system/stack/rfcomm/rfc_ts_frames.cc
@@ -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;
--
GitLab