fengqi/lv_micropython
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

stm32/rfcore: Don't send HCI ACL cmds while another is pending.

Browse Source 
And, for TX, the next/prev entries ane unused so set them to NULL to
indicate this.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2020-11-10 12:55:24 +11:00 committed by Damien George
parent 119c88ef17
commit 21c293fbcd
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ports/stm32/rfcore.c
View File

@ -32,6 +32,7 @@
#include "py/mphal.h" #include "py/mphal.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "extmod/modbluetooth.h" #include "extmod/modbluetooth.h"
#include "nimble/nimble_npl.h"
#include "rtc.h" #include "rtc.h"
#include "rfcore.h" #include "rfcore.h"
@ -74,6 +75,7 @@
#define HCI_EVENT_COMMAND_COMPLETE (0x0E) // <num packets><opcode 16><status><data...> #define HCI_EVENT_COMMAND_COMPLETE (0x0E) // <num packets><opcode 16><status><data...>
#define HCI_EVENT_COMMAND_STATUS (0x0F) // <status><num_packets><opcode 16> #define HCI_EVENT_COMMAND_STATUS (0x0F) // <status><num_packets><opcode 16>
#define HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS (0x13) // <num>(<handle 16><completed 16>)*
#define SYS_ACK_TIMEOUT_MS (250) #define SYS_ACK_TIMEOUT_MS (250)
#define BLE_ACK_TIMEOUT_MS (250) #define BLE_ACK_TIMEOUT_MS (250)
@ -83,6 +85,8 @@
// AN5289 // AN5289
#define MAGIC_IPCC_MEM_INCORRECT 0x3DE96F61 #define MAGIC_IPCC_MEM_INCORRECT 0x3DE96F61
volatile bool hci_acl_cmd_pending = false;
typedef struct _tl_list_node_t { typedef struct _tl_list_node_t {
volatile struct _tl_list_node_t *next; volatile struct _tl_list_node_t *next;
volatile struct _tl_list_node_t *prev; volatile struct _tl_list_node_t *prev;
@ -305,6 +309,11 @@ STATIC size_t tl_parse_hci_msg(const uint8_t *buf, parse_hci_info_t *parse) {
case HCI_KIND_BT_EVENT: { case HCI_KIND_BT_EVENT: {
info = "HCI_EVT"; info = "HCI_EVT";
// Acknowledgment of a pending ACL request, allow another one to be sent.
if (buf[1] == HCI_EVENT_NUMBER_OF_COMPLETED_PACKETS) {
hci_acl_cmd_pending = false;
}
len = 3 + buf[2]; len = 3 + buf[2];
if (parse != NULL) { if (parse != NULL) {
@ -424,8 +433,8 @@ STATIC void tl_check_msg(volatile tl_list_node_t *head, unsigned int ch, parse_h
STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, const uint8_t *buf, size_t len) { STATIC void tl_hci_cmd(uint8_t *cmd, unsigned int ch, uint8_t hdr, uint16_t opcode, const uint8_t *buf, size_t len) {
tl_list_node_t *n = (tl_list_node_t *)cmd; tl_list_node_t *n = (tl_list_node_t *)cmd;
n->next = n; n->next = NULL;
n->prev = n; n->prev = NULL;
cmd[8] = hdr; cmd[8] = hdr;
cmd[9] = opcode; cmd[9] = opcode;
cmd[10] = opcode >> 8; cmd[10] = opcode >> 8;
@ -584,13 +593,25 @@ void rfcore_ble_hci_cmd(size_t len, const uint8_t *src) {
} else if (src[0] == HCI_KIND_BT_ACL) { } else if (src[0] == HCI_KIND_BT_ACL) {
n = (tl_list_node_t *)&ipcc_membuf_ble_hci_acl_data_buf[0]; n = (tl_list_node_t *)&ipcc_membuf_ble_hci_acl_data_buf[0];
ch = IPCC_CH_HCI_ACL; ch = IPCC_CH_HCI_ACL;
// Give the previous ACL command up to 100ms to complete.
mp_uint_t timeout_start_ticks_ms = mp_hal_ticks_ms();
while (hci_acl_cmd_pending) {
if (mp_hal_ticks_ms() - timeout_start_ticks_ms > 100) {
break;
}
mp_bluetooth_nimble_hci_uart_wfi();
}
// Prevent sending another command until this one returns with HCI_EVENT_COMMAND_{COMPLETE,STATUS}.
hci_acl_cmd_pending = true;
} else { } else {
printf("** UNEXPECTED HCI HDR: 0x%02x **\n", src[0]); printf("** UNEXPECTED HCI HDR: 0x%02x **\n", src[0]);
return; return;
} }
n->next = n; n->next = NULL;
n->prev = n; n->prev = NULL;
memcpy(n->body, src, len); memcpy(n->body, src, len);
// IPCC indicate. // IPCC indicate.