From cfe14dccae1e63f5067ea29d27921fda26d735b2 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Fri, 27 Jul 2012 13:32:21 +0000
Subject: PM updates (missed last night)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4983 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/stm3210e-eval/src/up_idle.c                   | 12 ++++++------
 .../stm32f4discovery/src/stm32f4discovery-internal.h        | 13 +++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)

(limited to 'nuttx')

diff --git a/nuttx/configs/stm3210e-eval/src/up_idle.c b/nuttx/configs/stm3210e-eval/src/up_idle.c
index b73b88c08..983089d4a 100644
--- a/nuttx/configs/stm3210e-eval/src/up_idle.c
+++ b/nuttx/configs/stm3210e-eval/src/up_idle.c
@@ -104,17 +104,17 @@
 #    error "CONFIG_RTC_ALARM should be enabled to use CONFIG_PM_SLEEP_WAKEUP"
 #  endif
 
-   /* If CONFIG_PM_SLEEP_WAKEUP is defined, then ifndefCONFIG_PM_SLEEP_WAKEUP_SEC
-    * and ifndefCONFIG_PM_SLEEP_WAKEUP_NSEC define the delay until the STM32
+   /* If CONFIG_PM_SLEEP_WAKEUP is defined, then CONFIG_PM_SLEEP_WAKEUP_SEC
+    * and CONFIG_PM_SLEEP_WAKEUP_NSEC define the delay until the STM32
     * awakens from PM_SLEEP mode.
     */
 
-#  ifndefCONFIG_PM_SLEEP_WAKEUP_SEC
-#    defineCONFIG_PM_SLEEP_WAKEUP_SEC 10
+#  ifndef CONFIG_PM_SLEEP_WAKEUP_SEC
+#    define CONFIG_PM_SLEEP_WAKEUP_SEC 10
 #  endif
 
-#  ifndefCONFIG_PM_SLEEP_WAKEUP_NSEC
-#    defineCONFIG_PM_SLEEP_WAKEUP_NSEC 0
+#  ifndef CONFIG_PM_SLEEP_WAKEUP_NSEC
+#    define CONFIG_PM_SLEEP_WAKEUP_NSEC 0
 #  endif
 #endif
 
diff --git a/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h b/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h
index 917ccbd98..5d16f8caf 100644
--- a/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h
+++ b/nuttx/configs/stm32f4discovery/src/stm32f4discovery-internal.h
@@ -209,6 +209,19 @@ void stm32_disablefsmc(void);
 void up_ledpminitialize(void);
 #endif
 
+/****************************************************************************
+ * Name: up_pmbuttons
+ *
+ * Description:
+ *   Configure the user button of the STM32f4discovery board as EXTI,
+ *   so it is able to wakeup the MCU from the PM_STANDBY mode
+ *
+ ****************************************************************************/
+
+#if defined(CONFIG_PM) && defined(CONFIG_IDLE_CUSTOM) && defined(CONFIG_PM_BUTTONS)
+void up_pmbuttons(void);
+#endif
+
 #endif /* __ASSEMBLY__ */
 #endif /* __CONFIGS_STM3240G_EVAL_SRC_STM3240G_INTERNAL_H */
 
-- 
cgit v1.2.3