sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify STM32 PM infrastructure

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4870 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-06-26 12:39:23 +00:00
parent 4ca2862016
commit e68fe57420
5 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/src/stm32/Make.defs
View File

@ -86,8 +86,10 @@ endif
CHIP_CSRCS += stm32_pmstop.c stm32_pmstandby.c CHIP_CSRCS += stm32_pmstop.c stm32_pmstandby.c
ifeq ($(CONFIG_PM),y) ifeq ($(CONFIG_PM),y)
ifneq ($(CONFIG_PM_CUSTOMINIT),y)
CHIP_CSRCS += stm32_pminitialize.c CHIP_CSRCS += stm32_pminitialize.c
endif endif
endif
ifeq ($(CONFIG_STM32_ETHMAC),y) ifeq ($(CONFIG_STM32_ETHMAC),y)
CHIP_CSRCS += stm32_eth.c CHIP_CSRCS += stm32_eth.c

18
arch/arm/src/stm32/stm32_pm.h
View File

@ -43,7 +43,6 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <stdbool.h> #include <stdbool.h>
#include <semaphore.h>
#include "chip.h" #include "chip.h"
#include "up_internal.h" #include "up_internal.h"
@ -68,15 +67,6 @@ extern "C" {
#define EXTERN extern #define EXTERN extern
#endif #endif
/* Before any power state transition is made, the caller should hold this
* semaphore to assure that there are no concurrent, contradictory power
* state activities.
*/
#ifdef CONFIG_PM
EXTERN sem_t g_pmsem;
#endif
/**************************************************************************** /****************************************************************************
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
@ -98,10 +88,6 @@ EXTERN sem_t g_pmsem;
* original state. Otherwise, STOP mode did not occur and a negated * original state. Otherwise, STOP mode did not occur and a negated
* errno value is returned to indicate the cause of the failure. * errno value is returned to indicate the cause of the failure.
* *
* Assumptions:
* The caller holds the PM semaphore (g_pmsem) if this function is used
* as part of the NuttX power management logic.
*
****************************************************************************/ ****************************************************************************/
EXTERN int stm32_pmstop(bool lpds); EXTERN int stm32_pmstop(bool lpds);
@ -121,10 +107,6 @@ EXTERN int stm32_pmstop(bool lpds);
* and a negated errno value is returned to indicate the cause of the * and a negated errno value is returned to indicate the cause of the
* failure. * failure.
* *
* Assumptions:
* The caller holds the PM semaphore (g_pmsem) if this function is used
* as part of the NuttX power management logic.
*
****************************************************************************/ ****************************************************************************/
EXTERN int stm32_pmstandby(void); EXTERN int stm32_pmstandby(void);

13
arch/arm/src/stm32/stm32_pminitialize.c
View File

@ -58,13 +58,6 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/* Before any power state transition is made, the caller should hold this
* semaphore to assure that there are no concurrent, contradictory power
* state activities.
*/
sem_t g_pmsem;
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -93,12 +86,6 @@ sem_t g_pmsem;
void up_pminitialize(void) void up_pminitialize(void)
{ {
/* Initialize the PM semaphore to assure that no more than one power-related
* action occurs at a time.
*/
sem_init(&g_pmsem, 0, 1);
/* Then initialize the NuttX power management subsystem proper */ /* Then initialize the NuttX power management subsystem proper */
pm_initialize(); pm_initialize();

4
arch/arm/src/stm32/stm32_pmstandby.c
View File

@ -77,10 +77,6 @@
* and a negated errno value is returned to indicate the cause of the * and a negated errno value is returned to indicate the cause of the
* failure. * failure.
* *
* Assumptions:
* The caller holds the PM semaphore (g_pmsem) if this function is used
* as part of the NuttX power management logic.
*
****************************************************************************/ ****************************************************************************/
int stm32_pmstandby(void) int stm32_pmstandby(void)

4
arch/arm/src/stm32/stm32_pmstop.c
View File

@ -79,10 +79,6 @@
* original state. Otherwise, STOP mode did not occur and a negated * original state. Otherwise, STOP mode did not occur and a negated
* errno value is returned to indicate the cause of the failure. * errno value is returned to indicate the cause of the failure.
* *
* Assumptions:
* The caller holds the PM semaphore (g_pmsem) if this function is used
* as part of the NuttX power management logic.
*
****************************************************************************/ ****************************************************************************/
int stm32_pmstop(bool lpds) int stm32_pmstop(bool lpds)