ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix astyle issues

pull/14325/head
George Beckstein 2021-02-23 10:03:04 -05:00
parent ec9d647c31
commit 0212fde7fb
5 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/atlas_init.c
View File

@ -26,10 +26,10 @@
* Override the subtarget sdk init startup hook (specific to nRF2) * Override the subtarget sdk init startup hook (specific to nRF2)
* This will configure the internal regulator to operate at 3.3V * 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)
{ {
if (NRF_UICR->REGOUT0 != UICR_REGOUT0_VOUT_3V3) {
NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos; NRF_NVMC->CONFIG = NVMC_CONFIG_WEN_Wen << NVMC_CONFIG_WEN_Pos;
while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {} while (NRF_NVMC->READY == NVMC_READY_READY_Busy) {}
NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3; NRF_UICR->REGOUT0 = UICR_REGOUT0_VOUT_3V3;

3
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp
View File

@ -26,7 +26,8 @@
#if MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE #if MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE
/* Retarget stdio to USBSerial */ /* 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; static USBSerial usb_serial;
return &usb_serial; return &usb_serial;
} }

3
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/subtarget_init.c
View File

@ -19,6 +19,7 @@
#include "subtarget_init.h" #include "subtarget_init.h"
#include "platform/mbed_toolchain.h" #include "platform/mbed_toolchain.h"
MBED_WEAK void subtarget_sdk_init(void) { MBED_WEAK void subtarget_sdk_init(void)
{
/* Do nothing by default */ /* Do nothing by default */
} }