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

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

Konstify configurable params kHID_HOST_MAX_DEVICES am: f63096f1 

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

Change-Id: I2e15fa50d213fcabac36fc5759dd4b372f2dc8d6
parents 17efa3cb f63096f1

system/stack/hid/hidh_conn.cc

+14 −12
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 


namespace {

constexpr char kBtmLogTag[] = "HIDH";

constexpr uint8_t kHID_HOST_MAX_DEVICES = HID_HOST_MAX_DEVICES;

}



static uint8_t find_conn_by_cid(uint16_t cid);
@@ -115,7 +116,7 @@ tHID_STATUS hidh_conn_reg(void) { 
    return (HID_ERR_L2CAP_FAILED);

  }



  for (xx = 0; xx < HID_HOST_MAX_DEVICES; xx++) {

  for (xx = 0; xx < kHID_HOST_MAX_DEVICES; xx++) {

    hh_cb.devices[xx].in_use = false;

    hh_cb.devices[xx].conn.conn_state = HID_CONN_STATE_UNUSED;

  }
@@ -170,7 +171,7 @@ static void hidh_l2cif_connect_ind(const RawAddress& bd_addr, 
                                   uint16_t l2cap_cid, uint16_t psm,

                                   uint8_t l2cap_id) {

  bool bAccept = true;

  uint8_t i = HID_HOST_MAX_DEVICES;

  uint8_t i = kHID_HOST_MAX_DEVICES;



  HIDH_TRACE_EVENT("HID-Host Rcvd L2CAP conn ind, PSM: 0x%04x  CID 0x%x", psm,

                   l2cap_cid);
@@ -311,7 +312,7 @@ static void hidh_l2cif_connect_cfm(uint16_t l2cap_cid, uint16_t result) { 
  /* Find CCB based on CID, and verify we are in a state to accept this message

   */

  dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle < HID_HOST_MAX_DEVICES) {

  if (dhandle < kHID_HOST_MAX_DEVICES) {

    p_dev = &hh_cb.devices[dhandle];

    p_hcon = &hh_cb.devices[dhandle].conn;

  }
@@ -368,7 +369,7 @@ static void hidh_l2cif_config_ind(uint16_t l2cap_cid, tL2CAP_CFG_INFO* p_cfg) { 


  /* Find CCB based on CID */

  dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle < HID_HOST_MAX_DEVICES) {

  if (dhandle < kHID_HOST_MAX_DEVICES) {

    p_hcon = &hh_cb.devices[dhandle].conn;

  }
@@ -409,7 +410,7 @@ static void hidh_l2cif_config_cfm(uint16_t l2cap_cid, uint16_t initiator, 


  /* Find CCB based on CID */

  dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle < HID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;

  if (dhandle < kHID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;



  if (p_hcon == NULL) {

    HIDH_TRACE_WARNING("HID-Host Rcvd L2CAP cfg ind, unknown CID: 0x%x",
@@ -482,7 +483,7 @@ static void hidh_l2cif_disconnect_ind(uint16_t l2cap_cid, bool ack_needed) { 


  /* Find CCB based on CID */

  dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle < HID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;

  if (dhandle < kHID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;



  if (p_hcon == NULL) {

    HIDH_TRACE_WARNING("HID-Host Rcvd L2CAP disc, unknown CID: 0x%x",
@@ -551,7 +552,7 @@ static void hidh_l2cif_disconnect(uint16_t l2cap_cid) { 


  /* Find CCB based on CID */

  const uint8_t dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle == HID_HOST_MAX_DEVICES) {

  if (dhandle == kHID_HOST_MAX_DEVICES) {

    LOG_WARN("HID-Host Rcvd L2CAP disc cfm, unknown CID: 0x%x", l2cap_cid);

    return;

  }
@@ -592,7 +593,7 @@ static void hidh_l2cif_cong_ind(uint16_t l2cap_cid, bool congested) { 


  /* Find CCB based on CID */

  dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle < HID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;

  if (dhandle < kHID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;



  if (p_hcon == NULL) {

    HIDH_TRACE_WARNING(
@@ -637,7 +638,7 @@ static void hidh_l2cif_data_ind(uint16_t l2cap_cid, BT_HDR* p_msg) { 


  /* Find CCB based on CID */

  dhandle = find_conn_by_cid(l2cap_cid);

  if (dhandle < HID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;

  if (dhandle < kHID_HOST_MAX_DEVICES) p_hcon = &hh_cb.devices[dhandle].conn;



  if (p_hcon == NULL) {

    HIDH_TRACE_WARNING("HID-Host Rcvd L2CAP data, unknown CID: 0x%x",
@@ -875,15 +876,16 @@ tHID_STATUS hidh_conn_initiate(uint8_t dhandle) { 
 *

 * Function         find_conn_by_cid

 *

 * Description      This function finds a connection control block based on CID

 * Description      This function finds a connection control block based on CID.

 *

 * Returns          address of control block, or NULL if not found

 * Returns          index of control block, or kHID_HOST_MAX_DEVICES if not

 *                  found.

 *

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

static uint8_t find_conn_by_cid(uint16_t cid) {

  uint8_t xx;



  for (xx = 0; xx < HID_HOST_MAX_DEVICES; xx++) {

  for (xx = 0; xx < kHID_HOST_MAX_DEVICES; xx++) {

    if ((hh_cb.devices[xx].in_use) &&

        (hh_cb.devices[xx].conn.conn_state != HID_CONN_STATE_UNUSED) &&

        ((hh_cb.devices[xx].conn.ctrl_cid == cid) ||