michaelh/zephyr
1
0
Fork 0
Code Releases Activity

all: Update reserved function names

Browse source 
Update reserved function names starting with one underscore, replacing
them as follows:
   '_k_' with 'z_'
   '_K_' with 'Z_'
   '_handler_' with 'z_handl_'
   '_Cstart' with 'z_cstart'
   '_Swap' with 'z_swap'

This renaming is done on both global and those static function names
in kernel/include and include/. Other static function names in kernel/
are renamed by removing the leading underscore. Other function names
not starting with any prefix listed above are renamed starting with
a 'z_' or 'Z_' prefix.

Function names starting with two or three leading underscores are not
automatcally renamed since these names will collide with the variants
with two or three leading underscores.

Various generator scripts have also been updated as well as perf,
linker and usb files. These are
   drivers/serial/uart_handlers.c
   include/linker/kobject-text.ld
   kernel/include/syscall_handler.h
   scripts/gen_kobject_list.py
   scripts/gen_syscall_header.py

Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
This commit is contained in:
Patrik Flykt 2019-03-08 14:19:05 -07:00 • committed by Anas Nashif
commit 4344e27c26
324 changed files with 2264 additions and 2263 deletions
Download patch file Download diff file Expand all files Collapse all files

38
include/logging/log.h
View file

