michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: Rename reserved function names

Browse source 
Rename reserved function names in drivers/ subdirectory. Update
function macros concatenatenating function names with '##'. As
there is a conflict between the existing gpio_sch_manage_callback()
and _gpio_sch_manage_callback() names, leave the latter unmodified.

Signed-off-by: Patrik Flykt <patrik.flykt@intel.com>
This commit is contained in:
Patrik Flykt 2019-03-12 15:15:42 -06:00 • committed by Anas Nashif
commit 97b3bd11a7
110 changed files with 544 additions and 544 deletions
Download patch file Download diff file Expand all files Collapse all files

18
include/kernel.h
View file

@ -1387,7 +1387,7 @@ struct k_timer {
_OBJECT_TRACING_NEXT_PTR(k_timer)
};
#define _K_TIMER_INITIALIZER(obj, expiry, stop) \
#define Z_TIMER_INITIALIZER(obj, expiry, stop) \
{ \
.timeout = { \
.node = {},\
@ -1403,7 +1403,7 @@ struct k_timer {
_OBJECT_TRACING_INIT \
}
#define K_TIMER_INITIALIZER DEPRECATED_MACRO _K_TIMER_INITIALIZER
#define K_TIMER_INITIALIZER DEPRECATED_MACRO Z_TIMER_INITIALIZER
/**
* INTERNAL_HIDDEN @endcond
@ -1458,7 +1458,7 @@ typedef void (*k_timer_stop_t)(struct k_timer *timer);
#define K_TIMER_DEFINE(name, expiry_fn, stop_fn) \
struct k_timer name \
__in_section(_k_timer, static, name) = \
_K_TIMER_INITIALIZER(name, expiry_fn, stop_fn)
Z_TIMER_INITIALIZER(name, expiry_fn, stop_fn)
/**
* @brief Initialize a timer.
@ -2051,12 +2051,12 @@ struct k_fifo {
/**
* @cond INTERNAL_HIDDEN
*/
#define _K_FIFO_INITIALIZER(obj) \
#define Z_FIFO_INITIALIZER(obj) \
{ \
._queue = _K_QUEUE_INITIALIZER(obj._queue) \
}
#define K_FIFO_INITIALIZER DEPRECATED_MACRO _K_FIFO_INITIALIZER
#define K_FIFO_INITIALIZER DEPRECATED_MACRO Z_FIFO_INITIALIZER
/**
* INTERNAL_HIDDEN @endcond
@ -2256,7 +2256,7 @@ struct k_fifo {
#define K_FIFO_DEFINE(name) \
struct k_fifo name \
__in_section(_k_queue, static, name) = \
_K_FIFO_INITIALIZER(name)
Z_FIFO_INITIALIZER(name)
/** @} */
@ -3010,7 +3010,7 @@ struct k_sem {
_OBJECT_TRACING_NEXT_PTR(k_sem)
};
#define _K_SEM_INITIALIZER(obj, initial_count, count_limit) \
#define Z_SEM_INITIALIZER(obj, initial_count, count_limit) \
{ \
.wait_q = Z_WAIT_Q_INIT(&obj.wait_q), \
.count = initial_count, \
@ -3019,7 +3019,7 @@ struct k_sem {
_OBJECT_TRACING_INIT \
}
#define K_SEM_INITIALIZER DEPRECATED_MACRO _K_SEM_INITIALIZER
#define K_SEM_INITIALIZER DEPRECATED_MACRO Z_SEM_INITIALIZER
/**
* INTERNAL_HIDDEN @endcond
@ -3140,7 +3140,7 @@ static inline unsigned int z_impl_k_sem_count_get(struct k_sem *sem)
#define K_SEM_DEFINE(name, initial_count, count_limit) \
struct k_sem name \
__in_section(_k_sem, static, name) = \
_K_SEM_INITIALIZER(name, initial_count, count_limit); \
Z_SEM_INITIALIZER(name, initial_count, count_limit); \
BUILD_ASSERT(((count_limit) != 0) && \
((initial_count) <= (count_limit)));