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

Commit 174a3df2 authored by Hansong Zhang's avatar Hansong Zhang Committed by Automerger Merge Worker
Browse files

L2cap shim: Remove unused API am: 6e27c0cf 

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

Change-Id: I375e03b00ca225282988f6c6e3637c1c7609ac0f
parents 2c71de8e 6e27c0cf

system/main/shim/l2c_api.cc

+0 −4
Original line number Diff line number Diff line
@@ -532,10 +532,6 @@ void bluetooth::shim::L2CA_Deregister(uint16_t client_psm) { 
  shim_l2cap.RemoveClientPsm(psm);

}



uint16_t bluetooth::shim::L2CA_AllocatePSM(void) {

  return shim_l2cap.GetNextDynamicClassicPsm();

}



uint16_t bluetooth::shim::L2CA_AllocateLePSM(void) {

  return shim_l2cap.GetNextDynamicLePsm();

}

system/main/shim/l2c_api.h

+0 −12
Original line number Diff line number Diff line
@@ -55,18 +55,6 @@ uint16_t L2CA_Register(uint16_t psm, const tL2CAP_APPL_INFO& p_cb_info, 
 ******************************************************************************/

void L2CA_Deregister(uint16_t psm);



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

 *

 * Function         L2CA_AllocatePSM

 *

 * Description      Other layers call this function to find an unused PSM for

 *                  L2CAP services.

 *

 * Returns          PSM to use.

 *

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

uint16_t L2CA_AllocatePSM(void);



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

 *

 * Function         L2CA_AllocateLePSM

system/main/shim/l2cap.cc

+1 −21
Original line number Diff line number Diff line
@@ -64,8 +64,7 @@ const tL2CAP_APPL_INFO bluetooth::shim::legacy::PsmManager::Callbacks( 
}



bluetooth::shim::legacy::L2cap::L2cap()

    : classic_dynamic_psm_(kInitialClassicDynamicPsm),

      le_dynamic_psm_(kInitialLeDynamicPsm),

    : le_dynamic_psm_(kInitialLeDynamicPsm),

      classic_virtual_psm_(kInitialClassicVirtualPsm) {

  bluetooth::shim::RegisterDumpsysFunction(static_cast<void*>(this),

                                           [this](int fd) { Dump(fd); });
@@ -140,25 +139,6 @@ uint16_t bluetooth::shim::legacy::L2cap::GetNextDynamicLePsm() { 
  return le_dynamic_psm_;

}



uint16_t bluetooth::shim::legacy::L2cap::GetNextDynamicClassicPsm() {

  while (Classic().IsPsmRegistered(classic_dynamic_psm_)) {

    classic_dynamic_psm_ += 2;

    if (classic_dynamic_psm_ > kFinalClassicDynamicPsm) {

      classic_dynamic_psm_ = kInitialClassicDynamicPsm;

    } else if (classic_dynamic_psm_ & 0x0100) {

      /* the upper byte must be even */

      classic_dynamic_psm_ += 0x0100;

    }



    /* if psm is in range of reserved BRCM Aware features */

    if ((BRCM_RESERVED_PSM_START <= classic_dynamic_psm_) &&

        (classic_dynamic_psm_ <= BRCM_RESERVED_PSM_END)) {

      classic_dynamic_psm_ = BRCM_RESERVED_PSM_END + 2;

    }

  }

  return classic_dynamic_psm_;

}



uint16_t bluetooth::shim::legacy::L2cap::RegisterService(

    uint16_t psm, const tL2CAP_APPL_INFO& callbacks, bool enable_snoop,

    tL2CAP_ERTM_INFO* p_ertm_info, uint16_t my_mtu,

system/main/shim/l2cap.h

+0 −2
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ class L2cap { 
                                          uint16_t psm, uint16_t cid,

                                          uint16_t remote_cid);



  uint16_t GetNextDynamicClassicPsm();

  uint16_t GetNextDynamicLePsm();



  uint16_t ConvertClientToRealPsm(uint16_t psm,
@@ -104,7 +103,6 @@ class L2cap { 
  bool ConnectionExists(uint16_t cid) const;

  uint16_t CidToPsm(uint16_t cid) const;



  uint16_t classic_dynamic_psm_;

  uint16_t le_dynamic_psm_;

  uint16_t classic_virtual_psm_;