From 0212fde7fbdf9c563f8a9bc8ce46001dbf784c52 Mon Sep 17 00:00:00 2001 From: George Beckstein Date: Tue, 23 Feb 2021 10:03:04 -0500 Subject: [PATCH] Fix astyle issues --- .../TARGET_EP_ATLAS/atlas_init.c | 22 +++--- .../TARGET_EP_ATLAS/usb_stdio.cpp | 3 +- .../TARGET_NRF52/reloc_vector_table.c | 72 +++++++++---------- .../TARGET_NRF52/subtarget_init.c | 3 +- .../TARGET_NRF52/subtarget_init.h | 2 +- 5 files changed, 52 insertions(+), 50 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c index e539a5e6cf..ea23a7084d 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c @@ -26,19 +26,19 @@ * Override the subtarget sdk init startup hook (specific to nRF2) * This will configure the internal regulator to operate at 3.3V */ -void subtarget_sdk_init(void) { +void subtarget_sdk_init(void) +{ - if (NRF_UICR->REGOUT0 != UICR_REGOUT0_VOUT_3V3) - { - NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos; - while (NRF_NVMC->READY == NVMC_READY_READY_Busy){} - NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3; - NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos; - while (NRF_NVMC->READY == NVMC_READY_READY_Busy){} + if (NRF_UICR->REGOUT0 != UICR_REGOUT0_VOUT_3V3) { + NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos; + while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {} + NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3; + NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos; + while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {} - // Trigger a soft reset so that the settings take effect - NVIC_SystemReset(); - } + // Trigger a soft reset so that the settings take effect + NVIC_SystemReset(); + } } diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp index 6a579f24e0..fa0401ea1c 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp @@ -26,7 +26,8 @@ #if MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE /* Retarget stdio to USBSerial */ -mbed::FileHandle *mbed::mbed_target_override_console(int fd) { +mbed::FileHandle *mbed::mbed_target_override_console(int fd) +{ static USBSerial usb_serial; return &usb_serial; } diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c index f751f31243..7cb053f443 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/reloc_vector_table.c @@ -1,28 +1,28 @@ -/* +/* * Copyright (c) 2016 Nordic Semiconductor ASA * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without modification, * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this list + * + * 1. Redistributions of source code must retain the above copyright notice, this list * of conditions and the following disclaimer. * - * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA - * integrated circuit in a product or a software update for such product, must reproduce - * the above copyright notice, this list of conditions and the following disclaimer in + * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA + * integrated circuit in a product or a software update for such product, must reproduce + * the above copyright notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the distribution. * - * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be - * used to endorse or promote products derived from this software without specific prior + * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be + * used to endorse or promote products derived from this software without specific prior * written permission. * - * 4. This software, with or without modification, must only be used with a + * 4. This software, with or without modification, must only be used with a * Nordic Semiconductor ASA integrated circuit. * - * 5. Any software provided in binary or object form under this license must not be reverse - * engineered, decompiled, modified and/or disassembled. - * + * 5. Any software provided in binary or object form under this license must not be reverse + * engineered, decompiled, modified and/or disassembled. + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -33,9 +33,9 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * + * */ - + #include "nrf.h" #include "cmsis_nvic.h" #include "stdint.h" @@ -48,13 +48,13 @@ #endif #if defined(__ARMCC_VERSION) - __attribute__ ((section(".bss.nvictable"))) - uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS]; +__attribute__((section(".bss.nvictable"))) +uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS]; #elif defined(__GNUC__) - __attribute__ ((section(".nvictable"))) - uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS]; +__attribute__((section(".nvictable"))) +uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS]; #elif defined(__ICCARM__) - uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable"; +uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable"; #endif #include "platform/mbed_toolchain.h" @@ -73,11 +73,11 @@ extern uint32_t __Vectors[]; void nrf_reloc_vector_table(void) { // Copy and switch to dynamic vectors - uint32_t *old_vectors = VECTORS_FLASH_START; - uint32_t i; - for (i = 0; i< NVIC_NUM_VECTORS; i++) { - nrf_dispatch_vector[i] = old_vectors[i]; - } + uint32_t *old_vectors = VECTORS_FLASH_START; + uint32_t i; + for (i = 0; i < NVIC_NUM_VECTORS; i++) { + nrf_dispatch_vector[i] = old_vectors[i]; + } #if defined(SOFTDEVICE_PRESENT) @@ -85,9 +85,9 @@ void nrf_reloc_vector_table(void) * Before setting the new vector table address in the SoftDevice the MBR must be initialized. * If no bootloader is present the MBR will be initialized automatically. * If a bootloader is present nrf_dfu_mbr_init_sd must be called once and only once. - * + * * By resetting the MBR and SoftDevice VTOR address first, it becomes safe to initialize - * the MBR again regardless of how the application was started. + * the MBR again regardless of how the application was started. */ /* Reset MBR VTOR to original state before calling MBR init. */ @@ -101,7 +101,7 @@ void nrf_reloc_vector_table(void) /* Set SCB->VTOR to go through MBR to trap SoftDevice service calls. */ SCB->VTOR = 0x0; - /* Initialize MBR so SoftDevice service calls are being trapped correctly. + /* Initialize MBR so SoftDevice service calls are being trapped correctly. * This call sets MBR_VTOR_ADDRESS to point to the SoftDevice's VTOR at address 0x1000. */ nrf_dfu_mbr_init_sd(); @@ -112,18 +112,18 @@ void nrf_reloc_vector_table(void) #else /* No SoftDevice is present. Set all interrupts to vector table in RAM. */ - SCB->VTOR = (uint32_t) nrf_dispatch_vector; + SCB->VTOR = (uint32_t) nrf_dispatch_vector; #endif } void mbed_sdk_init(void) { - if (STDIO_UART_RTS != NC) { - gpio_t rts; - gpio_init_out(&rts, STDIO_UART_RTS); - /* Set STDIO_UART_RTS as gpio driven low */ - gpio_write(&rts, 0); - } + if (STDIO_UART_RTS != NC) { + gpio_t rts; + gpio_init_out(&rts, STDIO_UART_RTS); + /* Set STDIO_UART_RTS as gpio driven low */ + gpio_write(&rts, 0); + } - subtarget_sdk_init(); + subtarget_sdk_init(); } diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c index 22a5ee0397..52bd26bfaf 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c @@ -19,6 +19,7 @@ #include "subtarget_init.h" #include "platform/mbed_toolchain.h" -MBED_WEAK void subtarget_sdk_init(void) { +MBED_WEAK void subtarget_sdk_init(void) +{ /* Do nothing by default */ } diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.h b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.h index 6f4c798d89..a415641d42 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.h @@ -27,7 +27,7 @@ extern "C" { * Since Mbed's `mbed_sdk_init` hook is used by the NRF52 family code, this * initialization hook is provided so subtargets may implement their own startup * initialization code, if necessary. - * + * * By default, it is a blank function that is declared a "weak" symbol */ void subtarget_sdk_init(void);