espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-01 14:50:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/ll/css: Fix conn create hci with css disabled

Browse Source 
Need to skip conn interval checks if css is disabled.
This commit is contained in:
Andrzej Kaczmarek
2022-06-24 10:26:03 +02:00
parent 41708e93fb
commit bb109d3ba4
1 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_conn_hci.c
+28 -16
View File
@@ -514,7 +514,7 @@ ble_ll_conn_hci_create(const uint8_t *cmdbuf, uint8_t len)
uint16_t conn_itvl_min; uint16_t conn_itvl_min;
uint16_t conn_itvl_max; uint16_t conn_itvl_max;
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED) #if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
uint16_t css_slot_idx; uint16_t css_slot_idx = 0;
#endif #endif
int rc; int rc;
@@ -537,9 +537,11 @@ ble_ll_conn_hci_create(const uint8_t *cmdbuf, uint8_t len)
} }
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED) #if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
css_slot_idx = ble_ll_conn_css_get_next_slot(); if (ble_ll_sched_css_is_enabled()) {
if (css_slot_idx == BLE_LL_CONN_CSS_NO_SLOT) { css_slot_idx = ble_ll_conn_css_get_next_slot();
return BLE_ERR_MEM_CAPACITY; if (css_slot_idx == BLE_LL_CONN_CSS_NO_SLOT) {
return BLE_ERR_MEM_CAPACITY;
}
} }
#endif #endif
@@ -575,10 +577,14 @@ ble_ll_conn_hci_create(const uint8_t *cmdbuf, uint8_t len)
} }
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED) #if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
cc_params.conn_itvl = ble_ll_sched_css_get_conn_interval_us(); if (ble_ll_sched_css_is_enabled()) {
if ((cc_params.conn_itvl < conn_itvl_min) || cc_params.conn_itvl = ble_ll_sched_css_get_conn_interval_us();
(cc_params.conn_itvl > conn_itvl_max)) { if ((cc_params.conn_itvl < conn_itvl_min) ||
return BLE_ERR_INV_HCI_CMD_PARMS; (cc_params.conn_itvl > conn_itvl_max)) {
return BLE_ERR_INV_HCI_CMD_PARMS;
}
} else {
cc_params.conn_itvl = conn_itvl_max;
} }
#else #else
cc_params.conn_itvl = conn_itvl_max; cc_params.conn_itvl = conn_itvl_max;
@@ -673,10 +679,14 @@ ble_ll_conn_hci_ext_create_parse_params(const struct conn_params *params,
} }
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED) #if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
cc_params->conn_itvl = ble_ll_sched_css_get_conn_interval_us(); if (ble_ll_sched_css_is_enabled()) {
if ((cc_params->conn_itvl < conn_itvl_min) || cc_params->conn_itvl = ble_ll_sched_css_get_conn_interval_us();
(cc_params->conn_itvl > conn_itvl_max)) { if ((cc_params->conn_itvl < conn_itvl_min) ||
return BLE_ERR_INV_HCI_CMD_PARMS; (cc_params->conn_itvl > conn_itvl_max)) {
return BLE_ERR_INV_HCI_CMD_PARMS;
}
} else {
cc_params->conn_itvl = conn_itvl_max;
} }
#else #else
cc_params->conn_itvl = conn_itvl_max; cc_params->conn_itvl = conn_itvl_max;
@@ -740,7 +750,7 @@ ble_ll_conn_hci_ext_create(const uint8_t *cmdbuf, uint8_t len)
struct ble_ll_conn_sm *connsm; struct ble_ll_conn_sm *connsm;
const struct init_phy *init_phy; const struct init_phy *init_phy;
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED) #if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
uint16_t css_slot_idx; uint16_t css_slot_idx = 0;
#endif #endif
int rc; int rc;
@@ -765,9 +775,11 @@ ble_ll_conn_hci_ext_create(const uint8_t *cmdbuf, uint8_t len)
} }
#if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED) #if MYNEWT_VAL(BLE_LL_CONN_STRICT_SCHED)
css_slot_idx = ble_ll_conn_css_get_next_slot(); if (ble_ll_sched_css_is_enabled()) {
if (css_slot_idx == BLE_LL_CONN_CSS_NO_SLOT) { css_slot_idx = ble_ll_conn_css_get_next_slot();
return BLE_ERR_MEM_CAPACITY; if (css_slot_idx == BLE_LL_CONN_CSS_NO_SLOT) {
return BLE_ERR_MEM_CAPACITY;
}
} }
#endif #endif