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

Merge "Bluetooth HAL: Add missing retry logic to the H4Protocol::Send()" am: 9fec2f0104 am: fab5684ffe am: bdc8c88352

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

Change-Id: I719ab5ea32b8b7d83732fd6023cb3a824150f3ab
This commit is contained in:
Treehugger Robot
2021-10-27 20:54:42 +00:00
committed by Automerger Merge Worker
parent 1050f3afcc bdc8c88352
commit 29ca7e4087
1 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
bluetooth/1.0/default/h4_protocol.cc
View File

@@ -30,21 +30,52 @@ namespace bluetooth {
namespace hci {
size_t H4Protocol::Send(uint8_t type, const uint8_t* data, size_t length) {
struct iovec iov[] = {{&type, sizeof(type)},
{const_cast<uint8_t*>(data), length}};
ssize_t ret = 0;
do {
ret =
TEMP_FAILURE_RETRY(writev(uart_fd_, iov, sizeof(iov) / sizeof(iov[0])));
} while (-1 == ret && EAGAIN == errno);
if (ret == -1) {
ALOGE("%s error writing to UART (%s)", __func__, strerror(errno));
} else if (ret < static_cast<ssize_t>(length + 1)) {
ALOGE("%s: %d / %d bytes written - something went wrong...", __func__,
static_cast<int>(ret), static_cast<int>(length + 1));
struct iovec iov_array[] = {{&type, sizeof(type)},
{const_cast<uint8_t*>(data), length}};
struct iovec* iov = iov_array;
int iovcnt = sizeof(iov_array) / sizeof(iov_array[0]);
size_t total_bytes = 0;
for (int i = 0; i < iovcnt; i++) {
total_bytes += iov_array[i].iov_len;
}
return ret;
size_t bytes_written = 0;
size_t remaining_bytes = total_bytes;
while (remaining_bytes > 0) {
ssize_t ret = TEMP_FAILURE_RETRY(writev(uart_fd_, iov, iovcnt));
if (ret == -1) {
if (errno == EAGAIN) continue;
ALOGE("%s error writing to UART (%s)", __func__, strerror(errno));
break;
} else if (ret == 0) {
// Nothing written
ALOGE("%s zero bytes written - something went wrong...", __func__);
break;
} else if (ret == remaining_bytes) {
// Everything written
bytes_written += ret;
break;
}
bytes_written += ret;
remaining_bytes -= ret;
ALOGW("%s: %d/%d bytes written - retrying remaining %d bytes", __func__,
static_cast<int>(bytes_written), static_cast<int>(total_bytes),
static_cast<int>(remaining_bytes));
// Remove iovs which are written from the list
while (ret >= iov->iov_len) {
ret -= iov->iov_len;
++iov;
--iovcnt;
}
// Adjust the iov to point to the remaining data which needs to be written
if (ret) {
iov->iov_base = static_cast<uint8_t*>(iov->iov_base) + ret;
iov->iov_len -= ret;
}
}
return bytes_written;
}
void H4Protocol::OnPacketReady() {