diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-08-03 15:01:51 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2012-08-03 15:01:51 +0000 |
| commit | 7cf644f6a64c9fb7d0f4fe236a4e8082d2596f86 (patch) | |
| tree | 1c1e47620908d47be284d84ff77cc6ccaffe455c | |
| parent | 5c1574e66ca87eb0a60677032fd16e330cce9aac (diff) | |
| download | px4-firmware-7cf644f6a64c9fb7d0f4fe236a4e8082d2596f86.tar.gz px4-firmware-7cf644f6a64c9fb7d0f4fe236a4e8082d2596f86.tar.bz2 px4-firmware-7cf644f6a64c9fb7d0f4fe236a4e8082d2596f86.zip | |
STM32 PM update
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@5002 7fd9a85b-ad96-42d3-883c-3090e2eb8679
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_pmsleep.c | 6 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_rcc.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_idle.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_pmsleep.c b/nuttx/arch/arm/src/stm32/stm32_pmsleep.c index 5ebbcbf40..3027b99a7 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pmsleep.c +++ b/nuttx/arch/arm/src/stm32/stm32_pmsleep.c @@ -100,7 +100,7 @@ void stm32_pmsleep(bool sleeponexit) { regval &= ~NVIC_SYSCON_SLEEPONEXIT; } - + putreg32(regval, NVIC_SYSCON); /* Sleep until the wakeup interrupt or event occurs */ @@ -108,10 +108,10 @@ void stm32_pmsleep(bool sleeponexit) #ifdef CONFIG_PM_WFE /* Mode: SLEEP + Entry with WFE */ - __asm("wfe"); + asm("wfe"); #else /* Mode: SLEEP + Entry with WFI */ - __asm("wfi"); + asm("wfi"); #endif } diff --git a/nuttx/arch/arm/src/stm32/stm32_rcc.c b/nuttx/arch/arm/src/stm32/stm32_rcc.c index 49943baa3..6656186f2 100644 --- a/nuttx/arch/arm/src/stm32/stm32_rcc.c +++ b/nuttx/arch/arm/src/stm32/stm32_rcc.c @@ -162,7 +162,7 @@ void stm32_clockconfig(void) ************************************************************************************/ #ifdef CONFIG_PM -void stm32_clockenable(void); +void stm32_clockenable(void) { #if defined(CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG) diff --git a/nuttx/configs/stm3210e-eval/src/up_idle.c b/nuttx/configs/stm3210e-eval/src/up_idle.c index 296b48efc..13c88ee80 100644 --- a/nuttx/configs/stm3210e-eval/src/up_idle.c +++ b/nuttx/configs/stm3210e-eval/src/up_idle.c @@ -288,7 +288,7 @@ static void up_idlepm(void) if (oldstate == PM_STANDBY) { - stm32_clockconfig(); + stm32_clockenable(); } } break; |