diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-28 15:18:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-07-28 15:18:26 +0000 |
| commit | 51f1a88cb89e90f522a94c1dfe5ae16f17465121 (patch) | |
| tree | 52871679f64d7f67529f037fadfeb242b5f2f1ad /nuttx | |
| parent | e6785c7ef7a6d7eee0c8b6c2d8bd27e47d9b0d6a (diff) | |
| download | px4-nuttx-51f1a88cb89e90f522a94c1dfe5ae16f17465121.tar.gz px4-nuttx-51f1a88cb89e90f522a94c1dfe5ae16f17465121.tar.bz2 px4-nuttx-51f1a88cb89e90f522a94c1dfe5ae16f17465121.zip | |
PM update; NSH extension to catch return values
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4987 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_idle.c | 11 | ||||
| -rw-r--r-- | nuttx/configs/stm3210e-eval/src/up_lcd.c | 6 |
2 files changed, 9 insertions, 8 deletions
diff --git a/nuttx/configs/stm3210e-eval/src/up_idle.c b/nuttx/configs/stm3210e-eval/src/up_idle.c index b412aa5a9..296b48efc 100644 --- a/nuttx/configs/stm3210e-eval/src/up_idle.c +++ b/nuttx/configs/stm3210e-eval/src/up_idle.c @@ -122,9 +122,8 @@ ****************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) -static volatile bool g_alarmwakeup; +static volatile bool g_alarmwakeup; /* Wakeup Alarm indicator */ #endif - /**************************************************************************** * Private Functions ****************************************************************************/ @@ -159,7 +158,7 @@ static void up_alarmcb(void) ****************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) -static void up_alarm_exti(int irq, FAR void *context); +static int up_alarm_exti(int irq, FAR void *context) { up_alarmcb(); return OK; @@ -175,7 +174,7 @@ static void up_alarm_exti(int irq, FAR void *context); ****************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) -static void up_exti_cancel(void); +static void up_exti_cancel(void) { (void)stm32_exti_alarm(false, false, false, NULL); } @@ -190,7 +189,7 @@ static void up_exti_cancel(void); ****************************************************************************/ #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) -static int int up_rtc_alarm(int irq, FAR void *context); +static int up_rtc_alarm(time_t tv_sec, time_t tv_nsec, bool exti) { struct timespec alarmtime; int ret; @@ -201,7 +200,7 @@ static int int up_rtc_alarm(int irq, FAR void *context); { /* TODO: Make sure that that is no pending EXTI interrupt */ - stm32_exti_alarm(true, true, true, up_alarm_exti); + (void)stm32_exti_alarm(true, true, true, up_alarm_exti); } /* Configure the RTC alarm to Auto Wake the system */ diff --git a/nuttx/configs/stm3210e-eval/src/up_lcd.c b/nuttx/configs/stm3210e-eval/src/up_lcd.c index 6f50323ed..8b832aafb 100644 --- a/nuttx/configs/stm3210e-eval/src/up_lcd.c +++ b/nuttx/configs/stm3210e-eval/src/up_lcd.c @@ -1238,8 +1238,10 @@ static void stm3210e_pm_notify(struct pm_callback_s *cb , enum pm_state_e pmstat stm3210e_writereg(LCD_REG_59, 0x00); /* Gate scan stop */ } -// Does this belong here? - (void)stm3210e_poweroff(); + else + { + (void)stm3210e_poweroff(); + } } break; |