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

Commit 0f9a0cf4 authored by Chris Manton's avatar Chris Manton
Browse files

Connect main/shim/acl_legacy_interface::acl_ble_enhanced_connection_complete_from_shim 

Bug: 166280067
Tag: #refactor
Test: act.py -tc BleCocTest
Test: ble paired 2 phones
Test: classic paired Bose SoundLink

Change-Id: I26ae8837788425a74d7202a40b3e7fc7b2c7a279
parent 83ee3d10

system/main/shim/acl_legacy_interface.cc

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ const acl_interface_t GetAclInterface() { 
      .connection.classic.on_failed = btm_acl_connected,

      .connection.classic.on_disconnected = btm_acl_disconnected,



      .connection.le.on_connected = nullptr,

      .connection.le.on_connected =

          acl_ble_enhanced_connection_complete_from_shim,

      .connection.le.on_failed = acl_ble_connection_fail,

      .connection.le.on_disconnected = btm_acl_disconnected,

system/stack/acl/ble_acl.cc

+4 −3
Original line number Diff line number Diff line
@@ -108,9 +108,10 @@ void acl_ble_enhanced_connection_complete( 


void acl_ble_enhanced_connection_complete_from_shim(

    const tBLE_BD_ADDR& address_with_type, uint16_t handle, uint8_t role,

    bool match, uint16_t conn_interval, uint16_t conn_latency,

    uint16_t conn_timeout, const RawAddress& local_rpa,

    const RawAddress& peer_rpa, uint8_t peer_addr_type) {

    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout,

    const RawAddress& local_rpa, const RawAddress& peer_rpa,

    uint8_t peer_addr_type) {

  bool match = false;  // TODO look up in database

  acl_ble_enhanced_connection_complete(

      address_with_type, handle, role, match, conn_interval, conn_latency,

      conn_timeout, local_rpa, peer_rpa, peer_addr_type);

system/stack/include/ble_acl_interface.h

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ void acl_ble_enhanced_connection_complete( 
    const RawAddress& peer_rpa, uint8_t peer_addr_type);

void acl_ble_enhanced_connection_complete_from_shim(

    const tBLE_BD_ADDR& address_with_type, uint16_t handle, uint8_t role,

    bool match, uint16_t conn_interval, uint16_t conn_latency,

    uint16_t conn_timeout, const RawAddress& local_rpa,

    const RawAddress& peer_rpa, uint8_t peer_addr_type);

    uint16_t conn_interval, uint16_t conn_latency, uint16_t conn_timeout,

    const RawAddress& local_rpa, const RawAddress& peer_rpa,

    uint8_t peer_addr_type);

void acl_ble_connection_fail(const tBLE_BD_ADDR& address_with_type,

                             uint16_t handle, bool enhanced,

                             tHCI_STATUS status);