mirror of
https://github.com/espressif/esp-nimble.git
synced 2026-06-05 21:04:49 +00:00
fix(nimble): Add support for shorter connection interval
This commit is contained in:
@@ -7591,12 +7591,12 @@ ble_gap_check_conn_params(uint8_t phy, const struct ble_gap_conn_params *params)
|
||||
}
|
||||
}
|
||||
/* Check connection interval min */
|
||||
if ((params->itvl_min < BLE_HCI_CONN_ITVL_MIN) ||
|
||||
if ((params->itvl_min < BLE_HOST_CONN_PARAM_ITVL_MIN) ||
|
||||
(params->itvl_min > BLE_HCI_CONN_ITVL_MAX)) {
|
||||
return BLE_ERR_INV_HCI_CMD_PARMS;
|
||||
}
|
||||
/* Check connection interval max */
|
||||
if ((params->itvl_max < BLE_HCI_CONN_ITVL_MIN) ||
|
||||
if ((params->itvl_max < BLE_HOST_CONN_PARAM_ITVL_MIN) ||
|
||||
(params->itvl_max > BLE_HCI_CONN_ITVL_MAX) ||
|
||||
(params->itvl_max < params->itvl_min)) {
|
||||
return BLE_ERR_INV_HCI_CMD_PARMS;
|
||||
@@ -8976,7 +8976,8 @@ ble_gap_validate_conn_params(const struct ble_gap_upd_params *params)
|
||||
return false;
|
||||
}
|
||||
|
||||
if (params->itvl_min < 0x0006 || params->itvl_max > 0x0C80) {
|
||||
if (params->itvl_min < BLE_HOST_CONN_PARAM_ITVL_MIN ||
|
||||
params->itvl_max > BLE_HCI_CONN_ITVL_MAX) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -1848,7 +1848,7 @@ ble_hs_hci_evt_le_conn_upd_complete(uint8_t subevent, const void *data,
|
||||
}
|
||||
|
||||
if (ev->status == 0) {
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->conn_itvl) >= BLE_HCI_CONN_ITVL_MIN);
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->conn_itvl) >= BLE_HOST_CONN_PARAM_ITVL_MIN);
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->conn_itvl) <= BLE_HCI_CONN_ITVL_MAX);
|
||||
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->conn_latency) >= BLE_HCI_CONN_LATENCY_MIN);
|
||||
@@ -1888,7 +1888,7 @@ ble_hs_hci_evt_le_conn_parm_req(uint8_t subevent, const void *data, unsigned int
|
||||
return BLE_HS_ECONTROLLER;
|
||||
}
|
||||
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->min_interval) >= BLE_HCI_CONN_ITVL_MIN);
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->min_interval) >= BLE_HOST_CONN_PARAM_ITVL_MIN);
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->max_interval) <= BLE_HCI_CONN_ITVL_MAX);
|
||||
BLE_HS_DBG_ASSERT(le16toh(ev->max_interval) >= le16toh(ev->min_interval));
|
||||
|
||||
|
||||
@@ -1825,7 +1825,20 @@ struct ble_hci_vs_set_event_mask_cp {
|
||||
#define BLE_HCI_CONN_FILT_NO_WL (0)
|
||||
#define BLE_HCI_CONN_FILT_USE_WL (1)
|
||||
#define BLE_HCI_CONN_FILT_MAX (1)
|
||||
/* Bluetooth Core Spec minimum connection interval (7.5 ms in 1.25 ms units). */
|
||||
#define BLE_HCI_CONN_ITVL_MIN (0x0006)
|
||||
/* Host-side validation floor for connection interval (1.25 ms units). When
|
||||
* CONFIG_BT_BLE_HOST_ALLOW_SUB_SPEC_MIN_CONN_INT is enabled, the host accepts
|
||||
* sub-spec intervals and defers the real lower bound to the controller; 0x0001
|
||||
* is used instead of 0 so uint16_t range checks stay well-defined under
|
||||
* -Wtype-limits. For spec-visible values (e.g. PPCP) use BLE_HCI_CONN_ITVL_MIN.
|
||||
*/
|
||||
#if defined(CONFIG_BT_BLE_HOST_ALLOW_SUB_SPEC_MIN_CONN_INT) && \
|
||||
(CONFIG_BT_BLE_HOST_ALLOW_SUB_SPEC_MIN_CONN_INT)
|
||||
#define BLE_HOST_CONN_PARAM_ITVL_MIN (0x0001)
|
||||
#else
|
||||
#define BLE_HOST_CONN_PARAM_ITVL_MIN BLE_HCI_CONN_ITVL_MIN
|
||||
#endif
|
||||
#define BLE_HCI_CONN_ITVL_MAX (0x0c80)
|
||||
#define BLE_HCI_CONN_LATENCY_MIN (0x0000)
|
||||
#define BLE_HCI_CONN_LATENCY_MAX (0x01f3)
|
||||
|
||||
Reference in New Issue
Block a user