From f363945c75f8d403ca2ef4bd6695ccbdc8677402 Mon Sep 17 00:00:00 2001 From: Patrik Flykt Date: Tue, 12 Mar 2019 15:15:42 -0600 Subject: [PATCH] drivers: Rename reserved function names 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 --- libmetal/lib/system/zephyr/mutex.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libmetal/lib/system/zephyr/mutex.h b/libmetal/lib/system/zephyr/mutex.h index bfe689f..6ab20d4 100644 --- a/libmetal/lib/system/zephyr/mutex.h +++ b/libmetal/lib/system/zephyr/mutex.h @@ -29,7 +29,7 @@ typedef struct k_sem metal_mutex_t; * METAL_MUTEX_INIT - used for initializing an mutex elmenet in a static struct * or global */ -#define METAL_MUTEX_INIT(m) _K_SEM_INITIALIZER(m, 1, 1) +#define METAL_MUTEX_INIT(m) Z_SEM_INITIALIZER(m, 1, 1) /* * METAL_MUTEX_DEFINE - used for defining and initializing a global or * static singleton mutex