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

Commit 8a99439e authored by Chris Manton's avatar Chris Manton
Browse files

[8/25] bta::jv Use stack::l2cap::get_interface() 

Bug: 343808590
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Ia9ba7418b9e1f48ec78b016af3c658a356da29a6
parent bbebe980

system/bta/include/bta_jv_api.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "internal_include/bt_target.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cap_interface.h"

#include "stack/include/rfcdefs.h"

#include "types/bluetooth/uuid.h"

#include "types/raw_address.h"

system/bta/jv/bta_jv_act.cc

+3 −4
Original line number Diff line number Diff line
@@ -35,8 +35,6 @@ 
#include "bta/jv/bta_jv_int.h"

#include "bta/sys/bta_sys.h"

#include "internal_include/bt_target.h"

#include "internal_include/bt_trace.h"

#include "os/logging/log_adapter.h"

#include "osi/include/allocator.h"

#include "osi/include/properties.h"

#include "stack/btm/btm_sec.h"
@@ -48,6 +46,7 @@ 
#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/gap_api.h"

#include "stack/include/l2cap_interface.h"

#include "stack/include/l2cdefs.h"

#include "stack/include/port_api.h"

#include "stack/include/rfcdefs.h"
@@ -755,7 +754,7 @@ void bta_jv_get_channel_id(tBTA_JV_CONN_TYPE type /* One of BTA_JV_CONN_TYPE_ */ 
      }

      break;

    case tBTA_JV_CONN_TYPE::L2CAP_LE:

      psm = L2CA_AllocateLePSM();

      psm = stack::l2cap::get_interface().L2CA_AllocateLePSM();

      if (psm == 0) {

        log::error("Error: No free LE PSM available");

      }
@@ -782,7 +781,7 @@ void bta_jv_free_scn(tBTA_JV_CONN_TYPE type /* One of BTA_JV_CONN_TYPE_ */, uint 
      break;

    case tBTA_JV_CONN_TYPE::L2CAP_LE:

      log::verbose("type=BTA_JV_CONN_TYPE::L2CAP_LE. psm={}", scn);

      L2CA_FreeLePSM(scn);

      stack::l2cap::get_interface().L2CA_FreeLePSM(scn);

      break;

    default:

      break;