espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-10-25 15:03:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/controller: merge bsnbranch into bluetooth5

Browse Source 
Fix merge errors from first pass of merge.

X-Original-Commit: d072535a415d23c3237a204f3c455f8d730df767
This commit is contained in:
William San Filippo
2017-07-18 09:56:55 -07:00
parent 085095077b
commit caf3fe783f
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/include/controller/ble_ll_conn.h
-3
View File
@@ -217,9 +217,6 @@ struct ble_ll_conn_sm
uint8_t period_occ_mask; /* mask: period 0 = 0x01, period 3 = 0x08 */
#endif
/* RSSI */
int8_t conn_rssi;
/* Ack/Flow Control */
uint8_t tx_seqnum; /* note: can be 1 bit */
uint8_t next_exp_seqnum; /* note: can be 1 bit */
nimble/controller/src/ble_ll_sched.c
+3 -3
View File
@@ -301,8 +301,8 @@ ble_ll_sched_conn_reschedule(struct ble_ll_conn_sm *connsm)
*/
#if MYNEWT_VAL(BLE_LL_STRICT_CONN_SCHEDULING)
int
ble_ll_sched_master_new(struct ble_ll_conn_sm *connsm, uint32_t adv_rxend,
uint8_t req_slots)
ble_ll_sched_master_new(struct ble_ll_conn_sm *connsm,
struct ble_mbuf_hdr *ble_hdr, uint8_t pyld_len)
{
int rc;
os_sr_t sr;
@@ -311,7 +311,7 @@ ble_ll_sched_master_new(struct ble_ll_conn_sm *connsm, uint32_t adv_rxend,
uint32_t earliest_end;
uint32_t dur;
uint32_t itvl_t;
uint32_t adv_rxend;
int i;
uint32_t tpp;
uint32_t tse;