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

Commit de91d695 authored by Hansong Zhang's avatar Hansong Zhang
Browse files

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

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

system/stack/avdt/avdt_int.h

+1 −4
Original line number Diff line number Diff line
@@ -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;

};



/**

system/stack/avdt/avdt_l2c.cc

+0 −1
Original line number Diff line number Diff line
@@ -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;

system/stack/hid/hid_conn.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

system/stack/hid/hidd_conn.cc

+1 −2
Original line number Diff line number Diff line
@@ -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;

system/stack/hid/hidh_conn.cc

+0 −1
Original line number Diff line number Diff line
@@ -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) */