espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-13 17:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/transport; MYNEWT-737: Make ble_hci_uart_tx_char more efficient

Browse Source 
Modified the code in ble_hci_uart_tx_char to be faster. This
added a bit more code (should not have increased ram usage) and
should in general be faster than the old method and should also
free the mbufs slightly faster (each one is freed as it is
used).

X-Original-Commit: be6ce3cc261f0fedee0807ce85aae0b287d13dd2
This commit is contained in:
William San Filippo
2017-04-20 19:36:37 -07:00
parent 8eb92dd537
commit 67b663b8ae
1 changed files with 54 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/transport/uart/src/ble_hci_uart.c
+54 -11
View File
@@ -125,6 +125,16 @@ struct ble_hci_uart_pkt {
uint8_t type;
};
/**
* Structure for transmitting ACL packets over UART
*
*/
struct ble_hci_uart_h4_acl_tx
{
uint8_t *dptr;
struct os_mbuf *tx_acl;
};
static struct {
/*** State of data received over UART. */
uint8_t rx_type; /* Pending packet type. 0 means nothing pending */
@@ -135,9 +145,10 @@ static struct {
/*** State of data transmitted over UART. */
uint8_t tx_type; /* Pending packet type. 0 means nothing pending */
uint16_t rem_tx_len; /* Used for acl tx only currently */
union {
struct ble_hci_uart_cmd tx_cmd;
struct os_mbuf *tx_acl;
struct ble_hci_uart_h4_acl_tx tx_pkt;
};
STAILQ_HEAD(, ble_hci_uart_pkt) tx_pkts; /* Packet queue to send to UART */
} ble_hci_uart_state;
@@ -170,6 +181,12 @@ ble_hci_uart_acl_tx(struct os_mbuf *om)
struct ble_hci_uart_pkt *pkt;
os_sr_t sr;
/* If this packet is zero length, just free it */
if (OS_MBUF_PKTLEN(om) == 0) {
os_mbuf_free_chain(om);
return 0;
}
pkt = os_memblock_get(&ble_hci_uart_pkt_pool);
if (pkt == NULL) {
os_mbuf_free_chain(om);
@@ -220,6 +237,7 @@ static int
ble_hci_uart_tx_pkt_type(void)
{
struct ble_hci_uart_pkt *pkt;
struct os_mbuf *om;
os_sr_t sr;
int rc;
@@ -255,7 +273,12 @@ ble_hci_uart_tx_pkt_type(void)
case BLE_HCI_UART_H4_ACL:
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_ACL;
ble_hci_uart_state.tx_acl = pkt->data;
om = (struct os_mbuf *)pkt->data;
/* NOTE: first mbuf must have non-zero length */
os_mbuf_trim_front(om);
ble_hci_uart_state.tx_pkt.tx_acl = om;
ble_hci_uart_state.tx_pkt.dptr = om->om_data;
ble_hci_uart_state.rem_tx_len = OS_MBUF_PKTLEN(om);
break;
default:
@@ -276,7 +299,8 @@ static int
ble_hci_uart_tx_char(void *arg)
{
uint8_t u8;
int rc = -1;
int rc;
struct os_mbuf *om;
switch (ble_hci_uart_state.tx_type) {
case BLE_HCI_UART_H4_NONE: /* No pending packet, pick one from the queue */
@@ -297,17 +321,36 @@ ble_hci_uart_tx_char(void *arg)
/* Copy the first unsent byte from the tx buffer and remove it from the
* source.
*/
os_mbuf_copydata(ble_hci_uart_state.tx_acl, 0, 1, &u8);
os_mbuf_adj(ble_hci_uart_state.tx_acl, 1);
/* Free the tx buffer if this is the last byte to send. */
if (OS_MBUF_PKTLEN(ble_hci_uart_state.tx_acl) == 0) {
os_mbuf_free_chain(ble_hci_uart_state.tx_acl);
u8 = ble_hci_uart_state.tx_pkt.dptr[0];
--ble_hci_uart_state.rem_tx_len;
if (ble_hci_uart_state.rem_tx_len == 0) {
os_mbuf_free_chain(ble_hci_uart_state.tx_pkt.tx_acl);
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
} else {
om = ble_hci_uart_state.tx_pkt.tx_acl;
--om->om_len;
if (om->om_len == 0) {
/* Remove and free any zero mbufs */
while ((om != NULL) && (om->om_len == 0)) {
ble_hci_uart_state.tx_pkt.tx_acl = SLIST_NEXT(om, om_next);
os_mbuf_free(om);
om = ble_hci_uart_state.tx_pkt.tx_acl;
}
/* NOTE: om should never be NULL! What to do? */
if (om == NULL) {
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
} else {
ble_hci_uart_state.tx_pkt.dptr = om->om_data;
}
} else {
ble_hci_uart_state.tx_pkt.dptr++;
}
}
rc = u8;
break;
default:
rc = -1;
break;
}
return rc;
@@ -931,7 +974,7 @@ ble_hci_trans_reset(void)
ble_hci_uart_free_pkt(ble_hci_uart_state.tx_type,
ble_hci_uart_state.tx_cmd.data,
ble_hci_uart_state.tx_acl);
ble_hci_uart_state.tx_pkt.tx_acl);
ble_hci_uart_state.tx_type = BLE_HCI_UART_H4_NONE;
while ((pkt = STAILQ_FIRST(&ble_hci_uart_state.tx_pkts)) != NULL) {