project-chip · andy31415 · Nov 3, 2022 · Oct 28, 2022 · Nov 2, 2022
diff --git a/.github/workflows/examples-telink.yaml b/.github/workflows/examples-telink.yaml
@@ -32,7 +32,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: connectedhomeip/chip-build-telink:0.5.99
+            image: connectedhomeip/chip-build-telink:0.6.02
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/config/telink/app/zephyr.conf b/config/telink/app/zephyr.conf
@@ -66,7 +66,7 @@ CONFIG_OPENTHREAD_DEBUG=y
 CONFIG_OPENTHREAD_L2_DEBUG=y
 CONFIG_OPENTHREAD_L2_LOG_LEVEL_INF=y
 
-CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154"
+CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91"
 CONFIG_NET_CONFIG_MY_IPV6_ADDR="fdde:ad00:beef::1"
 CONFIG_NET_CONFIG_PEER_IPV6_ADDR="fdde:ad00:beef::2"
 
@@ -87,7 +87,8 @@ CONFIG_OPENTHREAD_DUA=y
 CONFIG_OPENTHREAD_MLR=y
 
 # mbedTLS tweaks
-CONFIG_MBEDTLS_DEBUG=y
+CONFIG_MBEDTLS_TEST=y
+CONFIG_MBEDTLS_PKCS5_C=y
 CONFIG_MBEDTLS_USER_CONFIG_ENABLE=y
 CONFIG_MBEDTLS_USER_CONFIG_FILE="telink-mbedtls-config.h"
 

diff --git a/config/telink/chip-module/CMakeLists.txt b/config/telink/chip-module/CMakeLists.txt
@@ -108,16 +108,7 @@ if (CONFIG_POSIX_API)
     )
 endif()
 
-# Add MbedTLS config file
-list(APPEND CHIP_CFLAGS -DMBEDTLS_CONFIG_FILE=CONFIG_MBEDTLS_CFG_FILE)
-
-# Add hardware cryptography dependencies
-zephyr_include_directories(${ZEPHYR_BASE}/../modules/crypto/mbedtls/include)
-zephyr_include_directories(${ZEPHYR_BASE}/modules/mbedtls/configs)
 zephyr_include_directories(${CHIP_ROOT}/src/platform/telink/)
-zephyr_include_directories(${CHIP_ROOT}/src/platform/telink/crypto/)
-zephyr_sources(${ZEPHYR_BASE}/../modules/hal/telink/tlsr9/drivers/B91/aes.c)
-zephyr_sources(${ZEPHYR_BASE}/../modules/hal/telink/tlsr9/drivers/B91/pke.c)
 
 zephyr_get_compile_flags(CHIP_CFLAGS_C C)
 zephyr_get_compile_flags(CHIP_CFLAGS_CC CXX)

diff --git a/examples/light-switch-app/telink/include/AppTask.h b/examples/light-switch-app/telink/include/AppTask.h
@@ -20,7 +20,7 @@
 
 #include "AppEvent.h"
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <platform/CHIPDeviceLayer.h>
 

diff --git a/examples/light-switch-app/telink/prj.conf b/examples/light-switch-app/telink/prj.conf
@@ -33,7 +33,7 @@ CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15
 CONFIG_OPENTHREAD_NETWORK_NAME="OpenThreadDemo"
 CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154"
+CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91"
 
 # Disable Matter OTA DFU
 CONFIG_CHIP_OTA_REQUESTOR=n

diff --git a/examples/light-switch-app/telink/src/AppTask.cpp b/examples/light-switch-app/telink/src/AppTask.cpp
@@ -50,8 +50,8 @@
 #include "OTAUtil.h"
 #endif
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 #include <algorithm>
 

diff --git a/examples/light-switch-app/telink/src/main.cpp b/examples/light-switch-app/telink/src/main.cpp
@@ -21,7 +21,7 @@
 #include <lib/support/CHIPMem.h>
 #include <platform/CHIPDeviceLayer.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(app);
 

