UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion] Coding style: change method names for more consistency

Browse Source
This commit is contained in:
Émilie Feral
2019-06-13 11:36:55 -04:00
parent 6b880c3a72
commit 89c8aaeb49
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ion/src/device/bench/command/sleep.cpp
View File

@@ -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);
}

2
ion/src/device/bench/command/stop.cpp
View File

@@ -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);
}

2
ion/src/device/n0100/drivers/power.cpp
View File

@@ -10,7 +10,7 @@ void standby() {
Device::Power::stopConfiguration();
Device::Board::shutdownPeripherals();
Device::WakeUp::onOnOffKeyDown();
Device::Power::internal_flash_standby();
Device::Power::internalFlashStandby();
}
}

2
ion/src/device/n0110/drivers/power.cpp
View File

@@ -12,7 +12,7 @@ void standby() {
Device::Power::waitUntilOnOffKeyReleased();
Device::Power::standbyConfiguration();
Device::Board::shutdownPeripherals();
Device::Power::internal_flash_standby();
Device::Power::internalFlashStandby();
}
}

6
ion/src/device/n0110/flash.ld
View File

@@ -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)

6
ion/src/device/shared/drivers/power.cpp
View File

@@ -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();

4
ion/src/device/shared/drivers/power.h
View File

@@ -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();

4
ion/src/device/shared/drivers/reset.cpp
View File

@@ -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);
}