@ -43,7 +43,7 @@ extern "C" {
* @param ... A string optionally containing printk valid conversion specifier,
* followed by as many values as specifiers.
*/
#define LOG_ERR(...) _LOG(LOG_LEVEL_ERR, __VA_ARGS__)
#define LOG_ERR(...) Z_LOG(LOG_LEVEL_ERR, __VA_ARGS__)
/**
* @brief Writes a WARNING level message to the log.
@ -54,7 +54,7 @@ extern "C" {
* @param ... A string optionally containing printk valid conversion specifier,
* followed by as many values as specifiers.
*/
#define LOG_WRN(...) _LOG(LOG_LEVEL_WRN, __VA_ARGS__)
#define LOG_WRN(...) Z_LOG(LOG_LEVEL_WRN, __VA_ARGS__)
/**
* @brief Writes an INFO level message to the log.
@ -64,7 +64,7 @@ extern "C" {
* @param ... A string optionally containing printk valid conversion specifier,
* followed by as many values as specifiers.
*/
#define LOG_INF(...) _LOG(LOG_LEVEL_INF, __VA_ARGS__)
#define LOG_INF(...) Z_LOG(LOG_LEVEL_INF, __VA_ARGS__)
/**
* @brief Writes a DEBUG level message to the log.
@ -74,7 +74,7 @@ extern "C" {
* @param ... A string optionally containing printk valid conversion specifier,
* followed by as many values as specifiers.
*/
#define LOG_DBG(...) _LOG(LOG_LEVEL_DBG, __VA_ARGS__)
#define LOG_DBG(...) Z_LOG(LOG_LEVEL_DBG, __VA_ARGS__)
/**
* @brief Writes an ERROR level message associated with the instance to the log.
@ -89,7 +89,7 @@ extern "C" {
* followed by as many values as specifiers.
*/
#define LOG_INST_ERR(_log_inst, ...) \
_LOG_INSTANCE(LOG_LEVEL_ERR, _log_inst, __VA_ARGS__)
Z_LOG_INSTANCE(LOG_LEVEL_ERR, _log_inst, __VA_ARGS__)
/**
* @brief Writes a WARNING level message associated with the instance to the
@ -105,7 +105,7 @@ extern "C" {
* specifier, followed by as many values as specifiers.
*/
#define LOG_INST_WRN(_log_inst, ...) \
_LOG_INSTANCE(LOG_LEVEL_WRN, _log_inst, __VA_ARGS__)
Z_LOG_INSTANCE(LOG_LEVEL_WRN, _log_inst, __VA_ARGS__)
/**
* @brief Writes an INFO level message associated with the instance to the log.
@ -120,7 +120,7 @@ extern "C" {
* followed by as many values as specifiers.
*/
#define LOG_INST_INF(_log_inst, ...) \
_LOG_INSTANCE(LOG_LEVEL_INF, _log_inst, __VA_ARGS__)
Z_LOG_INSTANCE(LOG_LEVEL_INF, _log_inst, __VA_ARGS__)
/**
* @brief Writes a DEBUG level message associated with the instance to the log.
@ -135,7 +135,7 @@ extern "C" {
* followed by as many values as specifiers.
*/
#define LOG_INST_DBG(_log_inst, ...) \
_LOG_INSTANCE(LOG_LEVEL_DBG, _log_inst, __VA_ARGS__)
Z_LOG_INSTANCE(LOG_LEVEL_DBG, _log_inst, __VA_ARGS__)
/**
* @brief Writes an ERROR level hexdump message to the log.
@ -148,7 +148,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_HEXDUMP_ERR(_data, _length, _str) \
_LOG_HEXDUMP(LOG_LEVEL_ERR, _data, _length, _str)
Z_LOG_HEXDUMP(LOG_LEVEL_ERR, _data, _length, _str)
/**
* @brief Writes a WARNING level message to the log.
@ -161,7 +161,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_HEXDUMP_WRN(_data, _length, _str) \
_LOG_HEXDUMP(LOG_LEVEL_WRN, _data, _length, _str)
Z_LOG_HEXDUMP(LOG_LEVEL_WRN, _data, _length, _str)
/**
* @brief Writes an INFO level message to the log.
@ -173,7 +173,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_HEXDUMP_INF(_data, _length, _str) \
_LOG_HEXDUMP(LOG_LEVEL_INF, _data, _length, _str)
Z_LOG_HEXDUMP(LOG_LEVEL_INF, _data, _length, _str)
/**
* @brief Writes a DEBUG level message to the log.
@ -185,7 +185,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_HEXDUMP_DBG(_data, _length, _str) \
_LOG_HEXDUMP(LOG_LEVEL_DBG, _data, _length, _str)
Z_LOG_HEXDUMP(LOG_LEVEL_DBG, _data, _length, _str)
/**
* @brief Writes an ERROR hexdump message associated with the instance to the
@ -202,7 +202,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_INST_HEXDUMP_ERR(_log_inst, _data, _length, _str) \
_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_ERR, _log_inst, _data, _length, _str)
Z_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_ERR, _log_inst, _data, _length, _str)
/**
* @brief Writes a WARNING level hexdump message associated with the instance to
@ -217,7 +217,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_INST_HEXDUMP_WRN(_log_inst, _data, _length, _str) \
_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_WRN, _log_inst, _data, _length, _str)
Z_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_WRN, _log_inst, _data, _length, _str)
/**
* @brief Writes an INFO level hexdump message associated with the instance to
@ -231,7 +231,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_INST_HEXDUMP_INF(_log_inst, _data, _length, _str) \
_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_INF, _log_inst, _data, _length, _str)
Z_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_INF, _log_inst, _data, _length, _str)
/**
* @brief Writes a DEBUG level hexdump message associated with the instance to
@ -245,7 +245,7 @@ extern "C" {
* @param _str Persistent, raw string.
*/
#define LOG_INST_HEXDUMP_DBG(_log_inst, _data, _length, _str) \
_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_DBG, _log_inst, _data, _length, _str)
Z_LOG_HEXDUMP_INSTANCE(LOG_LEVEL_DBG, _log_inst, _data, _length, _str)
/**
* @brief Writes an formatted string to the log.
@ -284,7 +284,7 @@ char *log_strdup(const char *str);
#define _LOG_LEVEL_RESOLVE(...) LOG_LEVEL_NONE
#else
#define _LOG_LEVEL_RESOLVE(...) \
_LOG_EVAL(LOG_LEVEL, \
Z_LOG_EVAL(LOG_LEVEL, \
(GET_ARG2(__VA_ARGS__, LOG_LEVEL)), \
(GET_ARG2(__VA_ARGS__, CONFIG_LOG_DEFAULT_LEVEL)))
#endif
@ -309,7 +309,7 @@ char *log_strdup(const char *str);
__attribute__((used))
#define _LOG_MODULE_DYNAMIC_DATA_COND_CREATE(_name) \
_LOG_EVAL( \
Z_LOG_EVAL( \
IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING), \
(_LOG_MODULE_DYNAMIC_DATA_CREATE(_name);), \
() \
@ -353,7 +353,7 @@ char *log_strdup(const char *str);
#define LOG_MODULE_REGISTER(...) \
_LOG_EVAL( \
Z_LOG_EVAL( \
_LOG_LEVEL_RESOLVE(__VA_ARGS__), \
(_LOG_MODULE_DATA_CREATE(GET_ARG1(__VA_ARGS__), \
_LOG_LEVEL_RESOLVE(__VA_ARGS__))),\

51
include/logging/log_core.h
View file

@ -35,10 +35,10 @@ extern "C" {
*
* Check @ref IS_ENABLED macro for detailed explanation of the trick.
*/
#define _LOG_RESOLVED_LEVEL(_level, _default) \
_LOG_RESOLVED_LEVEL1(_level, _default)
#define Z_LOG_RESOLVED_LEVEL(_level, _default) \
Z_LOG_RESOLVED_LEVEL1(_level, _default)
#define _LOG_RESOLVED_LEVEL1(_level, _default) \
#define Z_LOG_RESOLVED_LEVEL1(_level, _default) \
__COND_CODE(_LOG_XXXX##_level, (_level), (_default))
#define _LOG_XXXX0 _LOG_YYYY,
@ -61,10 +61,10 @@ extern "C" {
* @param _iffalse Code that should be inserted when evaluated to false.
* Note, that parameter must be provided in brackets.
*/
#define _LOG_EVAL(_eval_level, _iftrue, _iffalse) \
_LOG_EVAL1(_eval_level, _iftrue, _iffalse)
#define Z_LOG_EVAL(_eval_level, _iftrue, _iffalse) \
Z_LOG_EVAL1(_eval_level, _iftrue, _iffalse)
#define _LOG_EVAL1(_eval_level, _iftrue, _iffalse) \
#define Z_LOG_EVAL1(_eval_level, _iftrue, _iffalse) \
__COND_CODE(_LOG_ZZZZ##_eval_level, _iftrue, _iffalse)
#define _LOG_ZZZZ1 _LOG_YYYY,
@ -77,7 +77,7 @@ extern "C" {
* It is evaluated to LOG_LEVEL if defined. Otherwise CONFIG_LOG_DEFAULT_LEVEL
* is used.
*/
#define _LOG_LEVEL() _LOG_RESOLVED_LEVEL(LOG_LEVEL, CONFIG_LOG_DEFAULT_LEVEL)
#define _LOG_LEVEL() Z_LOG_RESOLVED_LEVEL(LOG_LEVEL, CONFIG_LOG_DEFAULT_LEVEL)
/**
* @def LOG_CONST_ID_GET
@ -86,7 +86,7 @@ extern "C" {
* @param _addr Address of the element.
*/
#define LOG_CONST_ID_GET(_addr) \
_LOG_EVAL(\
Z_LOG_EVAL(\
CONFIG_LOG,\
(__log_level ? \
log_const_source_id((const struct log_source_const_data *)_addr) : \
@ -113,7 +113,7 @@ extern "C" {
* @param _addr Address of the element.
*/
#define LOG_DYNAMIC_ID_GET(_addr) \
_LOG_EVAL(\
Z_LOG_EVAL(\
CONFIG_LOG,\
(__log_level ? \
log_dynamic_source_id((struct log_source_dynamic_data *)_addr) : 0),\
@ -131,7 +131,7 @@ extern "C" {
* used.
*/
#define _LOG_STR(...) "%s: " GET_ARG1(__VA_ARGS__), __func__\
#define Z_LOG_STR(...) "%s: " GET_ARG1(__VA_ARGS__), __func__\
COND_CODE_0(NUM_VA_ARGS_LESS_1(__VA_ARGS__),\
(),\
(, GET_ARGS_LESS_1(__VA_ARGS__))\
@ -141,7 +141,7 @@ extern "C" {
/******************************************************************************/
/****************** Internal macros for log frontend **************************/
/******************************************************************************/
/**@brief Second stage for _LOG_NARGS_POSTFIX */
/**@brief Second stage for Z_LOG_NARGS_POSTFIX */
#define _LOG_NARGS_POSTFIX_IMPL( \
_ignored, \
_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \
@ -155,18 +155,18 @@ extern "C" {
*
* @retval Postfix, number of arguments or _LONG when more than 3 arguments.
*/
#define _LOG_NARGS_POSTFIX(...) \
#define Z_LOG_NARGS_POSTFIX(...) \
_LOG_NARGS_POSTFIX_IMPL(__VA_ARGS__, LONG, LONG, LONG, LONG, LONG, \
LONG, LONG, LONG, LONG, LONG, LONG, LONG, 3, 2, 1, 0, ~)
#define _LOG_INTERNAL_X(N, ...) UTIL_CAT(_LOG_INTERNAL_, N)(__VA_ARGS__)
#define Z_LOG_INTERNAL_X(N, ...) UTIL_CAT(_LOG_INTERNAL_, N)(__VA_ARGS__)
#define __LOG_INTERNAL(_src_level, ...) \
do { \
if (IS_ENABLED(CONFIG_LOG_IMMEDIATE)) { \
log_string_sync(_src_level, __VA_ARGS__); \
} else { \
_LOG_INTERNAL_X(_LOG_NARGS_POSTFIX(__VA_ARGS__), \
Z_LOG_INTERNAL_X(Z_LOG_NARGS_POSTFIX(__VA_ARGS__), \
_src_level, __VA_ARGS__);\
} \
} while (false)
@ -193,13 +193,12 @@ extern "C" {
log_n(_str, args, ARRAY_SIZE(args), _src_level); \
} while (false)
#define _LOG_LEVEL_CHECK(_level, _check_level, _default_level) \
(_level <= _LOG_RESOLVED_LEVEL(_check_level, _default_level))
#define Z_LOG_LEVEL_CHECK(_level, _check_level, _default_level) \
(_level <= Z_LOG_RESOLVED_LEVEL(_check_level, _default_level))
#define _LOG_CONST_LEVEL_CHECK(_level) \
#define Z_LOG_CONST_LEVEL_CHECK(_level) \
(IS_ENABLED(CONFIG_LOG) && \
( \
_LOG_LEVEL_CHECK(_level, CONFIG_LOG_OVERRIDE_LEVEL, LOG_LEVEL_NONE) \
(Z_LOG_LEVEL_CHECK(_level, CONFIG_LOG_OVERRIDE_LEVEL, LOG_LEVEL_NONE) \
|| \
(!IS_ENABLED(CONFIG_LOG_OVERRIDE_LEVEL) && \
(_level <= __log_level) && \
@ -212,7 +211,7 @@ extern "C" {
/******************************************************************************/
#define __LOG(_level, _id, _filter, ...) \
do { \
if (_LOG_CONST_LEVEL_CHECK(_level) && \
if (Z_LOG_CONST_LEVEL_CHECK(_level) && \
(_level <= LOG_RUNTIME_FILTER(_filter))) { \
struct log_msg_ids src_level = { \
.level = _level, \
@ -222,7 +221,7 @@ extern "C" {
\
if ((1 << _level) & LOG_FUNCTION_PREFIX_MASK) { \
__LOG_INTERNAL(src_level, \
_LOG_STR(__VA_ARGS__)); \
Z_LOG_STR(__VA_ARGS__)); \
} else { \
__LOG_INTERNAL(src_level, __VA_ARGS__); \
} \
@ -234,13 +233,13 @@ extern "C" {
} \
} while (false)
#define _LOG(_level, ...) \
#define Z_LOG(_level, ...) \
__LOG(_level, \
(u16_t)LOG_CURRENT_MODULE_ID(), \
LOG_CURRENT_DYNAMIC_DATA_ADDR(), \
__VA_ARGS__)
#define _LOG_INSTANCE(_level, _inst, ...) \
#define Z_LOG_INSTANCE(_level, _inst, ...) \
__LOG(_level, \
IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING) ? \
LOG_DYNAMIC_ID_GET(_inst) : \
@ -254,7 +253,7 @@ extern "C" {
/******************************************************************************/
#define __LOG_HEXDUMP(_level, _id, _filter, _data, _length, _str) \
do { \
if (_LOG_CONST_LEVEL_CHECK(_level) && \
if (Z_LOG_CONST_LEVEL_CHECK(_level) && \
(_level <= LOG_RUNTIME_FILTER(_filter))) { \
struct log_msg_ids src_level = { \
.level = _level, \
@ -271,13 +270,13 @@ extern "C" {
} \
} while (false)
#define _LOG_HEXDUMP(_level, _data, _length, _str) \
#define Z_LOG_HEXDUMP(_level, _data, _length, _str) \
__LOG_HEXDUMP(_level, \
LOG_CURRENT_MODULE_ID(), \
LOG_CURRENT_DYNAMIC_DATA_ADDR(), \
_data, _length, _str)
#define _LOG_HEXDUMP_INSTANCE(_level, _inst, _data, _length, _str) \
#define Z_LOG_HEXDUMP_INSTANCE(_level, _inst, _data, _length, _str) \
__LOG_HEXDUMP(_level, \
IS_ENABLED(CONFIG_LOG_RUNTIME_FILTERING) ? \
LOG_DYNAMIC_ID_GET(_inst) : \

6
include/logging/log_instance.h
View file

@ -43,7 +43,7 @@ struct log_source_dynamic_data {
*/
#define LOG_ITEM_CONST_DATA(_name) UTIL_CAT(log_const_, _name)
#define _LOG_CONST_ITEM_REGISTER(_name, _str_name, _level) \
#define Z_LOG_CONST_ITEM_REGISTER(_name, _str_name, _level) \
const struct log_source_const_data LOG_ITEM_CONST_DATA(_name) \
__attribute__ ((section("." STRINGIFY(LOG_ITEM_CONST_DATA(_name))))) \
__attribute__((used)) = { \
@ -78,7 +78,7 @@ struct log_source_dynamic_data {
struct log_source_dynamic_data *_name
#define LOG_INSTANCE_REGISTER(_module_name, _inst_name, _level) \
_LOG_CONST_ITEM_REGISTER( \
Z_LOG_CONST_ITEM_REGISTER( \
LOG_INSTANCE_FULL_NAME(_module_name, _inst_name), \
STRINGIFY(_module_name._inst_name), \
_level); \
@ -99,7 +99,7 @@ struct log_source_dynamic_data {
const struct log_source_const_data *_name
#define LOG_INSTANCE_REGISTER(_module_name, _inst_name, _level) \
_LOG_CONST_ITEM_REGISTER( \
Z_LOG_CONST_ITEM_REGISTER( \
LOG_INSTANCE_FULL_NAME(_module_name, _inst_name), \
STRINGIFY(_module_name._inst_name), \
_level)

10
include/logging/log_msg.h
View file

@ -332,7 +332,7 @@ static inline union log_msg_chunk *log_msg_chunk_alloc(void)
*
* @return Allocated chunk of NULL.
*/
static inline struct log_msg *_log_msg_std_alloc(void)
static inline struct log_msg *z_log_msg_std_alloc(void)
{
struct log_msg *msg = (struct log_msg *)log_msg_chunk_alloc();
@ -356,7 +356,7 @@ static inline struct log_msg *_log_msg_std_alloc(void)
*/
static inline struct log_msg *log_msg_create_0(const char *str)
{
struct log_msg *msg = _log_msg_std_alloc();
struct log_msg *msg = z_log_msg_std_alloc();
if (msg != NULL) {
msg->str = str;
@ -381,7 +381,7 @@ static inline struct log_msg *log_msg_create_0(const char *str)
static inline struct log_msg *log_msg_create_1(const char *str,
u32_t arg1)
{
struct log_msg *msg = _log_msg_std_alloc();
struct log_msg *msg = z_log_msg_std_alloc();
if (msg != NULL) {
msg->str = str;
@ -410,7 +410,7 @@ static inline struct log_msg *log_msg_create_2(const char *str,
u32_t arg1,
u32_t arg2)
{
struct log_msg *msg = _log_msg_std_alloc();
struct log_msg *msg = z_log_msg_std_alloc();
if (msg != NULL) {
msg->str = str;
@ -442,7 +442,7 @@ static inline struct log_msg *log_msg_create_3(const char *str,
u32_t arg2,
u32_t arg3)
{
struct log_msg *msg = _log_msg_std_alloc();
struct log_msg *msg = z_log_msg_std_alloc();
if (msg != NULL) {
msg->str = str;