diff options
| -rw-r--r-- | src/kernel/ao_stdio.c | 4 | ||||
| -rw-r--r-- | src/kernel/ao_task.c | 10 | ||||
| -rw-r--r-- | src/lpc/Makefile-lpc.defs | 3 | ||||
| -rw-r--r-- | src/stm/Makefile.defs | 3 | ||||
| -rw-r--r-- | src/stmf0/Makefile-stmf0.defs | 3 |
5 files changed, 13 insertions, 10 deletions
diff --git a/src/kernel/ao_stdio.c b/src/kernel/ao_stdio.c index c3b51d12..a42c97fb 100644 --- a/src/kernel/ao_stdio.c +++ b/src/kernel/ao_stdio.c @@ -145,13 +145,13 @@ ao_echo(void) int8_t ao_add_stdio(int (*_pollchar)(void), void (*putchar)(char), - void (*flush)(void)) + void (*_flush)(void)) { if (ao_num_stdios == AO_NUM_STDIOS) ao_panic(AO_PANIC_STDIO); ao_stdios[ao_num_stdios]._pollchar = _pollchar; ao_stdios[ao_num_stdios].putchar = putchar; - ao_stdios[ao_num_stdios].flush = flush; + ao_stdios[ao_num_stdios].flush = _flush; ao_stdios[ao_num_stdios].echo = 1; #if AO_NUM_STDIOS > 1 return ao_num_stdios++; diff --git a/src/kernel/ao_task.c b/src/kernel/ao_task.c index dc5c1913..0bc85d40 100644 --- a/src/kernel/ao_task.c +++ b/src/kernel/ao_task.c @@ -67,7 +67,7 @@ static inline void ao_check_stack(void) { static struct ao_list run_queue; static struct ao_list alarm_queue; -static struct ao_list sleep_queue[SLEEP_HASH_SIZE]; +static struct ao_list ao_sleep_queue[SLEEP_HASH_SIZE]; static void ao_task_to_run_queue(struct ao_task *task) @@ -80,7 +80,7 @@ ao_task_to_run_queue(struct ao_task *task) static struct ao_list * ao_task_sleep_queue(void *wchan) { - return &sleep_queue[(uintptr_t) wchan % SLEEP_HASH_SIZE]; + return &ao_sleep_queue[(uintptr_t) wchan % SLEEP_HASH_SIZE]; } static void @@ -195,7 +195,7 @@ ao_task_init(void) ao_list_init(&alarm_queue); ao_task_alarm_tick = 0; for (i = 0; i < SLEEP_HASH_SIZE; i++) - ao_list_init(&sleep_queue[i]); + ao_list_init(&ao_sleep_queue[i]); } #if DEBUG @@ -290,7 +290,7 @@ ao_task_validate(void) #endif /* HAS_TASK_QUEUE */ void -ao_add_task(struct ao_task * task, void (*start)(void), const char *name) +ao_add_task(struct ao_task * task, void (*task_func)(void), const char *name) { uint8_t task_id; uint8_t t; @@ -310,7 +310,7 @@ ao_add_task(struct ao_task * task, void (*start)(void), const char *name) * Construct a stack frame so that it will 'return' * to the start of the task */ - ao_arch_init_stack(task, start); + ao_arch_init_stack(task, task_func); ao_arch_critical( #if HAS_TASK_QUEUE ao_task_init_queue(task); diff --git a/src/lpc/Makefile-lpc.defs b/src/lpc/Makefile-lpc.defs index 493650e1..16da583f 100644 --- a/src/lpc/Makefile-lpc.defs +++ b/src/lpc/Makefile-lpc.defs @@ -31,7 +31,8 @@ WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ -Wstrict-prototypes \ -Wmissing-prototypes \ -Wmissing-declarations \ - -Wnested-externs + -Wnested-externs \ + -Wshadow AO_CFLAGS=-I. -I$(TOPDIR)/lpc -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ -DNEWLIB_INTEGER_PRINTF_SCANF \ diff --git a/src/stm/Makefile.defs b/src/stm/Makefile.defs index 7130965a..2db534c2 100644 --- a/src/stm/Makefile.defs +++ b/src/stm/Makefile.defs @@ -29,7 +29,8 @@ WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ -Wstrict-prototypes \ -Wmissing-prototypes \ -Wmissing-declarations \ - -Wnested-externs + -Wnested-externs \ + -Wshadow AO_CFLAGS=-I. -I../stm -I../kernel -I../drivers -I../math -I../draw \ -DNEWLIB_INTEGER_PRINTF_SCANF \ diff --git a/src/stmf0/Makefile-stmf0.defs b/src/stmf0/Makefile-stmf0.defs index 9372edc0..0438fc7b 100644 --- a/src/stmf0/Makefile-stmf0.defs +++ b/src/stmf0/Makefile-stmf0.defs @@ -30,7 +30,8 @@ WARN_FLAGS=-Wall -Wextra -Werror -Wcast-align \ -Wstrict-prototypes \ -Wmissing-prototypes \ -Wmissing-declarations \ - -Wnested-externs + -Wnested-externs \ + -Wshadow AO_CFLAGS=-I. -I$(TOPDIR)/stmf0 -I$(TOPDIR)/kernel -I$(TOPDIR)/drivers \ -DNEWLIB_INTEGER_PRINTF_SCANF \ |