projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
String table and localization stuff.
[bertos.git]
/
kern
/
proc.c
diff --git
a/kern/proc.c
b/kern/proc.c
index 2301cee05c862bc5fe86c7722363c50e39db5d8a..164df21e91806b7f1cd366451af14ac2e92e0b56 100755
(executable)
--- a/
kern/proc.c
+++ b/
kern/proc.c
@@
-17,6
+17,12
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.24 2005/01/08 09:20:54 bernie
+ *#* Remove unused variable.
+ *#*
+ *#* Revision 1.23 2004/12/13 12:07:06 bernie
+ *#* DISABLE_IRQSAVE/ENABLE_IRQRESTORE: Convert to IRQ_SAVE_DISABLE/IRQ_RESTORE.
+ *#*
*#* Revision 1.22 2004/12/13 11:51:08 bernie
*#* DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.
*#*
*#* Revision 1.22 2004/12/13 11:51:08 bernie
*#* DISABLE_INTS/ENABLE_INTS: Convert to IRQ_DISABLE/IRQ_ENABLE.
*#*
@@
-179,7
+185,6
@@
void proc_init(void)
struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
{
Process *proc;
struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void), iptr_t data, size_t stacksize, cpustack_t *stack_base)
{
Process *proc;
- cpuflags_t flags;
size_t i;
size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
#if CONFIG_KERN_HEAP
size_t i;
size_t proc_size_words = ROUND2(sizeof(Process), sizeof(cpustack_t)) / sizeof(cpustack_t);
#if CONFIG_KERN_HEAP
@@
-251,9
+256,7
@@
struct Process *proc_new_with_name(UNUSED(const char*, name), void (*entry)(void
CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i));
/* Add to ready list */
CPU_PUSH_WORD(proc->stack, CPU_REG_INIT_VALUE(i));
/* Add to ready list */
- DISABLE_IRQSAVE(flags);
- SCHED_ENQUEUE(proc);
- ENABLE_IRQRESTORE(flags);
+ ATOMIC(SCHED_ENQUEUE(proc));
#if CONFIG_KERN_MONITOR
monitor_add(proc, name, stack_base, stacksize);
#if CONFIG_KERN_MONITOR
monitor_add(proc, name, stack_base, stacksize);
@@
-294,7
+297,7
@@
void proc_schedule(void)
old_process = CurrentProcess;
/* Poll on the ready queue for the first ready process */
old_process = CurrentProcess;
/* Poll on the ready queue for the first ready process */
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList)))
{
/*
while (!(CurrentProcess = (struct Process *)REMHEAD(&ProcReadyList)))
{
/*
@@
-311,7
+314,7
@@
void proc_schedule(void)
SCHEDULER_IDLE;
IRQ_DISABLE;
}
SCHEDULER_IDLE;
IRQ_DISABLE;
}
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
/*
* Optimization: don't switch contexts when the active
/*
* Optimization: don't switch contexts when the active
@@
-387,9
+390,9
@@
void proc_switch(void)
/* Just like proc_schedule, this function must not have auto variables. */
static cpuflags_t flags;
/* Just like proc_schedule, this function must not have auto variables. */
static cpuflags_t flags;
-
DISABLE_IRQSAV
E(flags);
+
IRQ_SAVE_DISABL
E(flags);
SCHED_ENQUEUE(CurrentProcess);
SCHED_ENQUEUE(CurrentProcess);
-
ENABLE_IRQ
RESTORE(flags);
+
IRQ_
RESTORE(flags);
proc_schedule();
}
proc_schedule();
}