From 3ff019b46dfe066b873c71f1d16e6a2fe6f11223 Mon Sep 17 00:00:00 2001
From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Mon, 27 Mar 2006 04:49:23 +0000
Subject: [PATCH] CPU_IDLE(): Fix for new emulator.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@591 38d2e660-2303-0410-9eaa-f027e97ec537
---
 cfg/cpu.h   | 11 ++++++-----
 kern/proc.c |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cfg/cpu.h b/cfg/cpu.h
index f845bde1..9b9d3143 100755
--- a/cfg/cpu.h
+++ b/cfg/cpu.h
@@ -17,6 +17,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.13  2006/03/27 04:49:23  bernie
+ *#* CPU_IDLE(): Fix for new emulator.
+ *#*
  *#* Revision 1.12  2006/03/21 10:52:39  bernie
  *#* Update ARM support.
  *#*
@@ -75,6 +78,7 @@
 #define DEVLIB_CPU_H
 
 #include <cfg/compiler.h> /* for uintXX_t */
+#include <cfg/arch_config.h>  /* ARCH_EMUL */
 
 
 /*!
@@ -578,15 +582,12 @@ STATIC_ASSERT(sizeof(uint64_t) * CPU_BITS_PER_CHAR == 64);
 	#if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
 		/* This emulator hook should yield the CPU to the host.  */
 		EXTERN_C_BEGIN
-		void SchedulerIdle(void);
+		void emul_idle(void);
 		EXTERN_C_END
-		#define CPU_IDLE SchedulerIdle()
+		#define CPU_IDLE emul_idle()
 	#else /* !ARCH_EMUL */
 		#define CPU_IDLE do { /* nothing */ } while (0)
 	#endif /* !ARCH_EMUL */
 #endif /* !CPU_IDLE */
 
-/* OBSOLETE */
-#define SCHEDULER_IDLE CPU_IDLE
-
 #endif /* DEVLIB_CPU_H */
diff --git a/kern/proc.c b/kern/proc.c
index 495ca735..ecd4ca41 100755
--- a/kern/proc.c
+++ b/kern/proc.c
@@ -17,6 +17,9 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.30  2006/03/27 04:49:23  bernie
+ *#* CPU_IDLE(): Fix for new emulator.
+ *#*
  *#* Revision 1.29  2006/02/24 01:17:05  bernie
  *#* Update for new emulator.
  *#*
@@ -331,7 +334,7 @@ void proc_schedule(void)
 		 * reason to do this.
 		 */
 		IRQ_ENABLE;
-		SCHEDULER_IDLE;
+		CPU_IDLE;
 		IRQ_DISABLE;
 	}
 	IRQ_RESTORE(flags);
-- 
2.25.1