Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 05:49:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove PDL from the HAL

Browse Source 
The benefit is small and it's painful to make libraries
available to apexes and the platform.

Bug: 296427840
Test: mma -j32
Change-Id: I7f2ed8636b90de415b8d5635dcd7c568810323bd
This commit is contained in:
Myles Watson
2023-08-28 11:53:31 -07:00
parent 8a21830735
commit 47c0282de8
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bluetooth/aidl/default/Android.bp
View File

@@ -30,15 +30,8 @@ cc_library_static {
defaults: ["android.hardware.bluetooth-service-build-defaults"],
srcs: [
"BluetoothHci.cpp",
":BluetoothPacketSources",
"net_bluetooth_mgmt.cpp",
],
generated_headers: [
"BluetoothGeneratedPackets_h",
],
include_dirs: [
"packages/modules/Bluetooth/system/gd",
],
}
cc_binary {

28
bluetooth/aidl/default/BluetoothHci.cpp
View File

@@ -29,11 +29,6 @@
#include "log/log.h"
// TODO: Remove custom logging defines from PDL packets.
#undef LOG_INFO
#undef LOG_DEBUG
#include "hci/hci_packets.h"
namespace {
int SetTerminalRaw(int fd) {
termios terminal_settings;
@@ -140,9 +135,7 @@ int BluetoothHci::getFdFromDevPath() {
void BluetoothHci::reset() {
// Send a reset command and wait until the command complete comes back.
std::vector<uint8_t> reset;
::bluetooth::packet::BitInserter bi{reset};
::bluetooth::hci::ResetBuilder::Create()->Serialize(bi);
std::vector<uint8_t> reset = {0x03, 0x0c, 0x00};
auto resetPromise = std::make_shared<std::promise<void>>();
auto resetFuture = resetPromise->get_future();
@@ -162,13 +155,15 @@ void BluetoothHci::reset() {
static_cast<int>(raw_sco.size()));
},
[resetPromise](const std::vector<uint8_t>& raw_event) {
bool valid = ::bluetooth::hci::ResetCompleteView::Create(
::bluetooth::hci::CommandCompleteView::Create(
::bluetooth::hci::EventView::Create(
::bluetooth::hci::PacketView<true>(
std::make_shared<std::vector<uint8_t>>(
raw_event)))))
.IsValid();
std::vector<uint8_t> reset_complete = {0x0e, 0x04, 0x01,
0x03, 0x0c, 0x00};
bool valid = raw_event.size() == 6 &&
raw_event[0] == reset_complete[0] &&
raw_event[1] == reset_complete[1] &&
// Don't compare the number of packets field.
raw_event[3] == reset_complete[3] &&
raw_event[4] == reset_complete[4] &&
raw_event[5] == reset_complete[5];
if (valid) {
resetPromise->set_value();
} else {
@@ -306,7 +301,8 @@ ndk::ScopedAStatus BluetoothHci::close() {
{
std::lock_guard<std::mutex> guard(mStateMutex);
if (mState != HalState::ONE_CLIENT) {
ASSERT(mState != HalState::INITIALIZING);
LOG_ALWAYS_FATAL_IF(mState == HalState::INITIALIZING,
"mState is INITIALIZING");
ALOGI("Already closed");
return ndk::ScopedAStatus::ok();
}