Merge branch 'apache:master' into gap-doc

apache · Aug 7, 2023 · a2c2f7a · a2c2f7a
2 parents d602df7 + fa5cc47
commit a2c2f7a
Show file tree

Hide file tree

Showing 11 changed files with 1,000 additions and 41 deletions.
diff --git a/.github/targets/nordic_pca10056_blehci_all_enabled/syscfg.yml b/.github/targets/nordic_pca10056_blehci_all_enabled/syscfg.yml
@@ -36,3 +36,4 @@ syscfg.vals:
     BLE_PHY_DBG_TIME_TXRXEN_READY_PIN: 12
     BLE_PHY_DBG_TIME_WFR_PIN: 16
     BLE_XTAL_SETTLE_TIME: 1500
+    BLE_LL_HCI_LLCP_TRACE: 1
diff --git a/.github/workflows/build_targets.yml b/.github/workflows/build_targets.yml
@@ -54,7 +54,7 @@ jobs:
              git clone --depth=1 https://github.com/mcu-tools/mcuboot.git repos/mcuboot
              git clone --depth=1 https://github.com/apache/mynewt-mcumgr repos/apache-mynewt-mcumgr
              git clone --depth=1 https://github.com/hathach/tinyusb.git repos/tinyusb
-             git clone --depth=1 https://github.com/NordicSemiconductor/nrfx --branch v2.8.0 repos/nordic-nrfx
+             git clone --depth=1 https://github.com/NordicSemiconductor/nrfx --branch v2.11.0 repos/nordic-nrfx
       - name: Build targets
         shell: bash
         run: |

diff --git a/apps/bttester/src/btp_l2cap.c b/apps/bttester/src/btp_l2cap.c
@@ -140,19 +140,6 @@ recv_cb(uint16_t conn_handle, struct ble_l2cap_chan *chan,
     tester_l2cap_coc_recv(chan, buf);
 }
 
-static void
-unstalled_cb(uint16_t conn_handle, struct ble_l2cap_chan *chan,
-             int status, void *arg)
-{
-    if (status) {
-        tester_rsp(BTP_SERVICE_ID_L2CAP, BTP_L2CAP_SEND_DATA,
-                   BTP_STATUS_FAILED);
-    } else {
-        tester_rsp(BTP_SERVICE_ID_L2CAP, BTP_L2CAP_SEND_DATA,
-                   BTP_STATUS_SUCCESS);
-    }
-}
-
 static void
 reconfigured_ev(uint16_t conn_handle, struct ble_l2cap_chan *chan,
                 struct ble_l2cap_chan_info *chan_info,
@@ -349,10 +336,6 @@ tester_l2cap_event(struct ble_l2cap_event *event, void *arg)
             (uint32_t) event->tx_unstalled.chan,
             event->tx_unstalled.conn_handle,
             event->tx_unstalled.status);
-
-        unstalled_cb(event->tx_unstalled.conn_handle,
-                     event->tx_unstalled.chan,
-                     event->tx_unstalled.status, arg);
         return 0;
     case BLE_L2CAP_EVENT_COC_RECONFIG_COMPLETED:
         if (ble_l2cap_get_chan_info(event->reconfigured.chan,

diff --git a/nimble/controller/src/ble_ll_hci_ev.c b/nimble/controller/src/ble_ll_hci_ev.c
@@ -643,16 +643,16 @@ void
 ble_ll_hci_ev_send_vs_llcp_trace(uint8_t type, uint16_t handle, uint16_t count,
                                  void *pdu, size_t length)
 {
-    struct ble_hci_ev_vs_debug *ev;
+    struct ble_hci_ev_vs *ev;
     struct ble_hci_ev *hci_ev;
 
     hci_ev = ble_transport_alloc_evt(1);
     if (hci_ev) {
-        hci_ev->opcode = BLE_HCI_EVCODE_VS_DEBUG;
+        hci_ev->opcode = BLE_HCI_EVCODE_VS;
         hci_ev->length = sizeof(*ev) + 8 + length;
         ev = (void *) hci_ev->data;
 
-        ev->id = 0x17;
+        ev->id = BLE_HCI_VS_SUBEV_ID_LLCP_TRACE;
         ev->data[0] = type;
         put_le16(&ev->data[1], handle);
         put_le16(&ev->data[3], count);