nimble/host: Add support for ext adv param v2 HCI command

apache · Aug 14, 2024 · 30903d4 · 30903d4
1 parent 49db784
commit 30903d4
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 2 deletions.
diff --git a/nimble/host/include/host/ble_gap.h b/nimble/host/include/host/ble_gap.h
@@ -1582,6 +1582,14 @@ struct ble_gap_ext_adv_params {
 
     /** Advertising Set ID */
     uint8_t sid;
+
+#if MYNEWT_VAL(BLE_EXT_ADV_V2)
+    /** Primary phy options */
+    uint8_t pri_phy_opt;
+
+    /** Secondary phy options */
+    uint8_t sec_phy_opt;
+#endif
 };
 
 /**

diff --git a/nimble/host/src/ble_gap.c b/nimble/host/src/ble_gap.c
@@ -3129,8 +3129,14 @@ ble_gap_ext_adv_params_tx(uint8_t instance,
                           int8_t *selected_tx_power)
 
 {
+#if MYNEWT_VAL(BLE_EXT_ADV_V2)
+    struct ble_hci_le_set_ext_adv_params_v2_cp cmd;
+#else
     struct ble_hci_le_set_ext_adv_params_cp cmd;
+#endif
+
     struct ble_hci_le_set_ext_adv_params_rp rsp;
+    uint16_t opcode;
     int rc;
 
     memset(&cmd, 0, sizeof(cmd));
@@ -3207,8 +3213,16 @@ ble_gap_ext_adv_params_tx(uint8_t instance,
     cmd.sid = params->sid;
     cmd.scan_req_notif = params->scan_req_notif;
 
-    rc = ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_LE,
-                                      BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM),
+#if MYNEWT_VAL(BLE_EXT_ADV_V2)
+    cmd.pri_phy_opt = params->pri_phy_opt;
+    cmd.sec_phy_opt = params->sec_phy_opt;
+
+    opcode = BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM_V2;
+#else
+    opcode = BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM;
+#endif
+
+    rc = ble_hs_hci_cmd_tx(BLE_HCI_OP(BLE_HCI_OGF_LE, opcode),
                            &cmd, sizeof(cmd), &rsp, sizeof(rsp));
 
     if (rc != 0) {

diff --git a/nimble/include/nimble/hci_common.h b/nimble/include/nimble/hci_common.h
@@ -597,6 +597,27 @@ struct ble_hci_le_set_ext_adv_params_rp {
     int8_t  tx_power;
 } __attribute__((packed));
 
+#define BLE_HCI_OCF_LE_SET_EXT_ADV_PARAM_V2             (0x007F)
+struct ble_hci_le_set_ext_adv_params_v2_cp {
+    uint8_t  adv_handle;
+    uint16_t props;
+    uint8_t  pri_itvl_min[3];
+    uint8_t  pri_itvl_max[3];
+    uint8_t pri_chan_map;
+    uint8_t own_addr_type;
+    uint8_t peer_addr_type;
+    uint8_t peer_addr[6];
+    uint8_t filter_policy;
+    int8_t tx_power;
+    uint8_t pri_phy;
+    uint8_t sec_max_skip;
+    uint8_t sec_phy;
+    uint8_t sid;
+    uint8_t scan_req_notif;
+    uint8_t pri_phy_opt;
+    uint8_t sec_phy_opt;
+} __attribute__((packed));
+
 #define BLE_HCI_OCF_LE_SET_EXT_ADV_DATA             (0x0037)
 struct ble_hci_le_set_ext_adv_data_cp {
     uint8_t adv_handle;

diff --git a/porting/examples/linux/include/syscfg/syscfg.h b/porting/examples/linux/include/syscfg/syscfg.h
@@ -433,6 +433,10 @@
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2
+#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
 #endif

diff --git a/porting/examples/linux_blemesh/include/syscfg/syscfg.h b/porting/examples/linux_blemesh/include/syscfg/syscfg.h
@@ -433,6 +433,10 @@
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2
+#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
 #endif

diff --git a/porting/examples/nuttx/include/syscfg/syscfg.h b/porting/examples/nuttx/include/syscfg/syscfg.h
@@ -433,6 +433,10 @@
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2
+#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
 #endif

diff --git a/porting/nimble/include/syscfg/syscfg.h b/porting/nimble/include/syscfg/syscfg.h
@@ -433,6 +433,10 @@
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2
+#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
 #endif

diff --git a/porting/npl/riot/include/syscfg/syscfg.h b/porting/npl/riot/include/syscfg/syscfg.h
@@ -1081,6 +1081,10 @@
 #define MYNEWT_VAL_BLE_EXT_ADV (0)
 #endif
 
+#ifndef MYNEWT_VAL_BLE_EXT_ADV_V2
+#define MYNEWT_VAL_BLE_EXT_ADV_V2 (0)
+#endif
+
 #ifndef MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE
 #define MYNEWT_VAL_BLE_EXT_ADV_MAX_SIZE (31)
 #endif