benchmark: do not build serial driver in context_switch if CONFIG_USE_HP_TIMER is...

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

diff --git a/bertos/benchmark/context_switch.c b/bertos/benchmark/context_switch.c
index 5ab77159d472cdc1b68db352e696c579d1d6314c..12298892a9c9bfebd15724ded8674b52d65e149f 100644 (file)
--- a/bertos/benchmark/context_switch.c
+++ b/bertos/benchmark/context_switch.c
@@ -47,7 +47,10 @@
 #include <cpu/power.h>
 
 #include <drv/timer.h>
+#if CONFIG_USE_HP_TIMER
 #include <drv/ser.h>
+static Serial out;
+#endif
 
 #include <kern/proc.h>
 
@@ -57,8 +60,6 @@ static PROC_DEFINE_STACK(hp_stack, PROC_STACK_SIZE);
 static PROC_DEFINE_STACK(lp_stack, PROC_STACK_SIZE);
 
 static Process *hp_proc, *lp_proc, *main_proc;
-static Serial out;
-
 #if CONFIG_USE_HP_TIMER
 static hptime_t start, end;
 #endif
@@ -101,8 +102,10 @@ void NORETURN context_switch(void)
        timer_init();
        proc_init();
 
-       ser_init(&out, CONFIG_CTX_DEBUG_PORT);
-       ser_setbaudrate(&out, CONFIG_CTX_DEBUG_BAUDRATE);
+       #if CONFIG_USE_HP_TIMER
+               ser_init(&out, CONFIG_CTX_DEBUG_PORT);
+               ser_setbaudrate(&out, CONFIG_CTX_DEBUG_BAUDRATE);
+       #endif
 
        #if CONFIG_USE_LED
                LED_INIT();

diff --git a/bertos/benchmark/context_switch.h b/bertos/benchmark/context_switch.h
index e17921aeeee0054d686f99c361de95ca9015d9aa..350a5312aa74f5aa57f79e5023f5c5f7b40b7b3a 100644 (file)
--- a/bertos/benchmark/context_switch.h
+++ b/bertos/benchmark/context_switch.h
@@ -36,7 +36,7 @@
  * \author Daniele Basiele <asterix@develer.com>
  *
  * $WIZ$ module_name = "context_switch"
- * $WIZ$ module_depends = "kfile", "kern", "signal", "timer", "ser"
+ * $WIZ$ module_depends = "kfile", "kern", "signal", "timer"
  * $WIZ$ module_configuration = "bertos/cfg/cfg_context_switch.h"
  * $WIZ$ module_hw = "bertos/hw/hw_led.h"
  */

diff --git a/bertos/cfg/cfg_context_switch.h b/bertos/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/bertos/cfg/cfg_context_switch.h
+++ b/bertos/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/bertos/gui/menu.h b/bertos/gui/menu.h
index d5b516ae9cec6443b94eb660ea5cfd0170ac76fa..9e6e58addca6f70b49873b5822fe226d2542527c 100644 (file)
--- a/bertos/gui/menu.h
+++ b/bertos/gui/menu.h
@@ -37,7 +37,6 @@
  * \brief Common menu handling API
  *
  * $WIZ$ module_name = "menu"
- * $WIZ$ module_configuration = "bertos/cfg/cfg_menu.h"
  * $WIZ$ module_depends = "text", "gfx", "timer", "kbd"
  */
 

