Skip to content

Commit 0212fde

Browse files
committed
Fix astyle issues
1 parent ec9d647 commit 0212fde

File tree

5 files changed

+55
-53
lines changed

5 files changed

+55
-53
lines changed

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
* Override the subtarget sdk init startup hook (specific to nRF2)
2727
* This will configure the internal regulator to operate at 3.3V
2828
*/
29-
void subtarget_sdk_init(void) {
30-
31-
if (NRF_UICR->REGOUT0 != UICR_REGOUT0_VOUT_3V3)
32-
{
33-
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos;
34-
while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
35-
NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3;
36-
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos;
37-
while (NRF_NVMC->READY == NVMC_READY_READY_Busy){}
38-
39-
// Trigger a soft reset so that the settings take effect
40-
NVIC_SystemReset();
41-
}
29+
void subtarget_sdk_init(void)
30+
{
31+
32+
if (NRF_UICR->REGOUT0 != UICR_REGOUT0_VOUT_3V3) {
33+
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos;
34+
while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {}
35+
NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3;
36+
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Ren << NVMC_CONFIG_WEN_Pos;
37+
while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {}
38+
39+
// Trigger a soft reset so that the settings take effect
40+
NVIC_SystemReset();
41+
}
4242
}
4343

4444

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
#if MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE
2727

2828
/* Retarget stdio to USBSerial */
29-
mbed::FileHandle *mbed::mbed_target_override_console(int fd) {
29+
mbed::FileHandle *mbed::mbed_target_override_console(int fd)
30+
{
3031
static USBSerial usb_serial;
3132
return &usb_serial;
3233
}
Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
/*
1+
/*
22
* Copyright (c) 2016 Nordic Semiconductor ASA
33
* All rights reserved.
4-
*
4+
*
55
* Redistribution and use in source and binary forms, with or without modification,
66
* are permitted provided that the following conditions are met:
7-
*
8-
* 1. Redistributions of source code must retain the above copyright notice, this list
7+
*
8+
* 1. Redistributions of source code must retain the above copyright notice, this list
99
* of conditions and the following disclaimer.
1010
*
11-
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12-
* integrated circuit in a product or a software update for such product, must reproduce
13-
* the above copyright notice, this list of conditions and the following disclaimer in
11+
* 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA
12+
* integrated circuit in a product or a software update for such product, must reproduce
13+
* the above copyright notice, this list of conditions and the following disclaimer in
1414
* the documentation and/or other materials provided with the distribution.
1515
*
16-
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17-
* used to endorse or promote products derived from this software without specific prior
16+
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be
17+
* used to endorse or promote products derived from this software without specific prior
1818
* written permission.
1919
*
20-
* 4. This software, with or without modification, must only be used with a
20+
* 4. This software, with or without modification, must only be used with a
2121
* Nordic Semiconductor ASA integrated circuit.
2222
*
23-
* 5. Any software provided in binary or object form under this license must not be reverse
24-
* engineered, decompiled, modified and/or disassembled.
25-
*
23+
* 5. Any software provided in binary or object form under this license must not be reverse
24+
* engineered, decompiled, modified and/or disassembled.
25+
*
2626
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2727
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
2828
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -33,9 +33,9 @@
3333
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
3434
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
3535
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36-
*
36+
*
3737
*/
38-
38+
3939
#include "nrf.h"
4040
#include "cmsis_nvic.h"
4141
#include "stdint.h"
@@ -48,13 +48,13 @@
4848
#endif
4949

5050
#if defined(__ARMCC_VERSION)
51-
__attribute__ ((section(".bss.nvictable")))
52-
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
51+
__attribute__((section(".bss.nvictable")))
52+
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
5353
#elif defined(__GNUC__)
54-
__attribute__ ((section(".nvictable")))
55-
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
54+
__attribute__((section(".nvictable")))
55+
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS];
5656
#elif defined(__ICCARM__)
57-
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable";
57+
uint32_t nrf_dispatch_vector[NVIC_NUM_VECTORS] @ ".nvictable";
5858
#endif
5959

6060
#include "platform/mbed_toolchain.h"
@@ -73,21 +73,21 @@ extern uint32_t __Vectors[];
7373
void nrf_reloc_vector_table(void)
7474
{
7575
// Copy and switch to dynamic vectors
76-
uint32_t *old_vectors = VECTORS_FLASH_START;
77-
uint32_t i;
78-
for (i = 0; i< NVIC_NUM_VECTORS; i++) {
79-
nrf_dispatch_vector[i] = old_vectors[i];
80-
}
76+
uint32_t *old_vectors = VECTORS_FLASH_START;
77+
uint32_t i;
78+
for (i = 0; i < NVIC_NUM_VECTORS; i++) {
79+
nrf_dispatch_vector[i] = old_vectors[i];
80+
}
8181

8282
#if defined(SOFTDEVICE_PRESENT)
8383

8484
/**
8585
* Before setting the new vector table address in the SoftDevice the MBR must be initialized.
8686
* If no bootloader is present the MBR will be initialized automatically.
8787
* If a bootloader is present nrf_dfu_mbr_init_sd must be called once and only once.
88-
*
88+
*
8989
* By resetting the MBR and SoftDevice VTOR address first, it becomes safe to initialize
90-
* the MBR again regardless of how the application was started.
90+
* the MBR again regardless of how the application was started.
9191
*/
9292

9393
/* Reset MBR VTOR to original state before calling MBR init. */
@@ -101,7 +101,7 @@ void nrf_reloc_vector_table(void)
101101
/* Set SCB->VTOR to go through MBR to trap SoftDevice service calls. */
102102
SCB->VTOR = 0x0;
103103

104-
/* Initialize MBR so SoftDevice service calls are being trapped correctly.
104+
/* Initialize MBR so SoftDevice service calls are being trapped correctly.
105105
* This call sets MBR_VTOR_ADDRESS to point to the SoftDevice's VTOR at address 0x1000.
106106
*/
107107
nrf_dfu_mbr_init_sd();
@@ -112,18 +112,18 @@ void nrf_reloc_vector_table(void)
112112
#else
113113

114114
/* No SoftDevice is present. Set all interrupts to vector table in RAM. */
115-
SCB->VTOR = (uint32_t) nrf_dispatch_vector;
115+
SCB->VTOR = (uint32_t) nrf_dispatch_vector;
116116
#endif
117117
}
118118

119119
void mbed_sdk_init(void)
120120
{
121-
if (STDIO_UART_RTS != NC) {
122-
gpio_t rts;
123-
gpio_init_out(&rts, STDIO_UART_RTS);
124-
/* Set STDIO_UART_RTS as gpio driven low */
125-
gpio_write(&rts, 0);
126-
}
127-
128-
subtarget_sdk_init();
121+
if (STDIO_UART_RTS != NC) {
122+
gpio_t rts;
123+
gpio_init_out(&rts, STDIO_UART_RTS);
124+
/* Set STDIO_UART_RTS as gpio driven low */
125+
gpio_write(&rts, 0);
126+
}
127+
128+
subtarget_sdk_init();
129129
}

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "subtarget_init.h"
2020
#include "platform/mbed_toolchain.h"
2121

22-
MBED_WEAK void subtarget_sdk_init(void) {
22+
MBED_WEAK void subtarget_sdk_init(void)
23+
{
2324
/* Do nothing by default */
2425
}

targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ extern "C" {
2727
* Since Mbed's `mbed_sdk_init` hook is used by the NRF52 family code, this
2828
* initialization hook is provided so subtargets may implement their own startup
2929
* initialization code, if necessary.
30-
*
30+
*
3131
* By default, it is a blank function that is declared a "weak" symbol
3232
*/
3333
void subtarget_sdk_init(void);

0 commit comments

Comments
 (0)