diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-27 00:14:38 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-27 00:14:38 +0000 |
| commit | a1f510576ad37d88d0985cf0ede02135c466d3a2 (patch) | |
| tree | a685efd6a9a049173f2c1a75e7edf83472f455e8 /nuttx/arch/arm | |
| parent | 14cfaf0623701b5b34b0da62bf7b55fd8cfaa7d2 (diff) | |
| download | px4-nuttx-a1f510576ad37d88d0985cf0ede02135c466d3a2.tar.gz px4-nuttx-a1f510576ad37d88d0985cf0ede02135c466d3a2.tar.bz2 px4-nuttx-a1f510576ad37d88d0985cf0ede02135c466d3a2.zip | |
PM update
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4982 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm')
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_pmstandby.c | 4 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_pmstop.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/stm32/stm32_pmstandby.c b/nuttx/arch/arm/src/stm32/stm32_pmstandby.c index 9aacfaa9a..467edaec2 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pmstandby.c +++ b/nuttx/arch/arm/src/stm32/stm32_pmstandby.c @@ -86,7 +86,7 @@ int stm32_pmstandby(void) /* Clear the Wake-Up Flag by setting the CWUF bit in the power control * register. */ - + regval = getreg32(STM32_PWR_CR); regval |= PWR_CR_CWUF; putreg32(regval, STM32_PWR_CR); @@ -104,6 +104,6 @@ int stm32_pmstandby(void) /* Sleep until the wakeup reset occurs */ - asm("WFI"); + asm("wfi"); return OK; /* Won't get here */ } diff --git a/nuttx/arch/arm/src/stm32/stm32_pmstop.c b/nuttx/arch/arm/src/stm32/stm32_pmstop.c index 9bd4af73a..14ce63b55 100644 --- a/nuttx/arch/arm/src/stm32/stm32_pmstop.c +++ b/nuttx/arch/arm/src/stm32/stm32_pmstop.c @@ -112,11 +112,11 @@ int stm32_pmstop(bool lpds) #ifdef CONFIG_PM_WFE /* Mode: SLEEP + Entry with WFE */ - __asm("wfe"); + asm("wfe"); #else /* Mode: SLEEP + Entry with WFI */ - __asm("wfi"); + asm("wfi"); #endif return OK; } |