distribution/packages/network/bluez/patches/bluez-08-hciattach-retry-device-reset-when-no-response.patch

62 lines
1.6 KiB
Diff
Raw Normal View History

2023-08-09 10:29:28 +00:00
From 57f7aead147b138109709bbef9d4c674a3a6dc9b Mon Sep 17 00:00:00 2001
2022-02-05 14:23:32 +00:00
From: meijjaa <jjmeijer88@gmail.com>
Date: Mon, 23 Jan 2017 22:35:33 +0100
Subject: [PATCH] hciattach: retry device reset when no response
Some bcm chips need a couple of retries to reset. Currently init will just
timeout after a failed reset.
Signed-off-by: meijjaa <jjmeijer88@gmail.com>
---
tools/hciattach_bcm43xx.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/tools/hciattach_bcm43xx.c b/tools/hciattach_bcm43xx.c
2023-08-09 10:29:28 +00:00
index bb24483..ad89161 100644
2022-02-05 14:23:32 +00:00
--- a/tools/hciattach_bcm43xx.c
+++ b/tools/hciattach_bcm43xx.c
2023-08-09 10:29:28 +00:00
@@ -24,6 +24,7 @@
2022-02-05 14:23:32 +00:00
#include <time.h>
#include <limits.h>
2023-08-09 10:29:28 +00:00
#include <sys/stat.h>
2022-02-05 14:23:32 +00:00
+#include <signal.h>
2023-08-09 10:29:28 +00:00
2022-02-05 14:23:32 +00:00
#include "lib/bluetooth.h"
#include "lib/hci.h"
2023-08-09 10:29:28 +00:00
@@ -82,21 +83,31 @@ fail:
2022-02-05 14:23:32 +00:00
return -1;
}
2023-08-09 10:29:28 +00:00
2022-02-05 14:23:32 +00:00
+int _fd;
+void expired(int sig)
+{
+ unsigned char cmd[] = { HCI_COMMAND_PKT, 0x03, 0x0C, 0x00 };
+ write(_fd, cmd, sizeof(cmd)) != sizeof(cmd);
+ alarm(4);
+}
+
static int bcm43xx_reset(int fd)
{
unsigned char cmd[] = { HCI_COMMAND_PKT, 0x03, 0x0C, 0x00 };
unsigned char resp[CC_MIN_SIZE];
2023-08-09 10:29:28 +00:00
2022-02-05 14:23:32 +00:00
+ _fd = fd;
+ signal(SIGALRM, expired);
if (write(fd, cmd, sizeof(cmd)) != sizeof(cmd)) {
fprintf(stderr, "Failed to write reset command\n");
return -1;
}
-
+ alarm(4);
if (read_hci_event(fd, resp, sizeof(resp)) < CC_MIN_SIZE) {
fprintf(stderr, "Failed to reset chip, invalid HCI event\n");
return -1;
}
-
+ alarm(0);
if (resp[4] != cmd[1] || resp[5] != cmd[2] || resp[6] != CMD_SUCCESS) {
fprintf(stderr, "Failed to reset chip, command failure\n");
return -1;
2023-08-09 10:29:28 +00:00
--
2.38.1