Fix kernel heap macros in bertos trunk.

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

diff --git a/Makefile b/Makefile
index 1eb5c26ef7b0b8c2cadb3186275e2c535d4b1435..78f7bf6cff5ce99cc47a8af62036e30c428a3c81 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,8 @@ default: all
 include bertos/config.mk
 
 #Include subtargets
-include examples/demo/demo.mk
-#include examples/at91sam7s/at91sam7s.mk
+#include examples/demo/demo.mk
+include examples/at91sam7s/at91sam7s.mk
 #include examples/triface/triface.mk
 
 include bertos/rules.mk

diff --git a/bertos/cfg/cfg_proc.h b/bertos/cfg/cfg_proc.h
index b2337bf25e6202f4efd600f9d58ac8135344554a..52e245265e745907bd2ae113c9aef253edaf18a2 100644 (file)
--- a/bertos/cfg/cfg_proc.h
+++ b/bertos/cfg/cfg_proc.h
@@ -57,6 +57,7 @@
  * Dynamic memory allocation for processes.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ supports = "False"
  */
 #define CONFIG_KERN_HEAP 0
 

diff --git a/examples/at91sam7s/at91sam7s.c b/examples/at91sam7s/at91sam7s.c
index f0c14a29fdcf17ba23dbec2c5d59a9fb98481198..17293a4448bd35091ce4a4d471a74ffa6118b813 100644 (file)
--- a/examples/at91sam7s/at91sam7s.c
+++ b/examples/at91sam7s/at91sam7s.c
@@ -45,6 +45,7 @@
 #include <drv/timer.h>
 #include <drv/sysirq_at91.h>
 #include <drv/ser.h>
+#include <drv/ntc.h>
 
 #include <io/arm.h>
 
@@ -71,7 +72,7 @@ static void leds_toggle(void)
                        roll = 1;
 
                PIOA_SODR = a;
-               PIOA_CODR = a >> 1;     
+               PIOA_CODR = a >> 1;
        }
        else
        {

diff --git a/examples/at91sam7s/cfg/cfg_proc.h b/examples/at91sam7s/cfg/cfg_proc.h
index 78a0447b9f43a897f0fe50cc80e985c444e7b906..9f5f3a2568a99b91617009742b0ec30d444c41ef 100644 (file)
--- a/examples/at91sam7s/cfg/cfg_proc.h
+++ b/examples/at91sam7s/cfg/cfg_proc.h
@@ -58,7 +58,7 @@
  * $WIZ$ type = "boolean"
  * $WIZ$ supports = "False"
  */
-#define CONFIG_KERN_HEAP 1
+#define CONFIG_KERN_HEAP 0
 
 /**
  * Preemptive process scheduling. WARNING: Experimental, still incomplete!