Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-22 10:30:13 +00:00
Code Issues Projects Releases Wiki Activity

cc2538: lpm: Fix build for LPM_CONF_ENABLE == 0

Browse Source 
lpm.c needs to #include lpm.h in order to get the definition of
lpm_periph_permit_pm1_func_t, which made the replacement macros conflict with
the function definitions for the LPM_CONF_ENABLE == 0 case. This change fixes
this issue by #if-ing out the code in lpm.c in that case. Also, the replacement
macro for lpm_register_peripheral() was missing in that case, which is fixed
here.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
This commit is contained in:
Benoît Thébaudeau 2014-01-28 20:10:51 +01:00
parent e10d462931
commit 42c287f363
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/cc2538/lpm.c
View File

@ -48,6 +48,8 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#if LPM_CONF_ENABLE != 0
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#if ENERGEST_CONF_ON #if ENERGEST_CONF_ON
static unsigned long irq_energest = 0; static unsigned long irq_energest = 0;
@ -378,4 +380,5 @@ lpm_init()
LPM_STATS_INIT(); LPM_STATS_INIT();
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#endif /* LPM_CONF_ENABLE != 0 */
/** @} */ /** @} */

1
cpu/cc2538/lpm.h
View File

@ -212,6 +212,7 @@ void lpm_register_peripheral(lpm_periph_permit_pm1_func_t permit_pm1_func);
#define lpm_enter() #define lpm_enter()
#define lpm_exit() #define lpm_exit()
#define lpm_set_max_pm(...) #define lpm_set_max_pm(...)
#define lpm_register_peripheral(...)
#endif #endif
#endif /* LPM_H_ */ #endif /* LPM_H_ */