From 3934e71803ff096c8f28212243a6bcacaeec595a Mon Sep 17 00:00:00 2001 From: Lefucjusz Date: Fri, 10 Mar 2023 10:37:44 +0100 Subject: [PATCH] [MOS-000] Remove redundant newlines when printing clocks As described. --- .../board/rt1051/bellpx/clock_config.cpp | 24 +++++++++---------- .../board/rt1051/puretx/clock_config.cpp | 24 +++++++++---------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/module-bsp/board/rt1051/bellpx/clock_config.cpp b/module-bsp/board/rt1051/bellpx/clock_config.cpp index a2c6e6e3c2a63727aff52e0d1bc4c0be3d66b8aa..b233f6fe997b425935d1cdc2d02d2033d3126580 100644 --- a/module-bsp/board/rt1051/bellpx/clock_config.cpp +++ b/module-bsp/board/rt1051/bellpx/clock_config.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md /* @@ -1061,8 +1061,7 @@ uint32_t GetPerphSourceClock(PerphClock_t clock) void PrintSystemClocks() { - - const char *_PLLNames[22] = { + const char *PLLNames[] = { "kCLOCK_CpuClk", /*!< CPU clock */ "kCLOCK_AhbClk", /*!< AHB clock */ "kCLOCK_SemcClk", /*!< SEMC clock */ @@ -1093,18 +1092,17 @@ void PrintSystemClocks() "kCLOCK_AudioPllClk", /*!< Audio PLLCLK. */ "kCLOCK_VideoPllClk", /*!< Video PLLCLK. */ }; - int i; - for (i = 0; i < 22; i++) { - LOG_PRINTF("%s: %lu Hz\r\n", _PLLNames[i], CLOCK_GetFreq(static_cast(i))); + for (size_t i = 0; i < ARRAY_SIZE(PLLNames); i++) { + LOG_PRINTF("%s: %lu Hz", PLLNames[i], CLOCK_GetFreq(static_cast(i))); } - LOG_PRINTF("PerphSourceClock_I2C: %lu\r\n", GetPerphSourceClock(PerphClock_I2C)); - LOG_PRINTF("PerphSourceClock_LPSPI: %lu\r\n", GetPerphSourceClock(PerphClock_LPSPI)); - LOG_PRINTF("PerphSourceClock_LPUART: %lu\r\n", GetPerphSourceClock(PerphClock_LPUART)); - LOG_PRINTF("PerphSourceClock_SAI1: %lu\r\n", GetPerphSourceClock(PerphClock_SAI1)); - LOG_PRINTF("PerphSourceClock_SAI2: %lu\r\n", GetPerphSourceClock(PerphClock_SAI2)); - LOG_PRINTF("PerphSourceClock_USDHC2: %lu\r\n", GetPerphSourceClock(PerphClock_USDHC2)); + LOG_PRINTF("PerphSourceClock_I2C: %lu", GetPerphSourceClock(PerphClock_I2C)); + LOG_PRINTF("PerphSourceClock_LPSPI: %lu", GetPerphSourceClock(PerphClock_LPSPI)); + LOG_PRINTF("PerphSourceClock_LPUART: %lu", GetPerphSourceClock(PerphClock_LPUART)); + LOG_PRINTF("PerphSourceClock_SAI1: %lu", GetPerphSourceClock(PerphClock_SAI1)); + LOG_PRINTF("PerphSourceClock_SAI2: %lu", GetPerphSourceClock(PerphClock_SAI2)); + LOG_PRINTF("PerphSourceClock_USDHC2: %lu", GetPerphSourceClock(PerphClock_USDHC2)); } #define CLOCK_CCM_HANDSHAKE_WAIT() \ @@ -1117,7 +1115,7 @@ void PrintSystemClocks() #define LPM_DELAY(value) \ \ do { \ - for (uint32_t i = 0; i < 5 * value; i++) { \ + for (uint32_t i = 0; i < 5 * (value); i++) { \ __NOP(); \ } \ \ diff --git a/module-bsp/board/rt1051/puretx/clock_config.cpp b/module-bsp/board/rt1051/puretx/clock_config.cpp index b3c0d6de309700f68db2ec4505766e9d59ae0228..055b18703a9b49a83f09d3552833c47501ec5911 100644 --- a/module-bsp/board/rt1051/puretx/clock_config.cpp +++ b/module-bsp/board/rt1051/puretx/clock_config.cpp @@ -1,4 +1,4 @@ -// Copyright (c) 2017-2022, Mudita Sp. z.o.o. All rights reserved. +// Copyright (c) 2017-2023, Mudita Sp. z.o.o. All rights reserved. // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md /* @@ -1066,8 +1066,7 @@ uint32_t GetPerphSourceClock(PerphClock_t clock) void PrintSystemClocks() { - - const char *_PLLNames[22] = { + const char *PLLNames[] = { "kCLOCK_CpuClk", /*!< CPU clock */ "kCLOCK_AhbClk", /*!< AHB clock */ "kCLOCK_SemcClk", /*!< SEMC clock */ @@ -1098,18 +1097,17 @@ void PrintSystemClocks() "kCLOCK_AudioPllClk", /*!< Audio PLLCLK. */ "kCLOCK_VideoPllClk", /*!< Video PLLCLK. */ }; - int i; - for (i = 0; i < 22; i++) { - LOG_PRINTF("%s: %lu Hz\r\n", _PLLNames[i], CLOCK_GetFreq(static_cast(i))); + for (size_t i = 0; i < ARRAY_SIZE(PLLNames); i++) { + LOG_PRINTF("%s: %lu Hz", PLLNames[i], CLOCK_GetFreq(static_cast(i))); } - LOG_PRINTF("PerphSourceClock_I2C: %lu\r\n", GetPerphSourceClock(PerphClock_I2C)); - LOG_PRINTF("PerphSourceClock_LPSPI: %lu\r\n", GetPerphSourceClock(PerphClock_LPSPI)); - LOG_PRINTF("PerphSourceClock_LPUART: %lu\r\n", GetPerphSourceClock(PerphClock_LPUART)); - LOG_PRINTF("PerphSourceClock_SAI1: %lu\r\n", GetPerphSourceClock(PerphClock_SAI1)); - LOG_PRINTF("PerphSourceClock_SAI2: %lu\r\n", GetPerphSourceClock(PerphClock_SAI2)); - LOG_PRINTF("PerphSourceClock_USDHC2: %lu\r\n", GetPerphSourceClock(PerphClock_USDHC2)); + LOG_PRINTF("PerphSourceClock_I2C: %lu", GetPerphSourceClock(PerphClock_I2C)); + LOG_PRINTF("PerphSourceClock_LPSPI: %lu", GetPerphSourceClock(PerphClock_LPSPI)); + LOG_PRINTF("PerphSourceClock_LPUART: %lu", GetPerphSourceClock(PerphClock_LPUART)); + LOG_PRINTF("PerphSourceClock_SAI1: %lu", GetPerphSourceClock(PerphClock_SAI1)); + LOG_PRINTF("PerphSourceClock_SAI2: %lu", GetPerphSourceClock(PerphClock_SAI2)); + LOG_PRINTF("PerphSourceClock_USDHC2: %lu", GetPerphSourceClock(PerphClock_USDHC2)); } #define CLOCK_CCM_HANDSHAKE_WAIT() \ @@ -1122,7 +1120,7 @@ void PrintSystemClocks() #define LPM_DELAY(value) \ \ do { \ - for (uint32_t i = 0; i < 5 * value; i++) { \ + for (uint32_t i = 0; i < 5 * (value); i++) { \ __NOP(); \ } \ \