diff --git a/boards/arduino/examples/aprs/cfg/cfg_context_switch.h b/boards/arduino/examples/aprs/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/arduino/examples/aprs/cfg/cfg_context_switch.h
+++ b/boards/arduino/examples/aprs/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/at91sam7x-ek/benchmark/context_switch/cfg/cfg_context_switch.h b/boards/at91sam7x-ek/benchmark/context_switch/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/at91sam7x-ek/benchmark/context_switch/cfg/cfg_context_switch.h
+++ b/boards/at91sam7x-ek/benchmark/context_switch/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/at91sam7x-ek/benchmark/kernel_footprint/cfg/cfg_context_switch.h b/boards/at91sam7x-ek/benchmark/kernel_footprint/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/at91sam7x-ek/benchmark/kernel_footprint/cfg/cfg_context_switch.h
+++ b/boards/at91sam7x-ek/benchmark/kernel_footprint/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/ek-lm3s1968/benchmark/context_switch/cfg/cfg_context_switch.h b/boards/ek-lm3s1968/benchmark/context_switch/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/ek-lm3s1968/benchmark/context_switch/cfg/cfg_context_switch.h
+++ b/boards/ek-lm3s1968/benchmark/context_switch/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/ek-lm3s1968/benchmark/kernel_footprint/cfg/cfg_context_switch.h b/boards/ek-lm3s1968/benchmark/kernel_footprint/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/ek-lm3s1968/benchmark/kernel_footprint/cfg/cfg_context_switch.h
+++ b/boards/ek-lm3s1968/benchmark/kernel_footprint/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/ek-lm3s1968/examples/gps/cfg/cfg_context_switch.h b/boards/ek-lm3s1968/examples/gps/cfg/cfg_context_switch.h
index 46abc5d2c047b239f77669d2f839ca9399b00e65..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/ek-lm3s1968/examples/gps/cfg/cfg_context_switch.h
+++ b/boards/ek-lm3s1968/examples/gps/cfg/cfg_context_switch.h
@@ -39,14 +39,23 @@
 #define CFG_CONTEXT_SWITCH_H
 
 /**
- * Use hp timer for the bechmark, otherwise it use
- * one led.
+ * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 
 
+/**
+ * Use board led for benchmark.
+ *
+ * $WIZ$ type = "boolean"
+ */
+#define CONFIG_USE_LED       1
+
+
 /**
  * Debug console port.
  * $WIZ$ type = "int"; min = 0

diff --git a/boards/lpc-p2378/benchmark/context_switch/cfg/cfg_context_switch.h b/boards/lpc-p2378/benchmark/context_switch/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/lpc-p2378/benchmark/context_switch/cfg/cfg_context_switch.h
+++ b/boards/lpc-p2378/benchmark/context_switch/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/lpc-p2378/benchmark/kernel_footprint/cfg/cfg_context_switch.h b/boards/lpc-p2378/benchmark/kernel_footprint/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/lpc-p2378/benchmark/kernel_footprint/cfg/cfg_context_switch.h
+++ b/boards/lpc-p2378/benchmark/kernel_footprint/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/triface/benchmark/context_switch/cfg/cfg_context_switch.h b/boards/triface/benchmark/context_switch/cfg/cfg_context_switch.h
index aebb221e28c0dc5e7f2121b77d465f7045f934e1..be15cf2fe70f80e98c3e8b0ca9157f7ba98da11e 100644 (file)
--- a/boards/triface/benchmark/context_switch/cfg/cfg_context_switch.h
+++ b/boards/triface/benchmark/context_switch/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/triface/benchmark/kernel_footprint/cfg/cfg_context_switch.h b/boards/triface/benchmark/kernel_footprint/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/triface/benchmark/kernel_footprint/cfg/cfg_context_switch.h
+++ b/boards/triface/benchmark/kernel_footprint/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1
 

diff --git a/boards/triface/examples/triface/cfg/cfg_context_switch.h b/boards/triface/examples/triface/cfg/cfg_context_switch.h
index 0538692987b453ad3e4b3deb519471dffa6c0906..fe0b4f8725be942d45765855b721802b213f5185 100644 (file)
--- a/boards/triface/examples/triface/cfg/cfg_context_switch.h
+++ b/boards/triface/examples/triface/cfg/cfg_context_switch.h
@@ -42,6 +42,8 @@
  * Use hp timer for the bechmark.
  *
  * $WIZ$ type = "boolean"
+ * $WIZ$ module= "boolean"
+ * $WIZ$ conditional_deps = "ser"
  */
 #define CONFIG_USE_HP_TIMER       1