From 458a04fd98b51741e3ec2fdb5226885053cceaf6 Mon Sep 17 00:00:00 2001 From: Junior Martinez <67972863+jmartinez-silabs@users.noreply.github.com> Date: Thu, 9 Jan 2025 16:21:07 -0500 Subject: [PATCH] address comments --- .../efr32mg24/BRD2703A/autogen/sl_ot_init.c | 44 +++++-------------- .../BRD4186C/autogen/sli_psa_config_autogen.h | 1 + .../BRD4187C/autogen/sli_psa_config_autogen.h | 1 + 3 files changed, 13 insertions(+), 33 deletions(-) diff --git a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_ot_init.c b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_ot_init.c index 78eb35993a..29efc8d397 100644 --- a/matter/efr32/efr32mg24/BRD2703A/autogen/sl_ot_init.c +++ b/matter/efr32/efr32mg24/BRD2703A/autogen/sl_ot_init.c @@ -1,39 +1,17 @@ -/******************************************************************************* - * @file - * @brief OpenThread initialization. - ******************************************************************************* - * # License - * Copyright 2024 Silicon Laboratories Inc. www.silabs.com - ******************************************************************************* - * - * SPDX-License-Identifier: Zlib - * - * The licensor of this software is Silicon Laboratories Inc. - * - * This software is provided 'as-is', without any express or implied - * warranty. In no event will the authors be held liable for any damages - * arising from the use of this software. - * - * Permission is granted to anyone to use this software for any purpose, - * including commercial applications, and to alter it and redistribute it - * freely, subject to the following restrictions: - * - * 1. The origin of this software must not be misrepresented; you must not - * claim that you wrote the original software. If you use this software - * in a product, an acknowledgment in the product documentation would be - * appreciated but is not required. - * 2. Altered source versions must be plainly marked as such, and must not be - * misrepresented as being the original software. - * 3. This notice may not be removed or altered from any source distribution. - * - ******************************************************************************/ #include "sl_ot_init.h" +// TODO: Remove the Power Manager include when OT does not add an EM1 req at init +#define CURRENT_MODULE_NAME "OPENTHREAD" +#include "sl_power_manager.h" void sl_ot_init(void) { - sl_ot_create_instance(); - sl_ot_sleep_init(); - sl_ot_cli_init(); - sl_ot_custom_cli_init(); + sl_ot_create_instance(); + sl_ot_sleep_init(); + + // TODO: Remove the Power Manager remove req when OT does not add an EM1 req at init + sl_power_manager_remove_em_requirement(SL_POWER_MANAGER_EM1); + + sl_ot_cli_init(); + sl_ot_custom_cli_init(); } \ No newline at end of file diff --git a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h index 253d76dfb3..bdcd1aef77 100644 --- a/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4186C/autogen/sli_psa_config_autogen.h @@ -24,6 +24,7 @@ #define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG +// Higher matter psa key slot count (30) than the usual (22) for the wf200 ncp. #define MBEDTLS_PSA_KEY_SLOT_COUNT (30 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT + 1) #ifndef SL_PSA_ITS_MAX_FILES #define SL_PSA_ITS_MAX_FILES (1 + SL_PSA_ITS_USER_MAX_FILES) diff --git a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h index 253d76dfb3..bdcd1aef77 100644 --- a/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h +++ b/matter/efr32/efr32mg24/BRD4187C/autogen/sli_psa_config_autogen.h @@ -24,6 +24,7 @@ #define PSA_WANT_ALG_TLS12_PSK_TO_MS 1 #define MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG +// Higher matter psa key slot count (30) than the usual (22) for the wf200 ncp. #define MBEDTLS_PSA_KEY_SLOT_COUNT (30 + 15 + 1 + SL_PSA_KEY_USER_SLOT_COUNT + 1) #ifndef SL_PSA_ITS_MAX_FILES #define SL_PSA_ITS_MAX_FILES (1 + SL_PSA_ITS_USER_MAX_FILES)