CPU_IDLE(): Fix for new emulator.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@591 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/cfg/cpu.h b/cfg/cpu.h
index f845bde1239daa0530e90708af6ca141c4096909..9b9d31430fea3bc9dbe30d805a4c3493334f65b8 100755 (executable)
--- 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 495ca735e5d2cedc650eedb4a848fb53b622e1ee..ecd4ca41579ab3c7ed0c7a1234fb5a873f5659a8 100755 (executable)
--- 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);