RFCOMM, AVDT, HID: L2cap signal id is not used

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: I53b2236b8603b4d8a3c6a49f8ae1355020a657e5

diff --git a/stack/avdt/avdt_int.h b/stack/avdt/avdt_int.h
index 425974e..6526e30 100644 (file)
--- a/stack/avdt/avdt_int.h
+++ b/stack/avdt/avdt_int.h
@@ -651,8 +651,7 @@ class AvdtpTransportChannel {
         tcid(0),
         ccb_idx(0),
         state(0),
-        cfg_flags(0),
-        id(0) {}
+        cfg_flags(0) {}
 
   void Reset() {
     peer_mtu = 0;
@@ -662,7 +661,6 @@ class AvdtpTransportChannel {
     ccb_idx = 0;
     state = 0;
     cfg_flags = 0;
-    id = 0;
   }
 
   uint16_t peer_mtu;     // L2CAP MTU of the peer device
@@ -672,7 +670,6 @@ class AvdtpTransportChannel {
   uint8_t ccb_idx;    // Channel control block for with this transport channel
   uint8_t state;      // Transport channel state
   uint8_t cfg_flags;  // L2CAP configuration flags
-  uint8_t id;
 };
 
 /**

diff --git a/stack/avdt/avdt_l2c.cc b/stack/avdt/avdt_l2c.cc
index 24e9980..dab5acc 100644 (file)
--- a/stack/avdt/avdt_l2c.cc
+++ b/stack/avdt/avdt_l2c.cc
@@ -150,7 +150,6 @@ void avdt_l2c_connect_ind_cback(const RawAddress& bd_addr, uint16_t lcid,
       p_tbl->my_mtu = kAvdtpMtu;
       p_tbl->tcid = AVDT_CHAN_SIG;
       p_tbl->lcid = lcid;
-      p_tbl->id = id;
       p_tbl->state = AVDT_AD_ST_SEC_ACP;
       p_tbl->cfg_flags = AVDT_L2C_CFG_CONN_ACP;
 

diff --git a/stack/hid/hid_conn.h b/stack/hid/hid_conn.h
index e2e5f67..7595d78 100644 (file)
--- a/stack/hid/hid_conn.h
+++ b/stack/hid/hid_conn.h
@@ -46,7 +46,6 @@ typedef struct hid_conn {
 
   uint8_t conn_flags;
 
-  uint8_t ctrl_id;
   uint16_t ctrl_cid;
   uint16_t intr_cid;
   uint16_t rem_mtu_size;

diff --git a/stack/hid/hidd_conn.cc b/stack/hid/hidd_conn.cc
index 65e0e7f..1e49ec8 100644 (file)
--- a/stack/hid/hidd_conn.cc
+++ b/stack/hid/hidd_conn.cc
@@ -102,7 +102,7 @@ static void hidd_l2cif_connect_ind(const RawAddress& bd_addr, uint16_t cid,
   tHID_DEV_DEV_CTB* p_dev;
   bool accept = TRUE;  // accept by default
 
-  HIDD_TRACE_EVENT("%s: psm=%04x cid=%04x id=%02x", __func__, psm, cid, id);
+  HIDD_TRACE_EVENT("%s: psm=%04x cid=%04x", __func__, psm, cid);
 
   p_dev = &hd_cb.device;
 
@@ -162,7 +162,6 @@ static void hidd_l2cif_connect_ind(const RawAddress& bd_addr, uint16_t cid,
 
     p_hcon->conn_flags = 0;
     p_hcon->ctrl_cid = cid;
-    p_hcon->ctrl_id = id;
     p_hcon->disc_reason = HID_SUCCESS;
     p_hcon->conn_state = HID_CONN_STATE_CONNECTING_INTR;
     return;

diff --git a/stack/hid/hidh_conn.cc b/stack/hid/hidh_conn.cc
index 039b99b..9c44fe4 100644 (file)
--- a/stack/hid/hidh_conn.cc
+++ b/stack/hid/hidh_conn.cc
@@ -201,7 +201,6 @@ static void hidh_l2cif_connect_ind(const RawAddress& bd_addr,
   if (psm == HID_PSM_CONTROL) {
     p_hcon->conn_flags = 0;
     p_hcon->ctrl_cid = l2cap_cid;
-    p_hcon->ctrl_id = l2cap_id;
     p_hcon->disc_reason = HID_SUCCESS; /* Authentication passed. Reset
                                               disc_reason (from
                                               HID_ERR_AUTH_FAILED) */

diff --git a/stack/rfcomm/port_int.h b/stack/rfcomm/port_int.h
index 8634816..14f0a25 100644 (file)
--- a/stack/rfcomm/port_int.h
+++ b/stack/rfcomm/port_int.h
@@ -93,8 +93,6 @@ typedef struct {
   bool is_disc_initiator; /* true if initiated disc of port */
   uint16_t
       pending_lcid; /* store LCID for incoming connection while connecting */
-  uint8_t
-      pending_id; /* store l2cap ID for incoming connection while connecting */
 } tRFC_MCB;
 
 /*

diff --git a/stack/rfcomm/rfc_l2cap_if.cc b/stack/rfcomm/rfc_l2cap_if.cc
index d69ebeb..0130971 100644 (file)
--- a/stack/rfcomm/rfc_l2cap_if.cc
+++ b/stack/rfcomm/rfc_l2cap_if.cc
@@ -93,7 +93,6 @@ void RFCOMM_ConnectInd(const RawAddress& bd_addr, uint16_t lcid,
     /* if this is collision case */
     if ((p_mcb->is_initiator) && (p_mcb->state == RFC_MX_STATE_WAIT_CONN_CNF)) {
       p_mcb->pending_lcid = lcid;
-      p_mcb->pending_id = id;
 
       /* wait random timeout (2 - 12) to resolve collision */
       /* if peer gives up then local device rejects incoming connection and

diff --git a/stack/rfcomm/rfc_mx_fsm.cc b/stack/rfcomm/rfc_mx_fsm.cc
index 60b0412..88719b2 100644 (file)
--- a/stack/rfcomm/rfc_mx_fsm.cc
+++ b/stack/rfcomm/rfc_mx_fsm.cc
@@ -243,7 +243,7 @@ void rfc_mx_sm_state_wait_conn_cnf(tRFC_MCB* p_mcb, uint16_t event,
           }
         }
 
-        rfc_mx_sm_execute(p_mcb, RFC_MX_EVENT_CONN_IND, &(p_mcb->pending_id));
+        rfc_mx_sm_execute(p_mcb, RFC_MX_EVENT_CONN_IND, nullptr);
       } else {
         PORT_CloseInd(p_mcb);
       }
@@ -583,7 +583,7 @@ void rfc_on_l2cap_error(uint16_t lcid, uint16_t result) {
       }
     }
 
-    rfc_mx_sm_execute(p_mcb, RFC_MX_EVENT_CONN_IND, &(p_mcb->pending_id));
+    rfc_mx_sm_execute(p_mcb, RFC_MX_EVENT_CONN_IND, nullptr);
   }
 
   if (result == L2CAP_CFG_FAILED_NO_REASON) {