Embedded
/
zephyr-hci-uart-3wire
1
0
Fork 0
Code Releases Activity

Fixes problems with oversized H5 packets; ensures logging on alloc failure

This commit is contained in:
Shawn Nock 2019-08-02 11:45:06 -04:00
parent 52dbf7ba41
commit 52edd92f00
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.c
View File

@ -16,6 +16,7 @@
#define LOG_MODULE_NAME hci_uart_h5 #define LOG_MODULE_NAME hci_uart_h5
#include <logging/log.h> #include <logging/log.h>
#include <logging/log_ctrl.h>
#include <misc/util.h> #include <misc/util.h>
@ -177,6 +178,7 @@ static inline void bt_uart_drain(struct device *dev)
void _reboot_if_not(struct net_buf *buf, char const *file, int line) { void _reboot_if_not(struct net_buf *buf, char const *file, int line) {
if (!buf) { if (!buf) {
log_panic();
LOG_ERR("Failed alloc at %s:%d", file, line); LOG_ERR("Failed alloc at %s:%d", file, line);
sys_reboot(SYS_REBOOT_COLD); sys_reboot(SYS_REBOOT_COLD);
} }
@ -453,6 +455,14 @@ void bt_uart_isr(struct device *unused)
} }
while (uart_fifo_read(hci_uart_dev, &byte, sizeof(byte))) { while (uart_fifo_read(hci_uart_dev, &byte, sizeof(byte))) {
if (buf->len == buf->size && byte != SLIP_DELIMITER) {
/* If our buffer is full, but the packet isn't done...
* unsync'ing SLIP will drop the rest of the packet and the net_buf_reset
* prepares the buffer for reuse without unref/alloc cycle.
*/
net_buf_reset(buf);
slip_state = SLIP_NOSYNC;
}
if (slip_state == SLIP_NOSYNC && byte != SLIP_DELIMITER) { if (slip_state == SLIP_NOSYNC && byte != SLIP_DELIMITER) {
continue; continue;
} }