X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fkern%2Fcoop.c;h=aa370ae589f6c5c589b851afe817030a1dd9e224;hb=e62ca0b357f09804d7d894949df44224c9d74bb7;hp=dd3aee211d82db28b7123194247480efda92d541;hpb=b0033f388edf3db04aec0901420a06bbc0f7ada7;p=bertos.git

diff --git a/bertos/kern/coop.c b/bertos/kern/coop.c
index dd3aee21..aa370ae5 100644
--- a/bertos/kern/coop.c
+++ b/bertos/kern/coop.c
@@ -56,7 +56,7 @@
  * Saving and restoring the context on the stack is done by a CPU-dependent
  * support routine which usually needs to be written in assembly.
  */
-EXTERN_C void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp);
+EXTERN_C void asm_switch_context(cpu_stack_t **new_sp, cpu_stack_t **save_sp);
 
 
 /**
@@ -65,11 +65,11 @@ EXTERN_C void asm_switch_context(cpustack_t **new_sp, cpustack_t **save_sp);
  */
 static void proc_schedule(void)
 {
-	cpuflags_t flags;
+	cpu_flags_t flags;
 
 	ATOMIC(LIST_ASSERT_VALID(&ProcReadyList));
 	ASSERT_USER_CONTEXT();
-	ASSERT_IRQ_ENABLED();
+	IRQ_ASSERT_ENABLED();
 
 	/* Poll on the ready queue for the first ready process */
 	IRQ_SAVE_DISABLE(flags);
@@ -101,7 +101,7 @@ static void proc_schedule(void)
 void proc_switch(void)
 {
 	/* Remember old process to save its context later */
-	const Process *old_process = CurrentProcess;
+	Process * const old_process = CurrentProcess;
 
 	proc_schedule();
 
@@ -111,7 +111,7 @@ void proc_switch(void)
 	 */
 	if (CurrentProcess != old_process)
 	{
-		cpustack_t *dummy;
+		cpu_stack_t *dummy;
 
 		#if CONFIG_KERN_MONITOR
 			LOG_INFO("Switch from %p(%s) to %p(%s)\n",