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

Bluetooth: Use fixed-size preambles am: 71390182c6

Browse Source 
am: a6b8e5af81

Change-Id: I128cc310c47198de6ad0ee5629c3b99592355d19
This commit is contained in:
Myles Watson
2017-01-31 00:35:40 +00:00
committed by android-build-merger
parent ce7ca8910c a6b8e5af81
commit 8c74ee070f
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bluetooth/1.0/default/vendor_interface.cc
View File

@@ -49,11 +49,10 @@ const size_t packet_length_offset_for_type[] = {
0, HCI_LENGTH_OFFSET_CMD, HCI_LENGTH_OFFSET_ACL, HCI_LENGTH_OFFSET_SCO,
HCI_LENGTH_OFFSET_EVT};
size_t HciGetPacketLengthForType(HciPacketType type,
const hidl_vec<uint8_t>& packet) {
size_t HciGetPacketLengthForType(HciPacketType type, const uint8_t* preamble) {
size_t offset = packet_length_offset_for_type[type];
if (type != HCI_PACKET_TYPE_ACL_DATA) return packet[offset];
return (((packet[offset + 1]) << 8) | packet[offset]);
if (type != HCI_PACKET_TYPE_ACL_DATA) return preamble[offset];
return (((preamble[offset + 1]) << 8) | preamble[offset]);
}
HC_BT_HDR* WrapPacketAndCopy(uint16_t event, const hidl_vec<uint8_t>& data) {
@@ -307,7 +306,6 @@ void VendorInterface::OnDataReady(int fd) {
hci_packet_type_ <= HCI_PACKET_TYPE_EVENT)
<< "buffer[0] = " << static_cast<unsigned int>(buffer[0]);
hci_parser_state_ = HCI_TYPE_READY;
hci_packet_.resize(HCI_PREAMBLE_SIZE_MAX);
hci_packet_bytes_remaining_ = preamble_size_for_type[hci_packet_type_];
hci_packet_bytes_read_ = 0;
break;
@@ -315,16 +313,18 @@ void VendorInterface::OnDataReady(int fd) {
case HCI_TYPE_READY: {
size_t bytes_read = TEMP_FAILURE_RETRY(
read(fd, hci_packet_.data() + hci_packet_bytes_read_,
read(fd, hci_packet_preamble_ + hci_packet_bytes_read_,
hci_packet_bytes_remaining_));
CHECK(bytes_read > 0);
hci_packet_bytes_remaining_ -= bytes_read;
hci_packet_bytes_read_ += bytes_read;
if (hci_packet_bytes_remaining_ == 0) {
size_t packet_length =
HciGetPacketLengthForType(hci_packet_type_, hci_packet_);
HciGetPacketLengthForType(hci_packet_type_, hci_packet_preamble_);
hci_packet_.resize(preamble_size_for_type[hci_packet_type_] +
packet_length);
memcpy(hci_packet_.data(), hci_packet_preamble_,
preamble_size_for_type[hci_packet_type_]);
hci_packet_bytes_remaining_ = packet_length;
hci_parser_state_ = HCI_PAYLOAD;
hci_packet_bytes_read_ = 0;

1
bluetooth/1.0/default/vendor_interface.h
View File

@@ -64,6 +64,7 @@ class VendorInterface {
enum HciParserState { HCI_IDLE, HCI_TYPE_READY, HCI_PAYLOAD };
HciParserState hci_parser_state_{HCI_IDLE};
HciPacketType hci_packet_type_{HCI_PACKET_TYPE_UNKNOWN};
uint8_t hci_packet_preamble_[HCI_PREAMBLE_SIZE_MAX];
hidl_vec<uint8_t> hci_packet_;
size_t hci_packet_bytes_remaining_;
size_t hci_packet_bytes_read_;