You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/11/10 19:32:28 UTC
[19/19] incubator-mynewt-core git commit: Merge remote-tracking
branch 'apache/master' into develop
Merge remote-tracking branch 'apache/master' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/406eeb0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/406eeb0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/406eeb0c
Branch: refs/heads/develop
Commit: 406eeb0c2fc736f3a13c8d7320c0b65eb44474c4
Parents: 858f94e 7aee851
Author: Christopher Collins <cc...@apache.org>
Authored: Thu Nov 10 11:06:24 2016 -0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Thu Nov 10 11:06:24 2016 -0800
----------------------------------------------------------------------
README.md | 2 +-
net/nimble/transport/uart/src/ble_hci_uart.c | 8 ++++++--
repository.yml | 3 ++-
3 files changed, 9 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/406eeb0c/net/nimble/transport/uart/src/ble_hci_uart.c
----------------------------------------------------------------------
diff --cc net/nimble/transport/uart/src/ble_hci_uart.c
index 530c5e4,663c817..13b32d3
--- a/net/nimble/transport/uart/src/ble_hci_uart.c
+++ b/net/nimble/transport/uart/src/ble_hci_uart.c
@@@ -38,17 -36,8 +38,21 @@@
#include "transport/uart/ble_hci_uart.h"
+#define BLE_HCI_UART_EVT_COUNT \
+ (MYNEWT_VAL(BLE_HCI_EVT_HI_BUF_COUNT) + MYNEWT_VAL(BLE_HCI_EVT_LO_BUF_COUNT))
+
+/***
- * NOTE:
++ * NOTES:
+ * The UART HCI transport doesn't use event buffer priorities. All incoming
- * and outgoing events and commands use buffers from the same pool.
++ * and outgoing events use buffers from the same pool.
++ *
++ * The "skip" definitions are here so that when buffers cannot be allocated,
++ * the command or acl packets are simply skipped so that the HCI interface
++ * does not lose synchronization and resets dont (necessarily) occur.
+ */
+
/* XXX: for now, define this here */
-#ifdef FEATURE_BLE_DEVICE
+#if MYNEWT_VAL(BLE_DEVICE)
extern void ble_ll_data_buffer_overflow(void);
extern void ble_ll_hw_error(uint8_t err);