tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix HCI parser and packetizer" am: de5c086b79

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2548490

Change-Id: I46f5f970da9675ba4d5231e9fd058413437bc7df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-04-21 18:00:18 +00:00 committed by Automerger Merge Worker
commit a80d7f5e25
3 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bluetooth/hci/h4_protocol.cc
View file

@ -105,15 +105,12 @@ void H4Protocol::SendDataToPacketizer(uint8_t* buffer, size_t length) {
buffer_offset += 1;
} else {
bool packet_ready = hci_packetizer_.OnDataReady(
hci_packet_type_, input_buffer, buffer_offset);
hci_packet_type_, input_buffer, &buffer_offset);
if (packet_ready) {
// Call packet callback and move offset.
buffer_offset += OnPacketReady(hci_packetizer_.GetPacket());
// Call packet callback.
OnPacketReady(hci_packetizer_.GetPacket());
// Get ready for the next type byte.
hci_packet_type_ = PacketType::UNKNOWN;
} else {
// The data was consumed, but there wasn't a packet.
buffer_offset = input_buffer.size();
}
}
}

21
bluetooth/hci/hci_packetizer.cc
View file

@ -51,9 +51,10 @@ const std::vector<uint8_t>& HciPacketizer::GetPacket() const { return packet_; }
bool HciPacketizer::OnDataReady(PacketType packet_type,
const std::vector<uint8_t>& buffer,
size_t offset) {
size_t* offset) {
bool packet_completed = false;
size_t bytes_available = buffer.size() - offset;
size_t bytes_available = buffer.size() - *offset;
switch (state_) {
case HCI_HEADER: {
size_t header_size =
@ -62,18 +63,20 @@ bool HciPacketizer::OnDataReady(PacketType packet_type,
bytes_remaining_ = header_size;
packet_.clear();
}
size_t bytes_to_copy = std::min(bytes_remaining_, bytes_available);
packet_.insert(packet_.end(), buffer.begin() + offset,
buffer.begin() + offset + bytes_to_copy);
packet_.insert(packet_.end(), buffer.begin() + *offset,
buffer.begin() + *offset + bytes_to_copy);
bytes_remaining_ -= bytes_to_copy;
bytes_available -= bytes_to_copy;
*offset += bytes_to_copy;
if (bytes_remaining_ == 0) {
bytes_remaining_ = HciGetPacketLengthForType(packet_type, packet_);
if (bytes_remaining_ > 0) {
state_ = HCI_PAYLOAD;
if (bytes_available > 0) {
packet_completed =
OnDataReady(packet_type, buffer, offset + bytes_to_copy);
packet_completed = OnDataReady(packet_type, buffer, offset);
}
} else {
packet_completed = true;
@ -84,9 +87,10 @@ bool HciPacketizer::OnDataReady(PacketType packet_type,
case HCI_PAYLOAD: {
size_t bytes_to_copy = std::min(bytes_remaining_, bytes_available);
packet_.insert(packet_.end(), buffer.begin() + offset,
buffer.begin() + offset + bytes_to_copy);
packet_.insert(packet_.end(), buffer.begin() + *offset,
buffer.begin() + *offset + bytes_to_copy);
bytes_remaining_ -= bytes_to_copy;
*offset += bytes_to_copy;
if (bytes_remaining_ == 0) {
state_ = HCI_HEADER;
packet_completed = true;
@ -94,6 +98,7 @@ bool HciPacketizer::OnDataReady(PacketType packet_type,
break;
}
}
return packet_completed;
}

2
bluetooth/hci/hci_packetizer.h
View file

@ -28,7 +28,7 @@ class HciPacketizer {
public:
HciPacketizer() = default;
bool OnDataReady(PacketType packet_type, const std::vector<uint8_t>& data,
size_t offset);
size_t* offset);
const std::vector<uint8_t>& GetPacket() const;
protected: