michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Rename K_max_eventnr to _k_num_events

Browse source 
Updating global variable's name to follow a consistent naming convention.

Change accomplished with the following script:

   #!/bin/bash
   echo "Searching for ${1} to replace with ${2}"
   find ./ \( -name "*.[chs]" -o -name "sysgen.py" -o -name "*.kconf" \) \
            ! -path "./host/src/genIdt/*" \
            ! -path "*/outdir/*" | xargs sed -i 's/\b'${1}'\b/'${2}'/g';

Change-Id: Idcd3b4dfd86b6e835638623fa7b39401cabdee06
Signed-off-by: Yonattan Louise <yonattan.a.louise.mendoza@intel.com>
This commit is contained in:
Yonattan Louise 2015-04-27 10:28:30 -05:00 • committed by Anas Nashif
commit 6120750f19
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/microkernel.h
View file

@ -83,7 +83,7 @@ extern int _k_task_count;
extern int _k_mem_map_count; extern int _k_mem_map_count;
extern int _k_mem_pool_count; extern int _k_mem_pool_count;
extern int _k_pipe_count; extern int _k_pipe_count;
extern const int K_max_eventnr; extern const int _k_num_events;
extern PFN_CHANNEL_RWT pKS_Channel_PutWT; extern PFN_CHANNEL_RWT pKS_Channel_PutWT;
extern PFN_CHANNEL_RWT pKS_Channel_GetWT; extern PFN_CHANNEL_RWT pKS_Channel_GetWT;

2
kernel/microkernel/include/kevent.h
View file

@ -35,7 +35,7 @@
extern struct evstr EVENTS[]; extern struct evstr EVENTS[];
extern const int K_max_eventnr; extern const int _k_num_events;
extern void K_event_signal(struct k_args *A); extern void K_event_signal(struct k_args *A);
extern void K_event_set_handler(struct k_args *A); extern void K_event_set_handler(struct k_args *A);

6
kernel/microkernel/k_event.c
View file

@ -48,7 +48,7 @@ void K_event_set_handler(struct k_args *A)
{ {
kevent_t event = A->Args.e1.event; kevent_t event = A->Args.e1.event;
if (likely(event < K_max_eventnr)) { if (likely(event < _k_num_events)) {
struct evstr *E = EVENTS + A->Args.e1.event; struct evstr *E = EVENTS + A->Args.e1.event;
if (E->func != NULL) { if (E->func != NULL) {
@ -130,7 +130,7 @@ void K_event_test(struct k_args *A)
{ {
kevent_t event = A->Args.e1.event; kevent_t event = A->Args.e1.event;
if (likely(event < K_max_eventnr)) { if (likely(event < _k_num_events)) {
struct evstr *E = EVENTS + event; struct evstr *E = EVENTS + event;
if (E->status) { /* the next event can be received */ if (E->status) { /* the next event can be received */
@ -242,7 +242,7 @@ void K_event_signal(struct k_args *A)
{ {
kevent_t event = A->Args.e1.event; kevent_t event = A->Args.e1.event;
if (likely(event < K_max_eventnr)) { if (likely(event < _k_num_events)) {
K_sigevent(event); K_sigevent(event);
A->Time.rcode = RC_OK; A->Time.rcode = RC_OK;
} else { } else {

4
kernel/microkernel/task_monitor.c
View file

@ -51,7 +51,7 @@ static int K_monitor_wind = 0;
taskswitchcallbackfunc TaskSwitchCallBack = NULL; taskswitchcallbackfunc TaskSwitchCallBack = NULL;
extern const int K_max_eventnr; extern const int _k_num_events;
void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func) void KS_TaskSetSwitchCallBack(taskswitchcallbackfunc func)
{ {
@ -87,7 +87,7 @@ void K_monitor_args(struct k_args *A)
{ {
K_monitor_wptr->time = timer_read(); K_monitor_wptr->time = timer_read();
if ((uint32_t)A < K_max_eventnr) if ((uint32_t)A < _k_num_events)
{ {
K_monitor_wptr->data2 = MO_EVENT | (uint32_t)A; K_monitor_wptr->data2 = MO_EVENT | (uint32_t)A;
} }

4
kernel/nanokernel/core/microk.c
View file

@ -89,9 +89,9 @@ FUNC_NORETURN void K_swapper(int parameter1, /* not used */
&_k_command_stack); /* will schedule */ &_k_command_stack); /* will schedule */
do { do {
kevent_t event; kevent_t event;
/* if event < K_max_eventnr, it's a well-known event */ /* if event < _k_num_events, it's a well-known event */
event = (kevent_t)(pArgs); event = (kevent_t)(pArgs);
if (event < (kevent_t)K_max_eventnr) { if (event < (kevent_t)_k_num_events) {
#ifdef CONFIG_TASK_MONITOR #ifdef CONFIG_TASK_MONITOR
if (K_monitor_mask & MON_EVENT) { if (K_monitor_mask & MON_EVENT) {
K_monitor_args(pArgs); K_monitor_args(pArgs);

2
samples/microkernel/test/test_events/src/events.c
View file

@ -132,7 +132,7 @@ int eventNoWaitTest(void)
{ {
int rv; /* return value from task_event_xxx() calls */ int rv; /* return value from task_event_xxx() calls */
rv = task_event_send(K_max_eventnr); /* An invalid event # */ rv = task_event_send(_k_num_events); /* An invalid event # */
if (rv != RC_FAIL) { if (rv != RC_FAIL) {
TC_ERROR("task_event_send() returned %d, not %d\n", rv, RC_FAIL); TC_ERROR("task_event_send() returned %d, not %d\n", rv, RC_FAIL);
return TC_FAIL; return TC_FAIL;

4
scripts/sysgen.py
View file

@ -474,7 +474,7 @@ def kernel_main_c_events():
# number of events # number of events
kernel_main_c_out("\n" + kernel_main_c_out("\n" +
"const int K_max_eventnr = %d;\n" % (total_events)) "const int _k_num_events = %d;\n" % (total_events))
# event object identifiers (for project-defined events only) # event object identifiers (for project-defined events only)
@ -1143,7 +1143,7 @@ def generate_vxmicro_h_misc():
global vxmicro_h_data global vxmicro_h_data
vxmicro_h_data += "\n" + \ vxmicro_h_data += "\n" + \
"extern const int K_max_eventnr;\n" + \ "extern const int _k_num_events;\n" + \
"extern struct evstr EVENTS[];\n\n" "extern struct evstr EVENTS[];\n\n"