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

Commit 693d2844 authored by Henri Chataing's avatar Henri Chataing Committed by Gerrit Code Review
Browse files

Merge changes Ie7b18ce3,Ic941a3b3,Ifb31c46c,I4072ca0d into main 

* changes:
  system/stack/sdp: Migrate to libbluetooth_log
  system/stack/rfcomm: Migrate to libbluetooth_log
  system/stack/pan: Migrate to libbluetooth_log
  system/stack/l2cap: Migrate to libbluetooth_log
parents 42aeac6a 93a522fe

system/stack/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -806,6 +806,7 @@ cc_test { 
        "libcutils",

    ],

    static_libs: [

        "libbase",

        "libbluetooth-types",

        "libbluetooth_crypto_toolbox",

        "libbluetooth_gd",
@@ -2133,6 +2134,7 @@ cc_test { 
        "libcutils",

    ],

    static_libs: [

        "libbase",

        "libbluetooth-types",

        "libbluetooth_gd",

        "libbluetooth_log",

system/stack/include/l2c_api.h

+8 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#ifndef L2C_API_H

#define L2C_API_H



#include <bluetooth/log.h>

#include <stdbool.h>



#include <cstdint>
@@ -925,4 +926,11 @@ void L2CA_SetMediaStreamChannel(uint16_t local_media_cid, bool status); 
bool L2CA_isMediaChannel(uint16_t handle, uint16_t channel_id,

                         bool is_local_cid);



namespace fmt {

template <>

struct formatter<tL2CAP_LATENCY> : enum_formatter<tL2CAP_LATENCY> {};

template <>

struct formatter<tL2CAP_PRIORITY> : enum_formatter<tL2CAP_PRIORITY> {};

}  // namespace fmt



#endif /* L2C_API_H */

system/stack/include/l2cdefs.h

+5 −0
Original line number Diff line number Diff line
@@ -481,4 +481,9 @@ constexpr uint16_t L2CAP_SDU_LENGTH_LE_MAX = 0xffff; 
/* Mask for sequence numbers (range 0 - 63) */

#define L2CAP_FCR_SEQ_MODULO 0x3F



namespace fmt {

template <>

struct formatter<tL2CAP_CONN> : enum_formatter<tL2CAP_CONN> {};

}  // namespace fmt



#endif

system/stack/l2cap/l2c_api.cc

+157 −156

File changed.

Preview size limit exceeded, changes collapsed.

system/stack/l2cap/l2c_ble.cc

+129 −142

File changed.

Preview size limit exceeded, changes collapsed.