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

Commit c04be027 authored by Hsin-yu Chao's avatar Hsin-yu Chao Committed by Automerger Merge Worker
Browse files

Merge "stack::btm::sco_hci - interface with non-Floss build" into main am: f8578f86 

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



Change-Id: I600a53e9dad19bec98dd9fa33ecc8c51b56a19aa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 70ab22e5 f8578f86

system/stack/BUILD.gn

+43 −0
Original line number Diff line number Diff line
@@ -229,6 +229,11 @@ source_set("stack") { 
    "//bt/system/stack/mmc",

    "//bt/system/types",

  ]

  if (use.test) {

    deps += [

      ":sco_hci_linux_test",

    ]

  }



  configs += [

    "//bt/system:target_defaults",
@@ -237,6 +242,44 @@ source_set("stack") { 
}



if (use.test) {

  executable("sco_hci_linux_test") {

    sources = [

      "btm/btm_sco_hci.cc",

      "test/btm/sco_hci_linux_test.cc",

      "//bt/system/test/common/core_interface.cc",

      "//bt/system/test/common/mock_functions.cc",

      "//bt/system/test/fake/fake_osi.cc",

      "//bt/system/test/mock/mock_bluetooth_interface.cc",

      "//bt/system/test/mock/mock_btif_stack_manager.cc",

      "//bt/system/test/mock/mock_osi_alarm.cc",

      "//bt/system/test/mock/mock_osi_allocator.cc",

      "//bt/system/test/mock/mock_osi_fixed_queue.cc",

      "//bt/system/test/mock/mock_osi_list.cc",

      "//bt/system/test/mock/mock_stack_rnr_interface.cc",

      "//bt/system/test/mock/mock_udrv_ulinux_uipc.cc",

    ]



    include_dirs = [

      "btm",

      "include",

      "test/common",

    ]

    libs = [

      "fmt",

    ]

    deps = [

      "//bt/system/log:libbluetooth_log",

      "//bt/system/common",

      "//bt/system/osi",

      "//bt/system/types",

    ]

    configs += [

      "//bt/system:external_gmock_main",

      "//bt/system:target_defaults",

      "//bt/system/log:log_defaults",

    ]

  }



  executable("net_test_btm_iso") {

    sources = [

      "btm/btm_iso.cc",

system/stack/btm/btm_sco_hci.cc

+25 −5
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ 
#include "stack/btm/btm_sco.h"

#include "udrv/include/uipc.h"



#define SCO_DATA_READ_POLL_MS 10

#define SCO_HOST_DATA_PATH "/var/run/bluetooth/audio/.sco_data"

// TODO(b/198260375): Make SCO data owner group configurable.

#define SCO_HOST_DATA_GROUP "bluetooth-audio"



/* Per Bluetooth Core v5.0 and HFP 1.9 specification. */

#define BTM_MSBC_H2_HEADER_0 0x01

#define BTM_MSBC_H2_HEADER_LEN 2
@@ -65,6 +60,13 @@ 
#define BTM_LC3_PKT_LEN 60

#define BTM_LC3_FS 240 /* Frame Size */



#if TARGET_FLOSS



#define SCO_DATA_READ_POLL_MS 10

#define SCO_HOST_DATA_PATH "/var/run/bluetooth/audio/.sco_data"

// TODO(b/198260375): Make SCO data owner group configurable.

#define SCO_HOST_DATA_GROUP "bluetooth-audio"



namespace {



std::unique_ptr<tUIPC_STATE> sco_uipc = nullptr;
@@ -86,11 +88,13 @@ void sco_data_cb(tUIPC_CH_ID, tUIPC_EVENT event) { 
}



}  // namespace

#endif



namespace bluetooth {

namespace audio {

namespace sco {



#if TARGET_FLOSS

void open() {

  if (sco_uipc != nullptr) {

    log::warn("Re-opening UIPC that is already running");
@@ -136,6 +140,22 @@ size_t write(const uint8_t* p_buf, uint32_t len) { 
  }

  return UIPC_Send(*sco_uipc, UIPC_CH_ID_AV_AUDIO, 0, p_buf, len) ? len : 0;

}

#else

void open() {}

void cleanup() {}



size_t read(uint8_t* p_buf, uint32_t len) {

  (void)p_buf;

  (void)len;

  return 0;

}



size_t write(const uint8_t* p_buf, uint32_t len) {

  (void)p_buf;

  (void)len;

  return 0;

}

#endif



enum decode_buf_state {

  DECODE_BUF_EMPTY,

system/stack/test/btm/sco_hci_linux_test.cc

0 → 100644
+125 −0
Original line number Diff line number Diff line 
/*

 *

 *  Copyright 2024 The Android Open Source Project

 *

 *  Licensed under the Apache License, Version 2.0 (the "License");

 *  you may not use this file except in compliance with the License.

 *  You may obtain a copy of the License at:

 *

 *  http://www.apache.org/licenses/LICENSE-2.0

 *

 *  Unless required by applicable law or agreed to in writing, software

 *  distributed under the License is distributed on an "AS IS" BASIS,

 *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 *  See the License for the specific language governing permissions and

 *  limitations under the License.

 *

 */



#include <gmock/gmock.h>

#include <gtest/gtest.h>



#include "stack/btm/btm_sco.h"

#include "stack/test/btm/btm_test_fixtures.h"

#include "test/common/mock_functions.h"

#include "udrv/include/uipc.h"



extern std::unique_ptr<tUIPC_STATE> mock_uipc_init_ret;

extern uint32_t mock_uipc_read_ret;

extern bool mock_uipc_send_ret;



namespace {



class ScoHciTest : public BtmWithMocksTest {

public:

protected:

  void SetUp() override {

    BtmWithMocksTest::SetUp();

    mock_uipc_init_ret = nullptr;

    mock_uipc_read_ret = 0;

    mock_uipc_send_ret = true;

  }

  void TearDown() override { BtmWithMocksTest::TearDown(); }

};



class ScoHciWithOpenCleanTest : public ScoHciTest {

public:

protected:

  void SetUp() override {

    ScoHciTest::SetUp();

    mock_uipc_init_ret = std::make_unique<tUIPC_STATE>();

    bluetooth::audio::sco::open();

  }

  void TearDown() override { bluetooth::audio::sco::cleanup(); }

};



TEST_F(ScoHciTest, ScoOverHciOpenFail) {

  bluetooth::audio::sco::open();

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 0);

  bluetooth::audio::sco::cleanup();



  // UIPC is nullptr and shouldn't require an actual call of UIPC_Close;

  ASSERT_EQ(get_func_call_count("UIPC_Close"), 0);

}



TEST_F(ScoHciWithOpenCleanTest, ScoOverHciOpenClean) {

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 1);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  mock_uipc_init_ret = std::make_unique<tUIPC_STATE>();

  // Double open will override uipc

  bluetooth::audio::sco::open();

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 2);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 2);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  bluetooth::audio::sco::cleanup();

  ASSERT_EQ(get_func_call_count("UIPC_Close"), 1);



  // Double clean shouldn't fail

  bluetooth::audio::sco::cleanup();

  ASSERT_EQ(get_func_call_count("UIPC_Close"), 1);

}



TEST_F(ScoHciTest, ScoOverHciReadNoOpen) {

  uint8_t buf[100];

  ASSERT_EQ(bluetooth::audio::sco::read(buf, sizeof(buf)), size_t(0));

  ASSERT_EQ(get_func_call_count("UIPC_Read"), 0);

}



TEST_F(ScoHciWithOpenCleanTest, ScoOverHciRead) {

  uint8_t buf[100];

  // The UPIC should be ready

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 1);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  mock_uipc_read_ret = sizeof(buf);

  ASSERT_EQ(bluetooth::audio::sco::read(buf, sizeof(buf)), mock_uipc_read_ret);

  ASSERT_EQ(get_func_call_count("UIPC_Read"), 1);

}



TEST_F(ScoHciTest, ScoOverHciWriteNoOpen) {

  uint8_t buf[100];

  bluetooth::audio::sco::write(buf, sizeof(buf));

  ASSERT_EQ(get_func_call_count("UIPC_Send"), 0);

}



TEST_F(ScoHciWithOpenCleanTest, ScoOverHciWrite) {

  uint8_t buf[100];

  // The UPIC should be ready

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 1);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  ASSERT_EQ(bluetooth::audio::sco::write(buf, sizeof(buf)), sizeof(buf));

  ASSERT_EQ(get_func_call_count("UIPC_Send"), 1);



  // Send fails

  mock_uipc_send_ret = false;

  ASSERT_EQ(bluetooth::audio::sco::write(buf, sizeof(buf)), size_t(0));

  ASSERT_EQ(get_func_call_count("UIPC_Send"), 2);

}

}  // namespace

system/stack/test/btm/sco_hci_test.cc

+0 −78
Original line number Diff line number Diff line
@@ -32,12 +32,8 @@ 
#include "stack/include/hfp_msbc_encoder.h"

#include "stack/test/btm/btm_test_fixtures.h"

#include "test/common/mock_functions.h"

#include "udrv/include/uipc.h"



extern bluetooth::core::CoreInterface* GetInterfaceToProfiles();

extern std::unique_ptr<tUIPC_STATE> mock_uipc_init_ret;

extern uint32_t mock_uipc_read_ret;

extern bool mock_uipc_send_ret;



namespace {
@@ -117,9 +113,6 @@ public: 
protected:

  void SetUp() override {

    BtmWithMocksTest::SetUp();

    mock_uipc_init_ret = nullptr;

    mock_uipc_read_ret = 0;

    mock_uipc_send_ret = true;



    static auto msbc_codec = MsbcCodecInterface{};

    static auto lc3_codec = Lc3CodecInterface{};
@@ -134,7 +127,6 @@ public: 
protected:

  void SetUp() override {

    ScoHciTest::SetUp();

    mock_uipc_init_ret = std::make_unique<tUIPC_STATE>();

    bluetooth::audio::sco::open();

  }

  void TearDown() override { bluetooth::audio::sco::cleanup(); }
@@ -163,76 +155,6 @@ protected: 
  void TearDown() override { bluetooth::audio::sco::swb::cleanup(); }

};



TEST_F(ScoHciTest, ScoOverHciOpenFail) {

  bluetooth::audio::sco::open();

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 0);

  bluetooth::audio::sco::cleanup();



  // UIPC is nullptr and shouldn't require an actual call of UIPC_Close;

  ASSERT_EQ(get_func_call_count("UIPC_Close"), 0);

}



TEST_F(ScoHciWithOpenCleanTest, ScoOverHciOpenClean) {

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 1);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  mock_uipc_init_ret = std::make_unique<tUIPC_STATE>();

  // Double open will override uipc

  bluetooth::audio::sco::open();

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 2);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 2);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  bluetooth::audio::sco::cleanup();

  ASSERT_EQ(get_func_call_count("UIPC_Close"), 1);



  // Double clean shouldn't fail

  bluetooth::audio::sco::cleanup();

  ASSERT_EQ(get_func_call_count("UIPC_Close"), 1);

}



