riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #13380 from kaspar030/pm_blocker_one_value

Browse Source 
sys/pm_layered: change PM_BLOCKER_INITIAL to single value
This commit is contained in:
Kaspar Schleiser 2020-02-17 13:07:02 +01:00 committed by GitHub
commit 9866cdd411
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/samd21/include/periph_cpu.h
View File

@ -32,7 +32,7 @@ extern "C" {
* @brief Override the default initial PM blocker * @brief Override the default initial PM blocker
* @todo Idle modes are enabled by default, deep sleep mode blocked * @todo Idle modes are enabled by default, deep sleep mode blocked
*/ */
#define PM_BLOCKER_INITIAL { .val_u32 = 0x00000001 } #define PM_BLOCKER_INITIAL 0x00000001
/** /**
* @name SAMD21 sleep modes for PM * @name SAMD21 sleep modes for PM

2
cpu/saml1x/include/periph_cpu.h
View File

@ -30,7 +30,7 @@ extern "C" {
* @brief Override the default initial PM blocker * @brief Override the default initial PM blocker
* @todo Idle modes are enabled by default, deep sleep mode blocked * @todo Idle modes are enabled by default, deep sleep mode blocked
*/ */
#define PM_BLOCKER_INITIAL { .val_u32 = 0x00000001 } #define PM_BLOCKER_INITIAL 0x00000001
/** /**
* @name SAML1x GCLK definitions * @name SAML1x GCLK definitions

4
sys/pm_layered/pm.c
View File

@ -30,7 +30,7 @@
#endif #endif
#ifndef PM_BLOCKER_INITIAL #ifndef PM_BLOCKER_INITIAL
#define PM_BLOCKER_INITIAL { .val_u32 = 0x01010101 } #define PM_BLOCKER_INITIAL 0x01010101 /* block all by default */
#endif #endif
/** /**
@ -44,7 +44,7 @@ typedef union {
/** /**
* @brief Global variable for keeping track of blocked modes * @brief Global variable for keeping track of blocked modes
*/ */
volatile pm_blocker_t pm_blocker = PM_BLOCKER_INITIAL; volatile pm_blocker_t pm_blocker = { .val_u32 = PM_BLOCKER_INITIAL };
void pm_set_lowest(void) void pm_set_lowest(void)
{ {