michaelh/zephyr
1
0
Fork 0
Code Releases Activity

init: Back out symbolic names in macro definition

Browse source 
Using the symbolic names in the macros fails to create the correct
object. Likely due to the order of evaluation by cpp. Back out this
change.

Change-Id: I3948228ecdab3c1087faf6e9dc9f25455ed63e7a
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
This commit is contained in:
Dirk Brandewie 2015-06-30 11:10:59 -07:00 • committed by Anas Nashif
commit 6f326eb097
1 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

21
include/init.h
View file

@ -67,28 +67,21 @@
.driver_data = data}; .driver_data = data};
/* Run on interrupt stack; no {micro,nano} kernel objects available */ /* Run on interrupt stack; no {micro,nano} kernel objects available */
#define pure_init(cfg, data) __define_initconfig(cfg, \ #define pure_init(cfg, data) __define_initconfig(cfg, 0, data)
PURE, data)
/* Run from nano kernel idle task; no micro kernel objects available */ /* Run from nano kernel idle task; no micro kernel objects available */
#define nano_early_init(cfg, data) __define_initconfig(cfg, \ #define nano_early_init(cfg, data) __define_initconfig(cfg, 1, data)
NANO_EARLY, data) #define nano_late_init(cfg, data) __define_initconfig(cfg, 2, data)
#define nano_late_init(cfg, data) __define_initconfig(cfg, \
NANO_LATE, data)
/* Run from micro kernel idle task. */ /* Run from micro kernel idle task. */
#define micro_early_init(cfg, data) __define_initconfig(cfg, \ #define micro_early_init(cfg, data) __define_initconfig(cfg, 3, data)
MICRO_EARLY, data) #define micro_late_init(cfg, data) __define_initconfig(cfg, 4, data)
#define micro_late_init(cfg, data) __define_initconfig(cfg, \
MICRO_LATE, data)
/* Run in the idle task; In a nano kernel only system run after /* Run in the idle task; In a nano kernel only system run after
* nano_late_init(). In a micro kernel system after micro_late_init() * nano_late_init(). In a micro kernel system after micro_late_init()
*/ */
#define app_early_init(cfg, data) __define_initconfig(cfg, \ #define app_early_init(cfg, data) __define_initconfig(cfg, 5, data)
APP_EARLY, data) #define app_late_init(cfg, data) __define_initconfig(cfg, 6, data)
#define app_late_init(cfg, data) __define_initconfig(cfg, \
APP_LATE, data)
#endif /* _INIT_H_ */ #endif /* _INIT_H_ */