diff --git a/examples/lighting-app/telink/include/LightingManager.h b/examples/lighting-app/telink/include/LightingManager.h
@@ -23,7 +23,7 @@
 #include <system/SystemError.h>
 
 #include <cstdint>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 class LightingManager
 {

diff --git a/examples/lighting-app/telink/prj.conf b/examples/lighting-app/telink/prj.conf
@@ -33,7 +33,7 @@ CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15
 CONFIG_OPENTHREAD_NETWORK_NAME="OpenThreadDemo"
 CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154"
+CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91"
 
 # Disable Matter OTA DFU
 CONFIG_CHIP_OTA_REQUESTOR=n

diff --git a/examples/lighting-app/telink/src/AppTask.cpp b/examples/lighting-app/telink/src/AppTask.cpp
@@ -51,8 +51,8 @@
 #include "OTAUtil.h"
 #endif
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 #include <algorithm>
 

diff --git a/examples/lighting-app/telink/src/LightingManager.cpp b/examples/lighting-app/telink/src/LightingManager.cpp
@@ -22,9 +22,9 @@
 
 #include <lib/support/CodeUtils.h>
 
-#include <drivers/pwm.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/drivers/pwm.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_DECLARE(app);
 

diff --git a/examples/lighting-app/telink/src/main.cpp b/examples/lighting-app/telink/src/main.cpp
@@ -21,7 +21,7 @@
 #include <lib/support/CHIPMem.h>
 #include <platform/CHIPDeviceLayer.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(app);
 

diff --git a/examples/ota-requestor-app/telink/include/AppTask.h b/examples/ota-requestor-app/telink/include/AppTask.h
@@ -20,7 +20,7 @@
 
 #include "AppEvent.h"
 
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #include <platform/CHIPDeviceLayer.h>
 

diff --git a/examples/ota-requestor-app/telink/prj.conf b/examples/ota-requestor-app/telink/prj.conf
@@ -30,7 +30,7 @@ CONFIG_OPENTHREAD_PANID=4660
 CONFIG_OPENTHREAD_CHANNEL=15
 CONFIG_OPENTHREAD_NETWORK_NAME="OpenThreadDemo"
 CONFIG_OPENTHREAD_XPANID="11:11:11:11:22:22:22:22"
-CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154"
+CONFIG_NET_CONFIG_IEEE802154_DEV_NAME="IEEE802154_b91"
 
 # Disable Matter OTA DFU
 CONFIG_CHIP_OTA_REQUESTOR=y

diff --git a/examples/ota-requestor-app/telink/src/AppTask.cpp b/examples/ota-requestor-app/telink/src/AppTask.cpp
@@ -49,8 +49,8 @@
 #include "OTAUtil.h"
 #endif
 
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 #include <algorithm>
 

diff --git a/examples/ota-requestor-app/telink/src/main.cpp b/examples/ota-requestor-app/telink/src/main.cpp
@@ -21,7 +21,7 @@
 #include <lib/support/CHIPMem.h>
 #include <platform/CHIPDeviceLayer.h>
 
-#include <kernel.h>
+#include <zephyr/kernel.h>
 
 LOG_MODULE_REGISTER(app);
 

diff --git a/examples/platform/telink/util/include/ButtonManager.h b/examples/platform/telink/util/include/ButtonManager.h
@@ -17,8 +17,8 @@
 
 #pragma once
 
-#include <device.h>
 #include <vector>
+#include <zephyr/device.h>
 
 #define STATE_HIGH 1
 #define STATE_LOW 0

diff --git a/examples/platform/telink/util/include/LEDWidget.h b/examples/platform/telink/util/include/LEDWidget.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include <cstdint>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 class LEDWidget
 {

diff --git a/examples/platform/telink/util/src/ButtonManager.cpp b/examples/platform/telink/util/src/ButtonManager.cpp
@@ -17,11 +17,11 @@
  */
 
 #include <assert.h>
-#include <device.h>
-#include <drivers/gpio.h>
-#include <kernel.h>
-#include <logging/log.h>
-#include <zephyr.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/gpio.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/zephyr.h>
 
 LOG_MODULE_REGISTER(ButtonManager);
 

diff --git a/examples/platform/telink/util/src/LEDWidget.cpp b/examples/platform/telink/util/src/LEDWidget.cpp
@@ -18,7 +18,7 @@
 
 #include "LEDWidget.h"
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 const struct device * LEDWidget::mPort = NULL;
 

diff --git a/examples/platform/telink/util/src/ThreadUtil.cpp b/examples/platform/telink/util/src/ThreadUtil.cpp
@@ -23,7 +23,7 @@
 #include <app/server/Dnssd.h>
 #include <lib/support/ThreadOperationalDataset.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #include <cstring>
 

diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h b/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.h
@@ -27,7 +27,7 @@
 #include <platform/internal/GenericPlatformManagerImpl.h>
 
 #include <sys/select.h>
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp b/src/include/platform/internal/GenericPlatformManagerImpl_Zephyr.ipp
@@ -35,7 +35,7 @@
 #include <system/SystemError.h>
 #include <system/SystemLayer.h>
 
-#include <sys/reboot.h>
+#include <zephyr/sys/reboot.h>
 
 #define DEFAULT_MIN_SLEEP_PERIOD (60 * 60 * 24 * 30) // Month [sec]
 

diff --git a/src/inet/InetInterface.cpp b/src/inet/InetInterface.cpp
@@ -56,7 +56,7 @@
 #endif // CHIP_SYSTEM_CONFIG_USE_SOCKETS && CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
 
 #if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
-#include <net/net_if.h>
+#include <zephyr/net/net_if.h>
 #endif // CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
 
 #if CHIP_SYSTEM_CONFIG_USE_OPEN_THREAD_ENDPOINT

diff --git a/src/inet/InetInterface.h b/src/inet/InetInterface.h
@@ -42,7 +42,7 @@ struct ifaddrs;
 #endif // CHIP_SYSTEM_CONFIG_USE_BSD_IFADDRS
 
 #if CHIP_SYSTEM_CONFIG_USE_ZEPHYR_NET_IF
-#include <device.h>
+#include <zephyr/device.h>
 
 struct net_if;
 struct net_if_ipv4;

diff --git a/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp b/src/platform/Zephyr/DiagnosticDataProviderImpl.cpp
@@ -28,13 +28,13 @@
 #include <platform/Zephyr/DiagnosticDataProviderImpl.h>
 #include <platform/Zephyr/SysHeapMalloc.h>
 
-#include <drivers/hwinfo.h>
-#include <sys/util.h>
+#include <zephyr/drivers/hwinfo.h>
+#include <zephyr/sys/util.h>
 
 #if CHIP_DEVICE_LAYER_TARGET_NRFCONNECT
 #include <platform/nrfconnect/Reboot.h>
 #elif defined(CONFIG_MCUBOOT_IMG_MANAGER)
-#include <dfu/mcuboot.h>
+#include <zephyr/dfu/mcuboot.h>
 #endif
 
 #include <malloc.h>

diff --git a/src/platform/Zephyr/KeyValueStoreManagerImpl.cpp b/src/platform/Zephyr/KeyValueStoreManagerImpl.cpp
@@ -27,7 +27,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <system/SystemError.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/Zephyr/KeyValueStoreManagerImpl.h b/src/platform/Zephyr/KeyValueStoreManagerImpl.h
@@ -24,7 +24,7 @@
 
 #pragma once
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/Zephyr/Logging.cpp b/src/platform/Zephyr/Logging.cpp
@@ -6,9 +6,9 @@
 #include <lib/support/EnforceFormat.h>
 #include <lib/support/logging/Constants.h>
 
-#include <kernel.h>
-#include <logging/log.h>
-#include <sys/cbprintf.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/sys/cbprintf.h>
 
 // If CONFIG_LOG_MODE_MINIMAL the timestamp is NOT added automatically by the Zephyr logger
 #ifdef CONFIG_LOG_MODE_MINIMAL

diff --git a/src/platform/Zephyr/PlatformManagerImpl.cpp b/src/platform/Zephyr/PlatformManagerImpl.cpp
@@ -32,8 +32,8 @@
 #include <platform/Zephyr/DiagnosticDataProviderImpl.h>
 #include <platform/internal/GenericPlatformManagerImpl_Zephyr.ipp>
 
-#include <drivers/entropy.h>
 #include <malloc.h>
+#include <zephyr/drivers/entropy.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/Zephyr/SystemTimeSupport.cpp b/src/platform/Zephyr/SystemTimeSupport.cpp
@@ -26,7 +26,7 @@
 
 #include <system/SystemError.h>
 
-#include <zephyr.h>
+#include <zephyr/zephyr.h>
 
 #if !CHIP_SYSTEM_CONFIG_USE_POSIX_TIME_FUNCTS
 

diff --git a/src/platform/Zephyr/ThreadStackManagerImpl.h b/src/platform/Zephyr/ThreadStackManagerImpl.h
@@ -25,8 +25,8 @@
 
 #include <platform/OpenThread/GenericThreadStackManagerImpl_OpenThread.h>
 
-#include <net/openthread.h>
-#include <zephyr.h>
+#include <zephyr/net/openthread.h>
+#include <zephyr/zephyr.h>
 
 #include <openthread/thread.h>
 #if !CONFIG_SOC_SERIES_RISCV_TELINK_B91

diff --git a/src/platform/Zephyr/ZephyrConfig.cpp b/src/platform/Zephyr/ZephyrConfig.cpp
@@ -30,7 +30,7 @@
 #include <lib/support/logging/CHIPLogging.h>
 #include <platform/internal/testing/ConfigUnitTest.h>
 
-#include <settings/settings.h>
+#include <zephyr/settings/settings.h>
 
 namespace chip {
 namespace DeviceLayer {

diff --git a/src/platform/telink/BLEManagerImpl.cpp b/src/platform/telink/BLEManagerImpl.cpp
@@ -35,7 +35,7 @@
 /*Includes for ieee802154 switchings */
 #define DT_DRV_COMPAT telink_b91_zb
 #include <drivers/ieee802154/b91.h>
-#include <net/ieee802154_radio.h>
+#include <zephyr/net/ieee802154_radio.h>
 
 /* Telink headers */
 #include "drivers.h"
@@ -319,11 +319,11 @@ CHIP_ERROR BLEManagerImpl::_InitStack(void)
     SuccessOrExit(err);
 
     /* Resetup stimer interrupt to handle BLE stack */
-    ret = irq_connect_dynamic(STIMER_IRQ_NUM, 2, stimer_irq_handler, NULL, 0);
+    ret = irq_connect_dynamic(STIMER_IRQ_NUM + CONFIG_2ND_LVL_ISR_TBL_OFFSET, 2, stimer_irq_handler, NULL, 0);
     ChipLogDetail(DeviceLayer, "Stimer IRQ assigned vector %d", ret);
 
     /* Resetup rf interrupt to handle BLE stack */
-    ret = irq_connect_dynamic(RF_IRQ_NUM, 2, rf_irq_handler, NULL, 0);
+    ret = irq_connect_dynamic(RF_IRQ_NUM + CONFIG_2ND_LVL_ISR_TBL_OFFSET, 2, rf_irq_handler, NULL, 0);
     ChipLogDetail(DeviceLayer, "RF IRQ assigned vector %d", ret);
 
 exit:
@@ -577,7 +577,7 @@ CHIP_ERROR BLEManagerImpl::StartAdvertising(void)
     /* @todo: move to RadioSwitch module*/
     const struct device * radio_dev = device_get_binding(CONFIG_NET_CONFIG_IEEE802154_DEV_NAME);
     __ASSERT(radio_dev != NULL, "Fail to get radio device");
-    b91_ieee802154_deinit(radio_dev);
+    b91_deinit(radio_dev);
 
     /* It is time to init BLE stack */
     err = _InitStack();
@@ -837,7 +837,7 @@ void BLEManagerImpl::SwitchToIeee802154(void)
     __ASSERT(radio_dev != NULL, "Fail to get radio device");
 
     /* Init IEEE802154 */
-    result = b91_ieee802154_init(radio_dev);
+    result = b91_init(radio_dev);
     __ASSERT(result == 0, "Fail to init IEEE802154 radio. Error: %d", result);
 }