This makes proc_test actually compile and pass:

 - use emul_idle() only when we have Qt

 - enable CONFIG_KERN_PREEMPT in generic config

Not sure why preemption was disabled in the first place.
It's required to pass proc_test.  Will commit this change if
noone complains within the next 24h.

This patch comes to you from Doha's airport with love!

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

diff --git a/bertos/cfg/cfg_kern.h b/bertos/cfg/cfg_kern.h
index 23bcd40c76dceb00e068bcf7c309d5fefdbf6c57..fffc9ca7719656fd1c617d6ee14f7b3ab326f1b4 100644 (file)
--- a/bertos/cfg/cfg_kern.h
+++ b/bertos/cfg/cfg_kern.h
@@ -54,7 +54,7 @@
 #define CONFIG_KERN_HEAP        0  ///< Dynamic memory allocation
 #define CONFIG_KERN_SEMAPHORES  1  ///< Re-entrant mutual exclusion primitives
 #define CONFIG_KERN_MONITOR     1  ///< Process monitor
-#define CONFIG_KERN_PREEMPT     0  ///< Preemptive process scheduling
+#define CONFIG_KERN_PREEMPT     1  ///< Preemptive process scheduling
 #define CONFIG_KERN_PRI         1  ///< Priority-based scheduling policy
 /*\}*/
 

diff --git a/bertos/cpu/frame.h b/bertos/cpu/frame.h
index 2a9680a2a7e64231ca89ae4c35645ddc652ec52a..c96351566f156c71d93de7fe50c803403ebc2966 100644 (file)
--- a/bertos/cpu/frame.h
+++ b/bertos/cpu/frame.h
@@ -226,7 +226,7 @@
  * in hosted environments such as emulators.
  */
 #ifndef CPU_IDLE
-       #if defined(ARCH_EMUL) && (ARCH & ARCH_EMUL)
+       #if defined(ARCH_QT) && (ARCH & ARCH_QT)
                /* This emulator hook should yield the CPU to the host.  */
                EXTERN_C_BEGIN
                void emul_idle(void);