From 89c8aaeb49e474c84d0bb5b060296b16af87239e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Thu, 13 Jun 2019 11:36:55 -0400 Subject: [PATCH] [ion] Coding style: change method names for more consistency --- ion/src/device/bench/command/sleep.cpp | 2 +- ion/src/device/bench/command/stop.cpp | 2 +- ion/src/device/n0100/drivers/power.cpp | 2 +- ion/src/device/n0110/drivers/power.cpp | 2 +- ion/src/device/n0110/flash.ld | 6 +++--- ion/src/device/shared/drivers/power.cpp | 6 +++--- ion/src/device/shared/drivers/power.h | 4 ++-- ion/src/device/shared/drivers/reset.cpp | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ion/src/device/bench/command/sleep.cpp b/ion/src/device/bench/command/sleep.cpp index 59935325b..37e2fb825 100644 --- a/ion/src/device/bench/command/sleep.cpp +++ b/ion/src/device/bench/command/sleep.cpp @@ -18,7 +18,7 @@ void Sleep(const char * input) { Device::Power::sleepConfiguration(); Device::Board::shutdownPeripherals(); Device::WakeUp::onUSBPlugging(); - Device::Power::internal_flash_suspend(); + Device::Power::internalFlashSuspend(); Device::Board::setStandardFrequency(Device::Board::Frequency::High); Device::Board::initPeripherals(false); } diff --git a/ion/src/device/bench/command/stop.cpp b/ion/src/device/bench/command/stop.cpp index 73b801d9d..a44dae5cd 100644 --- a/ion/src/device/bench/command/stop.cpp +++ b/ion/src/device/bench/command/stop.cpp @@ -18,7 +18,7 @@ void Stop(const char * input) { Device::Power::stopConfiguration(); Device::Board::shutdownPeripherals(); Device::WakeUp::onUSBPlugging(); - Device::Power::internal_flash_suspend(); + Device::Power::internalFlashSuspend(); Device::Board::initPeripherals(false); } diff --git a/ion/src/device/n0100/drivers/power.cpp b/ion/src/device/n0100/drivers/power.cpp index 0fba7ef61..a4ae9fbe8 100644 --- a/ion/src/device/n0100/drivers/power.cpp +++ b/ion/src/device/n0100/drivers/power.cpp @@ -10,7 +10,7 @@ void standby() { Device::Power::stopConfiguration(); Device::Board::shutdownPeripherals(); Device::WakeUp::onOnOffKeyDown(); - Device::Power::internal_flash_standby(); + Device::Power::internalFlashStandby(); } } diff --git a/ion/src/device/n0110/drivers/power.cpp b/ion/src/device/n0110/drivers/power.cpp index 596aa0384..18968518e 100644 --- a/ion/src/device/n0110/drivers/power.cpp +++ b/ion/src/device/n0110/drivers/power.cpp @@ -12,7 +12,7 @@ void standby() { Device::Power::waitUntilOnOffKeyReleased(); Device::Power::standbyConfiguration(); Device::Board::shutdownPeripherals(); - Device::Power::internal_flash_standby(); + Device::Power::internalFlashStandby(); } } diff --git a/ion/src/device/n0110/flash.ld b/ion/src/device/n0110/flash.ld index 6f6570e2c..c1b515eba 100644 --- a/ion/src/device/n0110/flash.ld +++ b/ion/src/device/n0110/flash.ld @@ -90,15 +90,15 @@ SECTIONS { *(.text._ZN3Ion6Device5Reset4coreEv) /* 'standby' dependencies '*/ - *(.text._ZN3Ion6Device5Power22internal_flash_standbyEv) + *(.text._ZN3Ion6Device5Power20internalFlashStandbyEv) *(.text._ZN3Ion6Device5Power17enterLowPowerModeEv) *(.text._ZN3Ion6Device5Board14shutdownClocksEb) /* 'suspend' dependencies '*/ - *(.text._ZN3Ion6Device5Power22internal_flash_suspendEb) + *(.text._ZN3Ion6Device5Power20internalFlashSuspendEb) /* 'Reset::jump' dependencies '*/ - *(.text._ZN3Ion6Device5Reset19internal_flash_jumpEj) + *(.text._ZN3Ion6Device5Reset17internalFlashJumpEj) /* Optimization */ */libgcc.a:(.text) diff --git a/ion/src/device/shared/drivers/power.cpp b/ion/src/device/shared/drivers/power.cpp index 1dca0f723..58bb08da4 100644 --- a/ion/src/device/shared/drivers/power.cpp +++ b/ion/src/device/shared/drivers/power.cpp @@ -55,7 +55,7 @@ void suspend(bool checkIfOnOffKeyReleased) { * - Stop charging */ Device::Power::configWakeUp(); - Device::Power::internal_flash_suspend(isLEDActive); + Device::Power::internalFlashSuspend(isLEDActive); // Check power key Device::Keyboard::init(); @@ -100,7 +100,7 @@ namespace Power { // Public Power methods using namespace Device::Regs; -void __attribute__((noinline)) internal_flash_suspend(bool isLEDActive) { +void __attribute__((noinline)) internalFlashSuspend(bool isLEDActive) { // Shutdown the external flash Device::ExternalFlash::shutdown(); // Shutdown all clocks (except the ones used by LED if active) @@ -118,7 +118,7 @@ void __attribute__((noinline)) internal_flash_suspend(bool isLEDActive) { Device::ExternalFlash::init(); } -void __attribute__((noinline)) internal_flash_standby() { +void __attribute__((noinline)) internalFlashStandby() { Device::ExternalFlash::shutdown(); Device::Board::shutdownClocks(); Device::Power::enterLowPowerMode(); diff --git a/ion/src/device/shared/drivers/power.h b/ion/src/device/shared/drivers/power.h index 5eaa18c9f..b90de0950 100644 --- a/ion/src/device/shared/drivers/power.h +++ b/ion/src/device/shared/drivers/power.h @@ -5,8 +5,8 @@ namespace Ion { namespace Device { namespace Power { -void internal_flash_suspend(bool isLEDActive = false); -void internal_flash_standby(); +void internalFlashSuspend(bool isLEDActive = false); +void internalFlashStandby(); void configWakeUp(); void sleepConfiguration(); diff --git a/ion/src/device/shared/drivers/reset.cpp b/ion/src/device/shared/drivers/reset.cpp index de33d0c87..d69b2e102 100644 --- a/ion/src/device/shared/drivers/reset.cpp +++ b/ion/src/device/shared/drivers/reset.cpp @@ -19,7 +19,7 @@ void core() { * flash (because the external flash is then shut down). We forbid * inlining these instructions in the external flash. */ -void __attribute__((noinline)) internal_flash_jump(uint32_t jumpIsrVectorAddress) { +void __attribute__((noinline)) internalFlashJump(uint32_t jumpIsrVectorAddress) { ExternalFlash::shutdown(); Board::shutdownClocks(); @@ -46,7 +46,7 @@ void jump(uint32_t jumpIsrVectorAddress) { /* Shutdown all clocks and periherals to mimic a hardware reset. */ Board::shutdownPeripherals(); - internal_flash_jump(jumpIsrVectorAddress); + internalFlashJump(jumpIsrVectorAddress); }