TEST_F(ScoHciTest, ScoOverHciReadNoOpen) {

  uint8_t buf[100];

  ASSERT_EQ(bluetooth::audio::sco::read(buf, sizeof(buf)), size_t(0));

  ASSERT_EQ(get_func_call_count("UIPC_Read"), 0);

}



TEST_F(ScoHciWithOpenCleanTest, ScoOverHciRead) {

  uint8_t buf[100];

  // The UPIC should be ready

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 1);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  mock_uipc_read_ret = sizeof(buf);

  ASSERT_EQ(bluetooth::audio::sco::read(buf, sizeof(buf)), mock_uipc_read_ret);

  ASSERT_EQ(get_func_call_count("UIPC_Read"), 1);

}



TEST_F(ScoHciTest, ScoOverHciWriteNoOpen) {

  uint8_t buf[100];

  bluetooth::audio::sco::write(buf, sizeof(buf));

  ASSERT_EQ(get_func_call_count("UIPC_Send"), 0);

}



TEST_F(ScoHciWithOpenCleanTest, ScoOverHciWrite) {

  uint8_t buf[100];

  // The UPIC should be ready

  ASSERT_EQ(get_func_call_count("UIPC_Init"), 1);

  ASSERT_EQ(get_func_call_count("UIPC_Open"), 1);

  ASSERT_EQ(mock_uipc_init_ret, nullptr);



  ASSERT_EQ(bluetooth::audio::sco::write(buf, sizeof(buf)), sizeof(buf));

  ASSERT_EQ(get_func_call_count("UIPC_Send"), 1);



  // Send fails

  mock_uipc_send_ret = false;

  ASSERT_EQ(bluetooth::audio::sco::write(buf, sizeof(buf)), size_t(0));

  ASSERT_EQ(get_func_call_count("UIPC_Send"), 2);

}



TEST_F(ScoHciWbsTest, WbsInit) {

  ASSERT_EQ(bluetooth::audio::sco::wbs::init(60), size_t(60));

  ASSERT_EQ(bluetooth::audio::sco::wbs::init(72), size_t(72));