Update to Mynewt-NimBLE version 1.9

This will update to the mainline Mynewt-nimble repo and pull in esp device support
from the esp-nimble fork. Doing this allows for simplified maintenance and avoids having
too much additional/unsupported upstream changes.

This also allows for using more recent NimBLE versions and being able to pull in important
updates that are not in esp-nimble.

Author: h2zero

src/NimBLEUtils.cpp

@@ -542,14 +542,22 @@ const char* NimBLEUtils::gapEventToString(uint8_t eventType) {
             return "BLE_GAP_EVENT_PARING_COMPLETE";
         case BLE_GAP_EVENT_SUBRATE_CHANGE: // 28
             return "BLE_GAP_EVENT_SUBRATE_CHANGE";
+#   ifdef BLE_GAP_EVENT_VS_HCI
         case BLE_GAP_EVENT_VS_HCI: // 29
             return "BLE_GAP_EVENT_VS_HCI";
+#   endif
+#   ifdef BLE_GAP_EVENT_REATTEMPT_COUNT
         case BLE_GAP_EVENT_REATTEMPT_COUNT: // 31
             return "BLE_GAP_EVENT_REATTEMPT_COUNT";
+#   endif
+#   ifdef BLE_GAP_EVENT_AUTHORIZE
         case BLE_GAP_EVENT_AUTHORIZE: // 32
             return "BLE_GAP_EVENT_AUTHORIZE";
+#   endif
+#   ifdef BLE_GAP_EVENT_TEST_UPDATE
         case BLE_GAP_EVENT_TEST_UPDATE: // 33
             return "BLE_GAP_EVENT_TEST_UPDATE";
+#   endif
 #   ifdef BLE_GAP_EVENT_DATA_LEN_CHG
         case BLE_GAP_EVENT_DATA_LEN_CHG: // 34
             return "BLE_GAP_EVENT_DATA_LEN_CHG";

src/nimble/CODING_STANDARDS.md

@@ -225,3 +225,6 @@ missing licensing information.  The BSD license was subsequently added to
 these files in later releases.  These files are:
     * babblesim/hw/mcu/nordic/nrf52_bsim/include/mcu/cmsis_nvic.h
 
+This product bundles part of linker scripts from Nordic Semiconductor,
+which is available under the "modified Tcl/Tk" license.  Bundled files are:
+    * targets/auracast_usb/nrf5340-mcu.ld

src/nimble/LICENSE

@@ -1,6 +1,5 @@
 Apache Mynewt NimBLE
-Copyright 2015-2022 The Apache Software Foundation
-Modifications Copyright 2017-2022 Espressif Systems (Shanghai) CO., LTD.
+Copyright 2015-2025 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

src/nimble/NOTICE

@@ -1,6 +1,6 @@
 # RELEASE NOTES
 
-09 August 2023 - Apache NimBLE v1.6.0
+15 December 2025 - Apache NimBLE v1.9.0
 
 For full release notes, please visit the
 [Apache Mynewt Wiki](https://cwiki.apache.org/confluence/display/MYNEWT/Release+Notes).
@@ -10,11 +10,8 @@ replaces the proprietary SoftDevice on Nordic chipsets.
 
 New features in this version of NimBLE include:
 
-* Initial support for ISO broacaster
-* Support for Bluetooth Core Specification 5.4
-* FEM antenna control
-* nRF PHY driver unification
-* IPC HCI transport improvements
+* Characteristic Extended Properties descriptor in GATT server
+* Framed PDUs in ISO Adaptation Layer
 
 If working on next-generation RTOS and Bluetooth protocol stack
 sounds exciting to you, get in touch, by sending a mail to the Apache Mynewt

src/nimble/RELEASE_NOTES.md

@@ -32,6 +32,9 @@
 #define BLE_HCI_EVENT_HDR_LEN               (2)
 #define BLE_HCI_CMD_HDR_LEN                 (3)
 
+typedef int ble_hci_trans_rx_cmd_fn(uint8_t *cmd, void *arg);
+typedef int ble_hci_trans_rx_acl_fn(struct os_mbuf *om, void *arg);
+
 static ble_hci_trans_rx_cmd_fn *ble_hci_rx_cmd_hs_cb;
 static void *ble_hci_rx_cmd_hs_arg;
 

src/nimble/esp_port/esp-hci/src/esp_nimble_hci.c

@@ -12,7 +12,7 @@
 #include <string.h>
 #include <errno.h>
 #include <stdint.h>
-#include <nimble/porting/nimble/include/sysinit/sysinit.h>
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
 #include "nimble/porting/nimble/include/os/os_mbuf.h"
 #include "nimble/nimble/transport/include/nimble/transport.h"
 #include "nimble/esp_port/port/transport/include/esp_hci_transport.h"

…mble/transport/esp_ipc/src/hci_esp_ipc.c …imble/esp_port/esp_ipc/src/hci_esp_ipc.csrc/nimble/nimble/transport/esp_ipc/src/hci_esp_ipc.c renamed to src/nimble/esp_port/esp_ipc/src/hci_esp_ipc.c src/nimble/nimble/transport/esp_ipc/src/hci_esp_ipc.c renamed to src/nimble/esp_port/esp_ipc/src/hci_esp_ipc.c

@@ -10,10 +10,13 @@
 #include <string.h>
 #include <errno.h>
 #include <stdint.h>
-#include <nimble/porting/nimble/include/sysinit/sysinit.h>
+#include "nimble/porting/nimble/include/sysinit/sysinit.h"
 #include "nimble/nimble/transport/include/nimble/transport.h"
 #include "nimble/esp_port/esp-hci/include/esp_nimble_hci.h"
 
+extern int ble_hci_trans_hs_acl_tx(struct os_mbuf *om);
+extern int ble_hci_trans_hs_cmd_tx(void *buf);
+
 /* This file is only used by ESP32, ESP32C3 and ESP32S3. */
 int
 ble_transport_to_ll_cmd_impl(void *buf)

…/esp_ipc_legacy/src/hci_esp_ipc_legacy.c …/esp_ipc_legacy/src/hci_esp_ipc_legacy.csrc/nimble/nimble/transport/esp_ipc_legacy/src/hci_esp_ipc_legacy.c renamed to src/nimble/esp_port/esp_ipc_legacy/src/hci_esp_ipc_legacy.c src/nimble/nimble/transport/esp_ipc_legacy/src/hci_esp_ipc_legacy.c renamed to src/nimble/esp_port/esp_ipc_legacy/src/hci_esp_ipc_legacy.c

@@ -74,7 +74,7 @@
 #ifndef __TC_CBC_MODE_H__
 #define __TC_CBC_MODE_H__
 
-#include <nimble/ext/tinycrypt/include/tinycrypt/aes.h>
+#include "nimble/ext/tinycrypt/include/tinycrypt/aes.h"
 
 #ifdef __cplusplus
 extern "C" {

src/nimble/ext/tinycrypt/include/tinycrypt/cbc_mode.h

@@ -74,7 +74,7 @@
 #ifndef __TC_CCM_MODE_H__
 #define __TC_CCM_MODE_H__
 
-#include <nimble/ext/tinycrypt/include/tinycrypt/aes.h>
+#include "nimble/ext/tinycrypt/include/tinycrypt/aes.h"
 #include <stddef.h>
 
 #ifdef __cplusplus