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
This commit is contained in:
patacongo
2012-07-28 15:18:26 +00:00
parent c0f1c562b7
commit 54d3b68da7
2 changed files with 9 additions and 8 deletions
+5 -6
View File
@@ -122,9 +122,8 @@
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) #if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM)
static volatile bool g_alarmwakeup; static volatile bool g_alarmwakeup; /* Wakeup Alarm indicator */
#endif #endif
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@@ -159,7 +158,7 @@ static void up_alarmcb(void)
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) #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(); up_alarmcb();
return OK; return OK;
@@ -175,7 +174,7 @@ static void up_alarm_exti(int irq, FAR void *context);
****************************************************************************/ ****************************************************************************/
#if defined(CONFIG_PM) && defined(CONFIG_RTC_ALARM) #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); (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) #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; struct timespec alarmtime;
int ret; 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 */ /* 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 */ /* Configure the RTC alarm to Auto Wake the system */
+4 -2
View File
@@ -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 */ stm3210e_writereg(LCD_REG_59, 0x00); /* Gate scan stop */
} }
// Does this belong here? else
(void)stm3210e_poweroff(); {
(void)stm3210e_poweroff();
}
} }
break; break;