michaelh/zephyr
1
0
Fork 0
Code Releases Activity

userspace: properly namespace handler functions

Browse source 
Now prefixed with z_hdlr_ instead of just hdlr_.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-03-15 10:47:05 -07:00 • committed by Andrew Boie
commit 7ea211256e
3 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/include/syscall_handler.h
View file

@ -524,7 +524,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
*/
#define Z__SYSCALL_HANDLER0(name_) \
u32_t hdlr_ ## name_(u32_t arg1 __unused, \
u32_t z_hdlr_ ## name_(u32_t arg1 __unused, \
u32_t arg2 __unused, \
u32_t arg3 __unused, \
u32_t arg4 __unused, \
@ -533,7 +533,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
void *ssf)
#define Z__SYSCALL_HANDLER1(name_, arg1_) \
u32_t hdlr_ ## name_(u32_t arg1_, \
u32_t z_hdlr_ ## name_(u32_t arg1_, \
u32_t arg2 __unused, \
u32_t arg3 __unused, \
u32_t arg4 __unused, \
@ -542,7 +542,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
void *ssf)
#define Z__SYSCALL_HANDLER2(name_, arg1_, arg2_) \
u32_t hdlr_ ## name_(u32_t arg1_, \
u32_t z_hdlr_ ## name_(u32_t arg1_, \
u32_t arg2_, \
u32_t arg3 __unused, \
u32_t arg4 __unused, \
@ -551,7 +551,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
void *ssf)
#define Z__SYSCALL_HANDLER3(name_, arg1_, arg2_, arg3_) \
u32_t hdlr_ ## name_(u32_t arg1_, \
u32_t z_hdlr_ ## name_(u32_t arg1_, \
u32_t arg2_, \
u32_t arg3_, \
u32_t arg4 __unused, \
@ -560,7 +560,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
void *ssf)
#define Z__SYSCALL_HANDLER4(name_, arg1_, arg2_, arg3_, arg4_) \
u32_t hdlr_ ## name_(u32_t arg1_, \
u32_t z_hdlr_ ## name_(u32_t arg1_, \
u32_t arg2_, \
u32_t arg3_, \
u32_t arg4_, \
@ -569,7 +569,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
void *ssf)
#define Z__SYSCALL_HANDLER5(name_, arg1_, arg2_, arg3_, arg4_, arg5_) \
u32_t hdlr_ ## name_(u32_t arg1_, \
u32_t z_hdlr_ ## name_(u32_t arg1_, \
u32_t arg2_, \
u32_t arg3_, \
u32_t arg4_, \
@ -578,7 +578,7 @@ static inline int z_obj_validation_check(struct _k_object *ko,
void *ssf)
#define Z__SYSCALL_HANDLER6(name_, arg1_, arg2_, arg3_, arg4_, arg5_, arg6_) \
u32_t hdlr_ ## name_(u32_t arg1_, \
u32_t z_hdlr_ ## name_(u32_t arg1_, \
u32_t arg2_, \
u32_t arg3_, \
u32_t arg4_, \

2
scripts/gen_syscall_header.py
View file

@ -81,7 +81,7 @@ def gen_make_syscall(ret, argc, tabcount):
# from gc-sections; these references will not consume space.
sys.stdout.write(
"static Z_GENERIC_SECTION(hndlr_ref) __used void *href = (void *)&hdlr_##name; \\\n")
"static Z_GENERIC_SECTION(hndlr_ref) __used void *href = (void *)&z_hdlr_##name; \\\n")
tabs(tabcount)
if (ret != Retval.VOID):
sys.stdout.write("return (ret)")

2
scripts/gen_syscalls.py
View file

@ -168,7 +168,7 @@ def analyze_fn(match_group):
invocation = "%s(%s)" % (macro, argslist)
handler = "hdlr_" + func_name
handler = "z_hdlr_" + func_name
# Entry in _k_syscall_table
table_entry = "[%s] = %s" % (sys_id, handler)