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

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

stack::l2cap::tL2CAP_LE_CFG_INFO Clean up struct init am: feb8975f am: d1abbd1d 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3149016



Change-Id: I9882fdd9e6daa369e4bb133541663f6673d441b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5bc36f0b d1abbd1d

system/stack/include/l2c_api.h

+11 −6
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 


#include "hcidefs.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2cdefs.h"

#include "types/bt_transport.h"

#include "types/hci_role.h"

#include "types/raw_address.h"
@@ -178,6 +179,7 @@ constexpr uint16_t L2CAP_LE_MIN_MTU = 23; // Minimum SDU size 
constexpr uint16_t L2CAP_LE_MIN_MPS = 23;

constexpr uint16_t L2CAP_LE_MAX_MPS = 65533;

constexpr uint16_t L2CAP_LE_CREDIT_MAX = 65535;

constexpr uint16_t L2CAP_LE_CREDIT_THRESHOLD = 64;



// This is initial amout of credits we send, and amount to which we increase

// credits once they fall below threshold
@@ -188,17 +190,20 @@ uint16_t L2CA_LeCreditDefault(); 
uint16_t L2CA_LeCreditThreshold();



// Max number of CIDs in the L2CAP CREDIT BASED CONNECTION REQUEST

constexpr uint16_t L2CAP_CREDIT_BASED_MAX_CIDS = 5;

constexpr uint8_t L2CAP_CREDIT_BASED_MAX_CIDS = 5;



/* Define a structure to hold the configuration parameter for LE L2CAP

 * connection oriented channels.

 */

constexpr uint16_t kDefaultL2capMtu = 100;

constexpr uint16_t kDefaultL2capMps = 100;



struct tL2CAP_LE_CFG_INFO {

  uint16_t result; /* Only used in confirm messages */

  uint16_t mtu = 100;

  uint16_t mps = 100;

  uint16_t credits = L2CA_LeCreditDefault();

  uint8_t number_of_channels = L2CAP_CREDIT_BASED_MAX_CIDS;

  uint16_t result{L2CAP_LE_RESULT_CONN_OK}; /* Only used in confirm messages */

  uint16_t mtu{kDefaultL2capMtu};

  uint16_t mps{kDefaultL2capMps};

  uint16_t credits{L2CA_LeCreditDefault()};

  uint8_t number_of_channels{L2CAP_CREDIT_BASED_MAX_CIDS};

};



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

system/stack/l2cap/l2c_api.cc

+4 −6
Original line number Diff line number Diff line
@@ -77,16 +77,14 @@ uint16_t L2CA_RegisterWithSecurity( 
}



uint16_t L2CA_LeCreditDefault() {

  static const uint16_t sL2CAP_LE_CREDIT_DEFAULT =

      bluetooth::os::GetSystemPropertyUint32Base(

          "bluetooth.l2cap.le.credit_default.value", 0xffff);

  static const uint16_t sL2CAP_LE_CREDIT_DEFAULT = bluetooth::os::GetSystemPropertyUint32Base(

          "bluetooth.l2cap.le.credit_default.value", L2CAP_LE_CREDIT_MAX);

  return sL2CAP_LE_CREDIT_DEFAULT;

}



uint16_t L2CA_LeCreditThreshold() {

  static const uint16_t sL2CAP_LE_CREDIT_THRESHOLD =

      bluetooth::os::GetSystemPropertyUint32Base(

          "bluetooth.l2cap.le.credit_threshold.value", 0x0040);

  static const uint16_t sL2CAP_LE_CREDIT_THRESHOLD = bluetooth::os::GetSystemPropertyUint32Base(

          "bluetooth.l2cap.le.credit_threshold.value", L2CAP_LE_CREDIT_THRESHOLD);

  return sL2CAP_LE_CREDIT_THRESHOLD;

}