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

nimble: Add initial support for Core Spec 5.1

Browse Source 
This only adds required defines for new HCI commands and events.
Option for selecting supported core version is also added.
This commit is contained in:
Szymon Janc
2019-10-15 08:46:17 +02:00
parent 9c6f8b1ac9
commit b0aef82b37
5 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_ctrl.c
+1 -1
View File
@@ -1507,7 +1507,7 @@ ble_ll_ctrl_version_ind_make(struct ble_ll_conn_sm *connsm, uint8_t *pyld)
connsm->csmflags.cfbit.version_ind_sent = 1;
/* Fill out response */
pyld[0] = BLE_HCI_VER_BCS_5_0;
pyld[0] = BLE_HCI_VER_BCS;
put_le16(pyld + 1, MYNEWT_VAL(BLE_LL_MFRG_ID));
put_le16(pyld + 3, BLE_LL_SUB_VERS_NR);
}
nimble/controller/src/ble_ll_hci.c
+2 -2
View File
@@ -213,9 +213,9 @@ ble_ll_hci_rd_local_version(uint8_t *rspbuf, uint8_t *rsplen)
{
struct ble_hci_ip_rd_local_ver_rp *rsp = (void *) rspbuf;
rsp->hci_ver = BLE_HCI_VER_BCS_5_0;
rsp->hci_ver = BLE_HCI_VER_BCS;
rsp->hci_rev = 0;
rsp->lmp_ver = BLE_LMP_VER_BCS_5_0;
rsp->lmp_ver = BLE_LMP_VER_BCS;
rsp->manufacturer = htole16(MYNEWT_VAL(BLE_LL_MFRG_ID));
rsp->lmp_subver = 0;
nimble/include/nimble/hci_common.h
+36
View File
@@ -764,6 +764,24 @@ struct ble_hci_le_set_privacy_mode_cp {
uint8_t mode;
} __attribute__((packed));
#define BLE_HCI_OCF_LE_RX_TEST_V3 (0x004F)
#define BLE_HCI_OCF_LE_TX_TEST_V3 (0x0050)
#define BLE_HCI_OCF_LE_SET_CONNLESS_CTE_TX_PARAMS (0x0051)
#define BLE_HCI_OCF_LE_SET_CONNLESS_CTE_TX_ENABLE (0x0052)
#define BLE_HCI_OCF_LE_SET_CONNLESS_IQ_SAMPLING_ENABLE (0x0053)
#define BLE_HCI_OCF_LE_SET_CONN_CTE_RX_PARAMS (0x0054)
#define BLE_HCI_OCF_LE_SET_CONN_CTE_TX_PARAMS (0x0055)
#define BLE_HCI_OCF_LE_SET_CONN_CTE_REQ_ENABLE (0x0056)
#define BLE_HCI_OCF_LE_SET_CONN_CTE_RESP_ENABLE (0x0057)
#define BLE_HCI_OCF_LE_RD_ANTENNA_INFO (0x0058)
#define BLE_HCI_OCF_LE_PERIODIC_ADV_RECEIVE_ENABLE (0x0059)
#define BLE_HCI_OCF_LE_PERIODIC_ADV_SYNC_TRANSFER (0x005A)
#define BLE_HCI_OCF_LE_PERIODIC_ADV_SET_INFO_TRANSFER (0x005B)
#define BLE_HCI_OCF_LE_PERIODIC_ADV_SYNC_TRANSFER_PARAMS (0x005C)
#define BLE_HCI_OCF_LE_SET_DEFAULT_SYNC_TRANSFER_PARAMS (0x005D)
#define BLE_HCI_OCF_LE_GENERATE_DHKEY_V2 (0x005E)
#define BLE_HCI_OCF_LE_MODIFY_SCA (0x005F)
/* Command Specific Definitions */
/* --- Set controller to host flow control (OGF 0x03, OCF 0x0031) --- */
#define BLE_HCI_CTLR_TO_HOST_FC_OFF (0)
@@ -1139,6 +1157,8 @@ struct ble_hci_ev_auth_pyld_tmo {
uint16_t conn_handle;
} __attribute__((packed));
#define BLE_HCI_EVCODE_SAM_STATUS_CHG (0x58)
#define BLE_HCI_EVCODE_VENDOR_DEBUG (0xFF)
struct ble_hci_ev_vendor_debug {
uint8_t id;
@@ -1356,6 +1376,11 @@ struct ble_hci_ev_le_subev_chan_sel_alg {
uint8_t csa;
} __attribute__((packed));
#define BLE_HCI_LE_SUBEV_CONNLESS_IQ_RPT (0x15)
#define BLE_HCI_LE_SUBEV_CONN_IQ_RPT (0x16)
#define BLE_HCI_LE_SUBEV_CTE_REQ_FAILED (0x17)
#define BLE_HCI_LE_SUBEV_PERIODIC_ADV_SYNC_TRANSFER (0x18)
/* Data buffer overflow event */
#define BLE_HCI_EVENT_ACL_BUF_OVERFLOW (0x01)
@@ -1396,6 +1421,7 @@ struct ble_hci_ev_le_subev_chan_sel_alg {
#define BLE_HCI_VER_BCS_4_1 (7)
#define BLE_HCI_VER_BCS_4_2 (8)
#define BLE_HCI_VER_BCS_5_0 (9)
#define BLE_HCI_VER_BCS_5_1 (10)
#define BLE_LMP_VER_BCS_1_0b (0)
#define BLE_LMP_VER_BCS_1_1 (1)
@@ -1407,6 +1433,16 @@ struct ble_hci_ev_le_subev_chan_sel_alg {
#define BLE_LMP_VER_BCS_4_1 (7)
#define BLE_LMP_VER_BCS_4_2 (8)
#define BLE_LMP_VER_BCS_5_0 (9)
#define BLE_LMP_VER_BCS_5_1 (10)
/* selected HCI and LMP version */
#if MYNEWT_VAL(BLE_VERSION) == 50
#define BLE_HCI_VER_BCS BLE_HCI_VER_BCS_5_0
#define BLE_LMP_VER_BCS BLE_LMP_VER_BCS_5_0
#elif MYNEWT_VAL(BLE_VERSION) == 51
#define BLE_HCI_VER_BCS BLE_HCI_VER_BCS_5_1
#define BLE_LMP_VER_BCS BLE_LMP_VER_BCS_5_1
#endif
#define BLE_HCI_DATA_HDR_SZ 4
#define BLE_HCI_DATA_HANDLE(handle_pb_bc) (((handle_pb_bc) & 0x0fff) >> 0)
nimble/syscfg.yml
+7
View File
@@ -65,3 +65,10 @@ syscfg.defs:
scan response data used in LE Advertising Extensions.
Valid range 31-1650.
value: 31
BLE_VERSION:
description: >
This allows to configure supported Bluetooth Core version. Some
features may not be available if version is too low. Version is
integer for easy comparison.
range: 50, 51
value: 50
porting/npl/riot/include/syscfg/syscfg.h
+4
View File
@@ -438,6 +438,10 @@
#define MYNEWT_VAL_BLE_WHITELIST (1)
#endif
#ifndef MYNEWT_VAL_BLE_VERSION
#define MYNEWT_VAL_BLE_VERSION 50
#endif
/*** nimble/controller */
#ifndef MYNEWT_VAL_BLE_CONTROLLER
#define MYNEWT_VAL_BLE_CONTROLLER (1)